@digigov/form 2.0.0-2445d5cb → 2.0.0-298cfc51

package/cjs/Field/index.js

@@ -79,7 +79,8 @@ const Field = ({
         reset,
         register,
         field: calculatedField,
-        error
+        error,
+        Field
       }
     );
   }
@@ -92,6 +93,7 @@ const Field = ({
         register,
         error,
         formState,
+        Field,
         ...calculatedField
       }
     );
@@ -110,6 +112,7 @@ const Field = ({
         setValue,
         getValues,
         unregister,
+        Field,
         ...calculatedField
       }
     );
@@ -124,7 +127,7 @@ const Field = ({
       register,
       reset,
       error,
-      fieldComponent: Field
+      Field
     }
   );
 };

package/cjs/Field/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/Field/index.tsx"],
-  "sourcesContent": ["import React, { useMemo } from 'react';\nimport { FieldBase } from '@digigov/form/Field/FieldBase';\nimport FieldConditional from '@digigov/form/Field/FieldConditional';\nimport {\n  FieldWithCondition,\n  CalculatedField,\n  FieldProps,\n} from '@digigov/form/Field/types';\nimport {\n  FIELD_COMPONENTS,\n  ALTERNATIVE_COMPONENTS,\n} from '@digigov/form/Field/utils';\nimport { calculateField } from '@digigov/form/Field/utils/calculateField';\nimport { useField } from '@digigov/form/Field/utils/useField';\nimport FieldArray from '@digigov/form/FieldArray';\nimport Multiplicity from '@digigov/form/MultiplicityField';\nexport const Field: React.FC<FieldProps> = ({\n  name,\n  disabled,\n  children,\n  ...customField\n}) => {\n  const {\n    field,\n    control,\n    register,\n    reset,\n    error,\n    componentRegistry,\n    formState,\n    setValue,\n    getValues,\n    unregister,\n    trigger,\n    clearErrors,\n  } = useField(name, customField?.type ? customField : null);\n  const calculatedField: CalculatedField = useMemo(\n    () =>\n      calculateField(\n        children,\n        field,\n        {\n          ...FIELD_COMPONENTS,\n          ...componentRegistry,\n        },\n        ALTERNATIVE_COMPONENTS\n      ),\n    [field]\n  );\n\n  if (calculatedField.condition) {\n    return (\n      <FieldConditional\n        control={control}\n        reset={reset}\n        register={register}\n        field={calculatedField as FieldWithCondition}\n        error={error}\n      />\n    );\n  }\n  if (calculatedField.type === 'array' && !calculatedField.multiplicity) {\n    calculatedField.name = name;\n    return (\n      <FieldArray\n        control={control}\n        register={register}\n        error={error}\n        formState={formState}\n        {...calculatedField}\n      />\n    );\n  }\n  if (\n    calculatedField.type === 'array' &&\n    calculatedField.multiplicity === true\n  ) {\n    calculatedField.name = name;\n    return (\n      <Multiplicity\n        control={control}\n        register={register}\n        trigger={trigger}\n        clearErrors={clearErrors}\n        error={error}\n        formState={formState}\n        setValue={setValue}\n        getValues={getValues}\n        unregister={unregister}\n        {...calculatedField}\n      />\n    );\n  }\n  return (\n    <FieldBase\n      {...calculatedField}\n      name={name}\n      disabled={disabled}\n      control={control}\n      register={register}\n      reset={reset}\n      error={error}\n      fieldComponent={Field}\n    />\n  );\n};\n\nexport default Field;\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA+B;AAC/B,uBAA0B;AAC1B,8BAA6B;AAM7B,mBAGO;AACP,4BAA+B;AAC/B,sBAAyB;AACzB,wBAAuB;AACvB,+BAAyB;AAClB,MAAM,QAA8B,CAAC;AAAA,EAC1C;AAAA,EACA;AAAA,EACA;AAAA,EACA,GAAG;AACL,MAAM;AACJ,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,QAAI,0BAAS,MAAM,aAAa,OAAO,cAAc,IAAI;AACzD,QAAM,sBAAmC;AAAA,IACvC,UACE;AAAA,MACE;AAAA,MACA;AAAA,MACA;AAAA,QACE,GAAG;AAAA,QACH,GAAG;AAAA,MACL;AAAA,MACA;AAAA,IACF;AAAA,IACF,CAAC,KAAK;AAAA,EACR;AAEA,MAAI,gBAAgB,WAAW;AAC7B,WACE,6BAAAA,QAAA;AAAA,MAAC,wBAAAC;AAAA,MAAA;AAAA,QACC;AAAA,QACA;AAAA,QACA;AAAA,QACA,OAAO;AAAA,QACP;AAAA;AAAA,IACF;AAAA,EAEJ;AACA,MAAI,gBAAgB,SAAS,WAAW,CAAC,gBAAgB,cAAc;AACrE,oBAAgB,OAAO;AACvB,WACE,6BAAAD,QAAA;AAAA,MAAC,kBAAAE;AAAA,MAAA;AAAA,QACC;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACC,GAAG;AAAA;AAAA,IACN;AAAA,EAEJ;AACA,MACE,gBAAgB,SAAS,WACzB,gBAAgB,iBAAiB,MACjC;AACA,oBAAgB,OAAO;AACvB,WACE,6BAAAF,QAAA;AAAA,MAAC,yBAAAG;AAAA,MAAA;AAAA,QACC;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACC,GAAG;AAAA;AAAA,IACN;AAAA,EAEJ;AACA,SACE,6BAAAH,QAAA;AAAA,IAAC;AAAA;AAAA,MACE,GAAG;AAAA,MACJ;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA,gBAAgB;AAAA;AAAA,EAClB;AAEJ;AAEA,IAAO,gBAAQ;",
+  "sourcesContent": ["import React, { useMemo } from 'react';\nimport { FieldBase } from '@digigov/form/Field/FieldBase';\nimport FieldConditional from '@digigov/form/Field/FieldConditional';\nimport {\n  FieldWithCondition,\n  CalculatedField,\n  FieldProps,\n} from '@digigov/form/Field/types';\nimport {\n  FIELD_COMPONENTS,\n  ALTERNATIVE_COMPONENTS,\n} from '@digigov/form/Field/utils';\nimport { calculateField } from '@digigov/form/Field/utils/calculateField';\nimport { useField } from '@digigov/form/Field/utils/useField';\nimport FieldArray from '@digigov/form/FieldArray';\nimport Multiplicity from '@digigov/form/MultiplicityField';\nexport const Field: React.FC<FieldProps> = ({\n  name,\n  disabled,\n  children,\n  ...customField\n}) => {\n  const {\n    field,\n    control,\n    register,\n    reset,\n    error,\n    componentRegistry,\n    formState,\n    setValue,\n    getValues,\n    unregister,\n    trigger,\n    clearErrors,\n  } = useField(name, customField?.type ? customField : null);\n  const calculatedField: CalculatedField = useMemo(\n    () =>\n      calculateField(\n        children,\n        field,\n        {\n          ...FIELD_COMPONENTS,\n          ...componentRegistry,\n        },\n        ALTERNATIVE_COMPONENTS\n      ),\n    [field]\n  );\n\n  if (calculatedField.condition) {\n    return (\n      <FieldConditional\n        control={control}\n        reset={reset}\n        register={register}\n        field={calculatedField as FieldWithCondition}\n        error={error}\n        Field={Field}\n      />\n    );\n  }\n  if (calculatedField.type === 'array' && !calculatedField.multiplicity) {\n    calculatedField.name = name;\n    return (\n      <FieldArray\n        control={control}\n        register={register}\n        error={error}\n        formState={formState}\n        Field={Field}\n        {...calculatedField}\n      />\n    );\n  }\n  if (\n    calculatedField.type === 'array' &&\n    calculatedField.multiplicity === true\n  ) {\n    calculatedField.name = name;\n    return (\n      <Multiplicity\n        control={control}\n        register={register}\n        trigger={trigger}\n        clearErrors={clearErrors}\n        error={error}\n        formState={formState}\n        setValue={setValue}\n        getValues={getValues}\n        unregister={unregister}\n        Field={Field}\n        {...calculatedField}\n      />\n    );\n  }\n  return (\n    <FieldBase\n      {...calculatedField}\n      name={name}\n      disabled={disabled}\n      control={control}\n      register={register}\n      reset={reset}\n      error={error}\n      Field={Field}\n    />\n  );\n};\n\nexport default Field;\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA+B;AAC/B,uBAA0B;AAC1B,8BAA6B;AAM7B,mBAGO;AACP,4BAA+B;AAC/B,sBAAyB;AACzB,wBAAuB;AACvB,+BAAyB;AAClB,MAAM,QAA8B,CAAC;AAAA,EAC1C;AAAA,EACA;AAAA,EACA;AAAA,EACA,GAAG;AACL,MAAM;AACJ,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,QAAI,0BAAS,MAAM,aAAa,OAAO,cAAc,IAAI;AACzD,QAAM,sBAAmC;AAAA,IACvC,UACE;AAAA,MACE;AAAA,MACA;AAAA,MACA;AAAA,QACE,GAAG;AAAA,QACH,GAAG;AAAA,MACL;AAAA,MACA;AAAA,IACF;AAAA,IACF,CAAC,KAAK;AAAA,EACR;AAEA,MAAI,gBAAgB,WAAW;AAC7B,WACE,6BAAAA,QAAA;AAAA,MAAC,wBAAAC;AAAA,MAAA;AAAA,QACC;AAAA,QACA;AAAA,QACA;AAAA,QACA,OAAO;AAAA,QACP;AAAA,QACA;AAAA;AAAA,IACF;AAAA,EAEJ;AACA,MAAI,gBAAgB,SAAS,WAAW,CAAC,gBAAgB,cAAc;AACrE,oBAAgB,OAAO;AACvB,WACE,6BAAAD,QAAA;AAAA,MAAC,kBAAAE;AAAA,MAAA;AAAA,QACC;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACC,GAAG;AAAA;AAAA,IACN;AAAA,EAEJ;AACA,MACE,gBAAgB,SAAS,WACzB,gBAAgB,iBAAiB,MACjC;AACA,oBAAgB,OAAO;AACvB,WACE,6BAAAF,QAAA;AAAA,MAAC,yBAAAG;AAAA,MAAA;AAAA,QACC;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACC,GAAG;AAAA;AAAA,IACN;AAAA,EAEJ;AACA,SACE,6BAAAH,QAAA;AAAA,IAAC;AAAA;AAAA,MACE,GAAG;AAAA,MACJ;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA;AAAA,EACF;AAEJ;AAEA,IAAO,gBAAQ;",
   "names": ["React", "FieldConditional", "FieldArray", "Multiplicity"]
 }

package/cjs/Field/types.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/Field/types.tsx"],
-  "sourcesContent": ["import React from 'react';\nimport { ErrorOption, UseFormReturn, UseFormProps } from 'react-hook-form';\nimport { ValidatorSchema } from '@digigov/form/validators/types';\nimport { GridProps } from '@digigov/ui/layouts/Grid';\n\nexport type FieldLabelProps = {\n  primary?: string;\n  secondary?: string;\n};\n\nexport interface FieldSpec {\n  key: string; // !TODO rename key to name;\n  type?:\n    | 'int'\n    | 'string'\n    | 'text'\n    | 'boolean'\n    | 'email'\n    | 'uuid4'\n    | 'choice:multiple'\n    | 'choice:single'\n    | 'mobile_phone'\n    | 'date'\n    | 'otp'\n    | 'afm'\n    | 'iban'\n    | 'file'\n    | 'image'\n    | 'postal_code'\n    | 'phone_number'\n    | 'array'\n    | 'object';\n  component?: any;\n  maxLength?: number;\n  condition?: Record<string, FieldCondition>;\n  controlled?: boolean;\n  label?: FieldLabelProps;\n  extra?: {\n    [key: string]: any;\n  };\n  editable?: boolean;\n  required?: boolean;\n  enabled?: boolean;\n  disabled?: boolean;\n  layout?: Record<\n    string,\n    | GridProps['xs']\n    | GridProps['sm']\n    | GridProps['md']\n    | GridProps['lg']\n    | GridProps['xl']\n  >;\n  validators?: ValidatorSchema[];\n  wrapper?: 'label' | 'fieldset';\n  maxWidth?: string;\n  maxHeight?: string;\n  width?: string;\n}\n\nexport interface FieldCondition {\n  is: string | string[] | number | number[] | boolean | boolean[];\n  then?: Partial<FieldSpec>;\n  else?: Partial<FieldSpec>;\n}\nexport interface ChildFieldMemoProps extends FieldConditionalProps {\n  dependencies: FormData;\n}\nexport type FormData = UseFormProps['defaultValues'];\n\nexport interface FieldWithCondition extends Omit<CalculatedField, 'condition'> {\n  condition: Record<string, FieldCondition>;\n}\n\nexport interface FieldConditionalProps {\n  field: FieldWithCondition;\n  control: UseFormReturn['control'];\n  register: UseFormReturn['register'];\n  reset: UseFormReturn['reset'];\n  error?: ErrorOption;\n}\n\nexport type FieldComponentItem = {\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  component: any;\n  controlled?: boolean;\n  wrapper?: FieldSpec['wrapper'];\n};\n\nexport interface FieldContainerProps {\n  name?: FieldSpec['key'];\n  layout?: FieldSpec['layout'];\n  label?: FieldSpec['label'];\n  error?: ErrorOption | Record<string, any>;\n  children?: React.ReactNode;\n  wrapper?: FieldSpec['wrapper'];\n}\n\nexport type FieldComponentRegistry = Record<string, FieldComponentItem>;\n\nexport type OmittedFieldSpec = Omit<FieldSpec, 'component'>;\n\nexport type UnknownValue = never | never[];\n\nexport interface ControlledFieldProps {\n  type?: string;\n  value: UnknownValue;\n  onChange: (v: UnknownValue) => void;\n  defaultValue?: UnknownValue;\n  onBlur?: (e: Event) => void;\n  extra?: never;\n  error?: boolean;\n  name?: string;\n  disabled?: boolean;\n}\n\nexport interface UncontrolledFieldProps {\n  name: string;\n  register: FieldBaseProps['register'];\n  control?: FieldBaseProps['control'];\n  error?: boolean;\n  extra?: Record<string, never>;\n  type?: string;\n  disabled?: boolean;\n}\n\nexport interface CalculatedField extends OmittedFieldSpec {\n  name: string;\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  component: any;\n  defaultValue?: never;\n  error?: ErrorOption;\n  wrapper?: FieldComponentItem['wrapper'];\n  multiplicity?: boolean;\n}\n\nexport interface FieldBaseProps extends CalculatedField {\n  control: UseFormReturn['control'];\n  register: UseFormReturn['register'];\n  reset: UseFormReturn['reset'];\n  fieldComponent?: React.FC<FieldBaseProps>;\n}\n\nexport interface FieldProps extends FieldSpec {\n  name: string;\n  children?: React.ReactNode;\n}\n\nexport interface UseFieldProps {\n  field: FieldSpec;\n  control: FieldBaseProps['control'];\n  register: FieldBaseProps['register'];\n  reset: FieldBaseProps['reset'];\n  watch: UseFormReturn['watch'];\n  formState: UseFormReturn['formState'];\n  getFieldState: UseFormReturn['getFieldState'];\n  setValue: UseFormReturn['setValue'];\n  getValues: UseFormReturn['getValues'];\n  unregister: UseFormReturn['unregister'];\n  trigger: UseFormReturn['trigger'];\n  clearErrors: UseFormReturn['clearErrors'];\n  error?: ErrorOption;\n  componentRegistry?: FieldComponentRegistry;\n}\n"],
+  "sourcesContent": ["import React from 'react';\nimport { ErrorOption, UseFormReturn, UseFormProps } from 'react-hook-form';\nimport { ValidatorSchema } from '@digigov/form/validators/types';\nimport { GridProps } from '@digigov/ui/layouts/Grid';\n\nexport type FieldLabelProps = {\n  primary?: string;\n  secondary?: string;\n};\n\nexport interface FieldSpec {\n  key: string; // !TODO rename key to name;\n  type?:\n  | 'int'\n  | 'string'\n  | 'text'\n  | 'boolean'\n  | 'email'\n  | 'uuid4'\n  | 'choice:multiple'\n  | 'choice:single'\n  | 'mobile_phone'\n  | 'date'\n  | 'otp'\n  | 'afm'\n  | 'iban'\n  | 'file'\n  | 'image'\n  | 'postal_code'\n  | 'phone_number'\n  | 'array'\n  | 'object';\n  component?: any;\n  autoComplete?: string;\n  maxLength?: number;\n  condition?: Record<string, FieldCondition>;\n  controlled?: boolean;\n  label?: FieldLabelProps;\n  extra?: {\n    [key: string]: any;\n  };\n  editable?: boolean;\n  required?: boolean;\n  enabled?: boolean;\n  disabled?: boolean;\n  layout?: Record<\n    string,\n    | GridProps['xs']\n    | GridProps['sm']\n    | GridProps['md']\n    | GridProps['lg']\n    | GridProps['xl']\n  >;\n  validators?: ValidatorSchema[];\n  wrapper?: 'label' | 'fieldset';\n  maxWidth?: string;\n  maxHeight?: string;\n  width?: string;\n}\n\nexport interface FieldCondition {\n  is: string | string[] | number | number[] | boolean | boolean[];\n  then?: Partial<FieldSpec>;\n  else?: Partial<FieldSpec>;\n}\nexport interface ChildFieldMemoProps extends FieldConditionalProps {\n  dependencies: FormData;\n}\nexport type FormData = UseFormProps['defaultValues'];\n\nexport interface FieldWithCondition extends Omit<CalculatedField, 'condition'> {\n  condition: Record<string, FieldCondition>;\n}\n\nexport interface FieldConditionalProps {\n  field: FieldWithCondition;\n  control: UseFormReturn['control'];\n  register: UseFormReturn['register'];\n  reset: UseFormReturn['reset'];\n  error?: ErrorOption;\n  Field: React.FC<FieldProps>;\n}\n\nexport type FieldComponentItem = {\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  component: any;\n  controlled?: boolean;\n  wrapper?: FieldSpec['wrapper'];\n};\n\nexport interface FieldContainerProps {\n  name?: FieldSpec['key'];\n  layout?: FieldSpec['layout'];\n  label?: FieldSpec['label'];\n  error?: ErrorOption | Record<string, any>;\n  children?: React.ReactNode;\n  wrapper?: FieldSpec['wrapper'];\n}\n\nexport type FieldComponentRegistry = Record<string, FieldComponentItem>;\n\nexport type OmittedFieldSpec = Omit<FieldSpec, 'component'>;\n\nexport type UnknownValue = never | never[];\n\nexport interface ControlledFieldProps {\n  type?: string;\n  value: UnknownValue;\n  onChange: (v: UnknownValue) => void;\n  defaultValue?: UnknownValue;\n  onBlur?: (e: Event) => void;\n  extra?: never;\n  error?: boolean;\n  name?: string;\n  disabled?: boolean;\n  Field: React.FC<FieldProps>;\n}\n\nexport interface UncontrolledFieldProps {\n  name: string;\n  register: FieldBaseProps['register'];\n  control?: FieldBaseProps['control'];\n  error?: boolean;\n  extra?: Record<string, never>;\n  type?: string;\n  disabled?: boolean;\n  Field: React.FC<FieldProps>;\n}\n\nexport interface CalculatedField extends OmittedFieldSpec {\n  name: string;\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  component: any;\n  defaultValue?: never;\n  error?: ErrorOption;\n  wrapper?: FieldComponentItem['wrapper'];\n  multiplicity?: boolean;\n}\n\nexport interface FieldBaseProps extends CalculatedField {\n  control: UseFormReturn['control'];\n  register: UseFormReturn['register'];\n  reset: UseFormReturn['reset'];\n  Field: React.FC<FieldProps>;\n}\n\nexport interface FieldProps extends FieldSpec {\n  name: string;\n  children?: React.ReactNode;\n}\n\nexport interface UseFieldProps {\n  field: FieldSpec;\n  control: FieldBaseProps['control'];\n  register: FieldBaseProps['register'];\n  reset: FieldBaseProps['reset'];\n  watch: UseFormReturn['watch'];\n  formState: UseFormReturn['formState'];\n  getFieldState: UseFormReturn['getFieldState'];\n  setValue: UseFormReturn['setValue'];\n  getValues: UseFormReturn['getValues'];\n  unregister: UseFormReturn['unregister'];\n  trigger: UseFormReturn['trigger'];\n  clearErrors: UseFormReturn['clearErrors'];\n  error?: ErrorOption;\n  componentRegistry?: FieldComponentRegistry;\n}\n"],
   "mappings": ";;;;;;;;;;;;;AAAA;AAAA;",
   "names": []
 }

