@digigov/form 2.0.0-cbc56209 → 2.0.0-d2ffc726

package/Field/ErrorGroup/index.js

@@ -0,0 +1,48 @@
+import React, { createContext, useEffect, useState } from "react";
+import { List, ListItem } from "@digigov/ui/content/List";
+import { ErrorSummary } from "@digigov/ui/feedback/ErrorSummary";
+import { useTranslation } from "@digigov/ui/i18n";
+import { Link } from "@digigov/ui/navigation/Link";
+import { Heading } from "@digigov/ui/typography/Heading";
+import { Base } from "@digigov/ui/utils/Base";
+const ErrorGroupContext = createContext(
+  null
+);
+const ErrorGroup = ({
+  children,
+  screenSize,
+  fieldOrder
+}) => {
+  const [errors, setErrors] = useState({});
+  const { t } = 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
+          }
+        });
+      }
+    }
+  };
+  useEffect(() => {
+    setErrors({});
+  }, [screenSize]);
+  return /* @__PURE__ */ React.createElement(ErrorGroupContext.Provider, { value: { setError } }, Object.keys(errors).length !== 0 && /* @__PURE__ */ React.createElement(ErrorSummary, { variant: "error-group" }, /* @__PURE__ */ React.createElement(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__ */ React.createElement(List, { listStyle: "bullet" }, (fieldOrder || Object.keys(errors).reverse()).filter((fieldName) => errors[fieldName]).map((fieldName, index) => {
+    return /* @__PURE__ */ React.createElement(ListItem, { key: index, id: `${fieldName}-error` }, /* @__PURE__ */ React.createElement(Base, { as: "b" }, t(errors[fieldName]?.label), ":"), " ", /* @__PURE__ */ React.createElement(Link, { href: `#${fieldName}` }, t(errors[fieldName]?.message)));
+  }))), children);
+};
+var ErrorGroup_default = ErrorGroup;
+export {
+  ErrorGroup,
+  ErrorGroupContext,
+  ErrorGroup_default as default
+};
+//# sourceMappingURL=ErrorGroup.js.map

package/{Questions/index.spec → Field/ErrorGroup}/package.json

@@ -2,5 +2,5 @@
   "sideEffects": false,
   "module": "./index.js",
   "types": "./index.d.ts",
-  "main": "../../cjs/Questions/index.spec/index.js"
+  "main": "../../cjs/Field/ErrorGroup/index.js"
 }

package/Field/ErrorGroup.d.ts

@@ -0,0 +1,15 @@
+import React from 'react';
+import type { ErrorOption } from 'react-hook-form';
+import type { FieldLabelProps } from '@digigov/form/Field/types';
+import type { Breakpoints } from '@digigov/ui/utils/hooks/useScreen';
+interface ErrorGroupContextType {
+    setError: (name?: string, label?: FieldLabelProps, error?: ErrorOption) => void;
+}
+export declare const ErrorGroupContext: React.Context<ErrorGroupContextType | null>;
+export interface ErrorGroupProps {
+    children: React.ReactNode;
+    screenSize?: Breakpoints | undefined;
+    fieldOrder?: any[];
+}
+export declare const ErrorGroup: React.FC<ErrorGroupProps>;
+export default ErrorGroup;

