@digigov/form 2.0.0-2445d5cb → 2.0.0-264e5fff

package/cjs/hooks/utils/index.js

@@ -0,0 +1,98 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var utils_exports = {};
+__export(utils_exports, {
+  extractFieldEntries: () => extractFieldEntries,
+  mapElementsToFields: () => mapElementsToFields,
+  sortElementsByPosition: () => sortElementsByPosition
+});
+module.exports = __toCommonJS(utils_exports);
+function extractFieldEntries(fields, prefix = "") {
+  const elementMap = /* @__PURE__ */ new Map();
+  const fieldEntries = Object.entries(fields);
+  if (fieldEntries.length === 0) return elementMap;
+  Object.entries(fields).forEach(([fieldName, field]) => {
+    if (!field) return;
+    const fullFieldName = prefix ? `${prefix}.${fieldName}` : fieldName;
+    if (isField(field)) {
+      const element = field._f.ref;
+      if (element) {
+        elementMap.set(fullFieldName, element);
+      }
+    } else if (isFieldRefs(field)) {
+      const keys = Object.keys(field);
+      const numericKeys = keys.filter((key) => /^\d+$/.test(key));
+      const hasNumericKeys = numericKeys.length > 0;
+      if (hasNumericKeys) {
+        numericKeys.forEach((index) => {
+          const arrayItem = field[index];
+          if (arrayItem && isFieldRefs(arrayItem)) {
+            const nestedEntries = extractFieldEntries(
+              arrayItem,
+              `${fullFieldName}.${index}`
+            );
+            nestedEntries.forEach((element, fieldName2) => {
+              elementMap.set(fieldName2, element);
+            });
+          }
+        });
+      } else {
+        const nestedEntries = extractFieldEntries(field, fullFieldName);
+        nestedEntries.forEach((element, fieldName2) => {
+          elementMap.set(fieldName2, element);
+        });
+      }
+    }
+  });
+  return elementMap;
+}
+const isField = (fieldRef) => Boolean(
+  fieldRef && typeof fieldRef === "object" && "_f" in fieldRef && fieldRef._f && "ref" in fieldRef._f
+);
+const isFieldRefs = (fieldRef) => Boolean(fieldRef && typeof fieldRef === "object" && !isField(fieldRef));
+function sortElementsByPosition(elements) {
+  const sortedEntries = Array.from(elements.entries()).sort(([, a], [, b]) => {
+    if (isActualHTMLElement(a) && isActualHTMLElement(b)) {
+      const aPosition = a.compareDocumentPosition(b);
+      if (aPosition & Node.DOCUMENT_POSITION_FOLLOWING) return -1;
+      if (aPosition & Node.DOCUMENT_POSITION_PRECEDING) return 1;
+    }
+    return 0;
+  });
+  return new Map(sortedEntries);
+}
+const isActualHTMLElement = (ref) => ref instanceof HTMLElement && typeof ref.focus === "function";
+function mapElementsToFields(elements) {
+  const fields = {};
+  elements.forEach((element, fieldName) => {
+    fields[fieldName] = {
+      _f: {
+        ref: element,
+        name: fieldName
+      }
+    };
+  });
+  return fields;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  extractFieldEntries,
+  mapElementsToFields,
+  sortElementsByPosition
+});
+//# sourceMappingURL=utils.js.map

