@digigov/form 0.7.1 → 0.8.2

package/es/MultiplicityField/index.js

@@ -0,0 +1,113 @@
+import _extends from "@babel/runtime/helpers/extends";
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import React, { useState } from 'react';
+import { Card, CardText, CardAction, Button, Heading, CardHeading } from '@digigov/react-core';
+import AddObjects from '@digigov/form/MultiplicityField/add-objects';
+import { useFieldArray } from 'react-hook-form';
+import FieldObject from '@digigov/form/FieldObject';
+import FieldContainer from '@digigov/form/Field/FieldContainer';
+// epeidh einai forwardRef to ref mas to dinei xwrista apo ta props
+export var Multiplicity = function Multiplicity(_ref) {
+  var extra = _ref.extra,
+      name = _ref.name,
+      control = _ref.control,
+      error = _ref.error,
+      register = _ref.register,
+      trigger = _ref.trigger,
+      clearErrors = _ref.clearErrors,
+      formState = _ref.formState,
+      label = _ref.label,
+      layout = _ref.layout,
+      setValue = _ref.setValue,
+      getValues = _ref.getValues,
+      unregister = _ref.unregister;
+
+  var _useFieldArray = useFieldArray({
+    control: control,
+    name: name
+  }),
+      fields = _useFieldArray.fields,
+      append = _useFieldArray.append,
+      remove = _useFieldArray.remove;
+
+  var _useState = useState([]),
+      _useState2 = _slicedToArray(_useState, 2),
+      stashedObjects = _useState2[0],
+      setStashedObjects = _useState2[1];
+
+  var handleStash = function handleStash(data) {
+    setStashedObjects([].concat(_toConsumableArray(stashedObjects), [data]));
+  };
+
+  var handleDelete = function handleDelete(index) {
+    remove(index); // creating a new array to maintain immutability
+
+    var newStashedObjects = _toConsumableArray(stashedObjects);
+
+    newStashedObjects.splice(index, 1);
+    setStashedObjects(newStashedObjects);
+  };
+
+  return /*#__PURE__*/React.createElement(FieldContainer, {
+    label: label,
+    layout: layout,
+    error: formState.isSubmitted && !formState.isSubmitting && error !== null && error !== void 0 && error.message ? error : undefined,
+    wrapper: "fieldset",
+    name: name
+  }, stashedObjects.length > 0 ? /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Heading, {
+    size: "m"
+  }, extra === null || extra === void 0 ? void 0 : extra.label.object.title_added), stashedObjects.map(function (_Object, index) {
+    return /*#__PURE__*/React.createElement(ListObject, {
+      key: "".concat(name, ".").concat(index),
+      index: index,
+      name: name,
+      extra: extra,
+      control: control,
+      register: register,
+      formState: formState,
+      onDelete: handleDelete
+    });
+  })) : '', /*#__PURE__*/React.createElement(AddObjects, {
+    name: name,
+    register: register,
+    control: control,
+    fields: fields,
+    error: error,
+    stashedObjects: stashedObjects,
+    extra: extra,
+    append: append,
+    remove: remove,
+    onStash: handleStash,
+    setValue: setValue,
+    getValues: getValues,
+    unregister: unregister,
+    trigger: trigger,
+    clearErrors: clearErrors
+  }));
+};
+export default Multiplicity;
+export var ListObject = function ListObject(_ref2) {
+  var index = _ref2.index,
+      name = _ref2.name,
+      extra = _ref2.extra,
+      control = _ref2.control,
+      register = _ref2.register,
+      onDelete = _ref2.onDelete,
+      formState = _ref2.formState;
+  var currentName = "".concat(name, ".").concat(index);
+  return /*#__PURE__*/React.createElement(Card, {
+    variant: (extra === null || extra === void 0 ? void 0 : extra.border) && 'border'
+  }, /*#__PURE__*/React.createElement(CardHeading, null, extra === null || extra === void 0 ? void 0 : extra.label.object.title, " #", index + 1), /*#__PURE__*/React.createElement(CardText, null, /*#__PURE__*/React.createElement(FieldObject, _extends({
+    name: currentName,
+    formState: formState,
+    register: register,
+    control: control
+  }, extra === null || extra === void 0 ? void 0 : extra.of))), /*#__PURE__*/React.createElement(CardAction, null, /*#__PURE__*/React.createElement(Button, {
+    type: "button",
+    variant: "link",
+    onClick: function onClick() {
+      return onDelete(index);
+    }
+  }, extra === null || extra === void 0 ? void 0 : extra.label.object["delete"])));
+};