package/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,OAAO,SAAS,eAAe,WAAW,gBAAgB;AAG1D,SAAS,MAAM,gBAAgB;AAC/B,SAAS,oBAAoB;AAC7B,SAAS,sBAAsB;AAC/B,SAAS,YAAY;AACrB,SAAS,eAAe;AACxB,SAAS,YAAY;AASd,MAAM,oBAAoB;AAAA,EAC/B;AACF;AAQO,MAAM,aAAwC,CAAC;AAAA,EACpD;AAAA,EACA;AAAA,EACA;AACF,MAAM;AACJ,QAAM,CAAC,QAAQ,SAAS,IAAI,SAAsB,CAAC,CAAC;AACpD,QAAM,EAAE,EAAE,IAAI,eAAe;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,YAAU,MAAM;AACd,cAAU,CAAC,CAAC;AAAA,EACd,GAAG,CAAC,UAAU,CAAC;AACf,SACE,oCAAC,kBAAkB,UAAlB,EAA2B,OAAO,EAAE,SAAS,KAC3C,OAAO,KAAK,MAAM,EAAE,WAAW,KAC9B,oCAAC,gBAAa,SAAQ,iBACpB,oCAAC,WAAQ,MAAK,QAAK,uNACyB,GAC5C,GACA,oCAAC,QAAK,WAAU,aACZ,cAAc,OAAO,KAAK,MAAM,EAAE,QAAQ,GACzC,OAAO,CAAC,cAAc,OAAO,SAAS,CAAC,EACvC,IAAI,CAAC,WAAW,UAAU;AACzB,WACE,oCAAC,YAAS,KAAK,OAAO,IAAI,GAAG,SAAS,YACpC,oCAAC,QAAK,IAAG,OAAK,EAAE,OAAO,SAAS,GAAG,KAAK,GAAE,GAAC,GAAQ,KACnD,oCAAC,QAAK,MAAM,IAAI,SAAS,MACtB,EAAE,OAAO,SAAS,GAAG,OAAO,CAC/B,CACF;AAAA,EAEJ,CAAC,CACL,CACF,GAED,QACH;AAEJ;AAEA,IAAO,qBAAQ;",
+  "names": []
+}

package/Field/FieldBase/index.js

@@ -1,81 +1,120 @@
-import _extends from "@babel/runtime/helpers/extends";
-import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["required", "name", "component", "wrapper", "control", "type", "controlled", "enabled", "editable", "defaultValue", "label", "extra", "layout", "error", "register"];
-import React from 'react';
-import { Controller } from 'react-hook-form';
-import FieldBaseContainer from '@digigov/form/Field/FieldBaseContainer';
-export var FieldBase = function FieldBase(props) {
-  var required = props.required,
-    name = props.name,
-    Component = props.component,
-    wrapper = props.wrapper,
-    control = props.control,
-    type = props.type,
-    _props$controlled = props.controlled,
-    controlled = _props$controlled === void 0 ? false : _props$controlled,
-    _props$enabled = props.enabled,
-    enabled = _props$enabled === void 0 ? true : _props$enabled,
-    editable = props.editable,
-    defaultValue = props.defaultValue,
-    label = props.label,
-    _props$extra = props.extra,
-    extra = _props$extra === void 0 ? {} : _props$extra,
-    layout = props.layout,
-    error = props.error,
-    register = props.register,
-    componentProps = _objectWithoutProperties(props, _excluded);
+import React, { useContext, useEffect } from "react";
+import { Controller } from "react-hook-form";
+import { ErrorGroupContext } from "@digigov/form/Field/ErrorGroup";
+import FieldBaseContainer from "@digigov/form/Field/FieldBaseContainer";
+const FieldBase = ({
+  required,
+  name,
+  component: Component,
+  wrapper,
+  control,
+  type,
+  controlled = false,
+  enabled = true,
+  editable,
+  defaultValue,
+  label,
+  extra = {},
+  layout,
+  error,
+  register,
+  ...componentProps
+}) => {
+  const errorGroupContext = useContext(ErrorGroupContext);
+  useEffect(() => {
+    if (errorGroupContext) {
+      errorGroupContext.setError(name, label, error);
+    }
+  }, [error, name, errorGroupContext?.setError]);
   if (!enabled) {
     return null;
   }
   if (controlled) {
-    return /*#__PURE__*/React.createElement(FieldBaseContainer, {
-      label: label,
-      layout: layout,
-      error: error,
-      wrapper: wrapper,
-      name: name
-    }, /*#__PURE__*/React.createElement(Controller, {
-      control: control,
-      name: name,
-      render: function render(_ref) {
-        var field = _ref.field;
-        return /*#__PURE__*/React.createElement(Component, _extends({}, field, {
-          defaultValue: defaultValue,
-          extra: extra,
-          error: !!error,
-          type: type,
-          "aria-required": !!required,
-          "aria-describedby": error && "".concat(name, "-error"),
-          required: required,
-          disabled: editable === false
-        }, componentProps));
-      }
-    }));
+    return /* @__PURE__ */ React.createElement(
+      FieldBaseContainer,
+      {
+        label,
+        layout,
+        register,
+        error: errorGroupContext ? void 0 : error,
+        hasError: !!error,
+        wrapper,
+        name,
+        controlled
+      },
+      /* @__PURE__ */ React.createElement(
+        Controller,
+        {
+          control,
+          name,
+          render: ({ field }) => {
+            return /* @__PURE__ */ React.createElement(
+              Component,
+              {
+                ...field,
+                control,
+                defaultValue: defaultValue ?? field.value,
+                extra,
+                error: !!error,
+                type,
+                "aria-required": !!required,
+                "aria-describedby": error && `${name}-error`,
+                required,
+                disabled: editable === false,
+                ...componentProps
+              }
+            );
+          }
+        }
+      )
+    );
   }
-  return /*#__PURE__*/React.createElement(FieldBaseContainer, {
-    label: label,
-    layout: layout,
-    error: error,
-    wrapper: wrapper,
-    name: name
-  }, Component !== null && Component !== void 0 && Component.render ? /*#__PURE__*/React.createElement(Component, _extends({}, register(name), {
-    control: control,
-    error: !!error,
-    extra: extra,
-    type: type,
-    "aria-required": !!required,
-    "aria-describedby": error && "".concat(name, "-error"),
-    required: required,
-    disabled: editable === false
-  }, componentProps)) : /*#__PURE__*/React.createElement(Component, _extends({}, register(name), {
-    register: register,
-    control: control,
-    error: !!error,
-    extra: extra,
-    type: type,
-    "aria-required": !!required,
-    "aria-describedby": error && "".concat(name, "-error"),
-    required: required,
-    disabled: editable === false
-  }, componentProps)));
-};
+  return /* @__PURE__ */ React.createElement(
+    FieldBaseContainer,
+    {
+      label,
+      layout,
+      register,
+      error: errorGroupContext ? void 0 : error,
+      hasError: !!error,
+      wrapper,
+      name
+    },
+    Component?.render ? /* @__PURE__ */ React.createElement(
+      Component,
+      {
+        ...register(name),
+        control,
+        error: !!error,
+        extra,
+        type,
+        "aria-required": !!required,
+        "aria-describedby": error && `${name}-error`,
+        required,
+        disabled: editable === false,
+        defaultValue,
+        ...componentProps
+      }
+    ) : /* @__PURE__ */ React.createElement(
+      Component,
+      {
+        ...register(name),
+        register,
+        control,
+        error: !!error,
+        extra,
+        type,
+        defaultValue,
+        "aria-required": !!required,
+        "aria-describedby": error && `${name}-error`,
+        required,
+        disabled: editable === false,
+        ...componentProps
+      }
+    )
+  );
+};
+export {
+  FieldBase
+};
+//# sourceMappingURL=FieldBase.js.map

