@digigov/form 2.0.0-85c27c19 → 2.0.0-8bbad051

package/Questions/Step/StepTitle.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/Questions/Step/StepTitle.tsx"],
-  "sourcesContent": ["import React, { useContext } from 'react';\nimport { StepContext } from '@digigov/form/Questions/Step/StepContext';\nimport Heading, { HeadingProps } from '@digigov/react-core/Heading';\nimport HeadingCaption from '@digigov/react-core/HeadingCaption';\nimport PageTitleContainer, {\n  PageTitleCaption,\n} from '@digigov/ui/app/PageTitleContainer';\nimport { useTranslation } from '@digigov/ui/i18n';\nimport { BackLink } from '@digigov/ui/navigation/BackLink';\n\nexport interface StepTitleInterface {\n  title?: string;\n  backButton?: string;\n  caption?: string;\n  step?: string;\n  children?: React.ReactNode;\n}\n\nexport const StepTitleHeading: React.FC<HeadingProps> = (props) => {\n  return <Heading>{props.children}</Heading>;\n};\n\nexport const StepTitleBase: React.FC<StepTitleInterface> = ({\n  caption,\n  step,\n  title,\n  backButton,\n  children,\n}): React.ReactElement => {\n  const { t } = useTranslation();\n  return (\n    <>\n      <BackLink>{backButton || t('button.back')}</BackLink>\n      <PageTitleContainer>\n        {children || (\n          <>\n            <HeadingCaption size=\"xl\">{caption && t(caption)}</HeadingCaption>\n            {step && <PageTitleCaption>{step}</PageTitleCaption>}\n            <StepTitleHeading>{title && t(title)}</StepTitleHeading>\n          </>\n        )}\n      </PageTitleContainer>\n    </>\n  );\n};\n\n/**\n * The StepTitle component accepts a title, a caption and a step indicator\n * about the Step asked to the User\n */\nexport const StepTitle: React.FC<StepTitleInterface> = (props) => {\n  const { caption, title, step, backButton } = useContext(StepContext);\n  return (\n    <StepTitleBase\n      backButton={backButton}\n      caption={caption}\n      step={step}\n      title={title}\n    >\n      {props.children}\n    </StepTitleBase>\n  );\n};\n\nexport default StepTitle;\n"],
-  "mappings": "AAAA,OAAO,SAAS,kBAAkB;AAClC,SAAS,mBAAmB;AAC5B,OAAO,aAA+B;AACtC,OAAO,oBAAoB;AAC3B,OAAO;AAAA,EACL;AAAA,OACK;AACP,SAAS,sBAAsB;AAC/B,SAAS,gBAAgB;AAUlB,MAAM,mBAA2C,CAAC,UAAU;AACjE,SAAO,oCAAC,eAAS,MAAM,QAAS;AAClC;AAEO,MAAM,gBAA8C,CAAC;AAAA,EAC1D;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAA0B;AACxB,QAAM,EAAE,EAAE,IAAI,eAAe;AAC7B,SACE,0DACE,oCAAC,gBAAU,cAAc,EAAE,aAAa,CAAE,GAC1C,oCAAC,0BACE,YACC,0DACE,oCAAC,kBAAe,MAAK,QAAM,WAAW,EAAE,OAAO,CAAE,GAChD,QAAQ,oCAAC,wBAAkB,IAAK,GACjC,oCAAC,wBAAkB,SAAS,EAAE,KAAK,CAAE,CACvC,CAEJ,CACF;AAEJ;AAMO,MAAM,YAA0C,CAAC,UAAU;AAChE,QAAM,EAAE,SAAS,OAAO,MAAM,WAAW,IAAI,WAAW,WAAW;AACnE,SACE;AAAA,IAAC;AAAA;AAAA,MACC;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA;AAAA,IAEC,MAAM;AAAA,EACT;AAEJ;AAEA,IAAO,oBAAQ;",
+  "sourcesContent": ["import React, { useContext } from 'react';\nimport { StepContext } from '@digigov/form/Questions/Step/StepContext';\nimport {\n  PageTitleContainer,\n  PageTitleCaption,\n} from '@digigov/ui/app/PageTitleContainer';\nimport { useTranslation } from '@digigov/ui/i18n';\nimport { BackLink } from '@digigov/ui/navigation/BackLink';\nimport type { HeadingProps } from '@digigov/ui/typography/Heading';\nimport { Heading } from '@digigov/ui/typography/Heading';\nimport { HeadingCaption } from '@digigov/ui/typography/HeadingCaption';\n\nexport interface StepTitleInterface {\n  title?: string;\n  backButton?: string;\n  caption?: string;\n  step?: string;\n  children?: React.ReactNode;\n}\n\nexport const StepTitleHeading: React.FC<HeadingProps> = (props) => {\n  return <Heading>{props.children}</Heading>;\n};\n\nexport const StepTitleBase: React.FC<StepTitleInterface> = ({\n  caption,\n  step,\n  title,\n  backButton,\n  children,\n}): React.ReactElement => {\n  const { t } = useTranslation();\n  return (\n    <>\n      <BackLink>{backButton || t('button.back')}</BackLink>\n      <PageTitleContainer>\n        {children || (\n          <>\n            <HeadingCaption size=\"xl\">{caption && t(caption)}</HeadingCaption>\n            {step && <PageTitleCaption>{step}</PageTitleCaption>}\n            <StepTitleHeading>{title && t(title)}</StepTitleHeading>\n          </>\n        )}\n      </PageTitleContainer>\n    </>\n  );\n};\n\n/**\n * The StepTitle component accepts a title, a caption and a step indicator\n * about the Step asked to the User\n */\nexport const StepTitle: React.FC<StepTitleInterface> = (props) => {\n  const { caption, title, step, backButton } = useContext(StepContext);\n  return (\n    <StepTitleBase\n      backButton={backButton}\n      caption={caption}\n      step={step}\n      title={title}\n    >\n      {props.children}\n    </StepTitleBase>\n  );\n};\n\nexport default StepTitle;\n"],
+  "mappings": "AAAA,OAAO,SAAS,kBAAkB;AAClC,SAAS,mBAAmB;AAC5B;AAAA,EACE;AAAA,EACA;AAAA,OACK;AACP,SAAS,sBAAsB;AAC/B,SAAS,gBAAgB;AAEzB,SAAS,eAAe;AACxB,SAAS,sBAAsB;AAUxB,MAAM,mBAA2C,CAAC,UAAU;AACjE,SAAO,oCAAC,eAAS,MAAM,QAAS;AAClC;AAEO,MAAM,gBAA8C,CAAC;AAAA,EAC1D;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAA0B;AACxB,QAAM,EAAE,EAAE,IAAI,eAAe;AAC7B,SACE,0DACE,oCAAC,gBAAU,cAAc,EAAE,aAAa,CAAE,GAC1C,oCAAC,0BACE,YACC,0DACE,oCAAC,kBAAe,MAAK,QAAM,WAAW,EAAE,OAAO,CAAE,GAChD,QAAQ,oCAAC,wBAAkB,IAAK,GACjC,oCAAC,wBAAkB,SAAS,EAAE,KAAK,CAAE,CACvC,CAEJ,CACF;AAEJ;AAMO,MAAM,YAA0C,CAAC,UAAU;AAChE,QAAM,EAAE,SAAS,OAAO,MAAM,WAAW,IAAI,WAAW,WAAW;AACnE,SACE;AAAA,IAAC;AAAA;AAAA,MACC;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA;AAAA,IAEC,MAAM;AAAA,EACT;AAEJ;AAEA,IAAO,oBAAQ;",
   "names": []
 }

package/Questions/Step/getAddMoreFields.d.ts

@@ -1,3 +1,3 @@
-import { StepInterface } from '@digigov/form/Questions/Step/types';
-import { FieldSpec } from '@digigov/form/types';
+import type { StepInterface } from '@digigov/form/Questions/Step/types';
+import type { FieldSpec } from '@digigov/form/types';
 export declare const getAddMoreFields: (currentStep: StepInterface) => FieldSpec[];