package/es/__stories__/IntField.js

@@ -0,0 +1,40 @@
+import React from 'react';
+import FormBuilder, { Field } from '@digigov/form/';
+import Button from '@digigov/ui/core/Button';
+var fields = [{
+  key: 'number_required',
+  label: {
+    primary: 'A positive number',
+    secondary: 'required'
+  },
+  required: true,
+  type: 'int'
+}, {
+  key: 'number_not_required',
+  label: {
+    primary: 'A positive number',
+    secondary: 'not required'
+  },
+  required: false,
+  type: 'int'
+}];
+var initialValues = {};
+
+var _ref = /*#__PURE__*/React.createElement(Button, {
+  type: "submit"
+}, "Submit");
+
+export var IntField = function IntField() {
+  return /*#__PURE__*/React.createElement(FormBuilder, {
+    fields: fields,
+    onSubmit: function onSubmit(data) {
+      console.log(data);
+    },
+    initial: initialValues
+  }, fields.map(function (field) {
+    return /*#__PURE__*/React.createElement(Field, {
+      key: field.key,
+      name: field.key
+    });
+  }), _ref);
+};

package/es/inputs/FileInput/FileInput.stories.js

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

package/es/inputs/FileInput/__stories__/Default.js

@@ -0,0 +1,23 @@
+import React from 'react';
+import FormBuilder, { Field } from '@digigov/form';
+import { Button } from '@digigov/ui/core';
+
+var _ref = /*#__PURE__*/React.createElement(Button, null, "\u03A3\u03C5\u03BD\u03AD\u03C7\u03B5\u03B9\u03B1");
+
+export var Default = function Default() {
+  return /*#__PURE__*/React.createElement(FormBuilder, {
+    onSubmit: function onSubmit(data) {
+      debugger;
+      console.log(data);
+    }
+  }, /*#__PURE__*/React.createElement(Field, {
+    key: 'string',
+    name: "file",
+    type: "file",
+    required: true,
+    label: {
+      primary: 'Βιογραφικό σημείωμα'
+    }
+  }), _ref);
+};
+export default Default;

package/es/inputs/FileInput/index.js

@@ -1,19 +1,25 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _extends from "@babel/runtime/helpers/extends";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["name", "extra", "disabled", "type"];
+var _excluded = ["name", "extra", "disabled", "reset", "onChange", "control"];
 import React, { useState } from 'react';
 import clsx from 'clsx';
 import { useTranslation } from '@digigov/ui/app/i18n';
 import Paragraph from '@digigov/ui/typography/Paragraph';
 import CoreHint from '@digigov/react-core/Hint';