package/Field/FieldBase.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-import { FieldBaseProps } from '@digigov/form/Field/types';
+import type { FieldBaseProps } from '@digigov/form/Field/types';
 export declare const FieldBase: React.FC<FieldBaseProps>;

package/Field/FieldBase.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/Field/FieldBase.tsx"],
+  "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  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                {...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,OAAO,SAAS,YAAY,iBAAiB;AAC7C,SAAS,kBAAkB;AAC3B,SAAS,yBAAyB;AAClC,OAAO,wBAAwB;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,GAAG;AACL,MAAM;AACJ,QAAM,oBAAoB,WAAW,iBAAiB;AAEtD,YAAU,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;AAAA,MAAC;AAAA;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;AAAA,QAAC;AAAA;AAAA,UACC;AAAA,UACA;AAAA,UACA,QAAQ,CAAC,EAAE,MAAM,MAAM;AACrB,mBACE;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,gBACtB,GAAG;AAAA;AAAA,YACN;AAAA,UAEJ;AAAA;AAAA,MACF;AAAA,IACF;AAAA,EAEJ;AAEA,SACE;AAAA,IAAC;AAAA;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;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;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": []
+}

package/Field/FieldBaseContainer/index.js

@@ -1,40 +1,52 @@
-import _extends from "@babel/runtime/helpers/extends";
-import React from 'react';
-import Label from '@digigov/form/inputs/Label';
-import ErrorMessage from '@digigov/react-core/ErrorMessage';
-import FieldContainer from '@digigov/react-core/FieldContainer';
-import CoreFieldset from '@digigov/react-core/Fieldset';
-import FieldsetLegend from '@digigov/react-core/FieldsetLegend';
-import Hint from '@digigov/react-core/Hint';
-import LabelContainer from '@digigov/react-core/LabelContainer';
-import { useTranslation } from '@digigov/ui/i18n';
-export var FieldBaseContainer = function FieldBaseContainer(_ref) {
-  var name = _ref.name,
-    wrapper = _ref.wrapper,
-    label = _ref.label,
-    children = _ref.children,
-    error = _ref.error,
-    layout = _ref.layout;
-  var _useTranslation = useTranslation(),
-    t = _useTranslation.t;
-  var errorMessage = error !== null && error !== void 0 && error.message.key ? error.message.key : (error === null || error === void 0 ? void 0 : error.message) || '';
-  var errorContext = (error === null || error === void 0 ? void 0 : error.message.context) || {};
-  if (wrapper === 'fieldset') {
-    return /*#__PURE__*/React.createElement(FieldContainer, _extends({
-      error: !!error
-    }, layout), /*#__PURE__*/React.createElement(CoreFieldset, null, /*#__PURE__*/React.createElement(FieldsetLegend, {
-      size: "sm"
-    }, label && label.primary), label && label.secondary && /*#__PURE__*/React.createElement(Hint, null, t(label.secondary)), error && /*#__PURE__*/React.createElement(ErrorMessage, {
-      id: "".concat(name, "-error")
-    }, t(errorMessage, errorContext)), children));
-  } else {
-    return /*#__PURE__*/React.createElement(FieldContainer, _extends({
-      error: !!error
-    }, layout), /*#__PURE__*/React.createElement(LabelContainer, null, label && /*#__PURE__*/React.createElement(Label, {
-      label: label
-    }), error && /*#__PURE__*/React.createElement(ErrorMessage, {
-      id: "".concat(name, "-error")
-    }, t(errorMessage, errorContext)), children));
+import React from "react";
+import Label from "@digigov/form/inputs/Label";
+import { ErrorMessage } from "@digigov/react-core/ErrorMessage";
+import FieldContainer from "@digigov/react-core/FieldContainer";
+import Fieldset from "@digigov/react-core/Fieldset";
+import FieldsetLegend from "@digigov/react-core/FieldsetLegend";
+import LabelContainer from "@digigov/react-core/LabelContainer";
+import { useTranslation } from "@digigov/ui/i18n";
+import { Hint } from "@digigov/ui/typography/Hint";
+const FieldBaseContainer = React.forwardRef(
+  ({
+    name,
+    wrapper,
+    label,
+    children,
+    error,
+    hasError,
+    layout,
+    controlled,
+    labelSize = "sm"
+  }, ref) => {
+    const { t } = useTranslation();
+    const errorMessage = error?.message.key ? error.message.key : error?.message || "";
+    const errorContext = error?.message.context || {};
+    if (wrapper === "fieldset") {
+      return /* @__PURE__ */ React.createElement(FieldContainer, { error: hasError, ...layout }, /* @__PURE__ */ React.createElement(
+        Fieldset,
+        {
+          ref,
+          className: "outline-none",
+          ...controlled && {
+            tabIndex: -1
+          }
+        },
+        /* @__PURE__ */ React.createElement(FieldsetLegend, { size: labelSize }, label && label.primary),
+        label && label.secondary && /* @__PURE__ */ React.createElement(Hint, null, t(label.secondary)),
+        error && /* @__PURE__ */ React.createElement(ErrorMessage, { id: `${name}-error` }, t(errorMessage, errorContext)),
+        children,
+        label && label.hint && /* @__PURE__ */ React.createElement(Hint, { size: "sm" }, label.hint)
+      ));
+    } else {
+      return /* @__PURE__ */ React.createElement(FieldContainer, { error: hasError, ...layout }, /* @__PURE__ */ React.createElement(LabelContainer, null, label && /* @__PURE__ */ React.createElement(Label, { label }), error && /* @__PURE__ */ React.createElement(ErrorMessage, { id: `${name}-error` }, t(errorMessage, errorContext)), children, label && label.hint && /* @__PURE__ */ React.createElement(Hint, { size: "sm" }, label.hint)));
+    }
   }
+);
+FieldBaseContainer.displayName = "FieldBaseContainer";
+var FieldBaseContainer_default = FieldBaseContainer;
+export {
+  FieldBaseContainer,
+  FieldBaseContainer_default as default
 };
-export default FieldBaseContainer;
+//# sourceMappingURL=FieldBaseContainer.js.map

package/Field/FieldBaseContainer.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
-import { FieldContainerProps } from '@digigov/form/Field/types';
-export declare const FieldBaseContainer: React.FC<FieldContainerProps>;
+import type { FieldContainerProps } from '@digigov/form/Field/types';
+export declare const FieldBaseContainer: React.ForwardRefExoticComponent<FieldContainerProps & React.RefAttributes<HTMLFieldSetElement>>;
 export default FieldBaseContainer;

package/Field/FieldBaseContainer.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/Field/FieldBaseContainer.tsx"],
+  "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": "AACA,OAAO,WAAW;AAElB,OAAO,WAAW;AAClB,SAAS,oBAAoB;AAC7B,OAAO,oBAAoB;AAC3B,OAAO,cAAc;AACrB,OAAO,oBAAoB;AAC3B,OAAO,oBAAoB;AAC3B,SAAS,sBAAsB;AAC/B,SAAS,YAAY;AAEd,MAAM,qBAAqB,MAAM;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,IAAI,eAAe;AAC7B,UAAM,eAAe,OAAO,QAAQ,MAChC,MAAM,QAAQ,MACd,OAAO,WAAW;AACtB,UAAM,eAAe,OAAO,QAAQ,WAAW,CAAC;AAChD,QAAI,YAAY,YAAY;AAC1B,aACE,oCAAC,kBAAe,OAAO,UAAW,GAAG,UACnC;AAAA,QAAC;AAAA;AAAA,UACC;AAAA,UACA,WAAU;AAAA,UACT,GAAI,cAAc;AAAA,YACjB,UAAU;AAAA,UACZ;AAAA;AAAA,QAEA,oCAAC,kBAAe,MAAM,aACnB,SAAS,MAAM,OAClB;AAAA,QACC,SAAS,MAAM,aAAa,oCAAC,YAAM,EAAE,MAAM,SAAS,CAAE;AAAA,QACtD,SACC,oCAAC,gBAAa,IAAI,GAAG,IAAI,YACtB,EAAE,cAAc,YAAY,CAC/B;AAAA,QAED;AAAA,QACA,SAAS,MAAM,QAAQ,oCAAC,QAAK,MAAK,QAAM,MAAM,IAAK;AAAA,MACtD,CACF;AAAA,IAEJ,OAAO;AACL,aACE,oCAAC,kBAAe,OAAO,UAAW,GAAG,UACnC,oCAAC,sBACE,SAAS,oCAAC,SAAM,OAAc,GAC9B,SACC,oCAAC,gBAAa,IAAI,GAAG,IAAI,YACtB,EAAE,cAAc,YAAY,CAC/B,GAED,UACA,SAAS,MAAM,QAAQ,oCAAC,QAAK,MAAK,QAAM,MAAM,IAAK,CACtD,CACF;AAAA,IAEJ;AAAA,EACF;AACF;AAEA,mBAAmB,cAAc;AAEjC,IAAO,6BAAQ;",
+  "names": []
+}

package/Field/FieldConditional/index.js

@@ -1,59 +1,89 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _extends from "@babel/runtime/helpers/extends";
-import React from 'react';
-import { useWatch } from 'react-hook-form';
-import { FieldBase } from '@digigov/form/Field/FieldBase';
-import { evaluateFieldWithConditions } from '@digigov/form/Field/utils';
-var ChildFieldMemo = /*#__PURE__*/React.memo(function ChildField(_ref) {
-  var dependencies = _ref.dependencies,
-    field = _ref.field,
-    control = _ref.control,
-    reset = _ref.reset,
-    register = _ref.register,
-    error = _ref.error;
-  var newField = evaluateFieldWithConditions(field, dependencies);
-  return /*#__PURE__*/React.createElement(FieldBase, _extends({}, newField, {
-    name: newField.key,
-    reset: reset,
-    control: control,
-    register: register,
-    error: error
-  }));
-}, function (prev, next) {
-  if (!prev || !prev.dependencies) {
-    return false;
-  }
-  if (prev.error !== next.error) {
-    return false;
-  }
-  for (var dep in next.dependencies) {
-    if (next.dependencies[dep] !== prev.dependencies[dep]) {
+import React from "react";
+import { useWatch } from "react-hook-form";
+import { FieldBase } from "@digigov/form/Field/FieldBase";
+import { evaluateFieldWithConditions } from "@digigov/form/Field/utils/evaluateFieldWithConditions";
+const ChildFieldMemo = React.memo(
+  function ChildField({
+    dependencies,
+    field,
+    control,
+    reset,
+    resetField,
+    register,
+    error,
+    Field
+  }) {
+    const newField = evaluateFieldWithConditions(
+      field,
+      dependencies
+    );
+    return /* @__PURE__ */ React.createElement(
+      FieldBase,
+      {
+        ...newField,
+        Field,
+        name: newField.key,
+        reset,
+        resetField,
+        control,
+        register,
+        error
+      }
+    );
+  },
+  (prev, next) => {
+    if (!prev || !prev.dependencies) {
+      return false;
+    }
+    if (prev.error !== next.error) {
       return false;
     }
+    for (const dep in next.dependencies) {
+      if (next.dependencies[dep] !== prev.dependencies[dep]) {
+        return false;
+      }
+    }
+    return true;
   }
-  return true;
-});
-export var FieldConditional = function FieldConditional(_ref2) {
-  var control = _ref2.control,
-    field = _ref2.field,
-    register = _ref2.register,
-    reset = _ref2.reset,
-    error = _ref2.error;
-  var dependencyKeys = Object.keys(field.condition);
-  var dependencyValues = useWatch({
+);
+const FieldConditional = ({
+  control,
+  field,
+  register,
+  reset,
+  resetField,
+  error,
+  Field
+}) => {
+  const dependencyKeys = Object.keys(field.condition);
+  const dependencyValues = useWatch({
     name: dependencyKeys,
-    control: control
-  });
-  var variables = dependencyKeys.reduce(function (data, fieldKey, index) {
-    return _extends({}, data, _defineProperty({}, fieldKey, dependencyValues[index]));
-  }, {});
-  return /*#__PURE__*/React.createElement(ChildFieldMemo, {
-    dependencies: variables,
-    field: field,
-    control: control,
-    register: register,
-    reset: reset,
-    error: error
+    control
   });
+  const variables = dependencyKeys.reduce(
+    (data, fieldKey, index) => ({
+      ...data,
+      [fieldKey]: dependencyValues[index]
+    }),
+    {}
+  );
+  return /* @__PURE__ */ React.createElement(
+    ChildFieldMemo,
+    {
+      dependencies: variables,
+      field,
+      control,
+      register,
+      reset,
+      resetField,
+      error,
+      Field
+    }
+  );
+};
+var FieldConditional_default = FieldConditional;
+export {
+  FieldConditional,
+  FieldConditional_default as default
 };
-export default FieldConditional;
+//# sourceMappingURL=FieldConditional.js.map

package/Field/FieldConditional.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
-import { FieldConditionalProps } from '@digigov/form/Field/types';
+import type { FieldConditionalProps } from '@digigov/form/Field/types';
 export declare const FieldConditional: React.FC<FieldConditionalProps>;
 export default FieldConditional;

package/Field/FieldConditional.js.map

@@ -0,0 +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 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,OAAO,WAAW;AAClB,SAAS,gBAAgB;AACzB,SAAS,iBAAiB;AAK1B,SAAS,mCAAmC;AAE5C,MAAM,iBAAiB,MAAM;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,WAAW;AAAA,MACf;AAAA,MACA;AAAA,IACF;AACA,WACE;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,mBAAmB,SAAS;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;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": []
+}

package/Field/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
-import { FieldProps } from '@digigov/form/Field/types';
+import type { FieldProps } from '@digigov/form/Field/types';
 export declare const Field: React.FC<FieldProps>;
 export default Field;