Merge branch 'main' into efs_fixes_20.12

island-is · Dec 20, 2024 · 9cafe74 · 9cafe74
2 parents c740595 + 0d1d63e
commit 9cafe74
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 9 deletions.
diff --git a/...ence-template/src/forms/exampleForm/tablesAndRepeatersSection/fieldsRepeaterSubsection.ts b/...ence-template/src/forms/exampleForm/tablesAndRepeatersSection/fieldsRepeaterSubsection.ts
@@ -23,7 +23,7 @@ export const fieldsRepeaterSubsection = buildSubSection({
           id: 'fieldsRepeater',
           title: 'Fields Repeater',
           formTitle: 'Title for each form',
-          width: 'half',
+          width: 'full',
           fields: {
             input: {
               component: 'input',

diff --git a/libs/application/ui-fields/src/lib/FieldsRepeaterFormField/FieldsRepeaterItem.tsx b/libs/application/ui-fields/src/lib/FieldsRepeaterFormField/FieldsRepeaterItem.tsx
@@ -46,6 +46,19 @@ export const Item = ({
   const { setValue, control, clearErrors } = useFormContext()
   const prevWatchedValuesRef = useRef<string | (string | undefined)[]>()
 
+  const getSpan = (component: string, width: string) => {
+    if (component !== 'radio' && component !== 'checkbox') {
+      if (width === 'half') {
+        return '1/2'
+      }
+      if (width === 'third') {
+        return '1/3'
+      }
+      return '1/1'
+    }
+    return '1/1'
+  }
+
   const {
     component,
     id: itemId,
@@ -61,9 +74,8 @@ export const Item = ({
     defaultValue,
     ...props
   } = item
-  const isHalfColumn = component !== 'radio' && width === 'half'
-  const isThirdColumn = component !== 'radio' && width === 'third'
-  const span = isHalfColumn ? '1/2' : isThirdColumn ? '1/3' : '1/1'
+
+  const span = getSpan(component, width)
   const Component = componentMapper[component]
   const id = `${dataId}[${index}].${itemId}`
   const activeValues = index >= 0 && values ? values[index] : undefined
@@ -203,7 +215,7 @@ export const Item = ({
         label={formatText(label, application, formatMessage)}
         options={translatedOptions}
         placeholder={formatText(placeholder, application, formatMessage)}
-        split={width === 'half' ? '1/2' : '1/1'}
+        split={width === 'half' ? '1/2' : width === 'third' ? '1/3' : '1/1'}
         error={getFieldError(itemId)}
         control={control}
         readOnly={Readonly}

diff --git a/libs/application/ui-fields/src/lib/TableRepeaterFormField/TableRepeaterItem.tsx b/libs/application/ui-fields/src/lib/TableRepeaterFormField/TableRepeaterItem.tsx
@@ -46,6 +46,19 @@ export const Item = ({
   const { setValue, control, clearErrors } = useFormContext()
   const prevWatchedValuesRef = useRef<string | (string | undefined)[]>()
 
+  const getSpan = (component: string, width: string) => {
+    if (component !== 'radio' && component !== 'checkbox') {
+      if (width === 'half') {
+        return '1/2'
+      }
+      if (width === 'third') {
+        return '1/3'
+      }
+      return '1/1'
+    }
+    return '1/1'
+  }
+
   const {
     component,
     id: itemId,
@@ -61,9 +74,8 @@ export const Item = ({
     defaultValue,
     ...props
   } = item
-  const isHalfColumn = component !== 'radio' && width === 'half'
-  const isThirdColumn = component !== 'radio' && width === 'third'
-  const span = isHalfColumn ? '1/2' : isThirdColumn ? '1/3' : '1/1'
+
+  const span = getSpan(component, width)
   const Component = componentMapper[component]
   const id = `${dataId}[${activeIndex}].${itemId}`
   const activeValues =
@@ -203,7 +215,7 @@ export const Item = ({
         label={formatText(label, application, formatMessage)}
         options={translatedOptions}
         placeholder={formatText(placeholder, application, formatMessage)}
-        split={width === 'half' ? '1/2' : '1/1'}
+        split={width === 'half' ? '1/2' : width === 'third' ? '1/3' : '1/1'}
         error={getFieldError(itemId)}
         control={control}
         readOnly={Readonly}