+import Button from '@digigov/ui/core/Button';
+import FileUpload from '@digigov/react-core/FileUpload';
+import Field from '@digigov/react-core/Field';
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export var FileInput = /*#__PURE__*/React.forwardRef(function FileInput(_ref, ref) {
   var name = _ref.name,
       _ref$extra = _ref.extra,
       extra = _ref$extra === void 0 ? {} : _ref$extra,
       disabled = _ref.disabled,
-      type = _ref.type,
+      reset = _ref.reset,
+      onChange = _ref.onChange,
+      control = _ref.control,
       props = _objectWithoutProperties(_ref, _excluded);
 
   var _useTranslation = useTranslation(),
@@ -24,31 +30,35 @@ export var FileInput = /*#__PURE__*/React.forwardRef(function FileInput(_ref, re
       files = _useState2[0],
       setFiles = _useState2[1];
 
-  return /*#__PURE__*/React.createElement("div", {
-    className: clsx(extra.className, files.length > 0 && 'govgr-uploaded-file', true && 'govgr-field-file')
-  }, files.length ? /*#__PURE__*/React.createElement(Paragraph, null, /*#__PURE__*/React.createElement("b", null, t('upload.file'), ":"), " ", "".concat(files.join(', '))) : /*#__PURE__*/React.createElement(CoreHint, null, t('upload.no_file')), /*#__PURE__*/React.createElement("label", {
-    tabIndex: 0,
-    role: "button",
-    className: clsx(extra.className, files.length === 0 && ['govgr-btn', 'govgr-btn-primary'], files.length > 0 && 'govgr-link', true && 'govgr-label-file')
-  }, /*#__PURE__*/React.createElement("input", _extends({
+  var handleChange = function handleChange(e) {
+    var target = e.target;
+    var selectedFiles = Array.from(target.files).map(function (_ref2) {
+      var name = _ref2.name;
+      return name;
+    });
+    setFiles(selectedFiles); // proceed calling the onChange provided
+    // by react-hook-form
+
+    onChange(e);
+  };
+
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Field, {
+    className: clsx(extra.className, files && files.length > 0 && 'govgr-uploaded-file')
+  }, files !== null && files !== void 0 && files.length ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Paragraph, null, /*#__PURE__*/React.createElement("b", null, t('upload.file'), ":"), " ", "".concat(files.join(', ')))) : /*#__PURE__*/React.createElement(CoreHint, null, t('upload.no_file')), /*#__PURE__*/React.createElement(FileUpload, _extends({
     ref: ref,
-    type: "file",
+    hasFiles: !!(files !== null && files !== void 0 && files.length),
     name: name,
     disabled: disabled,
-    style: {
-      display: 'none'
-    },
-    className: "govgr-file-upload",
-    onChange: function onChange(e) {
-      var target = e.target;
-      var selectedFiles = Array.from(target.files).map(function (_ref2) {
-        var name = _ref2.name;
-        return name;
-      });
-      setFiles(selectedFiles);
-    }
+    onChange: handleChange
   }, _extends({}, props, {
     required: undefined
-  }))), files.length ? t('upload.change_file') : t('upload.choose_file')));
+  })), files !== null && files !== void 0 && files.length ? t('upload.change_file') : t('upload.choose_file')), files !== undefined && files.length > 0 && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
+    variant: "link",
+    onClick: function onClick(event) {
+      event.preventDefault();
+      reset(_defineProperty({}, name, ''));
+      setFiles(undefined);
+    }
+  }, t('upload.reset_file')))));
 });
 export default FileInput;

package/es/inputs/Input/index.js

@@ -6,7 +6,7 @@ import TextInput from '@digigov/react-core/TextInput';
 import TextArea from '@digigov/react-core/TextArea';
 var TYPES_MAP = {
   string: 'text',
-  "int": 'number',
+  "int": 'text',
   text: 'text',
   date: 'date'
 };

package/es/inputs/Radio/index.js

@@ -1,8 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 var _excluded = ["register", "name", "control", "extra", "disabled"];
-import React, { useState } from 'react';
+import React from 'react';
 import Radio from '@digigov/react-core/Radio';
 import RadioItem from '@digigov/react-core/RadioItem';
 import { useTranslation } from '@digigov/ui/app/i18n';
@@ -23,32 +22,28 @@ export var RadioButtonsGroup = function RadioButtonsGroup(_ref) {
     name: name
   });
 