package/cjs/Field/utils/index.js

@@ -28,6 +28,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   ALTERNATIVE_COMPONENTS: () => ALTERNATIVE_COMPONENTS,
+  CONTROLLED_FIELD_COMPONENTS: () => CONTROLLED_FIELD_COMPONENTS,
   FIELD_COMPONENTS: () => FIELD_COMPONENTS
 });
 module.exports = __toCommonJS(utils_exports);
@@ -87,9 +88,26 @@ const ALTERNATIVE_COMPONENTS = {
     wrapper: "fieldset"
   }
 };
+const CONTROLLED_FIELD_COMPONENTS = {
+  ...FIELD_COMPONENTS,
+  "choice:single": {
+    wrapper: "fieldset",
+    controlled: true,
+    component: import_Radio.ControlledRadioButtonsGroup
+  },
+  text: {
+    component: import_Input.default,
+    controlled: true
+  },
+  string: {
+    component: import_Input.default,
+    controlled: true
+  }
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ALTERNATIVE_COMPONENTS,
+  CONTROLLED_FIELD_COMPONENTS,
   FIELD_COMPONENTS
 });
 //# sourceMappingURL=index.js.map

package/cjs/Field/utils/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/Field/utils/index.ts"],
-  "sourcesContent": ["import { FieldComponentRegistry } from '@digigov/form/Field/types';\nimport AutoCompleteInput from '@digigov/form/inputs/AutoCompleteInput';\nimport Checkboxes from '@digigov/form/inputs/Checkboxes';\nimport DateInput from '@digigov/form/inputs/DateInput';\nimport FileInput from '@digigov/form/inputs/FileInput';\nimport ImageInput from '@digigov/form/inputs/ImageInput';\nimport Input from '@digigov/form/inputs/Input';\nimport OtpInput from '@digigov/form/inputs/OtpInput';\nimport Radio from '@digigov/form/inputs/Radio';\nimport Select from '@digigov/form/inputs/Select';\n\nexport const FIELD_COMPONENTS: FieldComponentRegistry = {\n  text: {\n    component: Input,\n  },\n  string: {\n    component: Input,\n  },\n  file: {\n    wrapper: 'fieldset',\n    component: FileInput,\n  },\n  image: {\n    wrapper: 'fieldset',\n    component: ImageInput,\n  },\n  date: {\n    wrapper: 'fieldset',\n    controlled: true,\n    component: DateInput,\n  },\n  otp: {\n    wrapper: 'fieldset',\n    controlled: true,\n    component: OtpInput,\n  },\n  'choice:multiple': {\n    wrapper: 'fieldset',\n    controlled: true,\n    component: Checkboxes,\n  },\n  'choice:single': {\n    wrapper: 'fieldset',\n    controlled: false,\n    component: Radio,\n  },\n};\n\nexport const ALTERNATIVE_COMPONENTS: FieldComponentRegistry = {\n  Select: {\n    component: Select,\n    controlled: false,\n  },\n  AutoComplete: {\n    component: AutoCompleteInput,\n    controlled: true,\n    wrapper: 'fieldset',\n  },\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,+BAA8B;AAC9B,wBAAuB;AACvB,uBAAsB;AACtB,uBAAsB;AACtB,wBAAuB;AACvB,mBAAkB;AAClB,sBAAqB;AACrB,mBAAkB;AAClB,oBAAmB;AAEZ,MAAM,mBAA2C;AAAA,EACtD,MAAM;AAAA,IACJ,WAAW,aAAAA;AAAA,EACb;AAAA,EACA,QAAQ;AAAA,IACN,WAAW,aAAAA;AAAA,EACb;AAAA,EACA,MAAM;AAAA,IACJ,SAAS;AAAA,IACT,WAAW,iBAAAC;AAAA,EACb;AAAA,EACA,OAAO;AAAA,IACL,SAAS;AAAA,IACT,WAAW,kBAAAC;AAAA,EACb;AAAA,EACA,MAAM;AAAA,IACJ,SAAS;AAAA,IACT,YAAY;AAAA,IACZ,WAAW,iBAAAC;AAAA,EACb;AAAA,EACA,KAAK;AAAA,IACH,SAAS;AAAA,IACT,YAAY;AAAA,IACZ,WAAW,gBAAAC;AAAA,EACb;AAAA,EACA,mBAAmB;AAAA,IACjB,SAAS;AAAA,IACT,YAAY;AAAA,IACZ,WAAW,kBAAAC;AAAA,EACb;AAAA,EACA,iBAAiB;AAAA,IACf,SAAS;AAAA,IACT,YAAY;AAAA,IACZ,WAAW,aAAAC;AAAA,EACb;AACF;AAEO,MAAM,yBAAiD;AAAA,EAC5D,QAAQ;AAAA,IACN,WAAW,cAAAC;AAAA,IACX,YAAY;AAAA,EACd;AAAA,EACA,cAAc;AAAA,IACZ,WAAW,yBAAAC;AAAA,IACX,YAAY;AAAA,IACZ,SAAS;AAAA,EACX;AACF;",
+  "sourcesContent": ["import { FieldComponentRegistry } from '@digigov/form/Field/types';\nimport AutoCompleteInput from '@digigov/form/inputs/AutoCompleteInput';\nimport Checkboxes from '@digigov/form/inputs/Checkboxes';\nimport DateInput from '@digigov/form/inputs/DateInput';\nimport FileInput from '@digigov/form/inputs/FileInput';\nimport ImageInput from '@digigov/form/inputs/ImageInput';\nimport Input from '@digigov/form/inputs/Input';\nimport OtpInput from '@digigov/form/inputs/OtpInput';\nimport Radio, { ControlledRadioButtonsGroup } from '@digigov/form/inputs/Radio';\nimport Select from '@digigov/form/inputs/Select';\n\nexport const FIELD_COMPONENTS: FieldComponentRegistry = {\n  text: {\n    component: Input,\n  },\n  string: {\n    component: Input,\n  },\n  file: {\n    wrapper: 'fieldset',\n    component: FileInput,\n  },\n  image: {\n    wrapper: 'fieldset',\n    component: ImageInput,\n  },\n  date: {\n    wrapper: 'fieldset',\n    controlled: true,\n    component: DateInput,\n  },\n  otp: {\n    wrapper: 'fieldset',\n    controlled: true,\n    component: OtpInput,\n  },\n  'choice:multiple': {\n    wrapper: 'fieldset',\n    controlled: true,\n    component: Checkboxes,\n  },\n  'choice:single': {\n    wrapper: 'fieldset',\n    controlled: false,\n    component: Radio,\n  },\n};\n\nexport const ALTERNATIVE_COMPONENTS: FieldComponentRegistry = {\n  Select: {\n    component: Select,\n    controlled: false,\n  },\n  AutoComplete: {\n    component: AutoCompleteInput,\n    controlled: true,\n    wrapper: 'fieldset',\n  },\n};\n\nexport const CONTROLLED_FIELD_COMPONENTS: FieldComponentRegistry = {\n  ...FIELD_COMPONENTS,\n  'choice:single': {\n    wrapper: 'fieldset',\n    controlled: true,\n    component: ControlledRadioButtonsGroup,\n  },\n  text: {\n    component: Input,\n    controlled: true,\n  },\n  string: {\n    component: Input,\n    controlled: true,\n  },\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,+BAA8B;AAC9B,wBAAuB;AACvB,uBAAsB;AACtB,uBAAsB;AACtB,wBAAuB;AACvB,mBAAkB;AAClB,sBAAqB;AACrB,mBAAmD;AACnD,oBAAmB;AAEZ,MAAM,mBAA2C;AAAA,EACtD,MAAM;AAAA,IACJ,WAAW,aAAAA;AAAA,EACb;AAAA,EACA,QAAQ;AAAA,IACN,WAAW,aAAAA;AAAA,EACb;AAAA,EACA,MAAM;AAAA,IACJ,SAAS;AAAA,IACT,WAAW,iBAAAC;AAAA,EACb;AAAA,EACA,OAAO;AAAA,IACL,SAAS;AAAA,IACT,WAAW,kBAAAC;AAAA,EACb;AAAA,EACA,MAAM;AAAA,IACJ,SAAS;AAAA,IACT,YAAY;AAAA,IACZ,WAAW,iBAAAC;AAAA,EACb;AAAA,EACA,KAAK;AAAA,IACH,SAAS;AAAA,IACT,YAAY;AAAA,IACZ,WAAW,gBAAAC;AAAA,EACb;AAAA,EACA,mBAAmB;AAAA,IACjB,SAAS;AAAA,IACT,YAAY;AAAA,IACZ,WAAW,kBAAAC;AAAA,EACb;AAAA,EACA,iBAAiB;AAAA,IACf,SAAS;AAAA,IACT,YAAY;AAAA,IACZ,WAAW,aAAAC;AAAA,EACb;AACF;AAEO,MAAM,yBAAiD;AAAA,EAC5D,QAAQ;AAAA,IACN,WAAW,cAAAC;AAAA,IACX,YAAY;AAAA,EACd;AAAA,EACA,cAAc;AAAA,IACZ,WAAW,yBAAAC;AAAA,IACX,YAAY;AAAA,IACZ,SAAS;AAAA,EACX;AACF;AAEO,MAAM,8BAAsD;AAAA,EACjE,GAAG;AAAA,EACH,iBAAiB;AAAA,IACf,SAAS;AAAA,IACT,YAAY;AAAA,IACZ,WAAW;AAAA,EACb;AAAA,EACA,MAAM;AAAA,IACJ,WAAW,aAAAR;AAAA,IACX,YAAY;AAAA,EACd;AAAA,EACA,QAAQ;AAAA,IACN,WAAW,aAAAA;AAAA,IACX,YAAY;AAAA,EACd;AACF;",
   "names": ["Input", "FileInput", "ImageInput", "DateInput", "OtpInput", "Checkboxes", "Radio", "Select", "AutoCompleteInput"]
 }

package/cjs/FieldArray/index.js

@@ -33,10 +33,10 @@ __export(FieldArray_exports, {
 module.exports = __toCommonJS(FieldArray_exports);
 var import_react = __toESM(require("react"));
 var import_react_hook_form = require("react-hook-form");
-var import_FieldBaseContainer = __toESM(require("@digigov/form/Field/FieldBaseContainer"));
-var import_FieldObject = __toESM(require("@digigov/form/FieldObject"));
+var import_FieldBaseContainer = require("@digigov/form/Field/FieldBaseContainer");
+var import_FieldObject = require("@digigov/form/FieldObject");
 var import_Fieldset = require("@digigov/form/Fieldset");
-var import_Fieldset2 = __toESM(require("@digigov/react-core/Fieldset"));
+var import_Fieldset2 = require("@digigov/form/Fieldset");
 var import_Card = require("@digigov/ui/content/Card");
 var import_Button = require("@digigov/ui/form/Button");
 var import_Hint = require("@digigov/ui/typography/Hint");
@@ -48,6 +48,7 @@ const FieldArray = ({
   error,
   layout,
   label,
+  Field,
   ...customField
 }) => {
   const { fields, append, remove } = (0, import_react_hook_form.useFieldArray)({
@@ -55,7 +56,7 @@ const FieldArray = ({
     name
   });
   return /* @__PURE__ */ import_react.default.createElement(
-    import_FieldBaseContainer.default,
+    import_FieldBaseContainer.FieldBaseContainer,
     {
       label,
       layout,
@@ -64,15 +65,16 @@ const FieldArray = ({
       name
     },
     fields.length === 0 && /* @__PURE__ */ import_react.default.createElement(import_Hint.Hint, null, customField.extra?.label.object?.nothing_added),
-    fields.map((field, index) => /* @__PURE__ */ import_react.default.createElement(import_Card.Card, { variant: "border", key: field.id }, /* @__PURE__ */ import_react.default.createElement(import_Fieldset2.default, null, /* @__PURE__ */ import_react.default.createElement(import_Fieldset.FieldsetLabel, null, customField.extra?.label.object.title, " ", index + 1), /* @__PURE__ */ import_react.default.createElement(
-      import_FieldObject.default,
+    fields.map((field, index) => /* @__PURE__ */ import_react.default.createElement(import_Card.Card, { variant: "border", key: field.id }, /* @__PURE__ */ import_react.default.createElement(import_Fieldset2.Fieldset, null, /* @__PURE__ */ import_react.default.createElement(import_Fieldset.FieldsetLabel, null, customField.extra?.label.object.title, " ", index + 1), /* @__PURE__ */ import_react.default.createElement(
+      import_FieldObject.FieldObject,
       {
         name: `${name}.${index}`,
         error: Array.isArray(error) && error[index],
         formState,
         register,
         control,
-        ...customField.extra?.of
+        ...customField.extra?.of,
+        Field
       }
     ), /* @__PURE__ */ import_react.default.createElement(
       import_Button.Button,

package/cjs/FieldArray/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/FieldArray/index.tsx"],
-  "sourcesContent": ["import React from 'react';\nimport { ErrorOption, useFieldArray, UseFormReturn } from 'react-hook-form';\nimport FieldContainer from '@digigov/form/Field/FieldBaseContainer';\nimport { FieldProps } from '@digigov/form/Field/types';\nimport FieldObject from '@digigov/form/FieldObject';\nimport { FieldsetLabel } from '@digigov/form/Fieldset';\nimport Fieldset from '@digigov/react-core/Fieldset';\nimport { Card } from '@digigov/ui/content/Card';\nimport { Button } from '@digigov/ui/form/Button';\nimport { Hint } from '@digigov/ui/typography/Hint';\nexport interface FieldArrayProps extends FieldProps {\n  control: UseFormReturn['control'];\n  register: UseFormReturn['register'];\n  formState: UseFormReturn['formState'];\n  error?: ErrorOption;\n}\nexport const FieldArray: React.FC<FieldArrayProps> = ({\n  name,\n  register,\n  control,\n  formState,\n  error,\n  layout,\n  label,\n  ...customField\n}) => {\n  const { fields, append, remove } = useFieldArray({\n    control,\n    name,\n  });\n\n  return (\n    <FieldContainer\n      label={label}\n      layout={layout}\n      error={\n        formState.isSubmitted &&\n        !formState.isSubmitting &&\n        error?.message &&\n        error\n          ? error\n          : undefined\n      }\n      wrapper=\"fieldset\"\n      name={name}\n    >\n      {fields.length === 0 && (\n        <Hint>{customField.extra?.label.object?.nothing_added}</Hint>\n      )}\n      {fields.map((field, index) => (\n        <Card variant=\"border\" key={field.id}>\n          <Fieldset>\n            <FieldsetLabel>\n              {customField.extra?.label.object.title} {index + 1}\n            </FieldsetLabel>\n            <FieldObject\n              name={`${name}.${index}`}\n              error={Array.isArray(error) && error[index]}\n              formState={formState}\n              register={register}\n              control={control}\n              {...customField.extra?.of}\n            />\n            <Button\n              name={`${name}-object-remove`}\n              type=\"button\"\n              color=\"warning\"\n              onClick={() => remove(index)}\n            >\n              {customField.extra?.label.object?.delete}\n            </Button>\n          </Fieldset>\n        </Card>\n      ))}\n\n      <Button\n        type=\"button\"\n        name={`${name}-add-object`}\n        color=\"secondary\"\n        onClick={(ev) => {\n          ev.preventDefault();\n          append({});\n        }}\n      >\n        {customField.extra?.label.object?.add}\n      </Button>\n    </FieldContainer>\n  );\n};\n\nexport default FieldArray;\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAClB,6BAA0D;AAC1D,gCAA2B;AAE3B,yBAAwB;AACxB,sBAA8B;AAC9B,IAAAA,mBAAqB;AACrB,kBAAqB;AACrB,oBAAuB;AACvB,kBAAqB;AAOd,MAAM,aAAwC,CAAC;AAAA,EACpD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,GAAG;AACL,MAAM;AACJ,QAAM,EAAE,QAAQ,QAAQ,OAAO,QAAI,sCAAc;AAAA,IAC/C;AAAA,IACA;AAAA,EACF,CAAC;AAED,SACE,6BAAAC,QAAA;AAAA,IAAC,0BAAAC;AAAA,IAAA;AAAA,MACC;AAAA,MACA;AAAA,MACA,OACE,UAAU,eACV,CAAC,UAAU,gBACX,OAAO,WACP,QACI,QACA;AAAA,MAEN,SAAQ;AAAA,MACR;AAAA;AAAA,IAEC,OAAO,WAAW,KACjB,6BAAAD,QAAA,cAAC,wBAAM,YAAY,OAAO,MAAM,QAAQ,aAAc;AAAA,IAEvD,OAAO,IAAI,CAAC,OAAO,UAClB,6BAAAA,QAAA,cAAC,oBAAK,SAAQ,UAAS,KAAK,MAAM,MAChC,6BAAAA,QAAA,cAAC,iBAAAE,SAAA,MACC,6BAAAF,QAAA,cAAC,qCACE,YAAY,OAAO,MAAM,OAAO,OAAM,KAAE,QAAQ,CACnD,GACA,6BAAAA,QAAA;AAAA,MAAC,mBAAAG;AAAA,MAAA;AAAA,QACC,MAAM,GAAG,IAAI,IAAI,KAAK;AAAA,QACtB,OAAO,MAAM,QAAQ,KAAK,KAAK,MAAM,KAAK;AAAA,QAC1C;AAAA,QACA;AAAA,QACA;AAAA,QACC,GAAG,YAAY,OAAO;AAAA;AAAA,IACzB,GACA,6BAAAH,QAAA;AAAA,MAAC;AAAA;AAAA,QACC,MAAM,GAAG,IAAI;AAAA,QACb,MAAK;AAAA,QACL,OAAM;AAAA,QACN,SAAS,MAAM,OAAO,KAAK;AAAA;AAAA,MAE1B,YAAY,OAAO,MAAM,QAAQ;AAAA,IACpC,CACF,CACF,CACD;AAAA,IAED,6BAAAA,QAAA;AAAA,MAAC;AAAA;AAAA,QACC,MAAK;AAAA,QACL,MAAM,GAAG,IAAI;AAAA,QACb,OAAM;AAAA,QACN,SAAS,CAAC,OAAO;AACf,aAAG,eAAe;AAClB,iBAAO,CAAC,CAAC;AAAA,QACX;AAAA;AAAA,MAEC,YAAY,OAAO,MAAM,QAAQ;AAAA,IACpC;AAAA,EACF;AAEJ;AAEA,IAAO,qBAAQ;",
-  "names": ["import_Fieldset", "React", "FieldContainer", "Fieldset", "FieldObject"]
+  "sourcesContent": ["import React from 'react';\nimport { ErrorOption, useFieldArray, UseFormReturn } from 'react-hook-form';\nimport { FieldBaseContainer } from '@digigov/form/Field/FieldBaseContainer';\nimport { FieldProps } from '@digigov/form/Field/types';\nimport { FieldObject } from '@digigov/form/FieldObject';\nimport { FieldsetLabel } from '@digigov/form/Fieldset';\nimport { Fieldset } from '@digigov/form/Fieldset';\nimport { Card } from '@digigov/ui/content/Card';\nimport { Button } from '@digigov/ui/form/Button';\nimport { Hint } from '@digigov/ui/typography/Hint';\n\nexport interface FieldArrayProps extends FieldProps {\n  control: UseFormReturn['control'];\n  register: UseFormReturn['register'];\n  formState: UseFormReturn['formState'];\n  error?: ErrorOption;\n  Field: React.FC<FieldProps>;\n}\nexport const FieldArray: React.FC<FieldArrayProps> = ({\n  name,\n  register,\n  control,\n  formState,\n  error,\n  layout,\n  label,\n  Field,\n  ...customField\n}) => {\n  const { fields, append, remove } = useFieldArray({\n    control,\n    name,\n  });\n\n  return (\n    <FieldBaseContainer\n      label={label}\n      layout={layout}\n      error={\n        formState.isSubmitted &&\n        !formState.isSubmitting &&\n        error?.message &&\n        error\n          ? error\n          : undefined\n      }\n      wrapper=\"fieldset\"\n      name={name}\n    >\n      {fields.length === 0 && (\n        <Hint>{customField.extra?.label.object?.nothing_added}</Hint>\n      )}\n      {fields.map((field, index) => (\n        <Card variant=\"border\" key={field.id}>\n          <Fieldset>\n            <FieldsetLabel>\n              {customField.extra?.label.object.title} {index + 1}\n            </FieldsetLabel>\n            <FieldObject\n              name={`${name}.${index}`}\n              error={Array.isArray(error) && error[index]}\n              formState={formState}\n              register={register}\n              control={control}\n              {...customField.extra?.of}\n              Field={Field}\n            />\n            <Button\n              name={`${name}-object-remove`}\n              type=\"button\"\n              color=\"warning\"\n              onClick={() => remove(index)}\n            >\n              {customField.extra?.label.object?.delete}\n            </Button>\n          </Fieldset>\n        </Card>\n      ))}\n\n      <Button\n        type=\"button\"\n        name={`${name}-add-object`}\n        color=\"secondary\"\n        onClick={(ev) => {\n          ev.preventDefault();\n          append({});\n        }}\n      >\n        {customField.extra?.label.object?.add}\n      </Button>\n    </FieldBaseContainer>\n  );\n};\n\nexport default FieldArray;\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAClB,6BAA0D;AAC1D,gCAAmC;AAEnC,yBAA4B;AAC5B,sBAA8B;AAC9B,IAAAA,mBAAyB;AACzB,kBAAqB;AACrB,oBAAuB;AACvB,kBAAqB;AASd,MAAM,aAAwC,CAAC;AAAA,EACpD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,GAAG;AACL,MAAM;AACJ,QAAM,EAAE,QAAQ,QAAQ,OAAO,QAAI,sCAAc;AAAA,IAC/C;AAAA,IACA;AAAA,EACF,CAAC;AAED,SACE,6BAAAC,QAAA;AAAA,IAAC;AAAA;AAAA,MACC;AAAA,MACA;AAAA,MACA,OACE,UAAU,eACV,CAAC,UAAU,gBACX,OAAO,WACP,QACI,QACA;AAAA,MAEN,SAAQ;AAAA,MACR;AAAA;AAAA,IAEC,OAAO,WAAW,KACjB,6BAAAA,QAAA,cAAC,wBAAM,YAAY,OAAO,MAAM,QAAQ,aAAc;AAAA,IAEvD,OAAO,IAAI,CAAC,OAAO,UAClB,6BAAAA,QAAA,cAAC,oBAAK,SAAQ,UAAS,KAAK,MAAM,MAChC,6BAAAA,QAAA,cAAC,iCACC,6BAAAA,QAAA,cAAC,qCACE,YAAY,OAAO,MAAM,OAAO,OAAM,KAAE,QAAQ,CACnD,GACA,6BAAAA,QAAA;AAAA,MAAC;AAAA;AAAA,QACC,MAAM,GAAG,IAAI,IAAI,KAAK;AAAA,QACtB,OAAO,MAAM,QAAQ,KAAK,KAAK,MAAM,KAAK;AAAA,QAC1C;AAAA,QACA;AAAA,QACA;AAAA,QACC,GAAG,YAAY,OAAO;AAAA,QACvB;AAAA;AAAA,IACF,GACA,6BAAAA,QAAA;AAAA,MAAC;AAAA;AAAA,QACC,MAAM,GAAG,IAAI;AAAA,QACb,MAAK;AAAA,QACL,OAAM;AAAA,QACN,SAAS,MAAM,OAAO,KAAK;AAAA;AAAA,MAE1B,YAAY,OAAO,MAAM,QAAQ;AAAA,IACpC,CACF,CACF,CACD;AAAA,IAED,6BAAAA,QAAA;AAAA,MAAC;AAAA;AAAA,QACC,MAAK;AAAA,QACL,MAAM,GAAG,IAAI;AAAA,QACb,OAAM;AAAA,QACN,SAAS,CAAC,OAAO;AACf,aAAG,eAAe;AAClB,iBAAO,CAAC,CAAC;AAAA,QACX;AAAA;AAAA,MAEC,YAAY,OAAO,MAAM,QAAQ;AAAA,IACpC;AAAA,EACF;AAEJ;AAEA,IAAO,qBAAQ;",
+  "names": ["import_Fieldset", "React"]
 }

package/cjs/FieldObject/index.js

@@ -35,8 +35,8 @@ var import_react = __toESM(require("react"));
 var import_FieldBase = require("@digigov/form/Field/FieldBase");
 var import_utils = require("@digigov/form/Field/utils");
 var import_calculateField = require("@digigov/form/Field/utils/calculateField");
-var import_Fieldset = __toESM(require("@digigov/form/Fieldset"));
-var import_FieldsetLegend = require("@digigov/react-core/FieldsetLegend");
+var import_Fieldset = require("@digigov/form/Fieldset");
+var import_FieldContainer = require("@digigov/ui/form/FieldContainer");
 var import_i18n = require("@digigov/ui/i18n");
 const FieldObject = ({
   name,
@@ -46,10 +46,11 @@ const FieldObject = ({
   register,
   reset,
   formState,
-  error
+  error,
+  Field
 }) => {
   const { t } = (0, import_i18n.useTranslation)();
-  return /* @__PURE__ */ import_react.default.createElement(import_Fieldset.default, null, label?.primary && /* @__PURE__ */ import_react.default.createElement(import_FieldsetLegend.FieldsetLegend, { size: "sm" }, t(label.primary)), label?.secondary && /* @__PURE__ */ import_react.default.createElement(import_Fieldset.FieldsetCaption, null, t(label.secondary)), extra?.fields.map((field) => /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement(import_Fieldset.Fieldset, null, label?.primary && /* @__PURE__ */ import_react.default.createElement(import_FieldContainer.FieldsetLegend, { size: "sm" }, t(label.primary)), label?.secondary && /* @__PURE__ */ import_react.default.createElement(import_Fieldset.FieldsetCaption, null, t(label.secondary)), extra?.fields.map((field) => /* @__PURE__ */ import_react.default.createElement(
     FieldObjectItem,
     {
       key: `${name}.${field.key}`,
@@ -59,7 +60,8 @@ const FieldObject = ({
       reset,
       field,
       error: error && error[field.key],
-      formState
+      formState,
+      Field
     }
   )));
 };
@@ -71,7 +73,8 @@ const FieldObjectItem = ({
   control,
   formState,
   reset,
-  register
+  register,
+  Field
 }) => {
   const calculatedField = (0, import_react.useMemo)(
     () => (0, import_calculateField.calculateField)(children, field, import_utils.FIELD_COMPONENTS, import_utils.ALTERNATIVE_COMPONENTS),
@@ -83,6 +86,7 @@ const FieldObjectItem = ({
     {
       ...calculatedField,
       name,
+      Field,
       control,
       reset,
       register,

package/cjs/FieldObject/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/FieldObject/index.tsx"],
-  "sourcesContent": ["import React, { useMemo } from 'react';\nimport { ErrorOption, UseFormReturn } from 'react-hook-form';\nimport { FieldBase } from '@digigov/form/Field/FieldBase';\nimport { CalculatedField, FieldProps } from '@digigov/form/Field/types';\nimport {\n  FIELD_COMPONENTS,\n  ALTERNATIVE_COMPONENTS,\n} from '@digigov/form/Field/utils';\nimport { calculateField } from '@digigov/form/Field/utils/calculateField';\nimport Fieldset, { FieldsetCaption } from '@digigov/form/Fieldset';\nimport { FieldSpec } from '@digigov/form/types';\nimport { FieldsetLegend } from '@digigov/react-core/FieldsetLegend';\nimport { useTranslation } from '@digigov/ui/i18n';\n\nexport interface FieldObjectProps extends Omit<FieldProps, 'key'> {\n  control: UseFormReturn['control'];\n  register: UseFormReturn['register'];\n  reset: UseFormReturn['reset'];\n  formState: UseFormReturn['formState'];\n  error?: ErrorOption;\n}\n\nexport const FieldObject: React.FC<FieldObjectProps> = ({\n  name,\n  label,\n  extra,\n  control,\n  register,\n  reset,\n  formState,\n  error,\n}) => {\n  const { t } = useTranslation();\n\n  return (\n    <Fieldset>\n      {label?.primary && (\n        <FieldsetLegend size=\"sm\">{t(label.primary)}</FieldsetLegend>\n      )}\n      {label?.secondary && (\n        <FieldsetCaption>{t(label.secondary)}</FieldsetCaption>\n      )}\n      {extra?.fields.map((field) => (\n        <FieldObjectItem\n          key={`${name}.${field.key}`}\n          name={`${name}.${field.key}`}\n          control={control}\n          register={register}\n          reset={reset}\n          field={field}\n          error={error && error[field.key]}\n          formState={formState}\n        />\n      ))}\n    </Fieldset>\n  );\n};\n\nexport interface FieldObjectItemProps {\n  name: string;\n  field: FieldSpec;\n  control: UseFormReturn['control'];\n  register: UseFormReturn['register'];\n  reset: UseFormReturn['reset'];\n  formState: UseFormReturn['formState'];\n  error?: ErrorOption;\n  children?: React.ReactNode;\n}\n\nconst FieldObjectItem: React.FC<FieldObjectItemProps> = ({\n  name,\n  children,\n  field,\n  error,\n  control,\n  formState,\n  reset,\n  register,\n}) => {\n  const calculatedField: CalculatedField = useMemo(\n    () =>\n      calculateField(children, field, FIELD_COMPONENTS, ALTERNATIVE_COMPONENTS),\n    [field]\n  );\n\n  const customError = error ? error : formState?.errors[name];\n  return (\n    <FieldBase\n      {...calculatedField}\n      name={name}\n      control={control}\n      reset={reset}\n      register={register}\n      error={customError}\n    />\n  );\n};\n\nexport default FieldObject;\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA+B;AAE/B,uBAA0B;AAE1B,mBAGO;AACP,4BAA+B;AAC/B,sBAA0C;AAE1C,4BAA+B;AAC/B,kBAA+B;AAUxB,MAAM,cAA0C,CAAC;AAAA,EACtD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAAM;AACJ,QAAM,EAAE,EAAE,QAAI,4BAAe;AAE7B,SACE,6BAAAA,QAAA,cAAC,gBAAAC,SAAA,MACE,OAAO,WACN,6BAAAD,QAAA,cAAC,wCAAe,MAAK,QAAM,EAAE,MAAM,OAAO,CAAE,GAE7C,OAAO,aACN,6BAAAA,QAAA,cAAC,uCAAiB,EAAE,MAAM,SAAS,CAAE,GAEtC,OAAO,OAAO,IAAI,CAAC,UAClB,6BAAAA,QAAA;AAAA,IAAC;AAAA;AAAA,MACC,KAAK,GAAG,IAAI,IAAI,MAAM,GAAG;AAAA,MACzB,MAAM,GAAG,IAAI,IAAI,MAAM,GAAG;AAAA,MAC1B;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA,OAAO,SAAS,MAAM,MAAM,GAAG;AAAA,MAC/B;AAAA;AAAA,EACF,CACD,CACH;AAEJ;AAaA,MAAM,kBAAkD,CAAC;AAAA,EACvD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAAM;AACJ,QAAM,sBAAmC;AAAA,IACvC,UACE,sCAAe,UAAU,OAAO,+BAAkB,mCAAsB;AAAA,IAC1E,CAAC,KAAK;AAAA,EACR;AAEA,QAAM,cAAc,QAAQ,QAAQ,WAAW,OAAO,IAAI;AAC1D,SACE,6BAAAA,QAAA;AAAA,IAAC;AAAA;AAAA,MACE,GAAG;AAAA,MACJ;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA,OAAO;AAAA;AAAA,EACT;AAEJ;AAEA,IAAO,sBAAQ;",
-  "names": ["React", "Fieldset"]
+  "sourcesContent": ["import React, { useMemo } from 'react';\nimport { ErrorOption, UseFormReturn } from 'react-hook-form';\nimport { FieldBase } from '@digigov/form/Field/FieldBase';\nimport { CalculatedField, FieldProps } from '@digigov/form/Field/types';\nimport {\n  FIELD_COMPONENTS,\n  ALTERNATIVE_COMPONENTS,\n} from '@digigov/form/Field/utils';\nimport { calculateField } from '@digigov/form/Field/utils/calculateField';\nimport { Fieldset, FieldsetCaption } from '@digigov/form/Fieldset';\nimport { FieldSpec } from '@digigov/form/types';\nimport { FieldsetLegend } from '@digigov/ui/form/FieldContainer';\nimport { useTranslation } from '@digigov/ui/i18n';\n\nexport interface FieldObjectProps extends Omit<FieldProps, 'key'> {\n  control: UseFormReturn['control'];\n  register: UseFormReturn['register'];\n  reset: UseFormReturn['reset'];\n  formState: UseFormReturn['formState'];\n  error?: ErrorOption;\n  Field: React.FC<FieldProps>;\n}\n\nexport const FieldObject: React.FC<FieldObjectProps> = ({\n  name,\n  label,\n  extra,\n  control,\n  register,\n  reset,\n  formState,\n  error,\n  Field,\n}) => {\n  const { t } = useTranslation();\n\n  return (\n    <Fieldset>\n      {label?.primary && (\n        <FieldsetLegend size=\"sm\">{t(label.primary)}</FieldsetLegend>\n      )}\n      {label?.secondary && (\n        <FieldsetCaption>{t(label.secondary)}</FieldsetCaption>\n      )}\n      {extra?.fields.map((field) => (\n        <FieldObjectItem\n          key={`${name}.${field.key}`}\n          name={`${name}.${field.key}`}\n          control={control}\n          register={register}\n          reset={reset}\n          field={field}\n          error={error && error[field.key]}\n          formState={formState}\n          Field={Field}\n        />\n      ))}\n    </Fieldset>\n  );\n};\n\nexport interface FieldObjectItemProps {\n  name: string;\n  field: FieldSpec;\n  control: UseFormReturn['control'];\n  register: UseFormReturn['register'];\n  reset: UseFormReturn['reset'];\n  formState: UseFormReturn['formState'];\n  error?: ErrorOption;\n  children?: React.ReactNode;\n  Field: React.FC<FieldProps>;\n}\n\nconst FieldObjectItem: React.FC<FieldObjectItemProps> = ({\n  name,\n  children,\n  field,\n  error,\n  control,\n  formState,\n  reset,\n  register,\n  Field,\n}) => {\n  const calculatedField: CalculatedField = useMemo(\n    () =>\n      calculateField(children, field, FIELD_COMPONENTS, ALTERNATIVE_COMPONENTS),\n    [field]\n  );\n\n  const customError = error ? error : formState?.errors[name];\n  return (\n    <FieldBase\n      {...calculatedField}\n      name={name}\n      Field={Field}\n      control={control}\n      reset={reset}\n      register={register}\n      error={customError}\n    />\n  );\n};\n\nexport default FieldObject;\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA+B;AAE/B,uBAA0B;AAE1B,mBAGO;AACP,4BAA+B;AAC/B,sBAA0C;AAE1C,4BAA+B;AAC/B,kBAA+B;AAWxB,MAAM,cAA0C,CAAC;AAAA,EACtD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAAM;AACJ,QAAM,EAAE,EAAE,QAAI,4BAAe;AAE7B,SACE,6BAAAA,QAAA,cAAC,gCACE,OAAO,WACN,6BAAAA,QAAA,cAAC,wCAAe,MAAK,QAAM,EAAE,MAAM,OAAO,CAAE,GAE7C,OAAO,aACN,6BAAAA,QAAA,cAAC,uCAAiB,EAAE,MAAM,SAAS,CAAE,GAEtC,OAAO,OAAO,IAAI,CAAC,UAClB,6BAAAA,QAAA;AAAA,IAAC;AAAA;AAAA,MACC,KAAK,GAAG,IAAI,IAAI,MAAM,GAAG;AAAA,MACzB,MAAM,GAAG,IAAI,IAAI,MAAM,GAAG;AAAA,MAC1B;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA,OAAO,SAAS,MAAM,MAAM,GAAG;AAAA,MAC/B;AAAA,MACA;AAAA;AAAA,EACF,CACD,CACH;AAEJ;AAcA,MAAM,kBAAkD,CAAC;AAAA,EACvD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAAM;AACJ,QAAM,sBAAmC;AAAA,IACvC,UACE,sCAAe,UAAU,OAAO,+BAAkB,mCAAsB;AAAA,IAC1E,CAAC,KAAK;AAAA,EACR;AAEA,QAAM,cAAc,QAAQ,QAAQ,WAAW,OAAO,IAAI;AAC1D,SACE,6BAAAA,QAAA;AAAA,IAAC;AAAA;AAAA,MACE,GAAG;AAAA,MACJ;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA,OAAO;AAAA;AAAA,EACT;AAEJ;AAEA,IAAO,sBAAQ;",
+  "names": ["React"]
 }

package/cjs/Fieldset/index.js

@@ -27,7 +27,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var Fieldset_exports = {};
 __export(Fieldset_exports, {
-  Fieldset: () => import_Fieldset.default,
+  Fieldset: () => import_Fieldset.Fieldset,
   FieldsetBody: () => FieldsetBody,
   FieldsetCaption: () => FieldsetCaption,
   FieldsetLabel: () => FieldsetLabel,
@@ -35,27 +35,27 @@ __export(Fieldset_exports, {
 });
 module.exports = __toCommonJS(Fieldset_exports);
 var import_react = __toESM(require("react"));
-var import_Fieldset = __toESM(require("@digigov/react-core/Fieldset"));
-var import_FieldsetLegend = __toESM(require("@digigov/react-core/FieldsetLegend"));
-var import_Hint = __toESM(require("@digigov/react-core/Hint"));
-var import_Grid = __toESM(require("@digigov/ui/layouts/Grid"));
-var import_NormalText = __toESM(require("@digigov/ui/typography/NormalText"));
+var import_Fieldset = require("@digigov/react-core/Fieldset");
+var import_FieldContainer = require("@digigov/ui/form/FieldContainer");
+var import_Grid = require("@digigov/ui/layouts/Grid");
+var import_Hint = require("@digigov/ui/typography/Hint");
+var import_NormalText = require("@digigov/ui/typography/NormalText");
 const FieldsetLabel = ({
   children,
   ...props
 }) => {
-  return /* @__PURE__ */ import_react.default.createElement(import_FieldsetLegend.default, { heading: true, size: "xl", ...props }, children);
+  return /* @__PURE__ */ import_react.default.createElement(import_FieldContainer.FieldsetLegend, { heading: true, size: "xl", ...props }, children);
 };
 const FieldsetCaption = ({
   children,
   ...props
 }) => {
-  return /* @__PURE__ */ import_react.default.createElement(import_Hint.default, { ...props }, children);
+  return /* @__PURE__ */ import_react.default.createElement(import_Hint.Hint, { ...props }, children);
 };
 const FieldsetBody = ({ children }) => {
-  return /* @__PURE__ */ import_react.default.createElement(import_Grid.default, { item: true, xs: 12 }, /* @__PURE__ */ import_react.default.createElement(import_NormalText.default, null, children));
+  return /* @__PURE__ */ import_react.default.createElement(import_Grid.Grid, { item: true, xs: 12 }, /* @__PURE__ */ import_react.default.createElement(import_NormalText.NormalText, null, children));
 };
-var Fieldset_default = import_Fieldset.default;
+var Fieldset_default = import_Fieldset.Fieldset;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Fieldset,

package/cjs/Fieldset/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/Fieldset/index.tsx"],
-  "sourcesContent": ["import React from 'react';\nimport {\n  FieldsetLabelProps,\n  FieldsetCaptionProps,\n  FieldsetBodyProps,\n} from '@digigov/form/Fieldset/types';\nimport Fieldset from '@digigov/react-core/Fieldset';\nimport FieldsetLegend from '@digigov/react-core/FieldsetLegend';\nimport Hint from '@digigov/react-core/Hint';\nimport Grid from '@digigov/ui/layouts/Grid';\nimport NormalText from '@digigov/ui/typography/NormalText';\n\nexport const FieldsetLabel: React.FC<FieldsetLabelProps> = ({\n  children,\n  ...props\n}) => {\n  return (\n    <FieldsetLegend heading size=\"xl\" {...props}>\n      {children}\n    </FieldsetLegend>\n  );\n};\n\nexport const FieldsetCaption: React.FC<FieldsetCaptionProps> = ({\n  children,\n  ...props\n}) => {\n  return <Hint {...props}>{children}</Hint>;\n};\n\nexport const FieldsetBody: React.FC<FieldsetBodyProps> = ({ children }) => {\n  return (\n    <Grid item xs={12}>\n      <NormalText>{children}</NormalText>\n    </Grid>\n  );\n};\n\nexport { Fieldset };\nexport default Fieldset;\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA,kCAAAA;AAAA,EAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAMlB,sBAAqB;AACrB,4BAA2B;AAC3B,kBAAiB;AACjB,kBAAiB;AACjB,wBAAuB;AAEhB,MAAM,gBAA8C,CAAC;AAAA,EAC1D;AAAA,EACA,GAAG;AACL,MAAM;AACJ,SACE,6BAAAC,QAAA,cAAC,sBAAAC,SAAA,EAAe,SAAO,MAAC,MAAK,MAAM,GAAG,SACnC,QACH;AAEJ;AAEO,MAAM,kBAAkD,CAAC;AAAA,EAC9D;AAAA,EACA,GAAG;AACL,MAAM;AACJ,SAAO,6BAAAD,QAAA,cAAC,YAAAE,SAAA,EAAM,GAAG,SAAQ,QAAS;AACpC;AAEO,MAAM,eAA4C,CAAC,EAAE,SAAS,MAAM;AACzE,SACE,6BAAAF,QAAA,cAAC,YAAAG,SAAA,EAAK,MAAI,MAAC,IAAI,MACb,6BAAAH,QAAA,cAAC,kBAAAI,SAAA,MAAY,QAAS,CACxB;AAEJ;AAGA,IAAO,mBAAQ,gBAAAL;",
-  "names": ["Fieldset", "React", "FieldsetLegend", "Hint", "Grid", "NormalText"]
+  "sourcesContent": ["import React from 'react';\nimport {\n  FieldsetLabelProps,\n  FieldsetCaptionProps,\n  FieldsetBodyProps,\n} from '@digigov/form/Fieldset/types';\nimport { Fieldset } from '@digigov/react-core/Fieldset';\nimport { FieldsetLegend } from '@digigov/ui/form/FieldContainer';\nimport { Grid } from '@digigov/ui/layouts/Grid';\nimport { Hint } from '@digigov/ui/typography/Hint';\nimport { NormalText } from '@digigov/ui/typography/NormalText';\n\nexport const FieldsetLabel: React.FC<FieldsetLabelProps> = ({\n  children,\n  ...props\n}) => {\n  return (\n    <FieldsetLegend heading size=\"xl\" {...props}>\n      {children}\n    </FieldsetLegend>\n  );\n};\n\nexport const FieldsetCaption: React.FC<FieldsetCaptionProps> = ({\n  children,\n  ...props\n}) => {\n  return <Hint {...props}>{children}</Hint>;\n};\n\nexport const FieldsetBody: React.FC<FieldsetBodyProps> = ({ children }) => {\n  return (\n    <Grid item xs={12}>\n      <NormalText>{children}</NormalText>\n    </Grid>\n  );\n};\n\nexport { Fieldset };\nexport default Fieldset;\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAMlB,sBAAyB;AACzB,4BAA+B;AAC/B,kBAAqB;AACrB,kBAAqB;AACrB,wBAA2B;AAEpB,MAAM,gBAA8C,CAAC;AAAA,EAC1D;AAAA,EACA,GAAG;AACL,MAAM;AACJ,SACE,6BAAAA,QAAA,cAAC,wCAAe,SAAO,MAAC,MAAK,MAAM,GAAG,SACnC,QACH;AAEJ;AAEO,MAAM,kBAAkD,CAAC;AAAA,EAC9D;AAAA,EACA,GAAG;AACL,MAAM;AACJ,SAAO,6BAAAA,QAAA,cAAC,oBAAM,GAAG,SAAQ,QAAS;AACpC;AAEO,MAAM,eAA4C,CAAC,EAAE,SAAS,MAAM;AACzE,SACE,6BAAAA,QAAA,cAAC,oBAAK,MAAI,MAAC,IAAI,MACb,6BAAAA,QAAA,cAAC,oCAAY,QAAS,CACxB;AAEJ;AAGA,IAAO,mBAAQ;",
+  "names": ["React"]
 }

package/cjs/Fieldset/types.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/Fieldset/types.tsx"],
-  "sourcesContent": ["import { FieldsetLegendProps } from '@digigov/react-core/FieldsetLegend';\nimport { HintProps } from '@digigov/react-core/Hint';\n\nexport interface FieldsetLabelProps extends FieldsetLegendProps {}\nexport interface FieldsetCaptionProps extends HintProps {}\nexport interface FieldsetBodyProps {\n  children?: React.ReactNode;\n}\n"],
+  "sourcesContent": ["import { FieldsetLegendProps } from '@digigov/ui/form/FieldContainer';\nimport { HintProps } from '@digigov/ui/typography/Hint';\n\nexport interface FieldsetLabelProps extends FieldsetLegendProps {}\nexport interface FieldsetCaptionProps extends HintProps {}\nexport interface FieldsetBodyProps {\n  children?: React.ReactNode;\n}\n"],
   "mappings": ";;;;;;;;;;;;;AAAA;AAAA;",
   "names": []
 }

package/cjs/FormBuilder/index.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,19 +16,177 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var FormBuilder_exports = {};
 __export(FormBuilder_exports, {
-  FormBase: () => import_form.FormBase,
+  ControlledFormBuilder: () => ControlledFormBuilder,
+  FormBase: () => FormBase,
   default: () => FormBuilder_default,
-  useFormContext: () => import_form.useFormContext,
-  useFormValues: () => import_form.useFormValues
+  useFormContext: () => useFormContext,
+  useFormValues: () => useFormValues
 });
 module.exports = __toCommonJS(FormBuilder_exports);
-var import_form = require("@digigov/form");
-var FormBuilder_default = import_form.FormBuilder;
+var import_react = __toESM(require("react"));
+var import_react_hook_form = require("react-hook-form");
+var import_Field = require("@digigov/form/Field");
+var import_utils = require("@digigov/form/Field/utils");
+var import_Fieldset = require("@digigov/form/Fieldset");
+var import_FormContext = require("@digigov/form/FormContext");
+var import_utils2 = require("@digigov/form/utils");
+var import_validators = require("@digigov/form/validators");
+var import_Button = require("@digigov/ui/form/Button");
+var import_Form = require("@digigov/ui/form/Form");
+const FormBase = import_react.default.forwardRef(function FormBase2({
+  onSubmit,
+  children,
+  registerField,
+  fieldsMap,
+  fieldsetsMap,
+  resolver,
+  mode,
+  initial,
+  reValidateMode,
+  shouldFocusError,
+  criteriaMode,
+  componentRegistry,
+  grid,
+  ...props
+}, ref) {
+  const form = (0, import_react_hook_form.useForm)({
+    resolver,
+    mode,
+    defaultValues: initial,
+    reValidateMode,
+    shouldFocusError,
+    criteriaMode
+  });
+  const handleSubmit = (0, import_react.useCallback)(
+    (data) => {
+      onSubmit && onSubmit(data);
+    },
+    [onSubmit]
+  );
+  const submit = form.handleSubmit(handleSubmit);
+  const ctx = {
+    fieldsMap,
+    fieldsetsMap,
+    control: form.control,
+    register: form.register,
+    watch: form.watch,
+    resetField: form.resetField,
+    registerField,
+    errors: form.formState.errors,
+    formState: form.formState,
+    reset: form.reset,
+    trigger: form.trigger,
+    getFieldState: form.getFieldState,
+    setValue: form.setValue,
+    clearErrors: form.clearErrors,
+    getValues: form.getValues,
+    unregister: form.unregister,
+    componentRegistry,
+    setError: form.setError,
+    formRef: ref,
+    submit
+  };
+  return /* @__PURE__ */ import_react.default.createElement(import_FormContext.FormContext.Provider, { value: ctx }, /* @__PURE__ */ import_react.default.createElement(import_Form.Form, { grid, onSubmit: submit, ref, ...props }, children));
+});
+const useFormContext = () => {
+  return (0, import_react.useContext)(import_FormContext.FormContext);
+};
+const useFormValues = () => {
+  const ctx = useFormContext();
+  return ctx.getValues();
+};
+const FormBuilder = import_react.default.forwardRef(function FormBuilder2({
+  fields = [],
+  fieldsets,
+  initial = {},
+  onSubmit,
+  children,
+  reValidateMode = "onSubmit",
+  mode = "onSubmit",
+  shouldFocusError = true,
+  criteriaMode = "all",
+  auto = false,
+  validatorRegistry,
+  componentRegistry,
+  grid = false,
+  ...props
+}, ref) {
+  const fieldsState = (0, import_react.useRef)(fields);
+  const setFieldsState = (0, import_react.useCallback)((newFields) => {
+    fieldsState.current = newFields;
+  }, []);
+  const schema = (0, import_validators.useValidationSchema)(fieldsState, validatorRegistry);
+  const registerField = (0, import_react.useCallback)((field) => {
+    const fieldIndex = fieldsState.current.findIndex(
+      (f) => f.key === field.key
+    );
+    if (fieldIndex > -1) {
+      fieldsState.current[fieldIndex] = field;
+    } else {
+      fieldsState.current.push(field);
+    }
+    setFieldsState(fieldsState.current);
+  }, []);
+  let resolver;
+  let fieldsMap;
+  let fieldsetsMap;
+  let fieldChildren;
+  if (schema) {
+    resolver = (0, import_utils2.yupResolver)(schema);
+    fieldsMap = fields ? fields.reduce((map, field) => ({ ...map, [field.key]: field }), {}) : {};
+    fieldsetsMap = fieldsets && fieldsets.reduce(
+      (map, fieldset) => ({ ...map, [fieldset.key]: fieldset }),
+      {}
+    );
+    if (auto) {
+      if (fieldsets) {
+        fieldChildren = fieldsets.map((fieldset) => /* @__PURE__ */ import_react.default.createElement(import_Fieldset.Fieldset, { key: fieldset.key }));
+      } else if (fields) {
+        fieldChildren = fields.map((field) => /* @__PURE__ */ import_react.default.createElement(import_Field.Field, { key: field.key, name: field.key }));
+      }
+    }
+  }
+  return /* @__PURE__ */ import_react.default.createElement(
+    FormBase,
+    {
+      resolver,
+      fieldsetsMap,
+      fieldsMap,
+      registerField,
+      initial,
+      reValidateMode,
+      mode,
+      shouldFocusError,
+      criteriaMode,
+      onSubmit,
+      componentRegistry,
+      ref,
+      grid,
+      ...props
+    },
+    fieldChildren,
+    auto && /* @__PURE__ */ import_react.default.createElement(import_Button.Button, { type: "submit" }, "\u03A3\u03C5\u03BD\u03AD\u03C7\u03B5\u03B9\u03B1"),
+    children
+  );
+});
+const ControlledFormBuilder = (props) => {
+  return /* @__PURE__ */ import_react.default.createElement(FormBuilder, { ...props, componentRegistry: import_utils.CONTROLLED_FIELD_COMPONENTS });
+};
+var FormBuilder_default = FormBuilder;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  ControlledFormBuilder,
   FormBase,
   useFormContext,
   useFormValues

package/cjs/FormBuilder/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/FormBuilder/index.tsx"],
-  "sourcesContent": ["import {\n  FormBuilder,\n  useFormContext,\n  useFormValues,\n  FormBase,\n} from '@digigov/form';\nexport { useFormContext, useFormValues, FormBase };\nexport default FormBuilder;\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAKO;AAEP,IAAO,sBAAQ;",
-  "names": []
+  "sourcesContent": ["/* eslint-disable @typescript-eslint/no-explicit-any */\nimport React, { useCallback, useContext, useRef } from 'react';\nimport { useForm } from 'react-hook-form';\nimport { Field } from '@digigov/form/Field';\nimport { CONTROLLED_FIELD_COMPONENTS } from '@digigov/form/Field/utils';\nimport { Fieldset } from '@digigov/form/Fieldset';\nimport { FormContext } from '@digigov/form/FormContext';\nimport { FormBaseProps, FormData, FormBuilderProps } from '@digigov/form/types';\nimport { yupResolver } from '@digigov/form/utils';\nimport { useValidationSchema } from '@digigov/form/validators';\nimport { Button } from '@digigov/ui/form/Button';\nimport { Form } from '@digigov/ui/form/Form';\n\nconst FormBase = React.forwardRef(function FormBase(\n  {\n    onSubmit,\n    children,\n    registerField,\n    fieldsMap,\n    fieldsetsMap,\n    resolver,\n    mode,\n    initial,\n    reValidateMode,\n    shouldFocusError,\n    criteriaMode,\n    componentRegistry,\n    grid,\n    ...props\n  }: FormBaseProps,\n  ref: React.Ref<HTMLFormElement>\n) {\n  const form = useForm({\n    resolver,\n    mode,\n    defaultValues: initial,\n    reValidateMode,\n    shouldFocusError,\n    criteriaMode,\n  });\n\n  const handleSubmit = useCallback(\n    (data: FormData): void => {\n      onSubmit && onSubmit(data);\n    },\n    [onSubmit]\n  );\n  const submit = form.handleSubmit(handleSubmit);\n  const ctx = {\n    fieldsMap,\n    fieldsetsMap,\n    control: form.control,\n    register: form.register,\n    watch: form.watch,\n    resetField: form.resetField,\n    registerField: registerField,\n    errors: form.formState.errors,\n    formState: form.formState,\n    reset: form.reset,\n    trigger: form.trigger,\n    getFieldState: form.getFieldState,\n    setValue: form.setValue,\n    clearErrors: form.clearErrors,\n    getValues: form.getValues,\n    unregister: form.unregister,\n    componentRegistry,\n    setError: form.setError,\n    formRef: ref,\n    submit,\n  };\n  return (\n    <FormContext.Provider value={ctx}>\n      <Form grid={grid} onSubmit={submit} ref={ref} {...props}>\n        {children}\n      </Form>\n    </FormContext.Provider>\n  );\n});\n\nconst useFormContext = () => {\n  return useContext(FormContext);\n};\nconst useFormValues = () => {\n  const ctx = useFormContext();\n  return ctx.getValues();\n};\nconst FormBuilder = React.forwardRef(function FormBuilder(\n  {\n    fields = [],\n    fieldsets,\n    initial = {},\n    onSubmit,\n    children,\n    reValidateMode = 'onSubmit',\n    mode = 'onSubmit',\n    shouldFocusError = true,\n    criteriaMode = 'all',\n    auto = false,\n    validatorRegistry,\n    componentRegistry,\n    grid = false,\n    ...props\n  }: FormBuilderProps,\n  ref: React.Ref<HTMLFormElement>\n): React.ReactElement {\n  const fieldsState = useRef(fields);\n  const setFieldsState = useCallback((newFields) => {\n    fieldsState.current = newFields;\n  }, []);\n  const schema = useValidationSchema(fieldsState, validatorRegistry);\n  const registerField = useCallback((field) => {\n    const fieldIndex = fieldsState.current.findIndex(\n      (f) => f.key === field.key\n    );\n    if (fieldIndex > -1) {\n      fieldsState.current[fieldIndex] = field;\n    } else {\n      fieldsState.current.push(field);\n    }\n    setFieldsState(fieldsState.current);\n  }, []);\n  let resolver;\n  let fieldsMap;\n  let fieldsetsMap;\n  let fieldChildren;\n  if (schema) {\n    resolver = yupResolver(schema);\n    fieldsMap = fields\n      ? fields.reduce((map, field) => ({ ...map, [field.key]: field }), {})\n      : {};\n    fieldsetsMap =\n      fieldsets &&\n      fieldsets.reduce(\n        (map, fieldset) => ({ ...map, [fieldset.key]: fieldset }),\n        {}\n      );\n\n    if (auto) {\n      if (fieldsets) {\n        fieldChildren = fieldsets.map((fieldset) => (\n          <Fieldset key={fieldset.key} />\n        ));\n      } else if (fields) {\n        fieldChildren = fields.map((field) => (\n          <Field key={field.key} name={field.key} />\n        ));\n      }\n    }\n  }\n  return (\n    <FormBase\n      resolver={resolver}\n      fieldsetsMap={fieldsetsMap}\n      fieldsMap={fieldsMap}\n      registerField={registerField}\n      initial={initial}\n      reValidateMode={reValidateMode}\n      mode={mode}\n      shouldFocusError={shouldFocusError}\n      criteriaMode={criteriaMode}\n      onSubmit={onSubmit}\n      componentRegistry={componentRegistry}\n      ref={ref}\n      grid={grid}\n      {...props}\n    >\n      {fieldChildren}\n      {auto && <Button type=\"submit\">\u03A3\u03C5\u03BD\u03AD\u03C7\u03B5\u03B9\u03B1</Button>}\n      {children}\n    </FormBase>\n  );\n});\nexport const ControlledFormBuilder = (props) => {\n  return (\n    <FormBuilder {...props} componentRegistry={CONTROLLED_FIELD_COMPONENTS} />\n  );\n};\nexport default FormBuilder;\n\nexport { useFormContext, useFormValues, FormBase };\n"],
+  "mappings": "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",
+  "names": ["import_utils", "React", "FormBase", "FormBuilder"]
 }