@digigov/form 1.2.0-dcbd7ded → 2.0.0-0138f8bd

package/cjs/FieldArray/index.js

@@ -1,68 +1,126 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
+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 FieldArray_exports = {};
+__export(FieldArray_exports, {
+  FieldArray: () => FieldArray,
+  default: () => FieldArray_default
 });
-exports["default"] = exports.FieldArray = void 0;
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _react = _interopRequireDefault(require("react"));
-var _reactHookForm = require("react-hook-form");
-var _FieldBaseContainer = _interopRequireDefault(require("@digigov/form/Field/FieldBaseContainer"));
-var _FieldObject = _interopRequireDefault(require("@digigov/form/FieldObject"));
-var _Fieldset = require("@digigov/form/Fieldset");
-var _Fieldset2 = _interopRequireDefault(require("@digigov/react-core/cjs/Fieldset"));
-var _ui = require("@digigov/ui");
-var _excluded = ["name", "register", "control", "formState", "error", "layout", "label"];
-var FieldArray = exports.FieldArray = function FieldArray(_ref) {
-  var _customField$extra, _customField$extra$la, _customField$extra4, _customField$extra4$l;
-  var name = _ref.name,
-    register = _ref.register,
-    control = _ref.control,
-    formState = _ref.formState,
-    error = _ref.error,
-    layout = _ref.layout,
-    label = _ref.label,
-    customField = (0, _objectWithoutProperties2["default"])(_ref, _excluded);
-  var _useFieldArray = (0, _reactHookForm.useFieldArray)({
-      control: control,
-      name: name
-    }),
-    fields = _useFieldArray.fields,
-    append = _useFieldArray.append,
-    remove = _useFieldArray.remove;
-  return /*#__PURE__*/_react["default"].createElement(_FieldBaseContainer["default"], {
-    label: label,
-    layout: layout,
-    error: formState.isSubmitted && !formState.isSubmitting && error !== null && error !== void 0 && error.message && error ? error : undefined,
-    wrapper: "fieldset",
-    name: name
-  }, fields.length === 0 && /*#__PURE__*/_react["default"].createElement(_ui.Hint, null, (_customField$extra = customField.extra) === null || _customField$extra === void 0 ? void 0 : (_customField$extra$la = _customField$extra.label.object) === null || _customField$extra$la === void 0 ? void 0 : _customField$extra$la.nothing_added), fields.map(function (field, index) {
-    var _customField$extra2, _customField$extra3;
-    return /*#__PURE__*/_react["default"].createElement(_ui.Card, {
-      variant: "border",
-      key: field.id
-    }, /*#__PURE__*/_react["default"].createElement(_Fieldset2["default"], null, /*#__PURE__*/_react["default"].createElement(_Fieldset.FieldsetLabel, null, (_customField$extra2 = customField.extra) === null || _customField$extra2 === void 0 ? void 0 : _customField$extra2.label.object.title, " ", index + 1), /*#__PURE__*/_react["default"].createElement(_FieldObject["default"], (0, _extends2["default"])({
-      name: "".concat(name, ".").concat(index),
-      error: Array.isArray(error) && error[index],
-      formState: formState,
-      register: register,
-      control: control
-    }, (_customField$extra3 = customField.extra) === null || _customField$extra3 === void 0 ? void 0 : _customField$extra3.of)), /*#__PURE__*/_react["default"].createElement(_ui.Button, {
-      type: "button",
-      color: "warning",
-      onClick: function onClick() {
-        return remove(index);
-      }
-    }, "Remove")));
-  }), /*#__PURE__*/_react["default"].createElement(_ui.Button, {
-    type: "button",
-    color: "secondary",
-    onClick: function onClick(ev) {
-      ev.preventDefault();
-      append({});
+module.exports = __toCommonJS(FieldArray_exports);
+var import_react = __toESM(require("react"));
+var import_FieldBaseContainer = require("@digigov/form/Field/FieldBaseContainer");
+var import_BaseFieldArray = __toESM(require("@digigov/form/FieldArray/BaseFieldArray"));
+var import_FormDialog = require("@digigov/form/FieldArray/FormDialog");
+const FieldArray = ({
+  name,
+  trigger,
+  register,
+  clearErrors,
+  control,
+  formState,
+  error,
+  getValues,
+  setValue,
+  layout,
+  reset,
+  resetField,
+  label,
+  Field,
+  registerFieldFocus,
+  ...customField
+}) => {
+  const buttonRef = (0, import_react.useRef)(null);
+  (0, import_react.useEffect)(() => {
+    let unregister = () => {
+    };
+    if (buttonRef.current) {
+      unregister = registerFieldFocus(name, buttonRef.current);
     }
-  }, (_customField$extra4 = customField.extra) === null || _customField$extra4 === void 0 ? void 0 : (_customField$extra4$l = _customField$extra4.label.object) === null || _customField$extra4$l === void 0 ? void 0 : _customField$extra4$l.add));
+    return () => {
+      unregister(name);
+    };
+  }, [name, registerFieldFocus]);
+  const hasItemErrors = !!error && Object.keys(error).some((key) => /^\d+$/.test(key));
+  (0, import_react.useEffect)(() => {
+    if (!hasItemErrors) clearErrors(name);
+  }, [clearErrors, hasItemErrors, name]);
+  return /* @__PURE__ */ import_react.default.createElement(
+    import_FieldBaseContainer.FieldBaseContainer,
+    {
+      label,
+      layout,
+      register,
+      error: error?.message ? error : void 0,
+      hasError: !!error,
+      wrapper: "fieldset",
+      name,
+      labelSize: customField.extra?.labelSize,
+      controlled: true
+    },
+    customField.extra?.variant === "dialog" ? /* @__PURE__ */ import_react.default.createElement(
+      import_FormDialog.FormDialog,
+      {
+        ref: buttonRef,
+        name,
+        trigger,
+        register,
+        clearErrors,
+        control,
+        formState,
+        error,
+        getValues,
+        setValue,
+        layout,
+        label,
+        Field,
+        reset,
+        resetField,
+        sortable: customField.extra.sortable,
+        ...customField
+      }
+    ) : /* @__PURE__ */ import_react.default.createElement(
+      import_BaseFieldArray.default,
+      {
+        ref: buttonRef,
+        name,
+        register,
+        control,
+        formState,
+        error,
+        getValues,
+        Field,
+        ...customField
+      }
+    )
+  );
 };
-var _default = exports["default"] = FieldArray;
+var FieldArray_default = FieldArray;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  FieldArray
+});
+//# sourceMappingURL=index.js.map