package/cjs/hooks/utils.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/hooks/utils.ts"],
+  "sourcesContent": ["import type { Field, FieldRefs, Ref } from 'react-hook-form';\n\n/**\n * Recursively extracts field entries from nested form field structure.\n * Handles both regular nested objects and array-like structures.\n */\nexport function extractFieldEntries(\n  fields: FieldRefs,\n  prefix = ''\n): Map<string, Ref> {\n  const elementMap = new Map<string, Ref>();\n\n  const fieldEntries = Object.entries(fields);\n  if (fieldEntries.length === 0) return elementMap;\n\n  Object.entries(fields).forEach(([fieldName, field]) => {\n    if (!field) return;\n    const fullFieldName = prefix ? `${prefix}.${fieldName}` : fieldName;\n\n    // Handle direct field with ref\n    if (isField(field)) {\n      const element = field._f.ref;\n      if (element) {\n        elementMap.set(fullFieldName, element);\n      }\n    }\n\n    // Handle array fields (numeric keys indicate array indices)\n    else if (isFieldRefs(field)) {\n      // Check if any keys are numeric (indicating an array structure)\n      // Filter out non-numeric keys like '_f' which contains field metadata\n      const keys = Object.keys(field);\n      const numericKeys = keys.filter((key) => /^\\d+$/.test(key));\n      const hasNumericKeys = numericKeys.length > 0;\n\n      if (hasNumericKeys) {\n        // Process only the numeric array indices, ignore metadata keys like '_f'\n        numericKeys.forEach((index) => {\n          const arrayItem = field[index];\n          if (arrayItem && isFieldRefs(arrayItem)) {\n            const nestedEntries = extractFieldEntries(\n              arrayItem,\n              `${fullFieldName}.${index}`\n            );\n            // Merge nested entries into main map\n            nestedEntries.forEach((element, fieldName) => {\n              elementMap.set(fieldName, element);\n            });\n          }\n        });\n      } else {\n        // Handle regular nested objects\n        const nestedEntries = extractFieldEntries(field, fullFieldName);\n        // Merge nested entries into main map\n        nestedEntries.forEach((element, fieldName) => {\n          elementMap.set(fieldName, element);\n        });\n      }\n    }\n  });\n\n  return elementMap;\n}\n\n/** Type guard to check if a ref is a Field object */\nconst isField = (fieldRef: FieldRefs[keyof FieldRefs]): fieldRef is Field =>\n  Boolean(\n    fieldRef &&\n      typeof fieldRef === 'object' &&\n      '_f' in fieldRef &&\n      fieldRef._f &&\n      'ref' in fieldRef._f\n  );\n\n/** Type guard to check if a ref is a FieldRefs object (nested fields) */\nconst isFieldRefs = (\n  fieldRef: FieldRefs[keyof FieldRefs]\n): fieldRef is FieldRefs =>\n  Boolean(fieldRef && typeof fieldRef === 'object' && !isField(fieldRef));\n\n/**\n * Sorts a map of HTML elements by their position in the DOM.\n * Elements appearing earlier in the document order come first.\n */\nexport function sortElementsByPosition(\n  elements: Map<string, Ref>\n): Map<string, Ref> {\n  const sortedEntries = Array.from(elements.entries()).sort(([, a], [, b]) => {\n    if (isActualHTMLElement(a) && isActualHTMLElement(b)) {\n      const aPosition = a.compareDocumentPosition(b);\n      if (aPosition & Node.DOCUMENT_POSITION_FOLLOWING) return -1;\n      if (aPosition & Node.DOCUMENT_POSITION_PRECEDING) return 1;\n    }\n    return 0; // keep original order\n  });\n  return new Map(sortedEntries);\n}\n\n/** Type guard to check if a ref is an actual HTML element */\nconst isActualHTMLElement = (ref: Ref): ref is Ref & HTMLElement =>\n  ref instanceof HTMLElement && typeof ref.focus === 'function';\n\n/**\n * Maps a collection of HTML elements to a FieldRefs structure.\n *\n * It's not a direct conversion, but rather a way to create a simple FieldRefs\n * structure that can be used with React Hook Form.\n */\nexport function mapElementsToFields(\n  elements: Map<string, HTMLElement>\n): Record<string, Field> {\n  const fields = {};\n  elements.forEach((element, fieldName) => {\n    fields[fieldName] = {\n      _f: {\n        ref: element,\n        name: fieldName,\n      },\n    };\n  });\n  return fields;\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMO,SAAS,oBACd,QACA,SAAS,IACS;AAClB,QAAM,aAAa,oBAAI,IAAiB;AAExC,QAAM,eAAe,OAAO,QAAQ,MAAM;AAC1C,MAAI,aAAa,WAAW,EAAG,QAAO;AAEtC,SAAO,QAAQ,MAAM,EAAE,QAAQ,CAAC,CAAC,WAAW,KAAK,MAAM;AACrD,QAAI,CAAC,MAAO;AACZ,UAAM,gBAAgB,SAAS,GAAG,MAAM,IAAI,SAAS,KAAK;AAG1D,QAAI,QAAQ,KAAK,GAAG;AAClB,YAAM,UAAU,MAAM,GAAG;AACzB,UAAI,SAAS;AACX,mBAAW,IAAI,eAAe,OAAO;AAAA,MACvC;AAAA,IACF,WAGS,YAAY,KAAK,GAAG;AAG3B,YAAM,OAAO,OAAO,KAAK,KAAK;AAC9B,YAAM,cAAc,KAAK,OAAO,CAAC,QAAQ,QAAQ,KAAK,GAAG,CAAC;AAC1D,YAAM,iBAAiB,YAAY,SAAS;AAE5C,UAAI,gBAAgB;AAElB,oBAAY,QAAQ,CAAC,UAAU;AAC7B,gBAAM,YAAY,MAAM,KAAK;AAC7B,cAAI,aAAa,YAAY,SAAS,GAAG;AACvC,kBAAM,gBAAgB;AAAA,cACpB;AAAA,cACA,GAAG,aAAa,IAAI,KAAK;AAAA,YAC3B;AAEA,0BAAc,QAAQ,CAAC,SAASA,eAAc;AAC5C,yBAAW,IAAIA,YAAW,OAAO;AAAA,YACnC,CAAC;AAAA,UACH;AAAA,QACF,CAAC;AAAA,MACH,OAAO;AAEL,cAAM,gBAAgB,oBAAoB,OAAO,aAAa;AAE9D,sBAAc,QAAQ,CAAC,SAASA,eAAc;AAC5C,qBAAW,IAAIA,YAAW,OAAO;AAAA,QACnC,CAAC;AAAA,MACH;AAAA,IACF;AAAA,EACF,CAAC;AAED,SAAO;AACT;AAGA,MAAM,UAAU,CAAC,aACf;AAAA,EACE,YACE,OAAO,aAAa,YACpB,QAAQ,YACR,SAAS,MACT,SAAS,SAAS;AACtB;AAGF,MAAM,cAAc,CAClB,aAEA,QAAQ,YAAY,OAAO,aAAa,YAAY,CAAC,QAAQ,QAAQ,CAAC;AAMjE,SAAS,uBACd,UACkB;AAClB,QAAM,gBAAgB,MAAM,KAAK,SAAS,QAAQ,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM;AAC1E,QAAI,oBAAoB,CAAC,KAAK,oBAAoB,CAAC,GAAG;AACpD,YAAM,YAAY,EAAE,wBAAwB,CAAC;AAC7C,UAAI,YAAY,KAAK,4BAA6B,QAAO;AACzD,UAAI,YAAY,KAAK,4BAA6B,QAAO;AAAA,IAC3D;AACA,WAAO;AAAA,EACT,CAAC;AACD,SAAO,IAAI,IAAI,aAAa;AAC9B;AAGA,MAAM,sBAAsB,CAAC,QAC3B,eAAe,eAAe,OAAO,IAAI,UAAU;AAQ9C,SAAS,oBACd,UACuB;AACvB,QAAM,SAAS,CAAC;AAChB,WAAS,QAAQ,CAAC,SAAS,cAAc;AACvC,WAAO,SAAS,IAAI;AAAA,MAClB,IAAI;AAAA,QACF,KAAK;AAAA,QACL,MAAM;AAAA,MACR;AAAA,IACF;AAAA,EACF,CAAC;AACD,SAAO;AACT;",
+  "names": ["fieldName"]
+}

package/cjs/index.js

@@ -28,166 +28,22 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var src_exports = {};
 __export(src_exports, {
-  FormBase: () => FormBase,
-  FormBuilder: () => FormBuilder,
-  default: () => src_default,
-  useFormContext: () => useFormContext,
-  useFormValues: () => useFormValues
+  Field: () => import_Field.default,
+  Fieldset: () => import_Fieldset.default,
+  default: () => src_default
 });
 module.exports = __toCommonJS(src_exports);
-var import_react = __toESM(require("react"));
-var import_react_hook_form = require("react-hook-form");
 var import_Field = __toESM(require("@digigov/form/Field"));
 var import_Fieldset = __toESM(require("@digigov/form/Fieldset"));