package/Questions/Step/getAddMoreFields.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/Questions/Step/getAddMoreFields.tsx"],
-  "sourcesContent": ["import { StepInterface } from '@digigov/form/Questions/Step/types';\nimport { FieldSpec } from '@digigov/form/types';\n\nexport const getAddMoreFields = (currentStep: StepInterface): FieldSpec[] => {\n  return [\n    {\n      key: 'addMore',\n      type: 'choice:single',\n      required: true,\n      extra: {\n        options: [\n          {\n            label: currentStep.review?.addMore.answers.positive || {\n              primary: 'Yes',\n            },\n            value: 'yes',\n          },\n          {\n            label: currentStep.review?.addMore.answers.negative || {\n              primary: 'No',\n            },\n            value: 'no',\n          },\n        ],\n      },\n    },\n  ];\n};\n"],
+  "sourcesContent": ["import type { StepInterface } from '@digigov/form/Questions/Step/types';\nimport type { FieldSpec } from '@digigov/form/types';\n\nexport const getAddMoreFields = (currentStep: StepInterface): FieldSpec[] => {\n  return [\n    {\n      key: 'addMore',\n      type: 'choice:single',\n      required: true,\n      extra: {\n        options: [\n          {\n            label: currentStep.review?.addMore.answers.positive || {\n              primary: 'Yes',\n            },\n            value: 'yes',\n          },\n          {\n            label: currentStep.review?.addMore.answers.negative || {\n              primary: 'No',\n            },\n            value: 'no',\n          },\n        ],\n      },\n    },\n  ];\n};\n"],
   "mappings": "AAGO,MAAM,mBAAmB,CAAC,gBAA4C;AAC3E,SAAO;AAAA,IACL;AAAA,MACE,KAAK;AAAA,MACL,MAAM;AAAA,MACN,UAAU;AAAA,MACV,OAAO;AAAA,QACL,SAAS;AAAA,UACP;AAAA,YACE,OAAO,YAAY,QAAQ,QAAQ,QAAQ,YAAY;AAAA,cACrD,SAAS;AAAA,YACX;AAAA,YACA,OAAO;AAAA,UACT;AAAA,UACA;AAAA,YACE,OAAO,YAAY,QAAQ,QAAQ,QAAQ,YAAY;AAAA,cACrD,SAAS;AAAA,YACX;AAAA,YACA,OAAO;AAAA,UACT;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF;",
   "names": []
 }

package/Questions/Step/types.d.ts

@@ -1,5 +1,4 @@
-/// <reference types="react" />
-import { LabelProps } from '@digigov/form/inputs/Label';
+import type { LabelProps } from '@digigov/form/inputs/Label';
 export type StepType = 'object' | 'array';
 export type StepReviewAnswersType = 'positive' | 'negative';
 export interface StepAddMoreInterface {

package/Questions/__stories__/Default.d.ts

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

package/Questions/getNextStep.d.ts

@@ -1,2 +1,2 @@
-import { StepInterface } from '@digigov/form/Questions/Step/types';
+import type { StepInterface } from '@digigov/form/Questions/Step/types';
 export declare function getNextStep(currentStep: any, steps: any[], data: any): StepInterface | null;

package/Questions/getNextStep.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/Questions/getNextStep.tsx"],
-  "sourcesContent": ["import { StepInterface } from '@digigov/form/Questions/Step/types';\n\nexport function getNextStep(\n  currentStep: any,\n  steps: any[],\n  data: any\n): StepInterface | null {\n  if (currentStep.nextStep) {\n    const nextStepName = currentStep.nextStep(data);\n    if (nextStepName) {\n      return steps.find((step) => step.name === nextStepName);\n    }\n  }\n  const currentStepIndex = steps.findIndex(\n    (step) => step.name === currentStep.name\n  );\n  const nextStep = steps.slice(currentStepIndex + 1).find((step) => {\n    if (step.show) {\n      return step.show(data);\n    }\n    return true;\n  });\n  return nextStep;\n}\n"],
+  "sourcesContent": ["import type { StepInterface } from '@digigov/form/Questions/Step/types';\n\nexport function getNextStep(\n  currentStep: any,\n  steps: any[],\n  data: any\n): StepInterface | null {\n  if (currentStep.nextStep) {\n    const nextStepName = currentStep.nextStep(data);\n    if (nextStepName) {\n      return steps.find((step) => step.name === nextStepName);\n    }\n  }\n  const currentStepIndex = steps.findIndex(\n    (step) => step.name === currentStep.name\n  );\n  const nextStep = steps.slice(currentStepIndex + 1).find((step) => {\n    if (step.show) {\n      return step.show(data);\n    }\n    return true;\n  });\n  return nextStep;\n}\n"],
   "mappings": "AAEO,SAAS,YACd,aACA,OACA,MACsB;AACtB,MAAI,YAAY,UAAU;AACxB,UAAM,eAAe,YAAY,SAAS,IAAI;AAC9C,QAAI,cAAc;AAChB,aAAO,MAAM,KAAK,CAAC,SAAS,KAAK,SAAS,YAAY;AAAA,IACxD;AAAA,EACF;AACA,QAAM,mBAAmB,MAAM;AAAA,IAC7B,CAAC,SAAS,KAAK,SAAS,YAAY;AAAA,EACtC;AACA,QAAM,WAAW,MAAM,MAAM,mBAAmB,CAAC,EAAE,KAAK,CAAC,SAAS;AAChE,QAAI,KAAK,MAAM;AACb,aAAO,KAAK,KAAK,IAAI;AAAA,IACvB;AACA,WAAO;AAAA,EACT,CAAC;AACD,SAAO;AACT;",
   "names": []
 }

package/Questions/types.d.ts

@@ -1,5 +1,4 @@
-/// <reference types="react" />
-import { StepInterface } from '@digigov/form/Questions/Step/types';
+import type { StepInterface } from '@digigov/form/Questions/Step/types';
 export interface QuestionsInterface {
     name: string;
     steps: StepInterface[];

package/cjs/Field/ErrorGroup/index.js

@@ -0,0 +1,82 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var ErrorGroup_exports = {};
+__export(ErrorGroup_exports, {
+  ErrorGroup: () => ErrorGroup,
+  ErrorGroupContext: () => ErrorGroupContext,
+  default: () => ErrorGroup_default
+});
+module.exports = __toCommonJS(ErrorGroup_exports);
+var import_react = __toESM(require("react"));
+var import_List = require("@digigov/ui/content/List");
+var import_ErrorSummary = require("@digigov/ui/feedback/ErrorSummary");
+var import_i18n = require("@digigov/ui/i18n");
+var import_Link = require("@digigov/ui/navigation/Link");
+var import_Heading = require("@digigov/ui/typography/Heading");
+var import_Base = require("@digigov/ui/utils/Base");
+const ErrorGroupContext = (0, import_react.createContext)(
+  null
+);
+const ErrorGroup = ({
+  children,
+  screenSize,
+  fieldOrder
+}) => {
+  const [errors, setErrors] = (0, import_react.useState)({});
+  const { t } = (0, import_i18n.useTranslation)();
+  const setError = (name, label, error) => {
+    if (errors[name] !== error && errors[name]?.message !== error?.message) {
+      if (!error?.message) {
+        const updatedErrors = { ...errors };
+        delete updatedErrors[name];
+        setErrors(updatedErrors);
+      } else {
+        setErrors({
+          ...errors,
+          [name]: {
+            ...error,
+            label: label.primary
+          }
+        });
+      }
+    }
+  };
+  (0, import_react.useEffect)(() => {
+    setErrors({});
+  }, [screenSize]);
+  return /* @__PURE__ */ import_react.default.createElement(ErrorGroupContext.Provider, { value: { setError } }, Object.keys(errors).length !== 0 && /* @__PURE__ */ import_react.default.createElement(import_ErrorSummary.ErrorSummary, { variant: "error-group" }, /* @__PURE__ */ import_react.default.createElement(import_Heading.Heading, { size: "sm" }, "\u03A4\u03B1 \u03C0\u03B1\u03C1\u03B1\u03BA\u03AC\u03C4\u03C9 \u03C0\u03B5\u03B4\u03AF\u03B1 \u03C4\u03B7\u03C2 \u03C6\u03CC\u03C1\u03BC\u03B1\u03C2 \u03B5\u03B9\u03BD\u03B1\u03B9 \u03BB\u03AC\u03B8\u03BF\u03C2.", " "), /* @__PURE__ */ import_react.default.createElement(import_List.List, { listStyle: "bullet" }, (fieldOrder || Object.keys(errors).reverse()).filter((fieldName) => errors[fieldName]).map((fieldName, index) => {
+    return /* @__PURE__ */ import_react.default.createElement(import_List.ListItem, { key: index, id: `${fieldName}-error` }, /* @__PURE__ */ import_react.default.createElement(import_Base.Base, { as: "b" }, t(errors[fieldName]?.label), ":"), " ", /* @__PURE__ */ import_react.default.createElement(import_Link.Link, { href: `#${fieldName}` }, t(errors[fieldName]?.message)));
+  }))), children);
+};
+var ErrorGroup_default = ErrorGroup;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ErrorGroup,
+  ErrorGroupContext
+});
+//# sourceMappingURL=ErrorGroup.js.map