package/cjs/FieldArray/index.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/FieldArray/index.tsx"],
+  "sourcesContent": ["import React, { useEffect, useRef } from 'react';\nimport type { ErrorOption, UseFormReturn } from 'react-hook-form';\nimport { FieldBaseContainer } from '@digigov/form/Field/FieldBaseContainer';\nimport type { FieldProps } from '@digigov/form/Field/types';\nimport BaseFieldArray from '@digigov/form/FieldArray/BaseFieldArray';\nimport { FormDialog } from '@digigov/form/FieldArray/FormDialog';\nimport type { registerFieldFocus } from '@digigov/form/types';\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  registerFieldFocus: registerFieldFocus;\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  registerFieldFocus,\n  ...customField\n}) => {\n  /** The ref of the add-button */\n  const buttonRef = useRef<HTMLButtonElement | null>(null);\n\n  // Register the button to be focusable\n  useEffect(() => {\n    let unregister: (name: string) => void = () => {};\n    if (buttonRef.current) {\n      unregister = registerFieldFocus(name, buttonRef.current);\n    }\n\n    return () => {\n      unregister(name);\n    };\n  }, [name, registerFieldFocus]);\n\n  // Clear container error when there are no item errors\n  const hasItemErrors: boolean =\n    !!error && Object.keys(error).some((key) => /^\\d+$/.test(key));\n  useEffect(() => {\n    if (!hasItemErrors) clearErrors(name);\n  }, [clearErrors, hasItemErrors, name]);\n\n  return (\n    <FieldBaseContainer\n      label={label}\n      layout={layout}\n      register={register}\n      error={error?.message ? error : undefined}\n      hasError={!!error}\n      wrapper=\"fieldset\"\n      name={name}\n      labelSize={customField.extra?.labelSize}\n      controlled={true}\n    >\n      {customField.extra?.variant === 'dialog' ? (\n        <FormDialog\n          ref={buttonRef}\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        <BaseFieldArray\n          ref={buttonRef}\n          name={name}\n          register={register}\n          control={control}\n          formState={formState}\n          error={error}\n          getValues={getValues}\n          Field={Field}\n          {...customField}\n        />\n      )}\n    </FieldBaseContainer>\n  );\n};\n\nexport default FieldArray;\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAyC;AAEzC,gCAAmC;AAEnC,4BAA2B;AAC3B,wBAA2B;AAiBpB,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;AAAA,EACA,GAAG;AACL,MAAM;AAEJ,QAAM,gBAAY,qBAAiC,IAAI;AAGvD,8BAAU,MAAM;AACd,QAAI,aAAqC,MAAM;AAAA,IAAC;AAChD,QAAI,UAAU,SAAS;AACrB,mBAAa,mBAAmB,MAAM,UAAU,OAAO;AAAA,IACzD;AAEA,WAAO,MAAM;AACX,iBAAW,IAAI;AAAA,IACjB;AAAA,EACF,GAAG,CAAC,MAAM,kBAAkB,CAAC;AAG7B,QAAM,gBACJ,CAAC,CAAC,SAAS,OAAO,KAAK,KAAK,EAAE,KAAK,CAAC,QAAQ,QAAQ,KAAK,GAAG,CAAC;AAC/D,8BAAU,MAAM;AACd,QAAI,CAAC,cAAe,aAAY,IAAI;AAAA,EACtC,GAAG,CAAC,aAAa,eAAe,IAAI,CAAC;AAErC,SACE,6BAAAA,QAAA;AAAA,IAAC;AAAA;AAAA,MACC;AAAA,MACA;AAAA,MACA;AAAA,MACA,OAAO,OAAO,UAAU,QAAQ;AAAA,MAChC,UAAU,CAAC,CAAC;AAAA,MACZ,SAAQ;AAAA,MACR;AAAA,MACA,WAAW,YAAY,OAAO;AAAA,MAC9B,YAAY;AAAA;AAAA,IAEX,YAAY,OAAO,YAAY,WAC9B,6BAAAA,QAAA;AAAA,MAAC;AAAA;AAAA,QACC,KAAK;AAAA,QACL;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA,UAAU,YAAY,MAAM;AAAA,QAC3B,GAAG;AAAA;AAAA,IACN,IAEA,6BAAAA,QAAA;AAAA,MAAC,sBAAAC;AAAA,MAAA;AAAA,QACC,KAAK;AAAA,QACL;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACC,GAAG;AAAA;AAAA,IACN;AAAA,EAEJ;AAEJ;AAEA,IAAO,qBAAQ;",
+  "names": ["React", "BaseFieldArray"]
+}

