From 135a88f827bbce362f24bfd5f6ea935476e040b5 Mon Sep 17 00:00:00 2001 From: mguellsegarra <5711443+mguellsegarra@users.noreply.github.com> Date: Wed, 8 Jan 2025 12:35:47 +0000 Subject: [PATCH] fix: sync changes from main to develop --- .github/workflows/release.yaml | 7 ++++++- package-lock.json | 4 ++-- package.json | 2 +- src/components/ui/FieldSet/FieldSet.styles.tsx | 4 ++-- src/components/ui/FieldSet/FieldSet.tsx | 2 +- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index ced255a..5926fa8 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -33,7 +33,12 @@ jobs: - name: Checkout Repository uses: actions/checkout@v2 with: - fetch-depth: 1 + fetch-depth: 0 + + - name: Sync with Remote Branch + run: | + git fetch origin + git reset --hard origin/${{ github.ref_name }} - name: Install Dependencies run: npm ci diff --git a/package-lock.json b/package-lock.json index c252775..82d794b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@gisce/react-formiga-components", - "version": "1.9.0-rc.1", + "version": "1.9.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@gisce/react-formiga-components", - "version": "1.9.0-rc.1", + "version": "1.9.1", "license": "MIT", "dependencies": { "antd": "5.13.1", diff --git a/package.json b/package.json index 279cc3a..8cd8f49 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "engines": { "node": "20.5.0" }, - "version": "1.9.0-rc.1", + "version": "1.9.1", "module": "./dist/react-formiga-components.es.js", "types": "./dist/index.d.ts", "exports": { diff --git a/src/components/ui/FieldSet/FieldSet.styles.tsx b/src/components/ui/FieldSet/FieldSet.styles.tsx index 634a9b5..4c7aa3b 100644 --- a/src/components/ui/FieldSet/FieldSet.styles.tsx +++ b/src/components/ui/FieldSet/FieldSet.styles.tsx @@ -1,11 +1,11 @@ import styled from "styled-components"; -export const FieldSetElement = styled.fieldset<{ borderRadius?: string }>` +export const FieldSetElement = styled.fieldset<{ $borderRadius?: string }>` padding: 0.5rem; border-color: #d9d9d9; border-width: 1px; border-style: solid; - border-radius: ${(props) => props.borderRadius || "5px"}; + border-radius: ${(props) => props.$borderRadius || "5px"}; font-family: ui-sans-serif, system-ui, diff --git a/src/components/ui/FieldSet/FieldSet.tsx b/src/components/ui/FieldSet/FieldSet.tsx index 7cc69ca..6cacf27 100644 --- a/src/components/ui/FieldSet/FieldSet.tsx +++ b/src/components/ui/FieldSet/FieldSet.tsx @@ -16,7 +16,7 @@ export const FieldSet = (props: FieldSetProps): React.ReactElement => { ); return ( - + {labelComponent} {children}