@digigov/form 2.0.0-daaf7bdf → 2.0.0-eaf330f5

package/FieldArray/index.js

@@ -1,71 +1,122 @@
 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 {
+  Controller,
+  useFieldArray
+} from "react-hook-form";
+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,
+    Controller,
     {
-      label,
-      layout,
-      error: formState.isSubmitted && !formState.isSubmitting && error?.message && error ? error : void 0,
-      wrapper: "fieldset",
-      name
-    },
-    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,
-      {
-        name: `${name}.${index}`,
-        error: Array.isArray(error) && error[index],
-        formState,
-        register,
-        control,
-        ...customField.extra?.of,
-        Field
-      }
-    ), /* @__PURE__ */ React.createElement(
-      Button,
-      {
-        name: `${name}-object-remove`,
-        type: "button",
-        color: "warning",
-        onClick: () => remove(index)
-      },
-      customField.extra?.label.object?.delete
-    )))),
-    /* @__PURE__ */ React.createElement(
-      Button,
-      {
-        type: "button",
-        name: `${name}-add-object`,
-        color: "secondary",
-        onClick: (ev) => {
-          ev.preventDefault();
-          append({});
-        }
+      render: ({ field }) => {
+        return /* @__PURE__ */ React.createElement(
+          FieldBaseContainer,
+          {
+            label,
+            layout,
+            register,
+            error: error?.message && error ? error : void 0,
+            hasError: formState.isSubmitted && !formState.isSubmitting && !!error,
+            wrapper: "fieldset",
+            name,
+            labelSize: customField.extra?.labelSize
+          },
+          /* @__PURE__ */ React.createElement("div", { tabIndex: -1, ref: field.ref }),
+          customField.extra?.variant === "dialog" ? /* @__PURE__ */ React.createElement(
+            FormDialog,
+            {
+              name,
+              trigger,
+              register,
+              clearErrors,
+              control,
+              formState,
+              error,
+              getValues,
+              setValue,
+              layout,
+              label,
+              Field,
+              reset,
+              resetField,
+              sortable: customField.extra.sortable,
+              ...customField
+            }
+          ) : /* @__PURE__ */ React.createElement(React.Fragment, null, fields.map((field2, index) => /* @__PURE__ */ React.createElement(
+            Card,
+            {
+              variant: customField.extra?.border ? "border" : "divider",
+              key: field2.id
+            },
+            /* @__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
+          ))
+        );
       },
-      customField.extra?.label.object?.add
-    )
+      control,
+      name
+    }
   );
 };
 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;",
-  "names": []
+  "sourcesContent": ["import React from 'react';\nimport {\n  Controller,\n  ErrorOption,\n  useFieldArray,\n  UseFormReturn,\n} 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\n  const fields = getValues(name) || [];\n  return (\n    <Controller\n      render={({ field }) => {\n        return (\n          <FieldBaseContainer\n            label={label}\n            layout={layout}\n            register={register}\n            error={error?.message && error ? error : undefined}\n            hasError={\n              formState.isSubmitted && !formState.isSubmitting && !!error\n            }\n            wrapper=\"fieldset\"\n            name={name}\n            labelSize={customField.extra?.labelSize}\n          >\n            <div tabIndex={-1} ref={field.ref} />\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}\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={\n                          customField.extra?.label.object?.deleteButtonVariant\n                        }\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      control={control}\n      name={name}\n    />\n  );\n};\n\nexport default FieldArray;\n"],
+  "mappings": "AAAA,OAAO,WAAW;AAClB;AAAA,EACE;AAAA,EAEA;AAAA,OAEK;AACP,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;AAED,QAAM,SAAS,UAAU,IAAI,KAAK,CAAC;AACnC,SACE;AAAA,IAAC;AAAA;AAAA,MACC,QAAQ,CAAC,EAAE,MAAM,MAAM;AACrB,eACE;AAAA,UAAC;AAAA;AAAA,YACC;AAAA,YACA;AAAA,YACA;AAAA,YACA,OAAO,OAAO,WAAW,QAAQ,QAAQ;AAAA,YACzC,UACE,UAAU,eAAe,CAAC,UAAU,gBAAgB,CAAC,CAAC;AAAA,YAExD,SAAQ;AAAA,YACR;AAAA,YACA,WAAW,YAAY,OAAO;AAAA;AAAA,UAE9B,oCAAC,SAAI,UAAU,IAAI,KAAK,MAAM,KAAK;AAAA,UAElC,YAAY,OAAO,YAAY,WAC9B;AAAA,YAAC;AAAA;AAAA,cACC;AAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,cACA,UAAU,YAAY,MAAM;AAAA,cAC3B,GAAG;AAAA;AAAA,UACN,IAEA,0DACG,OAAO,IAAI,CAACA,QAAO,UAClB;AAAA,YAAC;AAAA;AAAA,cACC,SAAS,YAAY,OAAO,SAAS,WAAW;AAAA,cAChD,KAAKA,OAAM;AAAA;AAAA,YAEX,oCAAC,gBACC,oCAAC,qBACE,YAAY,OAAO,MAAM,OAAO,OAAO,KACvC,CAAC,YAAY,OAAO,WAAW,QAAQ,CAC1C,GACA;AAAA,cAAC;AAAA;AAAA,gBACC,MAAM,GAAG,IAAI,IAAI,KAAK;AAAA,gBACtB,OAAO,MAAM,QAAQ,KAAK,KAAK,MAAM,KAAK;AAAA,gBAC1C;AAAA,gBACA;AAAA,gBACA;AAAA,gBACC,GAAG,YAAY,OAAO;AAAA,gBACvB;AAAA;AAAA,YACF,GACA;AAAA,cAAC;AAAA;AAAA,gBACC,MAAM,GAAG,IAAI;AAAA,gBACb,SACE,YAAY,OAAO,MAAM,QAAQ;AAAA,gBAEnC,MAAK;AAAA,gBACL,OAAM;AAAA,gBACN,SAAS,MAAM,OAAO,KAAK;AAAA,gBAC3B,UAAU,CAAC,aAAa;AAAA;AAAA,cAEvB,YAAY,OAAO,MAAM,QAAQ;AAAA,YACpC,CACF;AAAA,UACF,CACD,GACA,YAAY,YACX;AAAA,YAAC;AAAA;AAAA,cACC,MAAK;AAAA,cACL,MAAM,GAAG,IAAI;AAAA,cACb,OAAM;AAAA,cACN,SAAS,YAAY,OAAO,MAAM,QAAQ;AAAA,cAC1C,SAAS,CAAC,OAAO;AACf,mBAAG,eAAe;AAClB,uBAAO,CAAC,CAAC;AAAA,cACX;AAAA,cACA,UAAU,CAAC,aAAa;AAAA;AAAA,YAEvB,YAAY,OAAO,MAAM,QAAQ;AAAA,UACpC,CAEJ;AAAA,QAEJ;AAAA,MAEJ;AAAA,MACA;AAAA,MACA;AAAA;AAAA,EACF;AAEJ;AAEA,IAAO,qBAAQ;",
+  "names": ["field"]
 }

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

@@ -5,4 +5,6 @@ declare namespace _default {
 }
 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: () => React.JSX.Element;
+export default AutoErrorGrouping;

package/FormBuilder/__stories__/ErrorGrouping.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+export declare const ErrorGrouping: () => 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], { shouldFocus: true });
+      }
+    }
+  }, [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 });
+          }
+        });
       }
     }
   }