package/cjs/Field/ErrorGroup.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/Field/ErrorGroup.tsx"],
+  "sourcesContent": ["import React, { createContext, useEffect, useState } from 'react';\nimport type { ErrorOption } from 'react-hook-form';\nimport type { FieldLabelProps } from '@digigov/form/Field/types';\nimport { List, ListItem } from '@digigov/ui/content/List';\nimport { ErrorSummary } from '@digigov/ui/feedback/ErrorSummary';\nimport { useTranslation } from '@digigov/ui/i18n';\nimport { Link } from '@digigov/ui/navigation/Link';\nimport { Heading } from '@digigov/ui/typography/Heading';\nimport { Base } from '@digigov/ui/utils/Base';\nimport type { Breakpoints } from '@digigov/ui/utils/hooks/useScreen';\ninterface ErrorGroupContextType {\n  setError: (\n    name?: string,\n    label?: FieldLabelProps,\n    error?: ErrorOption\n  ) => void;\n}\nexport const ErrorGroupContext = createContext<ErrorGroupContextType | null>(\n  null\n);\n\nexport interface ErrorGroupProps {\n  children: React.ReactNode;\n  screenSize?: Breakpoints | undefined;\n  fieldOrder?: any[];\n}\n\nexport const ErrorGroup: React.FC<ErrorGroupProps> = ({\n  children,\n  screenSize,\n  fieldOrder,\n}) => {\n  const [errors, setErrors] = useState<ErrorOption>({});\n  const { t } = useTranslation();\n  const setError = (name, label, error) => {\n    if (errors[name] !== error && errors[name]?.message !== error?.message) {\n      if (!error?.message) {\n        const updatedErrors = { ...errors };\n        delete updatedErrors[name];\n        setErrors(updatedErrors);\n      } else {\n        setErrors({\n          ...errors,\n          [name]: {\n            ...error,\n            label: label.primary,\n          },\n        });\n      }\n    }\n  };\n\n  useEffect(() => {\n    setErrors({});\n  }, [screenSize]);\n  return (\n    <ErrorGroupContext.Provider value={{ setError }}>\n      {Object.keys(errors).length !== 0 && (\n        <ErrorSummary variant=\"error-group\">\n          <Heading size=\"sm\">\n            \u03A4\u03B1 \u03C0\u03B1\u03C1\u03B1\u03BA\u03AC\u03C4\u03C9 \u03C0\u03B5\u03B4\u03AF\u03B1 \u03C4\u03B7\u03C2 \u03C6\u03CC\u03C1\u03BC\u03B1\u03C2 \u03B5\u03B9\u03BD\u03B1\u03B9 \u03BB\u03AC\u03B8\u03BF\u03C2.{' '}\n          </Heading>\n          <List listStyle=\"bullet\">\n            {(fieldOrder || Object.keys(errors).reverse())\n              .filter((fieldName) => errors[fieldName])\n              .map((fieldName, index) => {\n                return (\n                  <ListItem key={index} id={`${fieldName}-error`}>\n                    <Base as=\"b\">{t(errors[fieldName]?.label)}:</Base>{' '}\n                    <Link href={`#${fieldName}`}>\n                      {t(errors[fieldName]?.message)}\n                    </Link>\n                  </ListItem>\n                );\n              })}\n          </List>\n        </ErrorSummary>\n      )}\n      {children}\n    </ErrorGroupContext.Provider>\n  );\n};\n\nexport default ErrorGroup;\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA0D;AAG1D,kBAA+B;AAC/B,0BAA6B;AAC7B,kBAA+B;AAC/B,kBAAqB;AACrB,qBAAwB;AACxB,kBAAqB;AASd,MAAM,wBAAoB;AAAA,EAC/B;AACF;AAQO,MAAM,aAAwC,CAAC;AAAA,EACpD;AAAA,EACA;AAAA,EACA;AACF,MAAM;AACJ,QAAM,CAAC,QAAQ,SAAS,QAAI,uBAAsB,CAAC,CAAC;AACpD,QAAM,EAAE,EAAE,QAAI,4BAAe;AAC7B,QAAM,WAAW,CAAC,MAAM,OAAO,UAAU;AACvC,QAAI,OAAO,IAAI,MAAM,SAAS,OAAO,IAAI,GAAG,YAAY,OAAO,SAAS;AACtE,UAAI,CAAC,OAAO,SAAS;AACnB,cAAM,gBAAgB,EAAE,GAAG,OAAO;AAClC,eAAO,cAAc,IAAI;AACzB,kBAAU,aAAa;AAAA,MACzB,OAAO;AACL,kBAAU;AAAA,UACR,GAAG;AAAA,UACH,CAAC,IAAI,GAAG;AAAA,YACN,GAAG;AAAA,YACH,OAAO,MAAM;AAAA,UACf;AAAA,QACF,CAAC;AAAA,MACH;AAAA,IACF;AAAA,EACF;AAEA,8BAAU,MAAM;AACd,cAAU,CAAC,CAAC;AAAA,EACd,GAAG,CAAC,UAAU,CAAC;AACf,SACE,6BAAAA,QAAA,cAAC,kBAAkB,UAAlB,EAA2B,OAAO,EAAE,SAAS,KAC3C,OAAO,KAAK,MAAM,EAAE,WAAW,KAC9B,6BAAAA,QAAA,cAAC,oCAAa,SAAQ,iBACpB,6BAAAA,QAAA,cAAC,0BAAQ,MAAK,QAAK,uNACyB,GAC5C,GACA,6BAAAA,QAAA,cAAC,oBAAK,WAAU,aACZ,cAAc,OAAO,KAAK,MAAM,EAAE,QAAQ,GACzC,OAAO,CAAC,cAAc,OAAO,SAAS,CAAC,EACvC,IAAI,CAAC,WAAW,UAAU;AACzB,WACE,6BAAAA,QAAA,cAAC,wBAAS,KAAK,OAAO,IAAI,GAAG,SAAS,YACpC,6BAAAA,QAAA,cAAC,oBAAK,IAAG,OAAK,EAAE,OAAO,SAAS,GAAG,KAAK,GAAE,GAAC,GAAQ,KACnD,6BAAAA,QAAA,cAAC,oBAAK,MAAM,IAAI,SAAS,MACtB,EAAE,OAAO,SAAS,GAAG,OAAO,CAC/B,CACF;AAAA,EAEJ,CAAC,CACL,CACF,GAED,QACH;AAEJ;AAEA,IAAO,qBAAQ;",
+  "names": ["React"]
+}

package/cjs/Field/FieldBase/index.js