-  var _useState = useState(currentValue),
-      _useState2 = _slicedToArray(_useState, 1),
-      defaultValue = _useState2[0];
-
   var _useTranslation = useTranslation(),
       t = _useTranslation.t;
 
   return /*#__PURE__*/React.createElement(Radio, {
     className: className,
-    defaultValue: defaultValue,
+    defaultValue: currentValue,
     id: name
   }, options.map(function (_ref2) {
     var label = _ref2.label,
         v = _ref2.value,
-        optionDisabled = _ref2.disabled;
-    return /*#__PURE__*/React.createElement(RadioItem, _extends({
-      ref: register,
-      key: v,
-      name: name,
+        optionDisabled = _ref2.disabled,
+        selected = _ref2.selected;
+    return /*#__PURE__*/React.createElement("div", {
+      key: "".concat(name, ".").concat(v)
+    }, /*#__PURE__*/React.createElement(RadioItem, _extends({}, register(name), {
       value: v,
       disabled: disabled || optionDisabled
     }, _extends({}, props, {
       required: undefined,
       'aria-describedby': undefined,
       type: 'radio'
-    })), label && label.primary && t(label.primary) || v, label && label.secondary && /*#__PURE__*/React.createElement(Hint, null, t(label.secondary)));
+    })), label && label.primary && t(label.primary) || v, label && label.secondary && /*#__PURE__*/React.createElement(Hint, null, t(label.secondary))), selected && selected());
   }));
 };
 export default RadioButtonsGroup;

package/es/internal.js

@@ -1,5 +1,7 @@
 export { default as Field } from '@digigov/form/Field';
 export * from '@digigov/form/Field';
+export { default as FieldArray } from '@digigov/form/FieldArray';
+export * from '@digigov/form/FieldArray';
 export { default as FieldConditional } from '@digigov/form/Field/FieldConditional';
 export * from '@digigov/form/Field/FieldConditional';
 export { default as Fieldset } from '@digigov/form/Fieldset';

package/es/utils.js

@@ -1,84 +1,99 @@
 import _typeof from "@babel/runtime/helpers/typeof";
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _extends from "@babel/runtime/helpers/extends";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return generator._invoke = function (innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; }(innerFn, self, context), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; this._invoke = function (method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return ContinueSentinel; } var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (object) { var keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 
-/* eslint-disable @typescript-eslint/no-explicit-any */
+import { validateFieldsNatively } from '@hookform/resolvers';
+import { appendErrors } from 'react-hook-form';
+/**
+ * Why `path!` ? because it could be `undefined` in some case
+ * https://github.com/jquense/yup#validationerrorerrors-string--arraystring-value-any-path-string
+ */
+
 var parseErrorSchema = function parseErrorSchema(error, validateAllFieldCriteria) {
-  return Array.isArray(error.inner) && error.inner.length ? error.inner.reduce(function (previous, _ref) {
-    var path = _ref.path,
-        message = _ref.message,
-        type = _ref.type;
-    var previousTypes = path && previous[path] && previous[path].types || {};
-    var key = path || type;
-    return _extends({}, previous, key ? _defineProperty({}, key, _extends({}, previous[key] || {
-      message: message,
-      type: type
-    }, validateAllFieldCriteria ? {
-      types: _extends({}, previousTypes, _defineProperty({}, type, previousTypes[type] ? [].concat(_toConsumableArray([].concat(previousTypes[type])), [message]) : message))
-    } : {})) : {});
-  }, {}) : _defineProperty({}, error.path, {
-    message: error.message,
-    type: error.type
-  });
+  return (error.inner || []).reduce(function (previous, error) {
+    var _error$path;
+
+    error.path = (_error$path = error.path) === null || _error$path === void 0 ? void 0 : _error$path.replace(/\[([0-9]+)\]/g, '.$1');
+
+    if (!previous[error.path]) {
+      previous[error.path] = {
+        message: error.message,
+        type: error.type
+      };
+    }
+
+    if (validateAllFieldCriteria) {
+      var types = previous[error.path].types;
+      var messages = types && types[error.type];
+      previous[error.path] = appendErrors(error.path, validateAllFieldCriteria, previous, error.type, messages ? [].concat(messages, error.message) : error.message);
+    }
+
+    return previous;
+  }, {});
 };
 
 export var yupResolver = function yupResolver(schema) {
-  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
-    abortEarly: false
-  };
+  var schemaOptions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var resolverOptions = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   return /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(values, context) {
-      var validateAllFieldCriteria,
-          parsedErrors,
-          _args = arguments;
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(values, context, options) {
+      var result, parsed;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              validateAllFieldCriteria = _args.length > 2 && _args[2] !== undefined ? _args[2] : false;
-              _context.prev = 1;
+              _context.prev = 0;
 
-              if (options.context && process.env.NODE_ENV === 'development') {
+              if (schemaOptions.context && process.env.NODE_ENV === 'development') {
                 // eslint-disable-next-line no-console
                 console.warn("You should not used the yup options context. Please, use the 'useForm' context object instead");
               }
 
-              _context.next = 5;
-              return schema.validate(values, _extends({}, options, {
+              _context.next = 4;
+              return schema[resolverOptions.mode === 'sync' ? 'validateSync' : 'validate'](values, _extends({
+                abortEarly: false
+              }, schemaOptions, {
                 context: context
               }));
 
-            case 5:
-              _context.t0 = _context.sent;
-              _context.t1 = {};
+            case 4:
+              result = _context.sent;
+              options.shouldUseNativeValidation && validateFieldsNatively({}, options);
               return _context.abrupt("return", {
-                values: _context.t0,
-                errors: _context.t1
+                values: resolverOptions.rawValues ? values : result,
+                errors: {}
               });
 
-            case 10:
-              _context.prev = 10;
-              _context.t2 = _context["catch"](1);
-              parsedErrors = parseErrorSchema(_context.t2, validateAllFieldCriteria);
+            case 9:
+              _context.prev = 9;
+              _context.t0 = _context["catch"](0);
+
+              if (_context.t0.inner) {
+                _context.next = 13;
+                break;
+              }
+
+              throw _context.t0;
+
+            case 13:
+              parsed = parseErrorSchema(_context.t0, !options.shouldUseNativeValidation && options.criteriaMode === 'all');
               return _context.abrupt("return", {
                 values: {},
-                errors: parsedErrors
+                errors: parsed
               });
 
-            case 14:
+            case 15:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[1, 10]]);
+      }, _callee, null, [[0, 9]]);
     }));
 
