@digigov/form 0.7.1 → 0.8.2

package/es/validators/utils/number.js

@@ -0,0 +1,16 @@
+export function validateNumber(number) {
+  return !Number.isNaN(number);
+}
+export var NUMBER_VALIDATOR = function NUMBER_VALIDATOR() {
+  return {
+    name: 'number-validator',
+    message: 'form.error.number',
+    test: function test(value) {
+      if (value === null) {
+        return true;
+      }
+
+      return validateNumber(value);
+    }
+  };
+};

package/esm/Field/FieldBase.js

@@ -40,14 +40,8 @@ export var FieldBase = function FieldBase(props) {
       control: control,
       name: name,
       render: function render(_ref) {
-        var onChange = _ref.onChange,
-            onBlur = _ref.onBlur,
-            value = _ref.value;
-        return /*#__PURE__*/React.createElement(Component, _extends({
-          name: name,
-          onChange: onChange,
-          onBlur: onBlur,
-          value: value,
+        var field = _ref.field;
+        return /*#__PURE__*/React.createElement(Component, _extends({}, field, {
           defaultValue: defaultValue,
           extra: extra,
           error: !!error,
@@ -67,9 +61,7 @@ export var FieldBase = function FieldBase(props) {
     error: error,
     wrapper: wrapper,
     name: name
-  }, Component !== null && Component !== void 0 && Component.render ? /*#__PURE__*/React.createElement(Component, _extends({
-    name: name,
-    ref: register,
+  }, Component !== null && Component !== void 0 && Component.render ? /*#__PURE__*/React.createElement(Component, _extends({}, register(name), {
     control: control,
     error: !!error,
     extra: extra,
@@ -78,9 +70,7 @@ export var FieldBase = function FieldBase(props) {
     "aria-describedby": error && "".concat(name, "-error"),
     required: required,
     disabled: editable === false
-  }, componentProps)) : /*#__PURE__*/React.createElement(Component, _extends({
-    name: name,
-    register: register,
+  }, componentProps)) : /*#__PURE__*/React.createElement(Component, _extends({}, register(name), {
     control: control,
     error: !!error,
     extra: extra,

package/esm/Field/FieldConditional.js

@@ -7,11 +7,13 @@ 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
@@ -37,6 +39,7 @@ 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 variables = useWatch({
@@ -48,6 +51,7 @@ export var FieldConditional = function FieldConditional(_ref2) {
     field: field,
     control: control,
     register: register,
+    reset: reset,
     error: error
   });
 };

package/esm/Field/FieldContainer.js

@@ -19,14 +19,17 @@ export var FieldContainer = function FieldContainer(_ref) {
   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, {
+    }, 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));
+    }, t(errorMessage, errorContext)), children));
   } else {
     return /*#__PURE__*/React.createElement(CoreField, _extends({
       error: !!error
@@ -34,7 +37,7 @@ export var FieldContainer = function FieldContainer(_ref) {
       label: label
     }), error && /*#__PURE__*/React.createElement(ErrorMessage, {
       id: "".concat(name, "-error")
-    }, t((error === null || error === void 0 ? void 0 : error.message) || '')), children));
+    }, t(errorMessage, errorContext)), children));
   }
 };
 export default FieldContainer;

package/esm/Field/index.js

@@ -5,6 +5,8 @@ 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,
@@ -14,8 +16,15 @@ export var Field = function Field(_ref) {
       field = _useField.field,
       control = _useField.control,
       register = _useField.register,
+      reset = _useField.reset,
       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);
@@ -24,16 +33,43 @@ export var Field = function Field(_ref) {
   if (calculatedField.condition) {
     return /*#__PURE__*/React.createElement(FieldConditional, {
       control: control,
+      reset: reset,
       register: register,
       field: calculatedField,
       error: error
     });
   }
 
+  if (calculatedField.type === 'array' && calculatedField.multiplicity) {
+    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,
     register: register,
+    reset: reset,
     error: error
   }));
 };

package/esm/Field/utils.js

@@ -80,9 +80,18 @@ export var useField = function useField(name, customField) {
       fieldsMap = _useContext.fieldsMap,
       control = _useContext.control,
       register = _useContext.register,
+      reset = _useContext.reset,
+      trigger = _useContext.trigger,
+      clearErrors = _useContext.clearErrors,
       errors = _useContext.errors,
       registerField = _useContext.registerField,
-      componentRegistry = _useContext.componentRegistry;
+      watch = _useContext.watch,
+      componentRegistry = _useContext.componentRegistry,
+      getFieldState = _useContext.getFieldState,
+      setValue = _useContext.setValue,
+      getValues = _useContext.getValues,
+      unregister = _useContext.unregister,
+      formState = _useContext.formState;
 
   useMemo(function () {
     return (customField === null || customField === void 0 ? void 0 : customField.type) && registerField(_extends({}, customField, {
@@ -93,7 +102,16 @@ export var useField = function useField(name, customField) {
     field: customField || fieldsMap[name],
     control: control,
     register: register,
+    reset: reset,
+    trigger: trigger,
+    watch: watch,
     componentRegistry: componentRegistry,
+    getFieldState: getFieldState,
+    setValue: setValue,
+    clearErrors: clearErrors,
+    getValues: getValues,
+    unregister: unregister,
+    formState: formState,
     error: errors[name]
   };
 };

package/esm/FieldArray/FieldArray.stories.js

@@ -0,0 +1,7 @@
+import FieldArray from '@digigov/form/FieldArray';
+export default {
+  title: 'Digigov Form/FieldArray',
+  component: FieldArray
+};
+export * from '@digigov/form/FieldArray/__stories__/Default';
+export * from '@digigov/form/FieldArray/__stories__/WithExactLength';

package/esm/FieldArray/__stories__/Default.js

@@ -0,0 +1,88 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React, { Suspense } from 'react';
+import FormBuilder, { Field } from '@digigov/form';
+import { Button } from '@digigov/ui/core';
+var fields = [{
+  key: 'string',
+  type: 'string',
+  label: {
+    primary: 'Πεδίο 1',
+    secondary: 'Το multiplicity field είναι ένα πεδίο οπότε φαίνεται και είναι μέρος της φόρμας'
+  }
+}, {
+  key: 'multiplicity',
+  type: 'array',
+  label: {
+    primary: 'Συνυπογράφοντες',
+    secondary: 'Οι συνυπογράφοντες είναι άνθρωποι σαν και εμάς'
+  },
+  extra: {
+    label: {
+      question: {
+        title: 'Θέλετε να προσθέσετε επιπλέον συνυπογράφοντες;',
+        yes: 'Ναι',
+        no: 'Όχι'
+      },
+      edit: 'Επεξεργασία',
+      add: 'Προσθέστε τα στοιχεία του επόμενου συνυπογράφοντα',
+      "delete": 'Αφαίρεση συνυπογράφοντος',
+      save: 'Αποθήκευση'
+    },
+    min: 2,
+    max: 4,
+    of: {
+      type: 'object',
+      extra: {
+        fields: [{
+          key: 'afm',
+          type: 'afm',
+          required: true,
+          label: {
+            primary: 'ΑΦΜ'
+          }
+        }, {
+          key: 'firstName',
+          required: true,
+          type: 'string',
+          label: {
+            primary: 'Όνομα'
+          }
+        }, {
+          key: 'lastName',
+          required: true,
+          type: 'string',
+          label: {
+            primary: 'Επώνυμο'
+          }
+        }]
+      }
+    }
+  }
+}, {
+  key: 'phonenumber',
+  type: 'phone_number',
+  required: true,
+  label: {
+    primary: 'Πεδίο 2',
+    secondary: 'Το multiplicity field είναι ένα πεδίο οπότε φαίνεται και είναι μέρος της φόρμας'
+  }
+}];
+
+var _ref = /*#__PURE__*/React.createElement(Button, null, "\u03A3\u03C5\u03BD\u03AD\u03C7\u03B5\u03B9\u03B1");
+
+export var Default = function Default() {
+  return /*#__PURE__*/React.createElement(Suspense, {
+    fallback: "loading"
+  }, /*#__PURE__*/React.createElement(FormBuilder, {
+    onSubmit: function onSubmit(data) {
+      debugger;
+      console.log(data);
+    }
+  }, /*#__PURE__*/React.createElement(Field, _extends({
+    name: "string"
+  }, fields[0])), /*#__PURE__*/React.createElement(Field, _extends({
+    name: "multiplicity"
+  }, fields[1])), /*#__PURE__*/React.createElement(Field, _extends({
+    name: "phonenumber"
+  }, fields[2])), _ref));
+};

package/esm/FieldArray/__stories__/WithExactLength.js

@@ -0,0 +1,87 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React, { Suspense } from 'react';
+import FormBuilder, { Field } from '@digigov/form';
+import { Button } from '@digigov/ui/core';
+var fields = [{
+  key: 'string',
+  type: 'string',
+  label: {
+    primary: 'Πεδίο 1',
+    secondary: 'Το multiplicity field είναι ένα πεδίο οπότε φαίνεται και είναι μέρος της φόρμας'
+  }
+}, {
+  key: 'multiplicity',
+  type: 'array',
+  label: {
+    primary: 'Συνυπογράφοντες',
+    secondary: 'Οι συνυπογράφοντες είναι άνθρωποι σαν και εμάς'
+  },
+  extra: {
+    label: {
+      question: {
+        title: 'Θέλετε να προσθέσετε επιπλέον συνυπογράφοντες;',
+        yes: 'Ναι',
+        no: 'Όχι'
+      },
+      edit: 'Επεξεργασία',
+      add: 'Προσθέστε τα στοιχεία του επόμενου συνυπογράφοντα',
+      "delete": 'Αφαίρεση συνυπογράφοντος',
+      save: 'Αποθήκευση'
+    },
+    length: 2,
+    of: {
+      type: 'object',
+      extra: {
+        fields: [{
+          key: 'afm',
+          type: 'afm',
+          required: true,
+          label: {
+            primary: 'ΑΦΜ'
+          }
+        }, {
+          key: 'firstName',
+          required: true,
+          type: 'string',
+          label: {
+            primary: 'Όνομα'
+          }
+        }, {
+          key: 'lastName',
+          required: true,
+          type: 'string',
+          label: {
+            primary: 'Επώνυμο'
+          }
+        }]
+      }
+    }
+  }
+}, {
+  key: 'phonenumber',
+  type: 'phone_number',
+  required: true,
+  label: {
+    primary: 'Πεδίο 2',
+    secondary: 'Το multiplicity field είναι ένα πεδίο οπότε φαίνεται και είναι μέρος της φόρμας'
+  }
+}];
+
+var _ref = /*#__PURE__*/React.createElement(Button, null, "\u03A3\u03C5\u03BD\u03AD\u03C7\u03B5\u03B9\u03B1");
+
+export var WithExactLength = function WithExactLength() {
+  return /*#__PURE__*/React.createElement(Suspense, {
+    fallback: "loading"
+  }, /*#__PURE__*/React.createElement(FormBuilder, {
+    onSubmit: function onSubmit(data) {
+      debugger;
+      console.log(data);
+    }
+  }, /*#__PURE__*/React.createElement(Field, _extends({
+    name: "string"
+  }, fields[0])), /*#__PURE__*/React.createElement(Field, _extends({
+    name: "multiplicity"
+  }, fields[1])), /*#__PURE__*/React.createElement(Field, _extends({
+    name: "phonenumber"
+  }, fields[2])), _ref));
+};

package/esm/FieldArray/index.js

@@ -0,0 +1,62 @@
+import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["name", "register", "control", "formState", "error", "layout", "label"];
+import React from 'react';
+import { useFieldArray } from 'react-hook-form';
+import FieldObject from '@digigov/form/FieldObject';
+import { Button, Card } from '@digigov/ui/core';
+import { FieldsetLabel } from '@digigov/form/Fieldset';
+import Fieldset from '@digigov/react-core/Fieldset';
+import FieldContainer from '@digigov/form/Field/FieldContainer';
+export var FieldArray = function FieldArray(_ref) {
+  var name = _ref.name,
+      register = _ref.register,
+      control = _ref.control,
+      formState = _ref.formState,
+      error = _ref.error,
+      layout = _ref.layout,
+      label = _ref.label,
+      customField = _objectWithoutProperties(_ref, _excluded);
+
+  var _useFieldArray = useFieldArray({
+    control: control,
+    name: name
+  }),
+      fields = _useFieldArray.fields,
+      append = _useFieldArray.append,
+      remove = _useFieldArray.remove;
+
+  return /*#__PURE__*/React.createElement(FieldContainer, {
+    label: label,
+    layout: layout,
+    error: formState.isSubmitted && !formState.isSubmitting && error !== null && error !== void 0 && error.message && error ? error : undefined,
+    wrapper: "fieldset",
+    name: name
+  }, fields.map(function (field, index) {
+    var _customField$extra;
+
+    return /*#__PURE__*/React.createElement(Card, {
+      variant: "border",
+      key: field.id
+    }, /*#__PURE__*/React.createElement(Fieldset, null, /*#__PURE__*/React.createElement(FieldsetLabel, null, "\u03A3\u03C5\u03BD\u03C5\u03C0\u03BF\u03B3\u03C1\u03AC\u03C6\u03BF\u03BD\u03C4\u03B1\u03C2 ", index + 1), /*#__PURE__*/React.createElement(FieldObject, _extends({
+      name: "".concat(name, ".").concat(index),
+      error: Array.isArray(error) && error[index],
+      register: register,
+      control: control
+    }, (_customField$extra = customField.extra) === null || _customField$extra === void 0 ? void 0 : _customField$extra.of)), /*#__PURE__*/React.createElement(Button, {
+      type: "button",
+      color: "warning",
+      onClick: function onClick() {
+        return remove(index);
+      }
+    }, "Remove")));
+  }), /*#__PURE__*/React.createElement(Button, {
+    type: "button",
+    color: "secondary",
+    onClick: function onClick(ev) {
+      ev.preventDefault();
+      append({});
+    }
+  }, "\u03A0\u03C1\u03BF\u03C3\u03B8\u03AE\u03BA\u03B7 \u03C3\u03C5\u03BD\u03C5\u03C0\u03BF\u03B3\u03C1\u03AC\u03C6\u03BF\u03BD\u03C4\u03B1"));
+};
+export default FieldArray;

package/esm/FieldObject/index.js

@@ -0,0 +1,59 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React, { useMemo } from 'react';
+import Fieldset, { FieldsetCaption } from '@digigov/form/Fieldset';
+import { useTranslation } from '@digigov/ui/app/i18n';
+import { FieldBase } from '@digigov/form/Field/FieldBase';
+import { calculateField } from '@digigov/form/Field/utils';
+import { FieldsetLegend } from '@digigov/react-core';
+export var FieldObject = function FieldObject(_ref) {
+  var name = _ref.name,
+      label = _ref.label,
+      extra = _ref.extra,
+      error = _ref.error,
+      control = _ref.control,
+      register = _ref.register,
+      reset = _ref.reset,
+      formState = _ref.formState;
+
+  var _useTranslation = useTranslation(),
+      t = _useTranslation.t;
+
+  return /*#__PURE__*/React.createElement(Fieldset, null, (label === null || label === void 0 ? void 0 : label.primary) && /*#__PURE__*/React.createElement(FieldsetLegend, {
+    size: "s"
+  }, t(label.primary)), (label === null || label === void 0 ? void 0 : label.secondary) && /*#__PURE__*/React.createElement(FieldsetCaption, null, t(label.secondary)), extra === null || extra === void 0 ? void 0 : extra.fields.map(function (field) {
+    return /*#__PURE__*/React.createElement(FieldObjectItem, {
+      key: "".concat(name, ".").concat(field.key),
+      name: "".concat(name, ".").concat(field.key),
+      control: control,
+      register: register,
+      reset: reset,
+      field: field,
+      error: error && error[field.key],
+      formState: formState
+    });
+  }));
+};
+
+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 = useMemo(function () {
+    return calculateField(children, field);
+  }, [field]);
+  var customError = error ? error : formState === null || formState === void 0 ? void 0 : formState.errors[name];
+  return /*#__PURE__*/React.createElement(FieldBase, _extends({}, calculatedField, {
+    name: name,
+    control: control,
+    reset: reset,
+    register: register,
+    error: customError
+  }));
+};
+
+export default FieldObject;

package/esm/Form.stories.js

@@ -0,0 +1,4 @@
+export default {
+  title: 'Digigov Form'
+};
+export * from '@digigov/form/__stories__/IntField';

package/esm/FormBuilder.js

@@ -1,5 +1,4 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 var _excluded = ["onSubmit", "children", "registerField", "fieldsMap", "fieldsetsMap", "resolver", "mode", "initial", "reValidateMode", "shouldFocusError", "criteriaMode", "componentRegistry", "grid"],
@@ -39,22 +38,24 @@ export var FormBase = /*#__PURE__*/React.forwardRef(function FormBase(_ref, ref)
     criteriaMode: criteriaMode
   });
   var handleSubmit = useCallback(function (data) {
-    var errors = onSubmit && onSubmit(data);
-
-    if (errors) {
-      for (var key in errors) {
-        form.setError(key, errors[key]);
-      }
-    }
+    onSubmit && onSubmit(data);
   }, [onSubmit]);
   var ctx = {
     fieldsMap: fieldsMap,
     fieldsetsMap: fieldsetsMap,
     control: form.control,
     register: form.register,
+    watch: form.watch,
     registerField: registerField,
-    errors: form.errors,
+    errors: form.formState.errors,
+    formState: form.formState,
     reset: form.reset,
+    trigger: form.trigger,
+    getFieldState: form.getFieldState,
+    setValue: form.setValue,
+    clearErrors: form.clearErrors,
+    getValues: form.getValues,
+    unregister: form.unregister,
     componentRegistry: componentRegistry
   };
   return /*#__PURE__*/React.createElement(FormContext.Provider, {
@@ -80,7 +81,7 @@ export var FormBuilder = /*#__PURE__*/React.forwardRef(function FormBuilder(_ref
       _ref2$shouldFocusErro = _ref2.shouldFocusError,
       shouldFocusError = _ref2$shouldFocusErro === void 0 ? true : _ref2$shouldFocusErro,
       _ref2$criteriaMode = _ref2.criteriaMode,
-      criteriaMode = _ref2$criteriaMode === void 0 ? 'firstError' : _ref2$criteriaMode,
+      criteriaMode = _ref2$criteriaMode === void 0 ? 'all' : _ref2$criteriaMode,
       _ref2$auto = _ref2.auto,
       auto = _ref2$auto === void 0 ? false : _ref2$auto,
       validatorRegistry = _ref2.validatorRegistry,
@@ -95,7 +96,17 @@ export var FormBuilder = /*#__PURE__*/React.forwardRef(function FormBuilder(_ref
   }, []);
   var schema = useValidationSchema(fieldsState, validatorRegistry);
   var registerField = useCallback(function (field) {
-    setFieldsState([].concat(_toConsumableArray(fieldsState.current), [field]));
+    var fieldIndex = fieldsState.current.findIndex(function (f) {
+      return f.key === field.key;
+    });
+
+    if (fieldIndex > -1) {
+      fieldsState.current[fieldIndex] = field;
+    } else {
+      fieldsState.current.push(field);
+    }
+
+    setFieldsState(fieldsState.current);
   }, []);
   var resolver;
   var fieldsMap;

package/esm/MultiplicityField/MultiplicityField.stories.js

@@ -0,0 +1,10 @@
+import MultiplicityField from '@digigov/form/MultiplicityField';
+export default {
+  title: 'Digigov Form/MultiplicityField',
+  component: MultiplicityField
+};
+export * from '@digigov/form/MultiplicityField/__stories__/Default';
+export * from '@digigov/form/MultiplicityField/__stories__/WithMinLength';
+export * from '@digigov/form/MultiplicityField/__stories__/WithMaxLength';
+export * from '@digigov/form/MultiplicityField/__stories__/WithMinAndMaxLength';
+export * from '@digigov/form/MultiplicityField/__stories__/WithExactLength';