-var import_FormContext = require("@digigov/form/FormContext");
-var import_utils = require("@digigov/form/utils");
-var import_validators = require("@digigov/form/validators");
-var import_Form = require("@digigov/react-core/Form");
-var import_Button = require("@digigov/ui/form/Button");
-__reExport(src_exports, require("@digigov/form/internal"), module.exports);
-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_utils.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.default, { key: fieldset.key }));
-      } else if (fields) {
-        fieldChildren = fields.map((field) => /* @__PURE__ */ import_react.default.createElement(import_Field.default, { 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
-  );
-});
-var src_default = FormBuilder;
+__reExport(src_exports, require("@digigov/form/inputs/Label"), module.exports);
+var import_FormBuilder = __toESM(require("@digigov/form/FormBuilder"));
+__reExport(src_exports, require("@digigov/form/types"), module.exports);
+var src_default = import_FormBuilder.default;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  FormBase,
-  FormBuilder,
-  useFormContext,
-  useFormValues,
-  ...require("@digigov/form/internal")
+  Field,
+  Fieldset,
+  ...require("@digigov/form/inputs/Label"),
+  ...require("@digigov/form/types")
 });
 //# sourceMappingURL=index.js.map

package/cjs/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
-  "sources": ["../../src/index.tsx"],
-  "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 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 { Form } from '@digigov/react-core/Form';\nimport { Button } from '@digigov/ui/form/Button';\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\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});\n\nexport { FormBase, useFormContext, useFormValues, FormBuilder };\n\nexport * from '@digigov/form/internal';\n\nexport default FormBuilder;\n"],
-  "mappings": "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",
-  "names": ["React", "FormBase", "FormBuilder", "Fieldset", "Field"]
+  "sources": ["../../src/index.ts"],
+  "sourcesContent": ["export { default as Field } from '@digigov/form/Field';\nexport { default as Fieldset } from '@digigov/form/Fieldset';\nexport * from '@digigov/form/inputs/Label';\nimport FormBuilder from '@digigov/form/FormBuilder';\nexport * from '@digigov/form/types';\nexport default FormBuilder;\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAiC;AACjC,sBAAoC;AACpC,wBAAc,uCAFd;AAGA,yBAAwB;AACxB,wBAAc,gCAJd;AAKA,IAAO,cAAQ,mBAAAA;",
+  "names": ["FormBuilder"]
 }

package/cjs/inputs/AutoCompleteInput/index.js

@@ -32,14 +32,15 @@ __export(AutoCompleteInput_exports, {
 });
 module.exports = __toCommonJS(AutoCompleteInput_exports);
 var import_react = __toESM(require("react"));