-    return function (_x, _x2) {
-      return _ref4.apply(this, arguments);
+    return function (_x, _x2, _x3) {
+      return _ref.apply(this, arguments);
     };
   }();
 };

package/es/validators/index.js

@@ -4,6 +4,8 @@ import { useMemo } from 'react';
 import dayjs from 'dayjs';
 import customParseFormat from 'dayjs/plugin/customParseFormat';
 import { getYupObjectShape, AFM_VALIDATOR, FILE_MAX_SIZE_VALIDATOR, IBAN_VALIDATOR, MOBILE_PHONE_VALIDATOR, PHONE_NUMBER_VALIDATOR, POSTALCODE_VALIDATOR, UUID4_VALIDATOR } from '@digigov/form/validators/utils';
+import { NUMBER_VALIDATOR } from '@digigov/form/validators/utils/number';
+import { INT_VALIDATOR } from '@digigov/form/validators/utils/int';
 dayjs.extend(customParseFormat);
 var VALID_DATE_FORMATS = ['DD/MM/YYYY'];
 var DATE_CACHE = {};
@@ -33,10 +35,26 @@ export var getYUPTypeMap = function getYUPTypeMap() {
       if (_typeof(field.extra.of) === 'object') {
         // else if the field is an object then it is a scalar type
         // eg. number, string etc.
-        return yup.array().of(yupTypeMap[field.extra.of.type](field.extra.of)); // .min(field.extra.min)
-        // .max(field.extra.max)
-        // .length(field.extra.length)
-        // .required(field.required);
+        var arrayValidator = yup.array().of(yupTypeMap[field.extra.of.type](field.extra.of)).required(field.required);
+        if (field.extra.length) arrayValidator = arrayValidator.length(field.extra.length, {
+          key: 'form.error.array.length',
+          context: {
+            length: field.extra.length
+          }
+        });
+        if (field.extra.min) arrayValidator = arrayValidator.min(field.extra.min, {
+          key: 'form.error.array.min',
+          context: {
+            min: field.extra.min
+          }
+        });
+        if (field.extra.max) arrayValidator = arrayValidator.max(field.extra.max, {
+          key: 'form.error.array.max',
+          context: {
+            max: field.extra.max
+          }
+        });
+        return arrayValidator;
       } else if (typeof field.extra.of === 'string') {
         return yup.array().of(yupTypeMap[field.extra.of]());
       } else {
@@ -45,7 +63,9 @@ export var getYUPTypeMap = function getYUPTypeMap() {
       }
     },
     "int": function int() {
-      return yup.number().typeError('form.error.number').positive('form.error.positive_number');
+      return yup.mixed().transform(function (_, val) {
+        return val !== '' ? Number(val) : null;
+      }).test(NUMBER_VALIDATOR()).test(INT_VALIDATOR());
     },
     email: function email() {
       return yup.string().email('form.error.email');
@@ -77,8 +97,8 @@ export var getYUPTypeMap = function getYUPTypeMap() {
     date: function date(field) {
       var simpleDate = yup.string().nullable(true).test('date', 'form.error.date.invalid', function (value) {
         if (!value) return true;
-        value = getDate(value);
-        return value.isValid();
+        var date = getDate(value);
+        return date.isValid();
       });
       var params = field.extra || {};
 
@@ -104,8 +124,8 @@ export var getYUPTypeMap = function getYUPTypeMap() {
           },
           test: function test(value) {
             if (!value) return true;
-            value = getDate(value);
-            var isValid = +value.toDate() < +maxDate;
+            var date = getDate(value);
+            var isValid = +date.toDate() < +maxDate;
             return isValid;
           }
         });
@@ -134,8 +154,8 @@ export var getYUPTypeMap = function getYUPTypeMap() {
           },
           test: function test(value) {
             if (!value) return true;
-            value = getDate(value);
-            var isValid = +value.toDate() > +minDate;
+            var date = getDate(value);
+            var isValid = +date.toDate() > +minDate;
             return isValid;
           }
         });