@@ -32,26 +32,33 @@ __export(FieldBase_exports, {
 module.exports = __toCommonJS(FieldBase_exports);
 var import_react = __toESM(require("react"));
 var import_react_hook_form = require("react-hook-form");
+var import_ErrorGroup = require("@digigov/form/Field/ErrorGroup");
 var import_FieldBaseContainer = __toESM(require("@digigov/form/Field/FieldBaseContainer"));
-const FieldBase = (props) => {
-  const {
-    required,
-    name,
-    component: Component,
-    wrapper,
-    control,
-    type,
-    controlled = false,
-    enabled = true,
-    editable,
-    defaultValue,
-    label,
-    extra = {},
-    layout,
-    error,
-    register,
-    ...componentProps
-  } = props;
+const FieldBase = ({
+  required,
+  name,
+  component: Component,
+  wrapper,
+  control,
+  type,
+  controlled = false,
+  enabled = true,
+  editable,
+  defaultValue,
+  label,
+  extra = {},
+  layout,
+  error,
+  trim,
+  register,
+  ...componentProps
+}) => {
+  const errorGroupContext = (0, import_react.useContext)(import_ErrorGroup.ErrorGroupContext);
+  (0, import_react.useEffect)(() => {
+    if (errorGroupContext) {
+      errorGroupContext.setError(name, label, error);
+    }
+  }, [error, name, errorGroupContext?.setError]);
   if (!enabled) {
     return null;
   }
@@ -61,9 +68,12 @@ const FieldBase = (props) => {
       {
         label,
         layout,
-        error,
+        register,
+        error: errorGroupContext ? void 0 : error,
+        hasError: !!error,
         wrapper,
-        name
+        name,
+        controlled
       },
       /* @__PURE__ */ import_react.default.createElement(
         import_react_hook_form.Controller,
@@ -75,8 +85,8 @@ const FieldBase = (props) => {
               Component,
               {
                 ...field,
-                ref: void 0,
-                defaultValue,
+                control,
+                defaultValue: defaultValue ?? field.value,
                 extra,
                 error: !!error,
                 type,
@@ -84,6 +94,7 @@ const FieldBase = (props) => {
                 "aria-describedby": error && `${name}-error`,
                 required,
                 disabled: editable === false,
+                trim,
                 ...componentProps
               }
             );
@@ -97,7 +108,9 @@ const FieldBase = (props) => {
     {
       label,
       layout,
-      error,
+      register,
+      error: errorGroupContext ? void 0 : error,
+      hasError: !!error,
       wrapper,
       name
     },
@@ -113,6 +126,7 @@ const FieldBase = (props) => {
         "aria-describedby": error && `${name}-error`,
         required,
         disabled: editable === false,
+        defaultValue,
         ...componentProps
       }
     ) : /* @__PURE__ */ import_react.default.createElement(
@@ -124,11 +138,11 @@ const FieldBase = (props) => {
         error: !!error,
         extra,
         type,
+        defaultValue,
         "aria-required": !!required,
         "aria-describedby": error && `${name}-error`,
         required,
         disabled: editable === false,
-        ref: void 0,
         ...componentProps
       }
     )

package/cjs/Field/FieldBase.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/Field/FieldBase.tsx"],
-  "sourcesContent": ["import React from 'react';\nimport { Controller } from 'react-hook-form';\nimport FieldBaseContainer from '@digigov/form/Field/FieldBaseContainer';\nimport { FieldBaseProps } from '@digigov/form/Field/types';\n\nexport const FieldBase: React.FC<FieldBaseProps> = (props) => {\n  const {\n    required,\n    name,\n    component: Component,\n    wrapper,\n    control,\n    type,\n    controlled = false,\n    enabled = true,\n    editable,\n    defaultValue,\n    label,\n    extra = {},\n    layout,\n    error,\n    register,\n    ...componentProps\n  } = props;\n  if (!enabled) {\n    return null;\n  }\n  if (controlled) {\n    return (\n      <FieldBaseContainer\n        label={label}\n        layout={layout}\n        error={error}\n        wrapper={wrapper}\n        name={name}\n      >\n        <Controller\n          control={control}\n          name={name}\n          render={({ field }) => {\n            return (\n              <Component\n                {...field}\n                ref={undefined}\n                defaultValue={defaultValue}\n                extra={extra}\n                error={!!error}\n                type={type}\n                aria-required={!!required}\n                aria-describedby={error && `${name}-error`}\n                required={required}\n                disabled={editable === false}\n                {...componentProps}\n              />\n            );\n          }}\n        />\n      </FieldBaseContainer>\n    );\n  }\n\n  return (\n    <FieldBaseContainer\n      label={label}\n      layout={layout}\n      error={error}\n      wrapper={wrapper}\n      name={name}\n    >\n      {Component?.render ? (\n        <Component\n          {...register(name)}\n          control={control}\n          error={!!error}\n          extra={extra}\n          type={type}\n          aria-required={!!required}\n          aria-describedby={error && `${name}-error`}\n          required={required}\n          disabled={editable === false}\n          {...componentProps}\n        />\n      ) : (\n        <Component\n          {...register(name)}\n          register={register}\n          control={control}\n          error={!!error}\n          extra={extra}\n          type={type}\n          aria-required={!!required}\n          aria-describedby={error && `${name}-error`}\n          required={required}\n          disabled={editable === false}\n          ref={undefined}\n          {...componentProps}\n        />\n      )}\n    </FieldBaseContainer>\n  );\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAClB,6BAA2B;AAC3B,gCAA+B;AAGxB,MAAM,YAAsC,CAAC,UAAU;AAC5D,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA,WAAW;AAAA,IACX;AAAA,IACA;AAAA,IACA;AAAA,IACA,aAAa;AAAA,IACb,UAAU;AAAA,IACV;AAAA,IACA;AAAA,IACA;AAAA,IACA,QAAQ,CAAC;AAAA,IACT;AAAA,IACA;AAAA,IACA;AAAA,IACA,GAAG;AAAA,EACL,IAAI;AACJ,MAAI,CAAC,SAAS;AACZ,WAAO;AAAA,EACT;AACA,MAAI,YAAY;AACd,WACE,6BAAAA,QAAA;AAAA,MAAC,0BAAAC;AAAA,MAAA;AAAA,QACC;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA;AAAA,MAEA,6BAAAD,QAAA;AAAA,QAAC;AAAA;AAAA,UACC;AAAA,UACA;AAAA,UACA,QAAQ,CAAC,EAAE,MAAM,MAAM;AACrB,mBACE,6BAAAA,QAAA;AAAA,cAAC;AAAA;AAAA,gBACE,GAAG;AAAA,gBACJ,KAAK;AAAA,gBACL;AAAA,gBACA;AAAA,gBACA,OAAO,CAAC,CAAC;AAAA,gBACT;AAAA,gBACA,iBAAe,CAAC,CAAC;AAAA,gBACjB,oBAAkB,SAAS,GAAG,IAAI;AAAA,gBAClC;AAAA,gBACA,UAAU,aAAa;AAAA,gBACtB,GAAG;AAAA;AAAA,YACN;AAAA,UAEJ;AAAA;AAAA,MACF;AAAA,IACF;AAAA,EAEJ;AAEA,SACE,6BAAAA,QAAA;AAAA,IAAC,0BAAAC;AAAA,IAAA;AAAA,MACC;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA;AAAA,IAEC,WAAW,SACV,6BAAAD,QAAA;AAAA,MAAC;AAAA;AAAA,QACE,GAAG,SAAS,IAAI;AAAA,QACjB;AAAA,QACA,OAAO,CAAC,CAAC;AAAA,QACT;AAAA,QACA;AAAA,QACA,iBAAe,CAAC,CAAC;AAAA,QACjB,oBAAkB,SAAS,GAAG,IAAI;AAAA,QAClC;AAAA,QACA,UAAU,aAAa;AAAA,QACtB,GAAG;AAAA;AAAA,IACN,IAEA,6BAAAA,QAAA;AAAA,MAAC;AAAA;AAAA,QACE,GAAG,SAAS,IAAI;AAAA,QACjB;AAAA,QACA;AAAA,QACA,OAAO,CAAC,CAAC;AAAA,QACT;AAAA,QACA;AAAA,QACA,iBAAe,CAAC,CAAC;AAAA,QACjB,oBAAkB,SAAS,GAAG,IAAI;AAAA,QAClC;AAAA,QACA,UAAU,aAAa;AAAA,QACvB,KAAK;AAAA,QACJ,GAAG;AAAA;AAAA,IACN;AAAA,EAEJ;AAEJ;",
+  "sourcesContent": ["import React, { useContext, useEffect } from 'react';\nimport { Controller } from 'react-hook-form';\nimport { ErrorGroupContext } from '@digigov/form/Field/ErrorGroup';\nimport FieldBaseContainer from '@digigov/form/Field/FieldBaseContainer';\nimport type { FieldBaseProps } from '@digigov/form/Field/types';\n\nexport const FieldBase: React.FC<FieldBaseProps> = ({\n  required,\n  name,\n  component: Component,\n  wrapper,\n  control,\n  type,\n  controlled = false,\n  enabled = true,\n  editable,\n  defaultValue,\n  label,\n  extra = {},\n  layout,\n  error,\n  trim,\n  register,\n  ...componentProps\n}) => {\n  const errorGroupContext = useContext(ErrorGroupContext);\n\n  useEffect(() => {\n    if (errorGroupContext) {\n      errorGroupContext.setError(name, label, error);\n    }\n  }, [error, name, errorGroupContext?.setError]);\n\n  if (!enabled) {\n    return null;\n  }\n\n  if (controlled) {\n    return (\n      <FieldBaseContainer\n        label={label}\n        layout={layout}\n        register={register}\n        error={errorGroupContext ? undefined : error}\n        hasError={!!error}\n        wrapper={wrapper}\n        name={name}\n        controlled={controlled}\n      >\n        <Controller\n          control={control}\n          name={name}\n          render={({ field }) => {\n            return (\n              <Component\n                {...field}\n                control={control}\n                defaultValue={defaultValue ?? field.value}\n                extra={extra}\n                error={!!error}\n                type={type}\n                aria-required={!!required}\n                aria-describedby={error && `${name}-error`}\n                required={required}\n                disabled={editable === false}\n                trim={trim}\n                {...componentProps}\n              />\n            );\n          }}\n        />\n      </FieldBaseContainer>\n    );\n  }\n\n  return (\n    <FieldBaseContainer\n      label={label}\n      layout={layout}\n      register={register}\n      error={errorGroupContext ? undefined : error}\n      hasError={!!error}\n      wrapper={wrapper}\n      name={name}\n    >\n      {Component?.render ? (\n        <Component\n          {...register(name)}\n          control={control}\n          error={!!error}\n          extra={extra}\n          type={type}\n          aria-required={!!required}\n          aria-describedby={error && `${name}-error`}\n          required={required}\n          disabled={editable === false}\n          defaultValue={defaultValue}\n          {...componentProps}\n        />\n      ) : (\n        <Component\n          {...register(name)}\n          register={register}\n          control={control}\n          error={!!error}\n          extra={extra}\n          type={type}\n          defaultValue={defaultValue}\n          aria-required={!!required}\n          aria-describedby={error && `${name}-error`}\n          required={required}\n          disabled={editable === false}\n          {...componentProps}\n        />\n      )}\n    </FieldBaseContainer>\n  );\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA6C;AAC7C,6BAA2B;AAC3B,wBAAkC;AAClC,gCAA+B;AAGxB,MAAM,YAAsC,CAAC;AAAA,EAClD;AAAA,EACA;AAAA,EACA,WAAW;AAAA,EACX;AAAA,EACA;AAAA,EACA;AAAA,EACA,aAAa;AAAA,EACb,UAAU;AAAA,EACV;AAAA,EACA;AAAA,EACA;AAAA,EACA,QAAQ,CAAC;AAAA,EACT;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,GAAG;AACL,MAAM;AACJ,QAAM,wBAAoB,yBAAW,mCAAiB;AAEtD,8BAAU,MAAM;AACd,QAAI,mBAAmB;AACrB,wBAAkB,SAAS,MAAM,OAAO,KAAK;AAAA,IAC/C;AAAA,EACF,GAAG,CAAC,OAAO,MAAM,mBAAmB,QAAQ,CAAC;AAE7C,MAAI,CAAC,SAAS;AACZ,WAAO;AAAA,EACT;AAEA,MAAI,YAAY;AACd,WACE,6BAAAA,QAAA;AAAA,MAAC,0BAAAC;AAAA,MAAA;AAAA,QACC;AAAA,QACA;AAAA,QACA;AAAA,QACA,OAAO,oBAAoB,SAAY;AAAA,QACvC,UAAU,CAAC,CAAC;AAAA,QACZ;AAAA,QACA;AAAA,QACA;AAAA;AAAA,MAEA,6BAAAD,QAAA;AAAA,QAAC;AAAA;AAAA,UACC;AAAA,UACA;AAAA,UACA,QAAQ,CAAC,EAAE,MAAM,MAAM;AACrB,mBACE,6BAAAA,QAAA;AAAA,cAAC;AAAA;AAAA,gBACE,GAAG;AAAA,gBACJ;AAAA,gBACA,cAAc,gBAAgB,MAAM;AAAA,gBACpC;AAAA,gBACA,OAAO,CAAC,CAAC;AAAA,gBACT;AAAA,gBACA,iBAAe,CAAC,CAAC;AAAA,gBACjB,oBAAkB,SAAS,GAAG,IAAI;AAAA,gBAClC;AAAA,gBACA,UAAU,aAAa;AAAA,gBACvB;AAAA,gBACC,GAAG;AAAA;AAAA,YACN;AAAA,UAEJ;AAAA;AAAA,MACF;AAAA,IACF;AAAA,EAEJ;AAEA,SACE,6BAAAA,QAAA;AAAA,IAAC,0BAAAC;AAAA,IAAA;AAAA,MACC;AAAA,MACA;AAAA,MACA;AAAA,MACA,OAAO,oBAAoB,SAAY;AAAA,MACvC,UAAU,CAAC,CAAC;AAAA,MACZ;AAAA,MACA;AAAA;AAAA,IAEC,WAAW,SACV,6BAAAD,QAAA;AAAA,MAAC;AAAA;AAAA,QACE,GAAG,SAAS,IAAI;AAAA,QACjB;AAAA,QACA,OAAO,CAAC,CAAC;AAAA,QACT;AAAA,QACA;AAAA,QACA,iBAAe,CAAC,CAAC;AAAA,QACjB,oBAAkB,SAAS,GAAG,IAAI;AAAA,QAClC;AAAA,QACA,UAAU,aAAa;AAAA,QACvB;AAAA,QACC,GAAG;AAAA;AAAA,IACN,IAEA,6BAAAA,QAAA;AAAA,MAAC;AAAA;AAAA,QACE,GAAG,SAAS,IAAI;AAAA,QACjB;AAAA,QACA;AAAA,QACA,OAAO,CAAC,CAAC;AAAA,QACT;AAAA,QACA;AAAA,QACA;AAAA,QACA,iBAAe,CAAC,CAAC;AAAA,QACjB,oBAAkB,SAAS,GAAG,IAAI;AAAA,QAClC;AAAA,QACA,UAAU,aAAa;AAAA,QACtB,GAAG;AAAA;AAAA,IACN;AAAA,EAEJ;AAEJ;",
   "names": ["React", "FieldBaseContainer"]
 }

package/cjs/Field/FieldBaseContainer/index.js

@@ -33,30 +33,50 @@ __export(FieldBaseContainer_exports, {
 module.exports = __toCommonJS(FieldBaseContainer_exports);
 var import_react = __toESM(require("react"));
 var import_Label = __toESM(require("@digigov/form/inputs/Label"));
-var import_ErrorMessage = __toESM(require("@digigov/react-core/ErrorMessage"));
+var import_ErrorMessage = require("@digigov/react-core/ErrorMessage");
 var import_FieldContainer = __toESM(require("@digigov/react-core/FieldContainer"));
 var import_Fieldset = __toESM(require("@digigov/react-core/Fieldset"));
 var import_FieldsetLegend = __toESM(require("@digigov/react-core/FieldsetLegend"));
-var import_Hint = __toESM(require("@digigov/react-core/Hint"));
 var import_LabelContainer = __toESM(require("@digigov/react-core/LabelContainer"));
 var import_i18n = require("@digigov/ui/i18n");
-const FieldBaseContainer = ({
-  name,
-  wrapper,
-  label,
-  children,
-  error,
-  layout
-}) => {
-  const { t } = (0, import_i18n.useTranslation)();
-  const errorMessage = error?.message.key ? error.message.key : error?.message || "";
-  const errorContext = error?.message.context || {};
-  if (wrapper === "fieldset") {
-    return /* @__PURE__ */ import_react.default.createElement(import_FieldContainer.default, { error: !!error, ...layout }, /* @__PURE__ */ import_react.default.createElement(import_Fieldset.default, null, /* @__PURE__ */ import_react.default.createElement(import_FieldsetLegend.default, { size: "sm" }, label && label.primary), label && label.secondary && /* @__PURE__ */ import_react.default.createElement(import_Hint.default, null, t(label.secondary)), error && /* @__PURE__ */ import_react.default.createElement(import_ErrorMessage.default, { id: `${name}-error` }, t(errorMessage, errorContext)), children));
-  } else {
-    return /* @__PURE__ */ import_react.default.createElement(import_FieldContainer.default, { error: !!error, ...layout }, /* @__PURE__ */ import_react.default.createElement(import_LabelContainer.default, null, label && /* @__PURE__ */ import_react.default.createElement(import_Label.default, { label }), error && /* @__PURE__ */ import_react.default.createElement(import_ErrorMessage.default, { id: `${name}-error` }, t(errorMessage, errorContext)), children));
+var import_Hint = require("@digigov/ui/typography/Hint");
+const FieldBaseContainer = import_react.default.forwardRef(
+  ({
+    name,
+    wrapper,
+    label,
+    children,
+    error,
+    hasError,
+    layout,
+    controlled,
+    labelSize = "sm"
+  }, ref) => {
+    const { t } = (0, import_i18n.useTranslation)();
+    const errorMessage = error?.message.key ? error.message.key : error?.message || "";
+    const errorContext = error?.message.context || {};
+    if (wrapper === "fieldset") {
+      return /* @__PURE__ */ import_react.default.createElement(import_FieldContainer.default, { error: hasError, ...layout }, /* @__PURE__ */ import_react.default.createElement(
+        import_Fieldset.default,
+        {
+          ref,
+          className: "outline-none",
+          ...controlled && {
+            tabIndex: -1
+          }
+        },
+        /* @__PURE__ */ import_react.default.createElement(import_FieldsetLegend.default, { size: labelSize }, label && label.primary),
+        label && label.secondary && /* @__PURE__ */ import_react.default.createElement(import_Hint.Hint, null, t(label.secondary)),
+        error && /* @__PURE__ */ import_react.default.createElement(import_ErrorMessage.ErrorMessage, { id: `${name}-error` }, t(errorMessage, errorContext)),
+        children,
+        label && label.hint && /* @__PURE__ */ import_react.default.createElement(import_Hint.Hint, { size: "sm" }, label.hint)
+      ));
+    } else {
+      return /* @__PURE__ */ import_react.default.createElement(import_FieldContainer.default, { error: hasError, ...layout }, /* @__PURE__ */ import_react.default.createElement(import_LabelContainer.default, null, label && /* @__PURE__ */ import_react.default.createElement(import_Label.default, { label }), error && /* @__PURE__ */ import_react.default.createElement(import_ErrorMessage.ErrorMessage, { id: `${name}-error` }, t(errorMessage, errorContext)), children, label && label.hint && /* @__PURE__ */ import_react.default.createElement(import_Hint.Hint, { size: "sm" }, label.hint)));
+    }
   }
-};
+);
+FieldBaseContainer.displayName = "FieldBaseContainer";
 var FieldBaseContainer_default = FieldBaseContainer;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/cjs/Field/FieldBaseContainer.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/Field/FieldBaseContainer.tsx"],
-  "sourcesContent": ["import React from 'react';\nimport { FieldContainerProps } from '@digigov/form/Field/types';\nimport Label from '@digigov/form/inputs/Label';\nimport ErrorMessage from '@digigov/react-core/ErrorMessage';\nimport FieldContainer from '@digigov/react-core/FieldContainer';\nimport CoreFieldset from '@digigov/react-core/Fieldset';\nimport FieldsetLegend from '@digigov/react-core/FieldsetLegend';\nimport Hint from '@digigov/react-core/Hint';\nimport LabelContainer from '@digigov/react-core/LabelContainer';\nimport { useTranslation } from '@digigov/ui/i18n';\n\nexport const FieldBaseContainer: React.FC<FieldContainerProps> = ({\n  name,\n  wrapper,\n  label,\n  children,\n  error,\n  layout,\n}) => {\n  const { t } = useTranslation();\n  const errorMessage = error?.message.key\n    ? error.message.key\n    : error?.message || '';\n  const errorContext = error?.message.context || {};\n  if (wrapper === 'fieldset') {\n    return (\n      <FieldContainer error={!!error} {...layout}>\n        <CoreFieldset>\n          <FieldsetLegend size=\"sm\">{label && label.primary}</FieldsetLegend>\n          {label && label.secondary && <Hint>{t(label.secondary)}</Hint>}\n          {error && (\n            <ErrorMessage id={`${name}-error`}>\n              {t(errorMessage, errorContext)}\n            </ErrorMessage>\n          )}\n          {children}\n        </CoreFieldset>\n      </FieldContainer>\n    );\n  } else {\n    return (\n      <FieldContainer error={!!error} {...layout}>\n        <LabelContainer>\n          {label && <Label label={label} />}\n          {error && (\n            <ErrorMessage id={`${name}-error`}>\n              {t(errorMessage, errorContext)}\n            </ErrorMessage>\n          )}\n          {children}\n        </LabelContainer>\n      </FieldContainer>\n    );\n  }\n};\n\nexport default FieldBaseContainer;\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAElB,mBAAkB;AAClB,0BAAyB;AACzB,4BAA2B;AAC3B,sBAAyB;AACzB,4BAA2B;AAC3B,kBAAiB;AACjB,4BAA2B;AAC3B,kBAA+B;AAExB,MAAM,qBAAoD,CAAC;AAAA,EAChE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAAM;AACJ,QAAM,EAAE,EAAE,QAAI,4BAAe;AAC7B,QAAM,eAAe,OAAO,QAAQ,MAChC,MAAM,QAAQ,MACd,OAAO,WAAW;AACtB,QAAM,eAAe,OAAO,QAAQ,WAAW,CAAC;AAChD,MAAI,YAAY,YAAY;AAC1B,WACE,6BAAAA,QAAA,cAAC,sBAAAC,SAAA,EAAe,OAAO,CAAC,CAAC,OAAQ,GAAG,UAClC,6BAAAD,QAAA,cAAC,gBAAAE,SAAA,MACC,6BAAAF,QAAA,cAAC,sBAAAG,SAAA,EAAe,MAAK,QAAM,SAAS,MAAM,OAAQ,GACjD,SAAS,MAAM,aAAa,6BAAAH,QAAA,cAAC,YAAAI,SAAA,MAAM,EAAE,MAAM,SAAS,CAAE,GACtD,SACC,6BAAAJ,QAAA,cAAC,oBAAAK,SAAA,EAAa,IAAI,GAAG,IAAI,YACtB,EAAE,cAAc,YAAY,CAC/B,GAED,QACH,CACF;AAAA,EAEJ,OAAO;AACL,WACE,6BAAAL,QAAA,cAAC,sBAAAC,SAAA,EAAe,OAAO,CAAC,CAAC,OAAQ,GAAG,UAClC,6BAAAD,QAAA,cAAC,sBAAAM,SAAA,MACE,SAAS,6BAAAN,QAAA,cAAC,aAAAO,SAAA,EAAM,OAAc,GAC9B,SACC,6BAAAP,QAAA,cAAC,oBAAAK,SAAA,EAAa,IAAI,GAAG,IAAI,YACtB,EAAE,cAAc,YAAY,CAC/B,GAED,QACH,CACF;AAAA,EAEJ;AACF;AAEA,IAAO,6BAAQ;",
-  "names": ["React", "FieldContainer", "CoreFieldset", "FieldsetLegend", "Hint", "ErrorMessage", "LabelContainer", "Label"]
+  "sourcesContent": ["import type { ComponentRef } from 'react';\nimport React from 'react';\nimport type { FieldContainerProps } from '@digigov/form/Field/types';\nimport Label from '@digigov/form/inputs/Label';\nimport { ErrorMessage } from '@digigov/react-core/ErrorMessage';\nimport FieldContainer from '@digigov/react-core/FieldContainer';\nimport Fieldset from '@digigov/react-core/Fieldset';\nimport FieldsetLegend from '@digigov/react-core/FieldsetLegend';\nimport LabelContainer from '@digigov/react-core/LabelContainer';\nimport { useTranslation } from '@digigov/ui/i18n';\nimport { Hint } from '@digigov/ui/typography/Hint';\n\nexport const FieldBaseContainer = React.forwardRef<\n  ComponentRef<typeof Fieldset>,\n  FieldContainerProps\n>(\n  (\n    {\n      name,\n      wrapper,\n      label,\n      children,\n      error,\n      hasError,\n      layout,\n      controlled,\n      labelSize = 'sm',\n    },\n    ref\n  ) => {\n    const { t } = useTranslation();\n    const errorMessage = error?.message.key\n      ? error.message.key\n      : error?.message || '';\n    const errorContext = error?.message.context || {};\n    if (wrapper === 'fieldset') {\n      return (\n        <FieldContainer error={hasError} {...layout}>\n          <Fieldset\n            ref={ref}\n            className=\"outline-none\"\n            {...(controlled && {\n              tabIndex: -1,\n            })}\n          >\n            <FieldsetLegend size={labelSize}>\n              {label && label.primary}\n            </FieldsetLegend>\n            {label && label.secondary && <Hint>{t(label.secondary)}</Hint>}\n            {error && (\n              <ErrorMessage id={`${name}-error`}>\n                {t(errorMessage, errorContext)}\n              </ErrorMessage>\n            )}\n            {children}\n            {label && label.hint && <Hint size=\"sm\">{label.hint}</Hint>}\n          </Fieldset>\n        </FieldContainer>\n      );\n    } else {\n      return (\n        <FieldContainer error={hasError} {...layout}>\n          <LabelContainer>\n            {label && <Label label={label} />}\n            {error && (\n              <ErrorMessage id={`${name}-error`}>\n                {t(errorMessage, errorContext)}\n              </ErrorMessage>\n            )}\n            {children}\n            {label && label.hint && <Hint size=\"sm\">{label.hint}</Hint>}\n          </LabelContainer>\n        </FieldContainer>\n      );\n    }\n  }\n);\n\nFieldBaseContainer.displayName = 'FieldBaseContainer';\n\nexport default FieldBaseContainer;\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,mBAAkB;AAElB,mBAAkB;AAClB,0BAA6B;AAC7B,4BAA2B;AAC3B,sBAAqB;AACrB,4BAA2B;AAC3B,4BAA2B;AAC3B,kBAA+B;AAC/B,kBAAqB;AAEd,MAAM,qBAAqB,aAAAA,QAAM;AAAA,EAItC,CACE;AAAA,IACE;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,YAAY;AAAA,EACd,GACA,QACG;AACH,UAAM,EAAE,EAAE,QAAI,4BAAe;AAC7B,UAAM,eAAe,OAAO,QAAQ,MAChC,MAAM,QAAQ,MACd,OAAO,WAAW;AACtB,UAAM,eAAe,OAAO,QAAQ,WAAW,CAAC;AAChD,QAAI,YAAY,YAAY;AAC1B,aACE,6BAAAA,QAAA,cAAC,sBAAAC,SAAA,EAAe,OAAO,UAAW,GAAG,UACnC,6BAAAD,QAAA;AAAA,QAAC,gBAAAE;AAAA,QAAA;AAAA,UACC;AAAA,UACA,WAAU;AAAA,UACT,GAAI,cAAc;AAAA,YACjB,UAAU;AAAA,UACZ;AAAA;AAAA,QAEA,6BAAAF,QAAA,cAAC,sBAAAG,SAAA,EAAe,MAAM,aACnB,SAAS,MAAM,OAClB;AAAA,QACC,SAAS,MAAM,aAAa,6BAAAH,QAAA,cAAC,wBAAM,EAAE,MAAM,SAAS,CAAE;AAAA,QACtD,SACC,6BAAAA,QAAA,cAAC,oCAAa,IAAI,GAAG,IAAI,YACtB,EAAE,cAAc,YAAY,CAC/B;AAAA,QAED;AAAA,QACA,SAAS,MAAM,QAAQ,6BAAAA,QAAA,cAAC,oBAAK,MAAK,QAAM,MAAM,IAAK;AAAA,MACtD,CACF;AAAA,IAEJ,OAAO;AACL,aACE,6BAAAA,QAAA,cAAC,sBAAAC,SAAA,EAAe,OAAO,UAAW,GAAG,UACnC,6BAAAD,QAAA,cAAC,sBAAAI,SAAA,MACE,SAAS,6BAAAJ,QAAA,cAAC,aAAAK,SAAA,EAAM,OAAc,GAC9B,SACC,6BAAAL,QAAA,cAAC,oCAAa,IAAI,GAAG,IAAI,YACtB,EAAE,cAAc,YAAY,CAC/B,GAED,UACA,SAAS,MAAM,QAAQ,6BAAAA,QAAA,cAAC,oBAAK,MAAK,QAAM,MAAM,IAAK,CACtD,CACF;AAAA,IAEJ;AAAA,EACF;AACF;AAEA,mBAAmB,cAAc;AAEjC,IAAO,6BAAQ;",
+  "names": ["React", "FieldContainer", "Fieldset", "FieldsetLegend", "LabelContainer", "Label"]
 }

package/cjs/Field/FieldConditional/index.js

@@ -41,8 +41,10 @@ const ChildFieldMemo = import_react.default.memo(
     field,
     control,
     reset,
+    resetField,
     register,
-    error
+    error,
+    Field
   }) {
     const newField = (0, import_evaluateFieldWithConditions.evaluateFieldWithConditions)(
       field,
@@ -52,8 +54,10 @@ const ChildFieldMemo = import_react.default.memo(
       import_FieldBase.FieldBase,
       {
         ...newField,
+        Field,
         name: newField.key,
         reset,
+        resetField,
         control,
         register,
         error
@@ -80,7 +84,9 @@ const FieldConditional = ({
   field,
   register,
   reset,
-  error
+  resetField,
+  error,
+  Field
 }) => {
   const dependencyKeys = Object.keys(field.condition);
   const dependencyValues = (0, import_react_hook_form.useWatch)({
@@ -102,7 +108,9 @@ const FieldConditional = ({
       control,
       register,
       reset,
-      error
+      resetField,
+      error,
+      Field
     }
   );
 };

package/cjs/Field/FieldConditional.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/Field/FieldConditional.tsx"],
-  "sourcesContent": ["import React from 'react';\nimport { useWatch } from 'react-hook-form';\nimport { FieldBase } from '@digigov/form/Field/FieldBase';\nimport {\n  ChildFieldMemoProps,\n  FieldConditionalProps,\n} from '@digigov/form/Field/types';\nimport { evaluateFieldWithConditions } from '@digigov/form/Field/utils/evaluateFieldWithConditions';\n\nconst ChildFieldMemo = React.memo(\n  function ChildField({\n    dependencies,\n    field,\n    control,\n    reset,\n    register,\n    error,\n  }: ChildFieldMemoProps) {\n    const newField = evaluateFieldWithConditions(\n      field,\n      dependencies as FormData\n    );\n    return (\n      <FieldBase\n        {...newField}\n        name={newField.key}\n        reset={reset}\n        control={control}\n        register={register}\n        error={error}\n      />\n    );\n  },\n  (prev, next) => {\n    if (!prev || !prev.dependencies) {\n      return false;\n    }\n    if (prev.error !== next.error) {\n      return false;\n    }\n    for (const dep in next.dependencies) {\n      if (next.dependencies[dep] !== prev.dependencies[dep]) {\n        return false;\n      }\n    }\n    return true;\n  }\n);\n\nexport const FieldConditional: React.FC<FieldConditionalProps> = ({\n  control,\n  field,\n  register,\n  reset,\n  error,\n}) => {\n  const dependencyKeys = Object.keys(field.condition);\n  const dependencyValues = useWatch({\n    name: dependencyKeys,\n    control,\n  });\n  const variables = dependencyKeys.reduce(\n    (data, fieldKey, index) => ({\n      ...data,\n      [fieldKey]: dependencyValues[index],\n    }),\n    {}\n  );\n  return (\n    <ChildFieldMemo\n      dependencies={variables}\n      field={field}\n      control={control}\n      register={register}\n      reset={reset}\n      error={error}\n    />\n  );\n};\n\nexport default FieldConditional;\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAClB,6BAAyB;AACzB,uBAA0B;AAK1B,yCAA4C;AAE5C,MAAM,iBAAiB,aAAAA,QAAM;AAAA,EAC3B,SAAS,WAAW;AAAA,IAClB;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,GAAwB;AACtB,UAAM,eAAW;AAAA,MACf;AAAA,MACA;AAAA,IACF;AACA,WACE,6BAAAA,QAAA;AAAA,MAAC;AAAA;AAAA,QACE,GAAG;AAAA,QACJ,MAAM,SAAS;AAAA,QACf;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA;AAAA,IACF;AAAA,EAEJ;AAAA,EACA,CAAC,MAAM,SAAS;AACd,QAAI,CAAC,QAAQ,CAAC,KAAK,cAAc;AAC/B,aAAO;AAAA,IACT;AACA,QAAI,KAAK,UAAU,KAAK,OAAO;AAC7B,aAAO;AAAA,IACT;AACA,eAAW,OAAO,KAAK,cAAc;AACnC,UAAI,KAAK,aAAa,GAAG,MAAM,KAAK,aAAa,GAAG,GAAG;AACrD,eAAO;AAAA,MACT;AAAA,IACF;AACA,WAAO;AAAA,EACT;AACF;AAEO,MAAM,mBAAoD,CAAC;AAAA,EAChE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAAM;AACJ,QAAM,iBAAiB,OAAO,KAAK,MAAM,SAAS;AAClD,QAAM,uBAAmB,iCAAS;AAAA,IAChC,MAAM;AAAA,IACN;AAAA,EACF,CAAC;AACD,QAAM,YAAY,eAAe;AAAA,IAC/B,CAAC,MAAM,UAAU,WAAW;AAAA,MAC1B,GAAG;AAAA,MACH,CAAC,QAAQ,GAAG,iBAAiB,KAAK;AAAA,IACpC;AAAA,IACA,CAAC;AAAA,EACH;AACA,SACE,6BAAAA,QAAA;AAAA,IAAC;AAAA;AAAA,MACC,cAAc;AAAA,MACd;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA;AAAA,EACF;AAEJ;AAEA,IAAO,2BAAQ;",
+  "sourcesContent": ["import React from 'react';\nimport { useWatch } from 'react-hook-form';\nimport { FieldBase } from '@digigov/form/Field/FieldBase';\nimport type {\n  ChildFieldMemoProps,\n  FieldConditionalProps,\n} from '@digigov/form/Field/types';\nimport { evaluateFieldWithConditions } from '@digigov/form/Field/utils/evaluateFieldWithConditions';\n\nconst ChildFieldMemo = React.memo(\n  function ChildField({\n    dependencies,\n    field,\n    control,\n    reset,\n    resetField,\n    register,\n    error,\n    Field,\n  }: ChildFieldMemoProps) {\n    const newField = evaluateFieldWithConditions(\n      field,\n      dependencies as FormData\n    );\n    return (\n      <FieldBase\n        {...newField}\n        Field={Field}\n        name={newField.key}\n        reset={reset}\n        resetField={resetField}\n        control={control}\n        register={register}\n        error={error}\n      />\n    );\n  },\n  (prev, next) => {\n    if (!prev || !prev.dependencies) {\n      return false;\n    }\n    if (prev.error !== next.error) {\n      return false;\n    }\n    for (const dep in next.dependencies) {\n      if (next.dependencies[dep] !== prev.dependencies[dep]) {\n        return false;\n      }\n    }\n    return true;\n  }\n);\n\nexport const FieldConditional: React.FC<FieldConditionalProps> = ({\n  control,\n  field,\n  register,\n  reset,\n  resetField,\n  error,\n  Field,\n}) => {\n  const dependencyKeys = Object.keys(field.condition);\n  const dependencyValues = useWatch({\n    name: dependencyKeys,\n    control,\n  });\n  const variables = dependencyKeys.reduce(\n    (data, fieldKey, index) => ({\n      ...data,\n      [fieldKey]: dependencyValues[index],\n    }),\n    {}\n  );\n  return (\n    <ChildFieldMemo\n      dependencies={variables}\n      field={field}\n      control={control}\n      register={register}\n      reset={reset}\n      resetField={resetField}\n      error={error}\n      Field={Field}\n    />\n  );\n};\n\nexport default FieldConditional;\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAClB,6BAAyB;AACzB,uBAA0B;AAK1B,yCAA4C;AAE5C,MAAM,iBAAiB,aAAAA,QAAM;AAAA,EAC3B,SAAS,WAAW;AAAA,IAClB;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,GAAwB;AACtB,UAAM,eAAW;AAAA,MACf;AAAA,MACA;AAAA,IACF;AACA,WACE,6BAAAA,QAAA;AAAA,MAAC;AAAA;AAAA,QACE,GAAG;AAAA,QACJ;AAAA,QACA,MAAM,SAAS;AAAA,QACf;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA;AAAA,IACF;AAAA,EAEJ;AAAA,EACA,CAAC,MAAM,SAAS;AACd,QAAI,CAAC,QAAQ,CAAC,KAAK,cAAc;AAC/B,aAAO;AAAA,IACT;AACA,QAAI,KAAK,UAAU,KAAK,OAAO;AAC7B,aAAO;AAAA,IACT;AACA,eAAW,OAAO,KAAK,cAAc;AACnC,UAAI,KAAK,aAAa,GAAG,MAAM,KAAK,aAAa,GAAG,GAAG;AACrD,eAAO;AAAA,MACT;AAAA,IACF;AACA,WAAO;AAAA,EACT;AACF;AAEO,MAAM,mBAAoD,CAAC;AAAA,EAChE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAAM;AACJ,QAAM,iBAAiB,OAAO,KAAK,MAAM,SAAS;AAClD,QAAM,uBAAmB,iCAAS;AAAA,IAChC,MAAM;AAAA,IACN;AAAA,EACF,CAAC;AACD,QAAM,YAAY,eAAe;AAAA,IAC/B,CAAC,MAAM,UAAU,WAAW;AAAA,MAC1B,GAAG;AAAA,MACH,CAAC,QAAQ,GAAG,iBAAiB,KAAK;AAAA,IACpC;AAAA,IACA,CAAC;AAAA,EACH;AACA,SACE,6BAAAA,QAAA;AAAA,IAAC;AAAA;AAAA,MACC,cAAc;AAAA,MACd;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA;AAAA,EACF;AAEJ;AAEA,IAAO,2BAAQ;",
   "names": ["React"]
 }

package/cjs/Field/index.js

@@ -34,14 +34,12 @@ module.exports = __toCommonJS(Field_exports);
 var import_react = __toESM(require("react"));
 var import_FieldBase = require("@digigov/form/Field/FieldBase");
 var import_FieldConditional = __toESM(require("@digigov/form/Field/FieldConditional"));
-var import_utils = require("@digigov/form/Field/utils");
-var import_calculateField = require("@digigov/form/Field/utils/calculateField");
+var import_resolveField = require("@digigov/form/Field/utils/resolveField");
 var import_useField = require("@digigov/form/Field/utils/useField");
 var import_FieldArray = __toESM(require("@digigov/form/FieldArray"));
 var import_MultiplicityField = __toESM(require("@digigov/form/MultiplicityField"));
 const Field = ({
   name,
-  disabled,
   children,
   ...customField
 }) => {
@@ -50,6 +48,7 @@ const Field = ({
     control,
     register,
     reset,
+    resetField,
     error,
     componentRegistry,
     formState,
@@ -57,47 +56,50 @@ const Field = ({
     getValues,
     unregister,
     trigger,
-    clearErrors
+    clearErrors,
+    registerFieldFocus
   } = (0, import_useField.useField)(name, customField?.type ? customField : null);
-  const calculatedField = (0, import_react.useMemo)(
-    () => (0, import_calculateField.calculateField)(
-      children,
-      field,
-      {
-        ...import_utils.FIELD_COMPONENTS,
-        ...componentRegistry
-      },
-      import_utils.ALTERNATIVE_COMPONENTS
-    ),
+  const resolvedField = (0, import_react.useMemo)(
+    () => (0, import_resolveField.resolveField)(children, field, componentRegistry),
     [field]
   );
-  if (calculatedField.condition) {
+  if (resolvedField.condition) {
     return /* @__PURE__ */ import_react.default.createElement(
       import_FieldConditional.default,
       {
         control,
         reset,
+        resetField,
         register,
-        field: calculatedField,
-        error
+        field: resolvedField,
+        error,
+        Field
       }
     );
   }
-  if (calculatedField.type === "array" && !calculatedField.multiplicity) {
-    calculatedField.name = name;
+  if (resolvedField.type === "array" && !resolvedField.multiplicity) {
+    resolvedField.name = name;
     return /* @__PURE__ */ import_react.default.createElement(
       import_FieldArray.default,
       {
         control,
+        trigger,
         register,
+        clearErrors,
         error,
+        getValues,
+        setValue,
         formState,
-        ...calculatedField
+        Field,
+        reset,
+        resetField,
+        registerFieldFocus,
+        ...resolvedField
       }
     );
   }
-  if (calculatedField.type === "array" && calculatedField.multiplicity === true) {
-    calculatedField.name = name;
+  if (resolvedField.type === "array" && resolvedField.multiplicity === true) {
+    resolvedField.name = name;
     return /* @__PURE__ */ import_react.default.createElement(
       import_MultiplicityField.default,
       {
@@ -110,21 +112,26 @@ const Field = ({
         setValue,
         getValues,
         unregister,
-        ...calculatedField
+        resetField,
+        Field,
+        ...resolvedField
       }
     );
   }
+  const editable = customField.editable === false || customField.disabled === true ? false : true;
+  const customError = error ? error : formState?.errors[name];
   return /* @__PURE__ */ import_react.default.createElement(
     import_FieldBase.FieldBase,
     {
-      ...calculatedField,
+      ...resolvedField,
+      editable,
       name,
-      disabled,
       control,
       register,
       reset,
-      error,
-      fieldComponent: Field
+      error: customError,
+      resetField,
+      Field
     }
   );
 };