-var import_Hint = require("@digigov/react-core/Hint");
-var import_AutoComplete = __toESM(require("@digigov/ui/form/AutoComplete"));
+var import_AutoComplete = require("@digigov/ui/form/AutoComplete");
+var import_Hint = require("@digigov/ui/typography/Hint");
+var import_Base = require("@digigov/ui/utils/Base");
 const AutoCompleteInput = ({
   name,
-  extra: { options, multiple },
+  type,
+  extra: { options },
   onChange,
   value,
-  error,
   ...props
 }) => {
   const suggest = (0, import_react.useCallback)(
@@ -53,21 +54,22 @@ const AutoCompleteInput = ({
     [options]
   );
   return /* @__PURE__ */ import_react.default.createElement(
-    import_AutoComplete.default,
+    import_AutoComplete.AutoComplete,
     {
-      multiple,
+      multiple: type === "choice:multiple" ? true : false,
       source: suggest,
       onConfirm: (value2) => {
         if (Array.isArray(value2)) {
           const selectedValues = value2.map((item) => item.value);
-          selectedValues.length > 0 ? onChange(selectedValues) : onChange(void 0);
+          if (selectedValues.length > 0) onChange(selectedValues);
+          else onChange(void 0);
         } else {
           onChange(value2.value);
         }
       },
       templates: {
         suggestion({ label, value: value2 }) {
-          return /* @__PURE__ */ import_react.default.createElement("div", null, label && label.primary && label.primary || value2, label && label.secondary && /* @__PURE__ */ import_react.default.createElement(import_Hint.Hint, null, label.secondary));
+          return /* @__PURE__ */ import_react.default.createElement(import_Base.Base, { as: "div" }, label && label.primary && label.primary || value2, label && label.secondary && /* @__PURE__ */ import_react.default.createElement(import_Hint.Hint, null, label.secondary));
         },
         inputValue: (option) => {
           if (!option) {
@@ -79,7 +81,8 @@ const AutoCompleteInput = ({
       ...{
         ...props,
         reset: void 0,
-        required: void 0
+        required: void 0,
+        Field: void 0
       },
       name,
       id: `${name}-id`,

package/cjs/inputs/AutoCompleteInput/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/inputs/AutoCompleteInput/index.tsx"],
-  "sourcesContent": ["import React, { useCallback } from 'react';\nimport { ControlledFieldProps } from '@digigov/form/Field/types';\nimport { FieldOptionProps } from '@digigov/form/inputs/Label';\nimport { Hint } from '@digigov/react-core/Hint';\nimport UIAutoComplete, {\n  AutoCompleteProps as UIAutoCompleteProps,\n} from '@digigov/ui/form/AutoComplete';\n\nexport interface AutoCompleteInputExtra\n  extends Omit<\n    UIAutoCompleteProps,\n    | 'source'\n    | 'id'\n    | 'templates'\n    | 'defaultValue'\n    | 'onConfirm'\n    | 'dropdownArrow'\n  > {\n  options: Array<FieldOptionProps>;\n}\n\nexport interface AutoCompleteInputProps\n  extends Omit<ControlledFieldProps, 'value' | 'onChange' | 'extra'> {\n  extra: AutoCompleteInputExtra;\n  value: string;\n  onChange: (v: string | string[] | undefined) => void;\n}\n\nexport const AutoCompleteInput: React.FC<AutoCompleteInputProps> = ({\n  name,\n  extra: { options, multiple },\n  onChange,\n  value,\n  error,\n  ...props\n}) => {\n  const suggest = useCallback(function suggest(\n    query: string,\n    syncResults: (options: any[]) => void\n  ): void {\n    syncResults(\n      query\n        ? options.filter(function (option) {\n          return (\n            `${option.value} ${option.label?.primary || ''} ${option.label?.secondary || ''\n              }`\n              .toLowerCase()\n              .indexOf(query.toLowerCase()) !== -1\n          );\n        })\n        : options\n    );\n  },\n    [options]);\n\n  return (\n    <UIAutoComplete\n      multiple={multiple}\n      source={suggest}\n      onConfirm={(value) => {\n        if (Array.isArray(value)) {\n          const selectedValues = value.map(item => item.value);\n          selectedValues.length > 0 ? onChange(selectedValues) : onChange(undefined);\n        } else {\n          onChange(value.value);\n        }\n      }}\n      templates={{\n        suggestion({ label, value }) {\n          return (\n            <div>\n              {(label && label.primary && label.primary) || value}\n              {label && label.secondary && <Hint>{label.secondary}</Hint>}\n            </div>\n          );\n        },\n        inputValue: (option) => {\n          if (!option) {\n            return '';\n          }\n          return option.label.primary || option.value;\n        },\n      }}\n      {...{\n        ...props,\n        reset: undefined,\n        required: undefined,\n      }}\n      name={name}\n      id={`${name}-id`}\n      defaultValue={value}\n    />\n  );\n};\n\nexport default AutoCompleteInput;"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAmC;AAGnC,kBAAqB;AACrB,0BAEO;AAsBA,MAAM,oBAAsD,CAAC;AAAA,EAClE;AAAA,EACA,OAAO,EAAE,SAAS,SAAS;AAAA,EAC3B;AAAA,EACA;AAAA,EACA;AAAA,EACA,GAAG;AACL,MAAM;AACJ,QAAM,cAAU;AAAA,IAAY,SAASA,SACnC,OACA,aACM;AACN;AAAA,QACE,QACI,QAAQ,OAAO,SAAU,QAAQ;AACjC,iBACE,GAAG,OAAO,KAAK,IAAI,OAAO,OAAO,WAAW,EAAE,IAAI,OAAO,OAAO,aAAa,EAC3E,GACC,YAAY,EACZ,QAAQ,MAAM,YAAY,CAAC,MAAM;AAAA,QAExC,CAAC,IACC;AAAA,MACN;AAAA,IACF;AAAA,IACE,CAAC,OAAO;AAAA,EAAC;AAEX,SACE,6BAAAC,QAAA;AAAA,IAAC,oBAAAC;AAAA,IAAA;AAAA,MACC;AAAA,MACA,QAAQ;AAAA,MACR,WAAW,CAACC,WAAU;AACpB,YAAI,MAAM,QAAQA,MAAK,GAAG;AACxB,gBAAM,iBAAiBA,OAAM,IAAI,UAAQ,KAAK,KAAK;AACnD,yBAAe,SAAS,IAAI,SAAS,cAAc,IAAI,SAAS,MAAS;AAAA,QAC3E,OAAO;AACL,mBAASA,OAAM,KAAK;AAAA,QACtB;AAAA,MACF;AAAA,MACA,WAAW;AAAA,QACT,WAAW,EAAE,OAAO,OAAAA,OAAM,GAAG;AAC3B,iBACE,6BAAAF,QAAA,cAAC,aACG,SAAS,MAAM,WAAW,MAAM,WAAYE,QAC7C,SAAS,MAAM,aAAa,6BAAAF,QAAA,cAAC,wBAAM,MAAM,SAAU,CACtD;AAAA,QAEJ;AAAA,QACA,YAAY,CAAC,WAAW;AACtB,cAAI,CAAC,QAAQ;AACX,mBAAO;AAAA,UACT;AACA,iBAAO,OAAO,MAAM,WAAW,OAAO;AAAA,QACxC;AAAA,MACF;AAAA,MACC,GAAG;AAAA,QACF,GAAG;AAAA,QACH,OAAO;AAAA,QACP,UAAU;AAAA,MACZ;AAAA,MACA;AAAA,MACA,IAAI,GAAG,IAAI;AAAA,MACX,cAAc;AAAA;AAAA,EAChB;AAEJ;AAEA,IAAO,4BAAQ;",
-  "names": ["suggest", "React", "UIAutoComplete", "value"]
+  "sourcesContent": ["import React, { useCallback } from 'react';\nimport type { ControlledFieldProps } from '@digigov/form/Field/types';\nimport type { FieldOptionProps } from '@digigov/form/inputs/Label';\nimport type { AutoCompleteProps as UIAutoCompleteProps } from '@digigov/ui/form/AutoComplete';\nimport { AutoComplete } from '@digigov/ui/form/AutoComplete';\nimport { Hint } from '@digigov/ui/typography/Hint';\nimport { Base } from '@digigov/ui/utils/Base';\nexport interface AutoCompleteInputExtra\n  extends Omit<\n    UIAutoCompleteProps,\n    | 'source'\n    | 'id'\n    | 'templates'\n    | 'defaultValue'\n    | 'onConfirm'\n    | 'dropdownArrow'\n  > {\n  options: FieldOptionProps[];\n}\n\nexport interface AutoCompleteInputProps\n  extends Omit<ControlledFieldProps, 'value' | 'onChange' | 'extra'> {\n  extra: AutoCompleteInputExtra;\n  value: string;\n  onChange: (v: string | string[] | undefined) => void;\n}\n\nexport const AutoCompleteInput: React.FC<AutoCompleteInputProps> = ({\n  name,\n  type,\n  extra: { options },\n  onChange,\n  value,\n  ...props\n}) => {\n  const suggest = useCallback(\n    function suggest(\n      query: string,\n      syncResults: (options: any[]) => void\n    ): void {\n      syncResults(\n        query\n          ? options.filter(function (option) {\n              return (\n                `${option.value} ${option.label?.primary || ''} ${\n                  option.label?.secondary || ''\n                }`\n                  .toLowerCase()\n                  .indexOf(query.toLowerCase()) !== -1\n              );\n            })\n          : options\n      );\n    },\n    [options]\n  );\n\n  return (\n    <AutoComplete\n      multiple={type === 'choice:multiple' ? true : false}\n      source={suggest}\n      onConfirm={(value) => {\n        if (Array.isArray(value)) {\n          const selectedValues = value.map((item) => item.value);\n          if (selectedValues.length > 0) onChange(selectedValues);\n          else onChange(undefined);\n        } else {\n          onChange(value.value);\n        }\n      }}\n      templates={{\n        suggestion({ label, value }) {\n          return (\n            <Base as=\"div\">\n              {(label && label.primary && label.primary) || value}\n              {label && label.secondary && <Hint>{label.secondary}</Hint>}\n            </Base>\n          );\n        },\n        inputValue: (option) => {\n          if (!option) {\n            return '';\n          }\n          return option.label.primary || option.value;\n        },\n      }}\n      {...{\n        ...props,\n        reset: undefined,\n        required: undefined,\n        Field: undefined,\n      }}\n      name={name}\n      id={`${name}-id`}\n      defaultValue={value}\n    />\n  );\n};\n\nexport default AutoCompleteInput;\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAmC;AAInC,0BAA6B;AAC7B,kBAAqB;AACrB,kBAAqB;AAqBd,MAAM,oBAAsD,CAAC;AAAA,EAClE;AAAA,EACA;AAAA,EACA,OAAO,EAAE,QAAQ;AAAA,EACjB;AAAA,EACA;AAAA,EACA,GAAG;AACL,MAAM;AACJ,QAAM,cAAU;AAAA,IACd,SAASA,SACP,OACA,aACM;AACN;AAAA,QACE,QACI,QAAQ,OAAO,SAAU,QAAQ;AAC/B,iBACE,GAAG,OAAO,KAAK,IAAI,OAAO,OAAO,WAAW,EAAE,IAC5C,OAAO,OAAO,aAAa,EAC7B,GACG,YAAY,EACZ,QAAQ,MAAM,YAAY,CAAC,MAAM;AAAA,QAExC,CAAC,IACD;AAAA,MACN;AAAA,IACF;AAAA,IACA,CAAC,OAAO;AAAA,EACV;AAEA,SACE,6BAAAC,QAAA;AAAA,IAAC;AAAA;AAAA,MACC,UAAU,SAAS,oBAAoB,OAAO;AAAA,MAC9C,QAAQ;AAAA,MACR,WAAW,CAACC,WAAU;AACpB,YAAI,MAAM,QAAQA,MAAK,GAAG;AACxB,gBAAM,iBAAiBA,OAAM,IAAI,CAAC,SAAS,KAAK,KAAK;AACrD,cAAI,eAAe,SAAS,EAAG,UAAS,cAAc;AAAA,cACjD,UAAS,MAAS;AAAA,QACzB,OAAO;AACL,mBAASA,OAAM,KAAK;AAAA,QACtB;AAAA,MACF;AAAA,MACA,WAAW;AAAA,QACT,WAAW,EAAE,OAAO,OAAAA,OAAM,GAAG;AAC3B,iBACE,6BAAAD,QAAA,cAAC,oBAAK,IAAG,SACL,SAAS,MAAM,WAAW,MAAM,WAAYC,QAC7C,SAAS,MAAM,aAAa,6BAAAD,QAAA,cAAC,wBAAM,MAAM,SAAU,CACtD;AAAA,QAEJ;AAAA,QACA,YAAY,CAAC,WAAW;AACtB,cAAI,CAAC,QAAQ;AACX,mBAAO;AAAA,UACT;AACA,iBAAO,OAAO,MAAM,WAAW,OAAO;AAAA,QACxC;AAAA,MACF;AAAA,MACC,GAAG;AAAA,QACF,GAAG;AAAA,QACH,OAAO;AAAA,QACP,UAAU;AAAA,QACV,OAAO;AAAA,MACT;AAAA,MACA;AAAA,MACA,IAAI,GAAG,IAAI;AAAA,MACX,cAAc;AAAA;AAAA,EAChB;AAEJ;AAEA,IAAO,4BAAQ;",
+  "names": ["suggest", "React", "value"]
 }

package/cjs/inputs/Checkboxes/index.js

@@ -32,73 +32,78 @@ __export(Checkboxes_exports, {
 });
 module.exports = __toCommonJS(Checkboxes_exports);
 var import_react = __toESM(require("react"));
-var import_Checkbox = __toESM(require("@digigov/react-core/Checkbox"));
-var import_CheckboxConditional = require("@digigov/react-core/CheckboxConditional");
-var import_CheckboxItem = __toESM(require("@digigov/react-core/CheckboxItem"));
-var import_Hint = __toESM(require("@digigov/react-core/Hint"));
+var import_utils = require("@digigov/form/utils");
+var import_Checkbox = require("@digigov/ui/form/Checkbox");
 var import_i18n = require("@digigov/ui/i18n");
-const Checkboxes = ({
-  name,
-  onChange,
-  value,
-  extra: { options, className },
-  disabled,
-  fieldComponent: Field,
-  ...props
-}) => {
-  if (!value) value = [];
-  const handleChange = (optionValue, idx, show) => (evt) => {
-    let newValue;
-    if (evt.currentTarget.checked) {
-      newValue = value.concat([optionValue]);
-    } else {
-      newValue = value.filter((val) => val !== optionValue);
-    }
-    if (show && show.length > 0) {
-      setChecked(
-        (items) => items.map((item, index) => index === idx ? !item : item)
-      );
-    }
-    if (newValue.length === 0) newValue = void 0;
-    onChange(newValue);
-  };
-  const { t } = (0, import_i18n.useTranslation)();
-  const [checked, setChecked] = (0, import_react.useState)(
-    Array(options.length).fill(false)
-  );
-  return /* @__PURE__ */ import_react.default.createElement(import_Checkbox.default, { className }, options.map(
-    ({
-      label,
-      value: v,
-      show,
-      disabled: optionDisabled,
-      selected,
-      ...option
-    }, index) => /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, { key: index }, /* @__PURE__ */ import_react.default.createElement(
-      import_CheckboxItem.default,
-      {
-        key: `${name}.${index}`,
-        name: `${name}.${v}`,
+var import_Hint = require("@digigov/ui/typography/Hint");
+const Checkboxes = import_react.default.forwardRef(
+  ({
+    name,
+    onChange,
+    value,
+    extra: { options, className },
+    disabled,
+    Field,
+    ...props
+  }, ref) => {
+    if (!value) value = [];
+    const handleChange = (optionValue, idx, show) => (evt) => {
+      let newValue = [];
+      if (evt.currentTarget.checked) {
+        newValue = value.concat([optionValue]);
+      } else {
+        newValue = value.filter((val) => val !== optionValue);
+      }
+      if (show && show.length > 0) {
+        setChecked(
+          (items) => items.map((item, index) => index === idx ? !item : item)
+        );
+      }
+      if (newValue.length === 0) newValue = void 0;
+      onChange(newValue);
+    };
+    const { t } = (0, import_i18n.useTranslation)();
+    const [checked, setChecked] = (0, import_react.useState)(
+      Array(options.length).fill(false)
+    );
+    return /* @__PURE__ */ import_react.default.createElement(import_Checkbox.Checkbox, { className }, options.map(
+      ({
+        label,
         value: v,
-        disabled: disabled || optionDisabled,
-        checked: value?.includes(v),
-        onChange: handleChange(v, index, show),
-        ...option,
-        ...{
-          ...props,
-          reset: void 0,
-          defaultValue: void 0,
-          onBlur: void 0,
-          required: void 0,
-          "aria-describedby": void 0,
-          type: "checkbox"
-        }
-      },
-      label && label.primary && t(label.primary) || value,
-      label && label.secondary && /* @__PURE__ */ import_react.default.createElement(import_Hint.default, null, t(label.secondary))
-    ), !!checked[index] && show && Field && /* @__PURE__ */ import_react.default.createElement(import_CheckboxConditional.CheckboxConditional, null, show.map((fieldName) => /* @__PURE__ */ import_react.default.createElement(Field, { name: fieldName, key: fieldName }))), selected && selected())
-  ));
-};
+        show,
+        disabled: optionDisabled,
+        selected,
+        ...option
+      }, index) => /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, { key: index }, /* @__PURE__ */ import_react.default.createElement(
+        import_Checkbox.CheckboxItem,
+        {
+          ref: index === 0 ? ref : void 0,
+          key: `${name}.${index}`,
+          name: `${name}.${v}`,
+          id: `${name}.${v}`,
+          value: v,
+          disabled: disabled || optionDisabled,
+          checked: value?.includes(v),
+          onChange: handleChange(v, index, show),
+          ...option,
+          ...{
+            ...(0, import_utils.omit)(props, ["resetField"]),
+            reset: void 0,
+            defaultValue: void 0,
+            error: void 0,
+            onBlur: void 0,
+            required: void 0,
+            "aria-describedby": void 0,
+            type: "checkbox"
+          }
+        },
+        label && label.primary && t(label.primary) || value,
+        label && label.secondary && /* @__PURE__ */ import_react.default.createElement(import_Hint.Hint, null, t(label.secondary))
+      ), !!checked[index] && show && Field && /* @__PURE__ */ import_react.default.createElement(import_Checkbox.CheckboxConditional, null, show.map((fieldName) => /* @__PURE__ */ import_react.default.createElement(Field, { name: fieldName, key: fieldName }))), selected && selected())
+    ));
+  }
+);
+Checkboxes.displayName = "Checkboxes";
 var Checkboxes_default = Checkboxes;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/cjs/inputs/Checkboxes/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/inputs/Checkboxes/index.tsx"],
-  "sourcesContent": ["import React, { useState } from 'react';\nimport { ControlledFieldProps } from '@digigov/form/Field/types';\nimport { FieldOptionProps } from '@digigov/form/inputs/Label';\nimport CoreCheckboxes from '@digigov/react-core/Checkbox';\nimport { CheckboxConditional } from '@digigov/react-core/CheckboxConditional';\nimport CheckboxItem from '@digigov/react-core/CheckboxItem';\nimport Hint from '@digigov/react-core/Hint';\nimport { useTranslation } from '@digigov/ui/i18n';\n\nexport interface CheckboxesProps\n  extends Omit<ControlledFieldProps, 'extra' | 'value'> {\n  value?: string[];\n  extra: {\n    className?: string;\n    options: Array<FieldOptionProps>;\n  };\n  fieldComponent: React.FC<Omit<ControlledFieldProps, 'value' | 'onChange'>>;\n}\n\nexport const Checkboxes: React.FC<CheckboxesProps> = ({\n  name,\n  onChange,\n  value,\n  extra: { options, className },\n  disabled,\n  fieldComponent: Field,\n  ...props\n}) => {\n  if (!value) value = [];\n  const handleChange =\n    (optionValue, idx, show) =>\n    (evt): void => {\n      let newValue;\n      if (evt.currentTarget.checked) {\n        // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n        // @ts-ignore\n        newValue = value.concat([optionValue]);\n      } else {\n        // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n        // @ts-ignore\n        newValue = value.filter((val) => val !== optionValue);\n      }\n      if (show && show.length > 0) {\n        setChecked((items) =>\n          items.map((item, index) => (index === idx ? !item : item))\n        );\n      }\n\n      // reset value to undefined instead of an empty array\n      // so the error state mechanism can throw validation errors\n      if (newValue.length === 0) newValue = undefined;\n      onChange(newValue);\n    };\n  const { t } = useTranslation();\n  const [checked, setChecked] = useState(\n    Array<boolean>(options.length).fill(false)\n  );\n  return (\n    <CoreCheckboxes className={className}>\n      {options.map(\n        (\n          {\n            label,\n            value: v,\n            show,\n            disabled: optionDisabled,\n            selected,\n            ...option\n          },\n          index\n        ) => (\n          <React.Fragment key={index}>\n            <CheckboxItem\n              key={`${name}.${index}`}\n              name={`${name}.${v}`}\n              value={v}\n              disabled={disabled || optionDisabled}\n              checked={value?.includes(v)}\n              onChange={handleChange(v, index, show)}\n              {...option}\n              {...{\n                ...props,\n                reset: undefined,\n                defaultValue: undefined,\n                onBlur: undefined,\n                required: undefined,\n                'aria-describedby': undefined,\n                type: 'checkbox',\n              }}\n            >\n              {(label && label.primary && t(label.primary)) || value}\n              {label && label.secondary && <Hint>{t(label.secondary)}</Hint>}\n            </CheckboxItem>\n\n            {!!checked[index] && show && Field && (\n              <CheckboxConditional>\n                {show.map((fieldName) => (\n                  <Field name={fieldName} key={fieldName} />\n                ))}\n              </CheckboxConditional>\n            )}\n            {selected && selected()}\n          </React.Fragment>\n        )\n      )}\n    </CoreCheckboxes>\n  );\n};\n\nexport default Checkboxes;\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAgC;AAGhC,sBAA2B;AAC3B,iCAAoC;AACpC,0BAAyB;AACzB,kBAAiB;AACjB,kBAA+B;AAYxB,MAAM,aAAwC,CAAC;AAAA,EACpD;AAAA,EACA;AAAA,EACA;AAAA,EACA,OAAO,EAAE,SAAS,UAAU;AAAA,EAC5B;AAAA,EACA,gBAAgB;AAAA,EAChB,GAAG;AACL,MAAM;AACJ,MAAI,CAAC,MAAO,SAAQ,CAAC;AACrB,QAAM,eACJ,CAAC,aAAa,KAAK,SACnB,CAAC,QAAc;AACb,QAAI;AACJ,QAAI,IAAI,cAAc,SAAS;AAG7B,iBAAW,MAAM,OAAO,CAAC,WAAW,CAAC;AAAA,IACvC,OAAO;AAGL,iBAAW,MAAM,OAAO,CAAC,QAAQ,QAAQ,WAAW;AAAA,IACtD;AACA,QAAI,QAAQ,KAAK,SAAS,GAAG;AAC3B;AAAA,QAAW,CAAC,UACV,MAAM,IAAI,CAAC,MAAM,UAAW,UAAU,MAAM,CAAC,OAAO,IAAK;AAAA,MAC3D;AAAA,IACF;AAIA,QAAI,SAAS,WAAW,EAAG,YAAW;AACtC,aAAS,QAAQ;AAAA,EACnB;AACF,QAAM,EAAE,EAAE,QAAI,4BAAe;AAC7B,QAAM,CAAC,SAAS,UAAU,QAAI;AAAA,IAC5B,MAAe,QAAQ,MAAM,EAAE,KAAK,KAAK;AAAA,EAC3C;AACA,SACE,6BAAAA,QAAA,cAAC,gBAAAC,SAAA,EAAe,aACb,QAAQ;AAAA,IACP,CACE;AAAA,MACE;AAAA,MACA,OAAO;AAAA,MACP;AAAA,MACA,UAAU;AAAA,MACV;AAAA,MACA,GAAG;AAAA,IACL,GACA,UAEA,6BAAAD,QAAA,cAAC,aAAAA,QAAM,UAAN,EAAe,KAAK,SACnB,6BAAAA,QAAA;AAAA,MAAC,oBAAAE;AAAA,MAAA;AAAA,QACC,KAAK,GAAG,IAAI,IAAI,KAAK;AAAA,QACrB,MAAM,GAAG,IAAI,IAAI,CAAC;AAAA,QAClB,OAAO;AAAA,QACP,UAAU,YAAY;AAAA,QACtB,SAAS,OAAO,SAAS,CAAC;AAAA,QAC1B,UAAU,aAAa,GAAG,OAAO,IAAI;AAAA,QACpC,GAAG;AAAA,QACH,GAAG;AAAA,UACF,GAAG;AAAA,UACH,OAAO;AAAA,UACP,cAAc;AAAA,UACd,QAAQ;AAAA,UACR,UAAU;AAAA,UACV,oBAAoB;AAAA,UACpB,MAAM;AAAA,QACR;AAAA;AAAA,MAEE,SAAS,MAAM,WAAW,EAAE,MAAM,OAAO,KAAM;AAAA,MAChD,SAAS,MAAM,aAAa,6BAAAF,QAAA,cAAC,YAAAG,SAAA,MAAM,EAAE,MAAM,SAAS,CAAE;AAAA,IACzD,GAEC,CAAC,CAAC,QAAQ,KAAK,KAAK,QAAQ,SAC3B,6BAAAH,QAAA,cAAC,sDACE,KAAK,IAAI,CAAC,cACT,6BAAAA,QAAA,cAAC,SAAM,MAAM,WAAW,KAAK,WAAW,CACzC,CACH,GAED,YAAY,SAAS,CACxB;AAAA,EAEJ,CACF;AAEJ;AAEA,IAAO,qBAAQ;",
-  "names": ["React", "CoreCheckboxes", "CheckboxItem", "Hint"]
+  "sourcesContent": ["import React, { useState } from 'react';\nimport type { UseFormReturn } from 'react-hook-form';\nimport type { ControlledFieldProps } from '@digigov/form/Field/types';\nimport type { FieldOptionProps } from '@digigov/form/inputs/Label';\nimport { omit } from '@digigov/form/utils';\nimport {\n  Checkbox,\n  CheckboxItem,\n  CheckboxConditional,\n} from '@digigov/ui/form/Checkbox';\nimport { useTranslation } from '@digigov/ui/i18n';\nimport { Hint } from '@digigov/ui/typography/Hint';\n\nexport interface CheckboxesProps\n  extends Omit<ControlledFieldProps, 'extra' | 'value'> {\n  value?: string[];\n  extra: {\n    className?: string;\n    options: FieldOptionProps[];\n  };\n  fieldComponent: React.FC<Omit<ControlledFieldProps, 'value' | 'onChange'>>;\n  resetField: UseFormReturn['resetField'];\n}\n\nexport const Checkboxes = React.forwardRef<HTMLInputElement, CheckboxesProps>(\n  (\n    {\n      name,\n      onChange,\n      value,\n      extra: { options, className },\n      disabled,\n      Field,\n      ...props\n    },\n    ref\n  ) => {\n    if (!value) value = [];\n    const handleChange =\n      (optionValue, idx, show) =>\n      (evt): void => {\n        let newValue: any = [];\n        if (evt.currentTarget.checked) {\n          newValue = value.concat([optionValue]);\n        } else {\n          newValue = value.filter((val) => val !== optionValue);\n        }\n        if (show && show.length > 0) {\n          setChecked((items) =>\n            items.map((item, index) => (index === idx ? !item : item))\n          );\n        }\n\n        // reset value to undefined instead of an empty array\n        // so the error state mechanism can throw validation errors\n        if (newValue.length === 0) newValue = undefined;\n        onChange(newValue);\n      };\n    const { t } = useTranslation();\n    const [checked, setChecked] = useState(\n      Array<boolean>(options.length).fill(false)\n    );\n    return (\n      <Checkbox className={className}>\n        {options.map(\n          (\n            {\n              label,\n              value: v,\n              show,\n              disabled: optionDisabled,\n              selected,\n              ...option\n            },\n            index\n          ) => (\n            <React.Fragment key={index}>\n              <CheckboxItem\n                ref={index === 0 ? ref : undefined}\n                key={`${name}.${index}`}\n                name={`${name}.${v}`}\n                id={`${name}.${v}`}\n                value={v}\n                disabled={disabled || optionDisabled}\n                checked={value?.includes(v)}\n                onChange={handleChange(v, index, show)}\n                {...option}\n                {...{\n                  ...omit(props, ['resetField']),\n                  reset: undefined,\n                  defaultValue: undefined,\n                  error: undefined,\n                  onBlur: undefined,\n                  required: undefined,\n                  'aria-describedby': undefined,\n                  type: 'checkbox',\n                }}\n              >\n                {(label && label.primary && t(label.primary)) || value}\n                {label && label.secondary && <Hint>{t(label.secondary)}</Hint>}\n              </CheckboxItem>\n\n              {!!checked[index] && show && Field && (\n                <CheckboxConditional>\n                  {show.map((fieldName) => (\n                    <Field name={fieldName} key={fieldName} />\n                  ))}\n                </CheckboxConditional>\n              )}\n              {selected && selected()}\n            </React.Fragment>\n          )\n        )}\n      </Checkbox>\n    );\n  }\n);\n\nCheckboxes.displayName = 'Checkboxes';\n\nexport default Checkboxes;\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAgC;AAIhC,mBAAqB;AACrB,sBAIO;AACP,kBAA+B;AAC/B,kBAAqB;AAad,MAAM,aAAa,aAAAA,QAAM;AAAA,EAC9B,CACE;AAAA,IACE;AAAA,IACA;AAAA,IACA;AAAA,IACA,OAAO,EAAE,SAAS,UAAU;AAAA,IAC5B;AAAA,IACA;AAAA,IACA,GAAG;AAAA,EACL,GACA,QACG;AACH,QAAI,CAAC,MAAO,SAAQ,CAAC;AACrB,UAAM,eACJ,CAAC,aAAa,KAAK,SACnB,CAAC,QAAc;AACb,UAAI,WAAgB,CAAC;AACrB,UAAI,IAAI,cAAc,SAAS;AAC7B,mBAAW,MAAM,OAAO,CAAC,WAAW,CAAC;AAAA,MACvC,OAAO;AACL,mBAAW,MAAM,OAAO,CAAC,QAAQ,QAAQ,WAAW;AAAA,MACtD;AACA,UAAI,QAAQ,KAAK,SAAS,GAAG;AAC3B;AAAA,UAAW,CAAC,UACV,MAAM,IAAI,CAAC,MAAM,UAAW,UAAU,MAAM,CAAC,OAAO,IAAK;AAAA,QAC3D;AAAA,MACF;AAIA,UAAI,SAAS,WAAW,EAAG,YAAW;AACtC,eAAS,QAAQ;AAAA,IACnB;AACF,UAAM,EAAE,EAAE,QAAI,4BAAe;AAC7B,UAAM,CAAC,SAAS,UAAU,QAAI;AAAA,MAC5B,MAAe,QAAQ,MAAM,EAAE,KAAK,KAAK;AAAA,IAC3C;AACA,WACE,6BAAAA,QAAA,cAAC,4BAAS,aACP,QAAQ;AAAA,MACP,CACE;AAAA,QACE;AAAA,QACA,OAAO;AAAA,QACP;AAAA,QACA,UAAU;AAAA,QACV;AAAA,QACA,GAAG;AAAA,MACL,GACA,UAEA,6BAAAA,QAAA,cAAC,aAAAA,QAAM,UAAN,EAAe,KAAK,SACnB,6BAAAA,QAAA;AAAA,QAAC;AAAA;AAAA,UACC,KAAK,UAAU,IAAI,MAAM;AAAA,UACzB,KAAK,GAAG,IAAI,IAAI,KAAK;AAAA,UACrB,MAAM,GAAG,IAAI,IAAI,CAAC;AAAA,UAClB,IAAI,GAAG,IAAI,IAAI,CAAC;AAAA,UAChB,OAAO;AAAA,UACP,UAAU,YAAY;AAAA,UACtB,SAAS,OAAO,SAAS,CAAC;AAAA,UAC1B,UAAU,aAAa,GAAG,OAAO,IAAI;AAAA,UACpC,GAAG;AAAA,UACH,GAAG;AAAA,YACF,OAAG,mBAAK,OAAO,CAAC,YAAY,CAAC;AAAA,YAC7B,OAAO;AAAA,YACP,cAAc;AAAA,YACd,OAAO;AAAA,YACP,QAAQ;AAAA,YACR,UAAU;AAAA,YACV,oBAAoB;AAAA,YACpB,MAAM;AAAA,UACR;AAAA;AAAA,QAEE,SAAS,MAAM,WAAW,EAAE,MAAM,OAAO,KAAM;AAAA,QAChD,SAAS,MAAM,aAAa,6BAAAA,QAAA,cAAC,wBAAM,EAAE,MAAM,SAAS,CAAE;AAAA,MACzD,GAEC,CAAC,CAAC,QAAQ,KAAK,KAAK,QAAQ,SAC3B,6BAAAA,QAAA,cAAC,2CACE,KAAK,IAAI,CAAC,cACT,6BAAAA,QAAA,cAAC,SAAM,MAAM,WAAW,KAAK,WAAW,CACzC,CACH,GAED,YAAY,SAAS,CACxB;AAAA,IAEJ,CACF;AAAA,EAEJ;AACF;AAEA,WAAW,cAAc;AAEzB,IAAO,qBAAQ;",
+  "names": ["React"]
 }