package/cjs/FieldObject/index.js

@@ -1,64 +1,113 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
-Object.defineProperty(exports, "__esModule", {
-  value: true
+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 FieldObject_exports = {};
+__export(FieldObject_exports, {
+  FieldObject: () => FieldObject,
+  default: () => FieldObject_default
 });
-exports["default"] = exports.FieldObject = void 0;
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _react = _interopRequireWildcard(require("react"));
-var _FieldBase = require("@digigov/form/Field/FieldBase");
-var _utils = require("@digigov/form/Field/utils");
-var _Fieldset = _interopRequireWildcard(require("@digigov/form/Fieldset"));
-var _FieldsetLegend = require("@digigov/react-core/cjs/FieldsetLegend");
-var _i18n = require("@digigov/ui/cjs/i18n");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
-var FieldObject = exports.FieldObject = function FieldObject(_ref) {
-  var name = _ref.name,
-    label = _ref.label,
-    extra = _ref.extra,
-    control = _ref.control,
-    register = _ref.register,
-    reset = _ref.reset,
-    formState = _ref.formState;
-  var _useTranslation = (0, _i18n.useTranslation)(),
-    t = _useTranslation.t;
-  return /*#__PURE__*/_react["default"].createElement(_Fieldset["default"], null, (label === null || label === void 0 ? void 0 : label.primary) && /*#__PURE__*/_react["default"].createElement(_FieldsetLegend.FieldsetLegend, {
-    size: "sm"
-  }, t(label.primary)), (label === null || label === void 0 ? void 0 : label.secondary) && /*#__PURE__*/_react["default"].createElement(_Fieldset.FieldsetCaption, null, t(label.secondary)), extra === null || extra === void 0 ? void 0 : extra.fields.map(function (field) {
-    return /*#__PURE__*/_react["default"].createElement(FieldObjectItem, {
-      key: "".concat(name, ".").concat(field.key),
-      name: "".concat(name, ".").concat(field.key),
-      control: control,
-      register: register,
-      reset: reset,
-      field: field,
-      error: formState.errors && formState.errors[field.key],
-      formState: formState
-    });
-  }));
+module.exports = __toCommonJS(FieldObject_exports);
+var import_react = __toESM(require("react"));
+var import_FieldBase = require("@digigov/form/Field/FieldBase");
+var import_resolveField = require("@digigov/form/Field/utils/resolveField");
+var import_Fieldset = require("@digigov/form/Fieldset");
+var import_FieldContainer = require("@digigov/ui/form/FieldContainer");
+var import_i18n = require("@digigov/ui/i18n");
+const FieldObject = ({
+  name,
+  label,
+  extra,
+  control,
+  register,
+  reset,
+  resetField,
+  formState,
+  error,
+  defaultValue,
+  Field
+}) => {
+  const { t } = (0, import_i18n.useTranslation)();
+  return /* @__PURE__ */ import_react.default.createElement(import_Fieldset.Fieldset, null, label?.primary && /* @__PURE__ */ import_react.default.createElement(import_FieldContainer.FieldsetLegend, { size: "sm", marginBottom: 3 }, t(label.primary)), label?.secondary && /* @__PURE__ */ import_react.default.createElement(import_Fieldset.FieldsetCaption, { marginBottom: 3 }, t(label.secondary)), extra?.fields.map((field) => /* @__PURE__ */ import_react.default.createElement(
+    FieldObjectItem,
+    {
+      key: `${name ? name + "." : ""}${field.key ? `${field.key}` : ""}`,
+      name: `${name ? name + "." : ""}${field.key ? `${field.key}` : ""}`,
+      control,
+      register,
+      reset,
+      resetField,
+      field,
+      error: error && error[field.key],
+      formState,
+      defaultValue: defaultValue?.[field.key] || void 0,
+      Field
+    }
+  )));
 };
-var FieldObjectItem = function FieldObjectItem(_ref2) {
-  var name = _ref2.name,
-    children = _ref2.children,
-    field = _ref2.field,
-    error = _ref2.error,
-    control = _ref2.control,
-    formState = _ref2.formState,
-    reset = _ref2.reset,
-    register = _ref2.register;
-  var calculatedField = (0, _react.useMemo)(function () {
-    return (0, _utils.calculateField)(children, field);
-  }, [field]);
-  var customError = error ? error : formState === null || formState === void 0 ? void 0 : formState.errors[name];
-  return /*#__PURE__*/_react["default"].createElement(_FieldBase.FieldBase, (0, _extends2["default"])({}, calculatedField, {
-    name: name,
-    control: control,
-    reset: reset,
-    register: register,
-    error: customError
-  }));
+const FieldObjectItem = ({
+  name,
+  children,
+  field,
+  error,
+  control,
+  formState,
+  reset,
+  resetField,
+  register,
+  defaultValue,
+  Field
+}) => {
+  const resolvedField = (0, import_react.useMemo)(() => (0, import_resolveField.resolveField)(children, field), [field]);
+  if (Field) {
+    if (!field.type) {
+      field.type = "string";
+    }
+    return /* @__PURE__ */ import_react.default.createElement(Field, { ...field, name });
+  } else {
+    const customError = error ? error : formState?.errors[name];
+    return /* @__PURE__ */ import_react.default.createElement(
+      import_FieldBase.FieldBase,
+      {
+        ...resolvedField,
+        name,
+        Field,
+        control,
+        reset,
+        resetField,
+        register,
+        error: customError,
+        defaultValue
+      }
+    );
+  }
 };
-var _default = exports["default"] = FieldObject;
+var FieldObject_default = FieldObject;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  FieldObject
+});
+//# sourceMappingURL=index.js.map

package/cjs/FieldObject/index.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/FieldObject/index.tsx"],
+  "sourcesContent": ["import React, { useMemo } from 'react';\nimport type { ErrorOption, UseFormReturn } from 'react-hook-form';\nimport { FieldBase } from '@digigov/form/Field/FieldBase';\nimport type { FieldProps } from '@digigov/form/Field/types';\nimport { resolveField } from '@digigov/form/Field/utils/resolveField';\nimport { Fieldset, FieldsetCaption } from '@digigov/form/Fieldset';\nimport type { 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?: any;\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 ? name + '.' : ''}${field.key ? `${field.key}` : ''}`}\n          name={`${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 resolvedField = useMemo(() => resolveField(children, field), [field]);\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        {...resolvedField}\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;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA+B;AAE/B,uBAA0B;AAE1B,0BAA6B;AAC7B,sBAA0C;AAE1C,4BAA+B;AAC/B,kBAA+B;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,QAAI,4BAAe;AAE7B,SACE,6BAAAA,QAAA,cAAC,gCACE,OAAO,WACN,6BAAAA,QAAA,cAAC,wCAAe,MAAK,MAAK,cAAc,KACrC,EAAE,MAAM,OAAO,CAClB,GAED,OAAO,aACN,6BAAAA,QAAA,cAAC,mCAAgB,cAAc,KAAI,EAAE,MAAM,SAAS,CAAE,GAEvD,OAAO,OAAO,IAAI,CAAC,UAClB,6BAAAA,QAAA;AAAA,IAAC;AAAA;AAAA,MACC,KAAK,GAAG,OAAO,OAAO,MAAM,EAAE,GAAG,MAAM,MAAM,GAAG,MAAM,GAAG,KAAK,EAAE;AAAA,MAChE,MAAM,GAAG,OAAO,OAAO,MAAM,EAAE,GAAG,MAAM,MAAM,GAAG,MAAM,GAAG,KAAK,EAAE;AAAA,MACjE;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,oBAAgB,sBAAQ,UAAM,kCAAa,UAAU,KAAK,GAAG,CAAC,KAAK,CAAC;AAC1E,MAAI,OAAO;AACT,QAAI,CAAC,MAAM,MAAM;AACf,YAAM,OAAO;AAAA,IACf;AACA,WAAO,6BAAAA,QAAA,cAAC,SAAO,GAAG,OAAO,MAAY;AAAA,EACvC,OAAO;AACL,UAAM,cAAc,QAAQ,QAAQ,WAAW,OAAO,IAAI;AAC1D,WACE,6BAAAA,QAAA;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": ["React"]
+}

package/cjs/Fieldset/FieldsetWithContext/index.js

@@ -1,45 +1,59 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
-Object.defineProperty(exports, "__esModule", {
-  value: true
+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 FieldsetWithContext_exports = {};
+__export(FieldsetWithContext_exports, {
+  FieldsetWithContext: () => FieldsetWithContext
 });
-exports.FieldsetWithContext = void 0;
-var _react = _interopRequireWildcard(require("react"));
-var _Field = _interopRequireDefault(require("@digigov/form/Field"));
-var _Fieldset = require("@digigov/form/Fieldset/");
-var _FormContext = require("@digigov/form/FormContext");
-var _i18n = require("@digigov/ui/cjs/i18n");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
-var FieldsetWithContext = exports.FieldsetWithContext = function FieldsetWithContext(_ref) {
-  var name = _ref.name;
-  var _useFieldset = useFieldset(name),
-    label = _useFieldset.label,
-    body = _useFieldset.body,
-    fields = _useFieldset.fields;
-  var _useTranslation = (0, _i18n.useTranslation)(),
-    t = _useTranslation.t;
-  var _ref2 = /*#__PURE__*/_react["default"].createElement(_Fieldset.FieldsetBody, null, body);
-  return (0, _react.useMemo)(function () {
-    return /*#__PURE__*/_react["default"].createElement(_Fieldset.Fieldset, null, (label === null || label === void 0 ? void 0 : label.primary) && /*#__PURE__*/_react["default"].createElement(_Fieldset.FieldsetLabel, null, t(label.primary)), (label === null || label === void 0 ? void 0 : label.secondary) && /*#__PURE__*/_react["default"].createElement(_Fieldset.FieldsetCaption, null, t(label.secondary)), body && _ref2, fields.map(function (field) {
-      return /*#__PURE__*/_react["default"].createElement(_Field["default"], {
-        key: field,
-        name: field
-      });
-    }));
-  }, [label === null || label === void 0 ? void 0 : label.primary, label === null || label === void 0 ? void 0 : label.secondary, body, fields]);
+module.exports = __toCommonJS(FieldsetWithContext_exports);
+var import_react = __toESM(require("react"));
+var import_Field = __toESM(require("@digigov/form/Field"));
+var import_Fieldset = require("@digigov/form/Fieldset/");
+var import_FormContext = require("@digigov/form/FormContext");
+var import_i18n = require("@digigov/ui/i18n");
+const FieldsetWithContext = ({ name }) => {
+  const { label, body, fields } = useFieldset(name);
+  const { t } = (0, import_i18n.useTranslation)();
+  return (0, import_react.useMemo)(
+    () => /* @__PURE__ */ import_react.default.createElement(import_Fieldset.Fieldset, null, label?.primary && /* @__PURE__ */ import_react.default.createElement(import_Fieldset.FieldsetLabel, null, t(label.primary)), label?.secondary && /* @__PURE__ */ import_react.default.createElement(import_Fieldset.FieldsetCaption, null, t(label.secondary)), body && /* @__PURE__ */ import_react.default.createElement(import_Fieldset.FieldsetBody, null, body), fields.map((field) => /* @__PURE__ */ import_react.default.createElement(import_Field.default, { key: field, name: field }))),
+    [label?.primary, label?.secondary, body, fields]
+  );
 };
-var useFieldset = function useFieldset(name) {
-  var _useContext = (0, _react.useContext)(_FormContext.FormContext),
-    fieldsetsMap = _useContext.fieldsetsMap;
+const useFieldset = (name) => {
+  const { fieldsetsMap } = (0, import_react.useContext)(import_FormContext.FormContext);
   if (fieldsetsMap && fieldsetsMap[name]) {
-    return (0, _react.useMemo)(function () {
-      return fieldsetsMap[name];
-    }, [name]);
+    return (0, import_react.useMemo)(() => fieldsetsMap[name], [name]);
   } else {
-    if (!fieldsetsMap) throw new Error("Fieldsets is not defined");
-    throw new Error("No fieldset with name ".concat(name, " found"));
+    if (!fieldsetsMap) throw new Error(`Fieldsets is not defined`);
+    throw new Error(`No fieldset with name ${name} found`);
   }
-};
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  FieldsetWithContext
+});
+//# sourceMappingURL=FieldsetWithContext.js.map

package/cjs/Fieldset/FieldsetWithContext.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/Fieldset/FieldsetWithContext.tsx"],
+  "sourcesContent": ["import React, { useContext, useMemo } from 'react';\nimport Field from '@digigov/form/Field';\nimport {\n  Fieldset,\n  FieldsetLabel,\n  FieldsetCaption,\n  FieldsetBody,\n} from '@digigov/form/Fieldset/';\nimport { FormContext } from '@digigov/form/FormContext';\nimport type { FieldsetSpec } from '@digigov/form/types';\nimport { useTranslation } from '@digigov/ui/i18n';\n\nexport const FieldsetWithContext: React.FC<{ name: string }> = ({ name }) => {\n  const { label, body, fields } = useFieldset(name);\n  const { t } = useTranslation();\n  return useMemo(\n    () => (\n      <Fieldset>\n        {label?.primary && <FieldsetLabel>{t(label.primary)}</FieldsetLabel>}\n        {label?.secondary && (\n          <FieldsetCaption>{t(label.secondary)}</FieldsetCaption>\n        )}\n        {body && <FieldsetBody>{body}</FieldsetBody>}\n        {fields.map((field) => (\n          <Field key={field} name={field} />\n        ))}\n      </Fieldset>\n    ),\n    [label?.primary, label?.secondary, body, fields]\n  );\n};\n\nconst useFieldset = (name: string): FieldsetSpec => {\n  const { fieldsetsMap } = useContext(FormContext);\n  if (fieldsetsMap && fieldsetsMap[name]) {\n    return useMemo(() => fieldsetsMap[name], [name]);\n  } else {\n    if (!fieldsetsMap) throw new Error(`Fieldsets is not defined`);\n    throw new Error(`No fieldset with name ${name} found`);\n  }\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA2C;AAC3C,mBAAkB;AAClB,sBAKO;AACP,yBAA4B;AAE5B,kBAA+B;AAExB,MAAM,sBAAkD,CAAC,EAAE,KAAK,MAAM;AAC3E,QAAM,EAAE,OAAO,MAAM,OAAO,IAAI,YAAY,IAAI;AAChD,QAAM,EAAE,EAAE,QAAI,4BAAe;AAC7B,aAAO;AAAA,IACL,MACE,6BAAAA,QAAA,cAAC,gCACE,OAAO,WAAW,6BAAAA,QAAA,cAAC,qCAAe,EAAE,MAAM,OAAO,CAAE,GACnD,OAAO,aACN,6BAAAA,QAAA,cAAC,uCAAiB,EAAE,MAAM,SAAS,CAAE,GAEtC,QAAQ,6BAAAA,QAAA,cAAC,oCAAc,IAAK,GAC5B,OAAO,IAAI,CAAC,UACX,6BAAAA,QAAA,cAAC,aAAAC,SAAA,EAAM,KAAK,OAAO,MAAM,OAAO,CACjC,CACH;AAAA,IAEF,CAAC,OAAO,SAAS,OAAO,WAAW,MAAM,MAAM;AAAA,EACjD;AACF;AAEA,MAAM,cAAc,CAAC,SAA+B;AAClD,QAAM,EAAE,aAAa,QAAI,yBAAW,8BAAW;AAC/C,MAAI,gBAAgB,aAAa,IAAI,GAAG;AACtC,eAAO,sBAAQ,MAAM,aAAa,IAAI,GAAG,CAAC,IAAI,CAAC;AAAA,EACjD,OAAO;AACL,QAAI,CAAC,aAAc,OAAM,IAAI,MAAM,0BAA0B;AAC7D,UAAM,IAAI,MAAM,yBAAyB,IAAI,QAAQ;AAAA,EACvD;AACF;",
+  "names": ["React", "Field"]
+}

package/cjs/Fieldset/index.js

@@ -1,44 +1,66 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "Fieldset", {
-  enumerable: true,
-  get: function get() {
-    return _Fieldset["default"];
+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 Fieldset_exports = {};
+__export(Fieldset_exports, {
+  Fieldset: () => import_Fieldset.Fieldset,
+  FieldsetBody: () => FieldsetBody,
+  FieldsetCaption: () => FieldsetCaption,
+  FieldsetLabel: () => FieldsetLabel,
+  default: () => Fieldset_default
 });
-exports["default"] = exports.FieldsetLabel = exports.FieldsetCaption = exports.FieldsetBody = void 0;
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _react = _interopRequireDefault(require("react"));
-var _Fieldset = _interopRequireDefault(require("@digigov/react-core/cjs/Fieldset"));
-var _FieldsetLegend = _interopRequireDefault(require("@digigov/react-core/cjs/FieldsetLegend"));
-var _Hint = _interopRequireDefault(require("@digigov/react-core/cjs/Hint"));
-var _Grid = _interopRequireDefault(require("@digigov/ui/cjs/layouts/Grid"));
-var _NormalText = _interopRequireDefault(require("@digigov/ui/cjs/typography/NormalText"));
-var _excluded = ["children"],
-  _excluded2 = ["children"];
-var FieldsetLabel = exports.FieldsetLabel = function FieldsetLabel(_ref) {
-  var children = _ref.children,
-    props = (0, _objectWithoutProperties2["default"])(_ref, _excluded);
-  return /*#__PURE__*/_react["default"].createElement(_FieldsetLegend["default"], (0, _extends2["default"])({
-    heading: true,
-    size: "xl"
-  }, props), children);
+module.exports = __toCommonJS(Fieldset_exports);
+var import_react = __toESM(require("react"));
+var import_Fieldset = require("@digigov/react-core/Fieldset");
+var import_FieldContainer = require("@digigov/ui/form/FieldContainer");
+var import_Grid = require("@digigov/ui/layouts/Grid");
+var import_Hint = require("@digigov/ui/typography/Hint");
+var import_NormalText = require("@digigov/ui/typography/NormalText");
+const FieldsetLabel = ({
+  children,
+  ...props
+}) => {
+  return /* @__PURE__ */ import_react.default.createElement(import_FieldContainer.FieldsetLegend, { heading: true, size: "xl", ...props }, children);
 };
-var FieldsetCaption = exports.FieldsetCaption = function FieldsetCaption(_ref2) {
-  var children = _ref2.children,
-    props = (0, _objectWithoutProperties2["default"])(_ref2, _excluded2);
-  return /*#__PURE__*/_react["default"].createElement(_Hint["default"], props, children);
+const FieldsetCaption = ({
+  children,
+  ...props
+}) => {
+  return /* @__PURE__ */ import_react.default.createElement(import_Hint.Hint, { ...props }, children);
 };
-var FieldsetBody = exports.FieldsetBody = function FieldsetBody(_ref3) {
-  var children = _ref3.children;
-  return /*#__PURE__*/_react["default"].createElement(_Grid["default"], {
-    item: true,
-    xs: 12
-  }, /*#__PURE__*/_react["default"].createElement(_NormalText["default"], null, children));
+const FieldsetBody = ({ children }) => {
+  return /* @__PURE__ */ import_react.default.createElement(import_Grid.Grid, { item: true, xs: 12 }, /* @__PURE__ */ import_react.default.createElement(import_NormalText.NormalText, null, children));
 };
-var _default = exports["default"] = _Fieldset["default"];
+var Fieldset_default = import_Fieldset.Fieldset;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  Fieldset,
+  FieldsetBody,
+  FieldsetCaption,
+  FieldsetLabel
+});
+//# sourceMappingURL=index.js.map