@digigov/form 2.0.0-36b707c1 → 2.0.0-44e7106a

package/FieldArray/index.js

@@ -1,71 +1,110 @@
 import React from "react";
 import { useFieldArray } from "react-hook-form";
-import FieldContainer from "@digigov/form/Field/FieldBaseContainer";
-import FieldObject from "@digigov/form/FieldObject";
-import { FieldsetLabel } from "@digigov/form/Fieldset";
-import Fieldset from "@digigov/react-core/Fieldset";
+import { FieldBaseContainer } from "@digigov/form/Field/FieldBaseContainer";
+import { FormDialog } from "@digigov/form/FieldArray/FormDialog";
+import { FieldObject } from "@digigov/form/FieldObject";
+import { FieldsetLabel, Fieldset } from "@digigov/form/Fieldset";
 import { Card } from "@digigov/ui/content/Card";
 import { Button } from "@digigov/ui/form/Button";
-import { Hint } from "@digigov/ui/typography/Hint";
 const FieldArray = ({
   name,
+  trigger,
   register,
+  clearErrors,
   control,
   formState,
   error,
+  getValues,
+  setValue,
   layout,
+  reset,
+  resetField,
   label,
   Field,
   ...customField
 }) => {
-  const { fields, append, remove } = useFieldArray({
+  const { append, remove } = useFieldArray({
     control,
     name
   });
+  const fields = getValues(name) || [];
   return /* @__PURE__ */ React.createElement(
-    FieldContainer,
+    FieldBaseContainer,
     {
       label,
       layout,
-      error: formState.isSubmitted && !formState.isSubmitting && error?.message && error ? error : void 0,
+      register,
+      error: error?.message && error ? error : void 0,
+      hasError: formState.isSubmitted && !formState.isSubmitting && !!error,
       wrapper: "fieldset",
-      name
+      name,
+      labelSize: customField.extra?.labelSize,
+      controlled: true
     },
-    fields.length === 0 && /* @__PURE__ */ React.createElement(Hint, null, customField.extra?.label.object?.nothing_added),
-    fields.map((field, index) => /* @__PURE__ */ React.createElement(Card, { variant: "border", key: field.id }, /* @__PURE__ */ React.createElement(Fieldset, null, /* @__PURE__ */ React.createElement(FieldsetLabel, null, customField.extra?.label.object.title, " ", index + 1), /* @__PURE__ */ React.createElement(
-      FieldObject,
+    customField.extra?.variant === "dialog" ? /* @__PURE__ */ React.createElement(
+      FormDialog,
       {
-        name: `${name}.${index}`,
-        error: Array.isArray(error) && error[index],
-        formState,
+        name,
+        trigger,
         register,
+        clearErrors,
         control,
-        ...customField.extra?.of,
-        Field
+        formState,
+        error,
+        getValues,
+        setValue,
+        layout,
+        label,
+        Field,
+        reset,
+        resetField,
+        sortable: customField.extra.sortable,
+        ...customField
       }
-    ), /* @__PURE__ */ React.createElement(
-      Button,
+    ) : /* @__PURE__ */ React.createElement(React.Fragment, null, fields.map((field, index) => /* @__PURE__ */ React.createElement(
+      Card,
       {
-        name: `${name}-object-remove`,
-        type: "button",
-        color: "warning",
-        onClick: () => remove(index)
+        variant: customField.extra?.border ? "border" : "divider",
+        key: field.id || index
       },
-      customField.extra?.label.object?.delete
-    )))),
-    /* @__PURE__ */ React.createElement(
+      /* @__PURE__ */ React.createElement(Fieldset, null, /* @__PURE__ */ React.createElement(FieldsetLabel, null, customField.extra?.label.object.title, " ", !customField.extra?.noIndex && index + 1), /* @__PURE__ */ React.createElement(
+        FieldObject,
+        {
+          name: `${name}.${index}`,
+          error: Array.isArray(error) && error[index],
+          formState,
+          register,
+          control,
+          ...customField.extra?.of,
+          Field
+        }
+      ), /* @__PURE__ */ React.createElement(
+        Button,
+        {
+          name: `${name}-object-remove`,
+          variant: customField.extra?.label.object?.deleteButtonVariant,
+          type: "button",
+          color: "warning",
+          onClick: () => remove(index),
+          disabled: !customField?.editable
+        },
+        customField.extra?.label.object?.delete
+      ))
+    )), customField.editable && /* @__PURE__ */ React.createElement(
       Button,
       {
         type: "button",
         name: `${name}-add-object`,
         color: "secondary",
+        variant: customField.extra?.label.object?.addButtonVariant,
         onClick: (ev) => {
           ev.preventDefault();
           append({});
-        }
+        },
+        disabled: !customField?.editable
       },
       customField.extra?.label.object?.add
-    )
+    ))
   );
 };
 var FieldArray_default = FieldArray;

package/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  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    <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              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    </FieldContainer>\n  );\n};\n\nexport default FieldArray;\n"],
-  "mappings": "AAAA,OAAO,WAAW;AAClB,SAAsB,qBAAoC;AAC1D,OAAO,oBAAoB;AAE3B,OAAO,iBAAiB;AACxB,SAAS,qBAAqB;AAC9B,OAAO,cAAc;AACrB,SAAS,YAAY;AACrB,SAAS,cAAc;AACvB,SAAS,YAAY;AAQd,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,IAAI,cAAc;AAAA,IAC/C;AAAA,IACA;AAAA,EACF,CAAC;AAED,SACE;AAAA,IAAC;AAAA;AAAA,MACC;AAAA,MACA;AAAA,MACA,OACE,UAAU,eACR,CAAC,UAAU,gBACX,OAAO,WACP,QACE,QACA;AAAA,MAEN,SAAQ;AAAA,MACR;AAAA;AAAA,IAEC,OAAO,WAAW,KACjB,oCAAC,YAAM,YAAY,OAAO,MAAM,QAAQ,aAAc;AAAA,IAEvD,OAAO,IAAI,CAAC,OAAO,UAClB,oCAAC,QAAK,SAAQ,UAAS,KAAK,MAAM,MAChC,oCAAC,gBACC,oCAAC,qBACE,YAAY,OAAO,MAAM,OAAO,OAAM,KAAE,QAAQ,CACnD,GACA;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;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;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;",
+  "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 { FormDialog } from '@digigov/form/FieldArray/FormDialog';\nimport { FieldObject } from '@digigov/form/FieldObject';\nimport { FieldsetLabel, Fieldset } from '@digigov/form/Fieldset';\nimport { Card } from '@digigov/ui/content/Card';\nimport { Button } from '@digigov/ui/form/Button';\n\nexport interface FieldArrayProps extends FieldProps {\n  control: UseFormReturn['control'];\n  trigger: UseFormReturn['trigger'];\n  register: UseFormReturn['register'];\n  clearErrors: UseFormReturn['clearErrors'];\n  formState: UseFormReturn['formState'];\n  error?: ErrorOption;\n  getValues: UseFormReturn['getValues'];\n  setValue: UseFormReturn['setValue'];\n  reset: UseFormReturn['reset'];\n  resetField?: UseFormReturn['resetField'];\n  Field: React.FC<FieldProps>;\n}\nexport const FieldArray: React.FC<FieldArrayProps> = ({\n  name,\n  trigger,\n  register,\n  clearErrors,\n  control,\n  formState,\n  error,\n  getValues,\n  setValue,\n  layout,\n  reset,\n  resetField,\n  label,\n  Field,\n  ...customField\n}) => {\n  const { append, remove } = useFieldArray({\n    control,\n    name,\n  });\n  const fields = getValues(name) || [];\n  return (\n    <FieldBaseContainer\n      label={label}\n      layout={layout}\n      register={register}\n      error={error?.message && error ? error : undefined}\n      hasError={formState.isSubmitted && !formState.isSubmitting && !!error}\n      wrapper=\"fieldset\"\n      name={name}\n      labelSize={customField.extra?.labelSize}\n      controlled={true}\n    >\n      {customField.extra?.variant === 'dialog' ? (\n        <FormDialog\n          name={name}\n          trigger={trigger}\n          register={register}\n          clearErrors={clearErrors}\n          control={control}\n          formState={formState}\n          error={error}\n          getValues={getValues}\n          setValue={setValue}\n          layout={layout}\n          label={label}\n          Field={Field}\n          reset={reset}\n          resetField={resetField}\n          sortable={customField.extra.sortable}\n          {...customField}\n        />\n      ) : (\n        <>\n          {fields.map((field, index) => (\n            <Card\n              variant={customField.extra?.border ? 'border' : 'divider'}\n              key={field.id || index}\n            >\n              <Fieldset>\n                <FieldsetLabel>\n                  {customField.extra?.label.object.title}{' '}\n                  {!customField.extra?.noIndex && 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                  variant={customField.extra?.label.object?.deleteButtonVariant}\n                  type=\"button\"\n                  color=\"warning\"\n                  onClick={() => remove(index)}\n                  disabled={!customField?.editable}\n                >\n                  {customField.extra?.label.object?.delete}\n                </Button>\n              </Fieldset>\n            </Card>\n          ))}\n          {customField.editable && (\n            <Button\n              type=\"button\"\n              name={`${name}-add-object`}\n              color=\"secondary\"\n              variant={customField.extra?.label.object?.addButtonVariant}\n              onClick={(ev) => {\n                ev.preventDefault();\n                append({});\n              }}\n              disabled={!customField?.editable}\n            >\n              {customField.extra?.label.object?.add}\n            </Button>\n          )}\n        </>\n      )}\n    </FieldBaseContainer>\n  );\n};\n\nexport default FieldArray;\n"],
+  "mappings": "AAAA,OAAO,WAAW;AAClB,SAAsB,qBAAoC;AAC1D,SAAS,0BAA0B;AAEnC,SAAS,kBAAkB;AAC3B,SAAS,mBAAmB;AAC5B,SAAS,eAAe,gBAAgB;AACxC,SAAS,YAAY;AACrB,SAAS,cAAc;AAehB,MAAM,aAAwC,CAAC;AAAA,EACpD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,GAAG;AACL,MAAM;AACJ,QAAM,EAAE,QAAQ,OAAO,IAAI,cAAc;AAAA,IACvC;AAAA,IACA;AAAA,EACF,CAAC;AACD,QAAM,SAAS,UAAU,IAAI,KAAK,CAAC;AACnC,SACE;AAAA,IAAC;AAAA;AAAA,MACC;AAAA,MACA;AAAA,MACA;AAAA,MACA,OAAO,OAAO,WAAW,QAAQ,QAAQ;AAAA,MACzC,UAAU,UAAU,eAAe,CAAC,UAAU,gBAAgB,CAAC,CAAC;AAAA,MAChE,SAAQ;AAAA,MACR;AAAA,MACA,WAAW,YAAY,OAAO;AAAA,MAC9B,YAAY;AAAA;AAAA,IAEX,YAAY,OAAO,YAAY,WAC9B;AAAA,MAAC;AAAA;AAAA,QACC;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA,UAAU,YAAY,MAAM;AAAA,QAC3B,GAAG;AAAA;AAAA,IACN,IAEA,0DACG,OAAO,IAAI,CAAC,OAAO,UAClB;AAAA,MAAC;AAAA;AAAA,QACC,SAAS,YAAY,OAAO,SAAS,WAAW;AAAA,QAChD,KAAK,MAAM,MAAM;AAAA;AAAA,MAEjB,oCAAC,gBACC,oCAAC,qBACE,YAAY,OAAO,MAAM,OAAO,OAAO,KACvC,CAAC,YAAY,OAAO,WAAW,QAAQ,CAC1C,GACA;AAAA,QAAC;AAAA;AAAA,UACC,MAAM,GAAG,IAAI,IAAI,KAAK;AAAA,UACtB,OAAO,MAAM,QAAQ,KAAK,KAAK,MAAM,KAAK;AAAA,UAC1C;AAAA,UACA;AAAA,UACA;AAAA,UACC,GAAG,YAAY,OAAO;AAAA,UACvB;AAAA;AAAA,MACF,GACA;AAAA,QAAC;AAAA;AAAA,UACC,MAAM,GAAG,IAAI;AAAA,UACb,SAAS,YAAY,OAAO,MAAM,QAAQ;AAAA,UAC1C,MAAK;AAAA,UACL,OAAM;AAAA,UACN,SAAS,MAAM,OAAO,KAAK;AAAA,UAC3B,UAAU,CAAC,aAAa;AAAA;AAAA,QAEvB,YAAY,OAAO,MAAM,QAAQ;AAAA,MACpC,CACF;AAAA,IACF,CACD,GACA,YAAY,YACX;AAAA,MAAC;AAAA;AAAA,QACC,MAAK;AAAA,QACL,MAAM,GAAG,IAAI;AAAA,QACb,OAAM;AAAA,QACN,SAAS,YAAY,OAAO,MAAM,QAAQ;AAAA,QAC1C,SAAS,CAAC,OAAO;AACf,aAAG,eAAe;AAClB,iBAAO,CAAC,CAAC;AAAA,QACX;AAAA,QACA,UAAU,CAAC,aAAa;AAAA;AAAA,MAEvB,YAAY,OAAO,MAAM,QAAQ;AAAA,IACpC,CAEJ;AAAA,EAEJ;AAEJ;AAEA,IAAO,qBAAQ;",
   "names": []
 }