package/es/validators/utils/index.js

@@ -1,5 +1,3 @@
-import _extends from "@babel/runtime/helpers/extends";
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import * as yup from 'yup';
 export * from '@digigov/form/validators/utils/afm';
 export * from '@digigov/form/validators/utils/file';
@@ -8,29 +6,13 @@ export * from '@digigov/form/validators/utils/phone';
 export * from '@digigov/form/validators/utils/postal_code';
 export * from '@digigov/form/validators/utils/uuid4';
 export function getYupField(field, yupTypeMap) {
-  var yupField = yupTypeMap[field.type] || yupTypeMap.string;
+  var yupField = yupTypeMap[(field === null || field === void 0 ? void 0 : field.type) || 'string'] || yupTypeMap['string'];
   return yupField(field);
 }
 export function computeShape(fields, yupTypeMap, validatorRegistry) {
   var fieldSchemas = {};
   var objectFields = {};
   fields.forEach(function (field) {
-    if (field.key.includes('.')) {
-      var _field$key$split = field.key.split(/\.(.+)/),
-          _field$key$split2 = _slicedToArray(_field$key$split, 2),
-          objectKey = _field$key$split2[0],
-          fieldKey = _field$key$split2[1];
-
-      if (!objectFields[objectKey]) {
-        objectFields[objectKey] = [];
-      }
-
-      objectFields[objectKey].push(_extends({}, field, {
-        key: fieldKey
-      }));
-      return;
-    }
-
     var yupField = getYupField(field, yupTypeMap);
 
     if (field.condition) {

package/es/validators/utils/int.js

@@ -0,0 +1,20 @@
+export function validateIntNumber(number) {
+  if (number === undefined) {
+    return false;
+  } else {
+    return Number.isInteger(number) && Number(number) > 0;
+  }
+}
+export var INT_VALIDATOR = function INT_VALIDATOR() {
+  return {
+    name: 'int-validator',
+    message: 'form.error.positive_integer_number',
+    test: function test(value) {
+      if (value === null) {
+        return true;
+      }
+
+      return validateIntNumber(value);
+    }
+  };
+};