@digigov/form 0.6.10 → 0.8.0

package/es/Field/FieldBase.js

@@ -0,0 +1,85 @@
+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 FieldContainer from '@digigov/form/Field/FieldContainer';
+import { Controller } from 'react-hook-form';
+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);
+
+  if (!enabled) {
+    return null;
+  }
+
+  if (controlled) {
+    return /*#__PURE__*/React.createElement(FieldContainer, {
+      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(FieldContainer, {
+    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({
+    name: 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)));
+};

package/es/Field/FieldConditional.js

@@ -0,0 +1,54 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React from 'react';
+import { useWatch } from 'react-hook-form';
+import { evaluateFieldWithConditions } from '@digigov/form/Field/utils';
+import { FieldBase } from '@digigov/form/Field/FieldBase';
+var ChildFieldMemo = /*#__PURE__*/React.memo(function ChildField(_ref) {
+  var dependencies = _ref.dependencies,
+      field = _ref.field,
+      control = _ref.control,
+      register = _ref.register,
+      error = _ref.error;
+  var newField = evaluateFieldWithConditions(field, dependencies);
+  return /*#__PURE__*/React.createElement(FieldBase, _extends({}, newField, {
+    name: newField.key,
+    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]) {
+      return false;
+    }
+  }
+
+  return true;
+});
+export var FieldConditional = function FieldConditional(_ref2) {
+  var control = _ref2.control,
+      field = _ref2.field,
+      register = _ref2.register,
+      error = _ref2.error;
+  var dependencyKeys = Object.keys(field.condition);
+  var variables = useWatch({
+    name: dependencyKeys,
+    control: control
+  });
+  return /*#__PURE__*/React.createElement(ChildFieldMemo, {
+    dependencies: variables,
+    field: field,
+    control: control,
+    register: register,
+    error: error
+  });
+};
+export default FieldConditional;

package/es/Field/FieldContainer.js

@@ -0,0 +1,43 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React from 'react';
+import CoreField from '@digigov/react-core/Field';
+import CoreLabel from '@digigov/react-core/Label';
+import CoreFieldset from '@digigov/react-core/Fieldset';
+import Hint from '@digigov/react-core/Hint';
+import FieldsetLegend from '@digigov/react-core/FieldsetLegend';
+import ErrorMessage from '@digigov/react-core/ErrorMessage';
+import { useTranslation } from '@digigov/ui/app/i18n';
+import Label from '@digigov/form/inputs/Label';
+export var FieldContainer = function FieldContainer(_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(CoreField, _extends({
+      error: !!error
+    }, layout), /*#__PURE__*/React.createElement(CoreFieldset, null, /*#__PURE__*/React.createElement(FieldsetLegend, {
+      size: "s"
+    }, 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(CoreField, _extends({
+      error: !!error
+    }, layout), /*#__PURE__*/React.createElement(CoreLabel, null, label && /*#__PURE__*/React.createElement(Label, {
+      label: label
+    }), error && /*#__PURE__*/React.createElement(ErrorMessage, {
+      id: "".concat(name, "-error")
+    }, t(errorMessage, errorContext)), children));
+  }
+};
+export default FieldContainer;

package/es/Field/index.js

@@ -1,325 +1,36 @@
-import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _extends from "@babel/runtime/helpers/extends";
-var _excluded = ["required", "name", "component", "wrapper", "control", "type", "controlled", "enabled", "editable", "defaultValue", "label", "extra", "layout", "error", "register"],
-    _excluded2 = ["name", "children"];
-import React, { useContext, useMemo } from 'react';
-import { Controller, useWatch } from 'react-hook-form';
-import { FormContext } from '@digigov/form/FormContext';
-import CoreField from '@digigov/react-core/Field';
-import CoreLabel from '@digigov/react-core/Label';
-import CoreFieldset from '@digigov/react-core/Fieldset';
-import Hint from '@digigov/react-core/Hint';
-import FieldsetLegend from '@digigov/react-core/FieldsetLegend';
-import ErrorMessage from '@digigov/react-core/ErrorMessage';
-import Input from '@digigov/form/inputs/Input';
-import Checkboxes from '@digigov/form/inputs/Checkboxes';
-import Radio from '@digigov/form/inputs/Radio';
-import Select from '@digigov/form/inputs/Select';
-import FileInput from '@digigov/form/inputs/FileInput';
-import DateInput from '@digigov/form/inputs/DateInput';
-import Label from '@digigov/form/inputs/Label';
-import { useTranslation } from '@digigov/ui/app/i18n';
-
-function evaluateFieldWithConditions(field, variables) {
-  var newField = _extends({}, field);
-
-  if (variables) {
-    for (var key in variables) {
-      if (field.condition[key] && field.condition[key].is === variables[key]) {
-        var then = field.condition[key].then || {};
-
-        for (var attr in then) {
-          newField[attr] = then[attr];
-        }
-      } else if (field.condition[key]) {
-        var otherwise = field.condition[key]["else"] || {};
-
-        for (var _attr in otherwise) {
-          newField[_attr] = otherwise[_attr];
-        }
-      }
-    }
-  }
-
-  return newField;
-}
-
-var ChildFieldMemo = /*#__PURE__*/React.memo(function ChildField(_ref) {
-  var dependencies = _ref.dependencies,
-      field = _ref.field,
-      control = _ref.control,
-      register = _ref.register,
-      error = _ref.error;
-  var newField = evaluateFieldWithConditions(field, dependencies);
-  return /*#__PURE__*/React.createElement(FieldBase, _extends({}, newField, {
-    name: newField.key,
-    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]) {
-      return false;
-    }
-  }
-
-  return true;
-});
-export var ConditionalField = function ConditionalField(_ref2) {
-  var control = _ref2.control,
-      field = _ref2.field,
-      register = _ref2.register,
-      error = _ref2.error;
-  var dependencyKeys = Object.keys(field.condition);
-  var variables = useWatch({
-    name: dependencyKeys,
-    control: control
-  });
-  return /*#__PURE__*/React.createElement(ChildFieldMemo, {
-    dependencies: variables,
-    field: field,
-    control: control,
-    register: register,
-    error: error
-  });
-};
-var FIELD_COMPONENTS = {
-  text: {
-    component: Input
-  },
-  string: {
-    component: Input
-  },
-  file: {
-    wrapper: 'fieldset',
-    component: FileInput
-  },
-  date: {
-    wrapper: 'fieldset',
-    controlled: true,
-    component: DateInput
-  },
-  'choice:multiple': {
-    wrapper: 'fieldset',
-    controlled: true,
-    component: Checkboxes
-  },
-  'choice:single': {
-    wrapper: 'fieldset',
-    controlled: false,
-    component: Radio
-  }
-};
-var ALTERNATIVE_COMPONENTS = {
-  Select: {
-    component: Select,
-    controlled: false
-  }
-};
-
-var FieldContainer = function FieldContainer(_ref3) {
-  var name = _ref3.name,
-      wrapper = _ref3.wrapper,
-      label = _ref3.label,
-      children = _ref3.children,
-      error = _ref3.error;
-
-  var _useTranslation = useTranslation(),
-      t = _useTranslation.t;
-
-  if (wrapper === 'fieldset') {
-    return /*#__PURE__*/React.createElement(CoreField, {
-      error: !!error
-    }, /*#__PURE__*/React.createElement(CoreFieldset, null, /*#__PURE__*/React.createElement(FieldsetLegend, {
-      size: "s"
-    }, label && label.primary, label && label.secondary && /*#__PURE__*/React.createElement(Hint, null, t(label.secondary)), error && /*#__PURE__*/React.createElement(ErrorMessage, {
-      id: "".concat(name, "-error")
-    }, t((error === null || error === void 0 ? void 0 : error.message) || ''))), children));
-  } else {
-    return /*#__PURE__*/React.createElement(CoreField, {
-      error: !!error
-    }, /*#__PURE__*/React.createElement(CoreLabel, null, label && /*#__PURE__*/React.createElement(Label, {
-      label: label
-    }), error && /*#__PURE__*/React.createElement(ErrorMessage, {
-      id: "".concat(name, "-error")
-    }, t((error === null || error === void 0 ? void 0 : error.message) || '')), children));
-  }
-};
-
-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);
-
-  if (!enabled) {
-    return null;
-  }
-
-  if (controlled) {
-    return /*#__PURE__*/React.createElement(FieldContainer, {
-      label: label,
-      layout: layout,
-      error: error,
-      wrapper: wrapper,
-      name: name
-    }, /*#__PURE__*/React.createElement(Controller, {
-      control: control,
-      name: name,
-      render: function render(_ref4) {
-        var onChange = _ref4.onChange,
-            onBlur = _ref4.onBlur,
-            value = _ref4.value;
-        return /*#__PURE__*/React.createElement(Component, _extends({
-          name: name,
-          onChange: onChange,
-          onBlur: onBlur,
-          value: value,
-          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(FieldContainer, {
-    label: label,
-    layout: layout,
-    error: error,
-    wrapper: wrapper,
-    name: name
-  }, Component !== null && Component !== void 0 && Component.render ? /*#__PURE__*/React.createElement(Component, _extends({
-    name: name,
-    ref: register,
-    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({
-    name: 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)));
-};
-
-var useField = function useField(name, customField) {
-  var _useContext = useContext(FormContext),
-      fieldsMap = _useContext.fieldsMap,
-      control = _useContext.control,
-      register = _useContext.register,
-      errors = _useContext.errors,
-      registerField = _useContext.registerField,
-      componentRegistry = _useContext.componentRegistry;
-
-  useMemo(function () {
-    return (customField === null || customField === void 0 ? void 0 : customField.type) && registerField(_extends({}, customField, {
-      key: name
-    }));
-  }, [customField, name, registerField]);
-  return {
-    field: customField || fieldsMap[name],
-    control: control,
-    register: register,
-    componentRegistry: componentRegistry,
-    error: errors[name]
-  };
-};
-
-function calculateField(children, field, componentRegistry) {
-  var _field$extra;
-
-  var calculatedField = _extends({}, field);
-
-  var fieldComponentRegistry = _extends({}, FIELD_COMPONENTS, componentRegistry);
-
-  if (children) {
-    calculatedField.component = children;
-  } else if (typeof field.component === 'function') {// leave as is
-  } else if (!field.component && !field.type) {
-    var _fieldComponentRegist;
-
-    calculatedField.component = fieldComponentRegistry.string.component;
-    calculatedField.controlled = ((_fieldComponentRegist = fieldComponentRegistry.string) === null || _fieldComponentRegist === void 0 ? void 0 : _fieldComponentRegist.controlled) || false;
-  } else if (typeof (field === null || field === void 0 ? void 0 : (_field$extra = field.extra) === null || _field$extra === void 0 ? void 0 : _field$extra.component) === 'string' && ALTERNATIVE_COMPONENTS[field.extra.component]) {
-    var _ALTERNATIVE_COMPONEN;
-
-    calculatedField.controlled = ((_ALTERNATIVE_COMPONEN = ALTERNATIVE_COMPONENTS[field.extra.component]) === null || _ALTERNATIVE_COMPONEN === void 0 ? void 0 : _ALTERNATIVE_COMPONEN.controlled) || false;
-    calculatedField.component = ALTERNATIVE_COMPONENTS[field.extra.component].component;
-  } else if (!field.component && field.type && fieldComponentRegistry[field.type]) {
-    var _fieldComponentRegist2;
-
-    calculatedField.component = fieldComponentRegistry[field.type].component;
-    calculatedField.wrapper = fieldComponentRegistry[field.type].wrapper;
-    calculatedField.controlled = ((_fieldComponentRegist2 = fieldComponentRegistry[field.type]) === null || _fieldComponentRegist2 === void 0 ? void 0 : _fieldComponentRegist2.controlled) || false;
-  } else {
-    var _fieldComponentRegist3;
-
-    calculatedField.component = fieldComponentRegistry.string.component;
-    calculatedField.controlled = ((_fieldComponentRegist3 = fieldComponentRegistry.string) === null || _fieldComponentRegist3 === void 0 ? void 0 : _fieldComponentRegist3.controlled) || false;
-  }
-
-  return calculatedField;
-}
-
-export var Field = function Field(_ref5) {
-  var name = _ref5.name,
-      children = _ref5.children,
-      customField = _objectWithoutProperties(_ref5, _excluded2);
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["name", "children"];
+import React, { useMemo } from 'react';
+import { FieldBase } from '@digigov/form/Field/FieldBase';
+import FieldConditional from '@digigov/form/Field/FieldConditional';
+import { useField, calculateField } from '@digigov/form/Field/utils';
+import FieldArray from '@digigov/form/FieldArray';
+import Multiplicity from '@digigov/form/MultiplicityField';
+export var Field = function Field(_ref) {
+  var name = _ref.name,
+      children = _ref.children,
+      customField = _objectWithoutProperties(_ref, _excluded);
 
   var _useField = useField(name, customField !== null && customField !== void 0 && customField.type ? customField : null),
       field = _useField.field,
       control = _useField.control,
       register = _useField.register,
       error = _useField.error,
-      componentRegistry = _useField.componentRegistry;
+      componentRegistry = _useField.componentRegistry,
+      formState = _useField.formState,
+      setValue = _useField.setValue,
+      getValues = _useField.getValues,
+      unregister = _useField.unregister,
+      trigger = _useField.trigger,
+      clearErrors = _useField.clearErrors;
 
   var calculatedField = useMemo(function () {
     return calculateField(children, field, componentRegistry);
   }, [field]);
 
   if (calculatedField.condition) {
-    return /*#__PURE__*/React.createElement(ConditionalField, {
+    return /*#__PURE__*/React.createElement(FieldConditional, {
       control: control,
       register: register,
       field: calculatedField,
@@ -327,6 +38,32 @@ export var Field = function Field(_ref5) {
     });
   }
 
+  if (calculatedField.type === 'array' && calculatedField.multiplicity) {
+    // if (error) debugger;
+    calculatedField.name = name;
+    return /*#__PURE__*/React.createElement(Multiplicity, _extends({
+      control: control,
+      register: register,
+      trigger: trigger,
+      clearErrors: clearErrors,
+      error: error,
+      formState: formState,
+      setValue: setValue,
+      getValues: getValues,
+      unregister: unregister
+    }, calculatedField));
+  }
+
+  if (calculatedField.type === 'array') {
+    calculatedField.name = name;
+    return /*#__PURE__*/React.createElement(FieldArray, _extends({
+      control: control,
+      register: register,
+      error: error,
+      formState: formState
+    }, calculatedField));
+  }
+
   return /*#__PURE__*/React.createElement(FieldBase, _extends({}, calculatedField, {
     name: name,
     control: control,