package/FieldObject/index.d.ts

@@ -6,20 +6,25 @@ export interface FieldObjectProps extends Omit<FieldProps, 'key'> {
     control: UseFormReturn['control'];
     register: UseFormReturn['register'];
     reset: UseFormReturn['reset'];
+    resetField: UseFormReturn['resetField'];
     formState: UseFormReturn['formState'];
     error?: ErrorOption;
+    defaultValue?: undefined;
     Field: React.FC<FieldProps>;
 }
 export declare const FieldObject: React.FC<FieldObjectProps>;
 export interface FieldObjectItemProps {
+    key: string;
     name: string;
     field: FieldSpec;
     control: UseFormReturn['control'];
     register: UseFormReturn['register'];
     reset: UseFormReturn['reset'];
+    resetField: UseFormReturn['resetField'];
     formState: UseFormReturn['formState'];
     error?: ErrorOption;
     children?: React.ReactNode;
+    defaultValue?: undefined;
     Field: React.FC<FieldProps>;
 }
 export default FieldObject;

package/FieldObject/index.js

@@ -5,8 +5,8 @@ import {
   ALTERNATIVE_COMPONENTS
 } from "@digigov/form/Field/utils";
 import { calculateField } from "@digigov/form/Field/utils/calculateField";
-import Fieldset, { FieldsetCaption } from "@digigov/form/Fieldset";
-import { FieldsetLegend } from "@digigov/react-core/FieldsetLegend";
+import { Fieldset, FieldsetCaption } from "@digigov/form/Fieldset";
+import { FieldsetLegend } from "@digigov/ui/form/FieldContainer";
 import { useTranslation } from "@digigov/ui/i18n";
 const FieldObject = ({
   name,
@@ -15,22 +15,26 @@ const FieldObject = ({
   control,
   register,
   reset,
+  resetField,
   formState,
   error,
+  defaultValue,
   Field
 }) => {
   const { t } = useTranslation();
-  return /* @__PURE__ */ React.createElement(Fieldset, null, label?.primary && /* @__PURE__ */ React.createElement(FieldsetLegend, { size: "sm" }, t(label.primary)), label?.secondary && /* @__PURE__ */ React.createElement(FieldsetCaption, null, t(label.secondary)), extra?.fields.map((field) => /* @__PURE__ */ React.createElement(
+  return /* @__PURE__ */ React.createElement(Fieldset, null, label?.primary && /* @__PURE__ */ React.createElement(FieldsetLegend, { size: "sm", marginBottom: 3 }, t(label.primary)), label?.secondary && /* @__PURE__ */ React.createElement(FieldsetCaption, { marginBottom: 3 }, t(label.secondary)), extra?.fields.map((field) => /* @__PURE__ */ React.createElement(
     FieldObjectItem,
     {
-      key: `${name}.${field.key}`,
-      name: `${name}.${field.key}`,
+      key: `${name}${field.key ? `.${field.key}` : ""}`,
+      name: `${name}${field.key ? `.${field.key}` : ""}`,
       control,
       register,
       reset,
+      resetField,
       field,
       error: error && error[field.key],
       formState,
+      defaultValue: defaultValue?.[field.key] || void 0,
       Field
     }
   )));
@@ -43,26 +47,37 @@ const FieldObjectItem = ({
   control,
   formState,
   reset,
+  resetField,
   register,
+  defaultValue,
   Field
 }) => {
   const calculatedField = useMemo(
     () => calculateField(children, field, FIELD_COMPONENTS, ALTERNATIVE_COMPONENTS),
     [field]
   );
-  const customError = error ? error : formState?.errors[name];
-  return /* @__PURE__ */ React.createElement(
-    FieldBase,
-    {
-      ...calculatedField,
-      name,
-      Field,
-      control,
-      reset,
-      register,
-      error: customError
+  if (Field) {
+    if (!field.type) {
+      field.type = "string";
     }
-  );
+    return /* @__PURE__ */ React.createElement(Field, { ...field, name });
+  } else {
+    const customError = error ? error : formState?.errors[name];
+    return /* @__PURE__ */ React.createElement(
+      FieldBase,
+      {
+        ...calculatedField,
+        name,
+        Field,
+        control,
+        reset,
+        resetField,
+        register,
+        error: customError,
+        defaultValue
+      }
+    );
+  }
 };
 var FieldObject_default = FieldObject;
 export {

package/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  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,OAAO,SAAS,eAAe;AAE/B,SAAS,iBAAiB;AAE1B;AAAA,EACE;AAAA,EACA;AAAA,OACK;AACP,SAAS,sBAAsB;AAC/B,OAAO,YAAY,uBAAuB;AAE1C,SAAS,sBAAsB;AAC/B,SAAS,sBAAsB;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,IAAI,eAAe;AAE7B,SACE,oCAAC,gBACE,OAAO,WACN,oCAAC,kBAAe,MAAK,QAAM,EAAE,MAAM,OAAO,CAAE,GAE7C,OAAO,aACN,oCAAC,uBAAiB,EAAE,MAAM,SAAS,CAAE,GAEtC,OAAO,OAAO,IAAI,CAAC,UAClB;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,kBAAmC;AAAA,IACvC,MACE,eAAe,UAAU,OAAO,kBAAkB,sBAAsB;AAAA,IAC1E,CAAC,KAAK;AAAA,EACR;AAEA,QAAM,cAAc,QAAQ,QAAQ,WAAW,OAAO,IAAI;AAC1D,SACE;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;",
+  "sourcesContent": ["import React, { useMemo } from 'react';\nimport { ErrorOption, UseFormReturn } from 'react-hook-form';\nimport { FieldBase } from '@digigov/form/Field/FieldBase';\nimport { FieldProps, CalculatedField } 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  resetField: UseFormReturn['resetField'];\n  formState: UseFormReturn['formState'];\n  error?: ErrorOption;\n  defaultValue?: undefined;\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  resetField,\n  formState,\n  error,\n  defaultValue,\n  Field,\n}) => {\n  const { t } = useTranslation();\n\n  return (\n    <Fieldset>\n      {label?.primary && (\n        <FieldsetLegend size=\"sm\" marginBottom={3}>\n          {t(label.primary)}\n        </FieldsetLegend>\n      )}\n      {label?.secondary && (\n        <FieldsetCaption marginBottom={3}>{t(label.secondary)}</FieldsetCaption>\n      )}\n      {extra?.fields.map((field) => (\n        <FieldObjectItem\n          key={`${name}${field.key ? `.${field.key}` : ''}`}\n          name={`${name}${field.key ? `.${field.key}` : ''}`}\n          control={control}\n          register={register}\n          reset={reset}\n          resetField={resetField}\n          field={field}\n          error={error && error[field.key]}\n          formState={formState}\n          defaultValue={defaultValue?.[field.key] || undefined}\n          Field={Field}\n        />\n      ))}\n    </Fieldset>\n  );\n};\n\nexport interface FieldObjectItemProps {\n  key: string;\n  name: string;\n  field: FieldSpec;\n  control: UseFormReturn['control'];\n  register: UseFormReturn['register'];\n  reset: UseFormReturn['reset'];\n  resetField: UseFormReturn['resetField'];\n  formState: UseFormReturn['formState'];\n  error?: ErrorOption;\n  children?: React.ReactNode;\n  defaultValue?: undefined;\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  resetField,\n  register,\n  defaultValue,\n  Field,\n}) => {\n  const calculatedField: CalculatedField = useMemo(\n    () =>\n      calculateField(children, field, FIELD_COMPONENTS, ALTERNATIVE_COMPONENTS),\n    [field]\n  );\n  if (Field) {\n    if (!field.type) {\n      field.type = 'string';\n    }\n    return <Field {...field} name={name} />;\n  } else {\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        resetField={resetField}\n        register={register}\n        error={customError}\n        defaultValue={defaultValue}\n      />\n    );\n  }\n};\n\nexport default FieldObject;\n"],
+  "mappings": "AAAA,OAAO,SAAS,eAAe;AAE/B,SAAS,iBAAiB;AAE1B;AAAA,EACE;AAAA,EACA;AAAA,OACK;AACP,SAAS,sBAAsB;AAC/B,SAAS,UAAU,uBAAuB;AAE1C,SAAS,sBAAsB;AAC/B,SAAS,sBAAsB;AAaxB,MAAM,cAA0C,CAAC;AAAA,EACtD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAAM;AACJ,QAAM,EAAE,EAAE,IAAI,eAAe;AAE7B,SACE,oCAAC,gBACE,OAAO,WACN,oCAAC,kBAAe,MAAK,MAAK,cAAc,KACrC,EAAE,MAAM,OAAO,CAClB,GAED,OAAO,aACN,oCAAC,mBAAgB,cAAc,KAAI,EAAE,MAAM,SAAS,CAAE,GAEvD,OAAO,OAAO,IAAI,CAAC,UAClB;AAAA,IAAC;AAAA;AAAA,MACC,KAAK,GAAG,IAAI,GAAG,MAAM,MAAM,IAAI,MAAM,GAAG,KAAK,EAAE;AAAA,MAC/C,MAAM,GAAG,IAAI,GAAG,MAAM,MAAM,IAAI,MAAM,GAAG,KAAK,EAAE;AAAA,MAChD;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA,OAAO,SAAS,MAAM,MAAM,GAAG;AAAA,MAC/B;AAAA,MACA,cAAc,eAAe,MAAM,GAAG,KAAK;AAAA,MAC3C;AAAA;AAAA,EACF,CACD,CACH;AAEJ;AAiBA,MAAM,kBAAkD,CAAC;AAAA,EACvD;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAAM;AACJ,QAAM,kBAAmC;AAAA,IACvC,MACE,eAAe,UAAU,OAAO,kBAAkB,sBAAsB;AAAA,IAC1E,CAAC,KAAK;AAAA,EACR;AACA,MAAI,OAAO;AACT,QAAI,CAAC,MAAM,MAAM;AACf,YAAM,OAAO;AAAA,IACf;AACA,WAAO,oCAAC,SAAO,GAAG,OAAO,MAAY;AAAA,EACvC,OAAO;AACL,UAAM,cAAc,QAAQ,QAAQ,WAAW,OAAO,IAAI;AAC1D,WACE;AAAA,MAAC;AAAA;AAAA,QACE,GAAG;AAAA,QACJ;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA,OAAO;AAAA,QACP;AAAA;AAAA,IACF;AAAA,EAEJ;AACF;AAEA,IAAO,sBAAQ;",
   "names": []
 }

package/Fieldset/index.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { FieldsetLabelProps, FieldsetCaptionProps, FieldsetBodyProps } from '@digigov/form/Fieldset/types';
-import Fieldset from '@digigov/react-core/Fieldset';
+import { Fieldset } from '@digigov/react-core/Fieldset';
 export declare const FieldsetLabel: React.FC<FieldsetLabelProps>;
 export declare const FieldsetCaption: React.FC<FieldsetCaptionProps>;
 export declare const FieldsetBody: React.FC<FieldsetBodyProps>;

package/Fieldset/index.js

@@ -1,9 +1,9 @@
 import React from "react";
-import Fieldset from "@digigov/react-core/Fieldset";
-import FieldsetLegend from "@digigov/react-core/FieldsetLegend";
-import Hint from "@digigov/react-core/Hint";
-import Grid from "@digigov/ui/layouts/Grid";
-import NormalText from "@digigov/ui/typography/NormalText";
+import { Fieldset } from "@digigov/react-core/Fieldset";
+import { FieldsetLegend } from "@digigov/ui/form/FieldContainer";
+import { Grid } from "@digigov/ui/layouts/Grid";
+import { Hint } from "@digigov/ui/typography/Hint";
+import { NormalText } from "@digigov/ui/typography/NormalText";
 const FieldsetLabel = ({
   children,
   ...props

package/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,OAAO,WAAW;AAMlB,OAAO,cAAc;AACrB,OAAO,oBAAoB;AAC3B,OAAO,UAAU;AACjB,OAAO,UAAU;AACjB,OAAO,gBAAgB;AAEhB,MAAM,gBAA8C,CAAC;AAAA,EAC1D;AAAA,EACA,GAAG;AACL,MAAM;AACJ,SACE,oCAAC,kBAAe,SAAO,MAAC,MAAK,MAAM,GAAG,SACnC,QACH;AAEJ;AAEO,MAAM,kBAAkD,CAAC;AAAA,EAC9D;AAAA,EACA,GAAG;AACL,MAAM;AACJ,SAAO,oCAAC,QAAM,GAAG,SAAQ,QAAS;AACpC;AAEO,MAAM,eAA4C,CAAC,EAAE,SAAS,MAAM;AACzE,SACE,oCAAC,QAAK,MAAI,MAAC,IAAI,MACb,oCAAC,kBAAY,QAAS,CACxB;AAEJ;AAGA,IAAO,mBAAQ;",
+  "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,OAAO,WAAW;AAMlB,SAAS,gBAAgB;AACzB,SAAS,sBAAsB;AAC/B,SAAS,YAAY;AACrB,SAAS,YAAY;AACrB,SAAS,kBAAkB;AAEpB,MAAM,gBAA8C,CAAC;AAAA,EAC1D;AAAA,EACA,GAAG;AACL,MAAM;AACJ,SACE,oCAAC,kBAAe,SAAO,MAAC,MAAK,MAAM,GAAG,SACnC,QACH;AAEJ;AAEO,MAAM,kBAAkD,CAAC;AAAA,EAC9D;AAAA,EACA,GAAG;AACL,MAAM;AACJ,SAAO,oCAAC,QAAM,GAAG,SAAQ,QAAS;AACpC;AAEO,MAAM,eAA4C,CAAC,EAAE,SAAS,MAAM;AACzE,SACE,oCAAC,QAAK,MAAI,MAAC,IAAI,MACb,oCAAC,kBAAY,QAAS,CACxB;AAEJ;AAGA,IAAO,mBAAQ;",
   "names": []
 }

package/Fieldset/types.d.ts

@@ -1,5 +1,5 @@
-import { FieldsetLegendProps } from '@digigov/react-core/FieldsetLegend';
-import { HintProps } from '@digigov/react-core/Hint';
+import { FieldsetLegendProps } from '@digigov/ui/form/FieldContainer';
+import { HintProps } from '@digigov/ui/typography/Hint';
 export interface FieldsetLabelProps extends FieldsetLegendProps {
 }
 export interface FieldsetCaptionProps extends HintProps {

package/FormBuilder/FormBuilder.stories.d.ts

@@ -1,8 +1,12 @@
 declare namespace _default {
     export let title: string;
     export { FormBuilder as component };
+    export let tags: string[];
+    export { doc as markdown };
     export let displayName: string;
 }
 export default _default;
 export { Default } from "@digigov/form/FormBuilder/__stories__/Default";
+export { ErrorGrouping } from "@digigov/form/FormBuilder/__stories__/ErrorGrouping";
+export { AutoErrorGrouping } from "@digigov/form/FormBuilder/__stories__/AutoErrorGrouping";
 import FormBuilder from '@digigov/form/FormBuilder';

package/FormBuilder/__stories__/AutoErrorGrouping.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+export declare const AutoErrorGrouping: (_: any) => React.JSX.Element;
+export default AutoErrorGrouping;

package/FormBuilder/__stories__/Default.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-export declare const Default: () => React.JSX.Element;
+export declare const Default: (_: any) => React.JSX.Element;
 export default Default;

package/FormBuilder/__stories__/ErrorGrouping.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+export declare const ErrorGrouping: (_: any) => React.JSX.Element;
+export default ErrorGrouping;

package/FormBuilder/index.js

@@ -1,13 +1,15 @@
-import React, { useCallback, useContext, useRef } from "react";
+import React, { useCallback, useContext, useEffect, useRef } from "react";
 import { useForm } from "react-hook-form";
-import Field from "@digigov/form/Field";
+import { Field } from "@digigov/form/Field";
+import { ErrorGroup } from "@digigov/form/Field/ErrorGroup";
 import { CONTROLLED_FIELD_COMPONENTS } from "@digigov/form/Field/utils";
-import Fieldset from "@digigov/form/Fieldset";
+import { FieldsetWithContext } from "@digigov/form/Fieldset/FieldsetWithContext";
 import { FormContext } from "@digigov/form/FormContext";
 import { yupResolver } from "@digigov/form/utils";
 import { useValidationSchema } from "@digigov/form/validators";
-import { Form } from "@digigov/react-core/Form";
 import { Button } from "@digigov/ui/form/Button";
+import { Form } from "@digigov/ui/form/Form";
+import { useScreenSize } from "@digigov/ui/utils/hooks/useScreen";
 const FormBase = React.forwardRef(function FormBase2({
   onSubmit,
   children,
@@ -18,10 +20,11 @@ const FormBase = React.forwardRef(function FormBase2({
   mode,
   initial,
   reValidateMode,
-  shouldFocusError,
+  shouldFocusError = true,
   criteriaMode,
   componentRegistry,
   grid,
+  errors,
   ...props
 }, ref) {
   const form = useForm({
@@ -34,10 +37,20 @@ const FormBase = React.forwardRef(function FormBase2({
   });
   const handleSubmit = useCallback(
     (data) => {
-      onSubmit && onSubmit(data);
+      if (onSubmit) {
+        form.reset(data);
+        onSubmit(data);
+      }
     },
     [onSubmit]
   );
+  useEffect(() => {
+    if (errors) {
+      for (const fieldName in errors) {
+        form.setError(fieldName, errors[fieldName]);
+      }
+    }
+  }, [errors]);
   const submit = form.handleSubmit(handleSubmit);
   const ctx = {
     fieldsMap,
@@ -63,6 +76,36 @@ const FormBase = React.forwardRef(function FormBase2({
   };
   return /* @__PURE__ */ React.createElement(FormContext.Provider, { value: ctx }, /* @__PURE__ */ React.createElement(Form, { grid, onSubmit: submit, ref, ...props }, children));
 });
+const DEFAULT_LAYOUT = {
+  xs: 12,
+  sm: 12,
+  md: 12,
+  lg: 12,
+  xl: 12
+};
+const BREAKPOINTS = ["xs", "sm", "md", "lg", "xl"];
+const groupFieldsByLayout = (fields) => {
+  return BREAKPOINTS.reduce((sizes, size) => {
+    sizes[size] = fields.reduce((acc, item) => {
+      const layoutValue = item.layout?.[size] || 12;
+      if (layoutValue === 0) {
+        return [...acc, item];
+      }
+      const lastElement = acc[acc.length - 1];
+      const currentSum = Array.isArray(lastElement) ? lastElement.reduce((sum, i) => sum + (i.layout?.[size] || 0), 0) : 0;
+      if (!Array.isArray(lastElement) || currentSum + layoutValue > 12) {
+        return layoutValue === 12 ? [...acc, item] : [...acc, [item]];
+      }
+      return [...acc.slice(0, -1), [...lastElement, item]];
+    }, []).map((item) => {
+      if (Array.isArray(item) && item.length === 1) {
+        return item[0];
+      }
+      return item;
+    });
+    return sizes;
+  }, {});
+};
 const useFormContext = () => {
   return useContext(FormContext);
 };
@@ -86,6 +129,32 @@ const FormBuilder = React.forwardRef(function FormBuilder2({
   grid = false,
   ...props
 }, ref) {
+  const { screenSize } = useScreenSize();
+  fields = fields.map((field) => {
+    const layout = field.layout;
+    if (!layout) {
+      return {
+        ...field,
+        layout: DEFAULT_LAYOUT
+      };
+    }
+    return {
+      ...field,
+      layout: BREAKPOINTS.reduce(
+        (expandedLayout, breakpoint, breakpointIndex) => {
+          if (field?.layout?.[breakpoint]) {
+            expandedLayout[breakpoint] = field?.layout[breakpoint];
+          } else if (expandedLayout[BREAKPOINTS[breakpointIndex - 1]]) {
+            expandedLayout[breakpoint] = expandedLayout[BREAKPOINTS[breakpointIndex - 1]];
+          } else {
+            expandedLayout[breakpoint] = 12;
+          }
+          return expandedLayout;
+        },
+        {}
+      )
+    };
+  });
   const fieldsState = useRef(fields);
   const setFieldsState = useCallback((newFields) => {
     fieldsState.current = newFields;
@@ -115,9 +184,27 @@ const FormBuilder = React.forwardRef(function FormBuilder2({
     );
     if (auto) {
       if (fieldsets) {
-        fieldChildren = fieldsets.map((fieldset) => /* @__PURE__ */ React.createElement(Fieldset, { key: fieldset.key }));
+        fieldChildren = fieldsets.map((fieldset) => /* @__PURE__ */ React.createElement(FieldsetWithContext, { key: fieldset.key, name: fieldset.key }));
       } else if (fields) {
-        fieldChildren = fields.map((field) => /* @__PURE__ */ React.createElement(Field, { key: field.key, name: field.key }));
+        const fieldsByLayouts = groupFieldsByLayout(fields);
+        const fieldsByLayoutSize = fieldsByLayouts[screenSize];
+        fieldChildren = fieldsByLayoutSize.map((item, index) => {
+          if (Array.isArray(item)) {
+            return /* @__PURE__ */ React.createElement(
+              ErrorGroup,
+              {
+                key: index,
+                screenSize,
+                fieldOrder: item.map((field) => field.key)
+              },
+              item.map((f) => {
+                return /* @__PURE__ */ React.createElement(Field, { key: f.key, name: f.key });
+              })
+            );
+          } else {
+            return /* @__PURE__ */ React.createElement(Field, { key: item.key, name: item.key });
+          }
+        });
       }
     }
   }

package/FormBuilder/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/FormBuilder/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 { 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 { 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  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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",
+  "sourcesContent": ["import React, { useCallback, useContext, useEffect, useRef } from 'react';\nimport { useForm } from 'react-hook-form';\nimport { Field } from '@digigov/form/Field';\nimport { ErrorGroup } from '@digigov/form/Field/ErrorGroup';\nimport { CONTROLLED_FIELD_COMPONENTS } from '@digigov/form/Field/utils';\nimport { FieldsetWithContext } from '@digigov/form/Fieldset/FieldsetWithContext';\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';\nimport { useScreenSize } from '@digigov/ui/utils/hooks/useScreen';\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 = true,\n    criteriaMode,\n    componentRegistry,\n    grid,\n    errors,\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      if (onSubmit) {\n        form.reset(data);\n        onSubmit(data);\n      }\n    },\n    [onSubmit]\n  );\n  useEffect(() => {\n    if (errors) {\n      for (const fieldName in errors) {\n        form.setError(fieldName, errors[fieldName]);\n      }\n    }\n  }, [errors]);\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\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 DEFAULT_LAYOUT = {\n  xs: 12,\n  sm: 12,\n  md: 12,\n  lg: 12,\n  xl: 12,\n};\n\nconst BREAKPOINTS = ['xs', 'sm', 'md', 'lg', 'xl'];\n\nconst groupFieldsByLayout = (fields) => {\n  return BREAKPOINTS.reduce((sizes, size) => {\n    sizes[size] = fields\n      .reduce((acc, item) => {\n        const layoutValue = item.layout?.[size] || 12;\n        if (layoutValue === 0) {\n          return [...acc, item];\n        }\n        const lastElement = acc[acc.length - 1];\n        const currentSum = Array.isArray(lastElement)\n          ? lastElement.reduce((sum, i) => sum + (i.layout?.[size] || 0), 0)\n          : 0;\n        if (!Array.isArray(lastElement) || currentSum + layoutValue > 12) {\n          return layoutValue === 12 ? [...acc, item] : [...acc, [item]];\n        }\n\n        return [...acc.slice(0, -1), [...lastElement, item]];\n      }, [])\n      .map((item) => {\n        if (Array.isArray(item) && item.length === 1) {\n          return item[0];\n        }\n        return item;\n      });\n    return sizes;\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 { screenSize } = useScreenSize();\n  fields = fields.map((field) => {\n    const layout = field.layout;\n    if (!layout) {\n      return {\n        ...field,\n        layout: DEFAULT_LAYOUT,\n      };\n    }\n    return {\n      ...field,\n      layout: BREAKPOINTS.reduce(\n        (expandedLayout, breakpoint, breakpointIndex) => {\n          if (field?.layout?.[breakpoint]) {\n            expandedLayout[breakpoint] = field?.layout[breakpoint];\n          } else if (expandedLayout[BREAKPOINTS[breakpointIndex - 1]]) {\n            expandedLayout[breakpoint] =\n              expandedLayout[BREAKPOINTS[breakpointIndex - 1]];\n          } else {\n            expandedLayout[breakpoint] = 12;\n          }\n          return expandedLayout;\n        },\n        {}\n      ),\n    };\n  });\n\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          <FieldsetWithContext key={fieldset.key} name={fieldset.key} />\n        ));\n      } else if (fields) {\n        const fieldsByLayouts = groupFieldsByLayout(fields);\n        const fieldsByLayoutSize = fieldsByLayouts[screenSize];\n        fieldChildren = fieldsByLayoutSize.map((item, index) => {\n          if (Array.isArray(item)) {\n            return (\n              <ErrorGroup\n                key={index}\n                screenSize={screenSize}\n                fieldOrder={item.map((field) => field.key)}\n              >\n                {item.map((f) => {\n                  return <Field key={f.key} name={f.key} />;\n                })}\n              </ErrorGroup>\n            );\n          } else {\n            return <Field key={item.key} name={item.key} />;\n          }\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": ["FormBase", "FormBuilder"]
 }

package/FormBuilder/interaction.test.d.ts

@@ -0,0 +1 @@
+export {};

package/FormContext.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/FormContext.tsx"],
-  "sourcesContent": ["import React from 'react';\nimport { createContext } from 'react';\nimport { FormContextProps } from '@digigov/form/types';\n\nexport const FormContext: React.Context<FormContextProps> = createContext({\n  fieldsMap: {},\n  fieldsetsMap: {},\n} as FormContextProps);\n"],
-  "mappings": "AACA,SAAS,qBAAqB;AAGvB,MAAM,cAA+C,cAAc;AAAA,EACxE,WAAW,CAAC;AAAA,EACZ,cAAc,CAAC;AACjB,CAAqB;",
+  "sourcesContent": ["import React, { createContext } from 'react';\nimport { FormContextProps } from '@digigov/form/types';\n\nexport const FormContext: React.Context<FormContextProps> = createContext({\n  fieldsMap: {},\n  fieldsetsMap: {},\n} as FormContextProps);\n"],
+  "mappings": "AAAA,SAAgB,qBAAqB;AAG9B,MAAM,cAA+C,cAAc;AAAA,EACxE,WAAW,CAAC;AAAA,EACZ,cAAc,CAAC;AACjB,CAAqB;",
   "names": []
 }