@digigov/form 0.7.0 → 0.8.1

package/esm/validators/index.js

@@ -33,10 +33,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; // .required(field.required)
       } else if (typeof field.extra.of === 'string') {
         return yup.array().of(yupTypeMap[field.extra.of]());
       } else {
@@ -77,8 +93,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 +120,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 +150,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/esm/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/inputs/FileInput/index.js

@@ -25,19 +25,22 @@ var _Paragraph = _interopRequireDefault(require("@digigov/ui/typography/Paragrap
 
 var _Hint = _interopRequireDefault(require("@digigov/react-core/Hint"));
 
-var _excluded = ["name", "extra", "disabled", "type"];
+var _Button = _interopRequireDefault(require("@digigov/ui/core/Button"));
+
+var _excluded = ["name", "extra", "disabled", "reset"];
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-var FileInput = /*#__PURE__*/_react["default"].forwardRef(function FileInput(_ref, ref) {
+var FileInput = function FileInput(_ref) {
   var name = _ref.name,
       _ref$extra = _ref.extra,
       extra = _ref$extra === void 0 ? {} : _ref$extra,
       disabled = _ref.disabled,
-      type = _ref.type,
+      _ref$reset = _ref.reset,
+      reset = _ref$reset === void 0 ? true : _ref$reset,
       props = (0, _objectWithoutProperties2["default"])(_ref, _excluded);
 
   var _useTranslation = (0, _i18n.useTranslation)(),
@@ -48,14 +51,13 @@ var FileInput = /*#__PURE__*/_react["default"].forwardRef(function FileInput(_re
       files = _useState2[0],
       setFiles = _useState2[1];
 
-  return /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _clsx["default"])(extra.className, files.length > 0 && 'govgr-uploaded-file', true && 'govgr-field-file')
-  }, files.length ? /*#__PURE__*/_react["default"].createElement(_Paragraph["default"], null, /*#__PURE__*/_react["default"].createElement("b", null, t('upload.file'), ":"), " ", "".concat(files.join(', '))) : /*#__PURE__*/_react["default"].createElement(_Hint["default"], null, t('upload.no_file')), /*#__PURE__*/_react["default"].createElement("label", {
+  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _clsx["default"])(extra.className, files.length > 0 && files && 'govgr-uploaded-file', true && 'govgr-field-file')
+  }, files !== null && files !== void 0 && files.length ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_Paragraph["default"], null, /*#__PURE__*/_react["default"].createElement("b", null, t('upload.file'), ":"), " ", "".concat(files.join(', ')))) : /*#__PURE__*/_react["default"].createElement(_Hint["default"], null, t('upload.no_file')), /*#__PURE__*/_react["default"].createElement("label", {
     tabIndex: 0,
     role: "button",
-    className: (0, _clsx["default"])(extra.className, files.length === 0 && ['govgr-btn', 'govgr-btn-primary'], files.length > 0 && 'govgr-link', true && 'govgr-label-file')
+    className: (0, _clsx["default"])(extra.className, (!files || (files === null || files === void 0 ? void 0 : files.length) === 0) && 'govgr-btn', (!files || (files === null || files === void 0 ? void 0 : files.length) === 0) && 'govgr-btn-secondary', true && 'govgr-label-file', (files === null || files === void 0 ? void 0 : files.length) && 'govgr-link')
   }, /*#__PURE__*/_react["default"].createElement("input", (0, _extends2["default"])({
-    ref: ref,
     type: "file",
     name: name,
     disabled: disabled,
@@ -73,8 +75,13 @@ var FileInput = /*#__PURE__*/_react["default"].forwardRef(function FileInput(_re
     }
   }, (0, _extends2["default"])({}, 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')), reset && files !== undefined && files.length > 0 && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+    variant: "link",
+    onClick: function onClick() {
+      setFiles(undefined);
+    }
+  }, t('upload.reset_file')))));
+};
 
 exports.FileInput = FileInput;
 var _default = FileInput;

package/inputs/Radio/index.js

@@ -2,8 +2,6 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -11,11 +9,9 @@ exports["default"] = exports.RadioButtonsGroup = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 
 var _Radio = _interopRequireDefault(require("@digigov/react-core/Radio"));
 
@@ -29,10 +25,6 @@ var _Hint = _interopRequireDefault(require("@digigov/react-core/Hint"));
 
 var _excluded = ["register", "name", "control", "extra", "disabled"];
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 var RadioButtonsGroup = function RadioButtonsGroup(_ref) {
   var register = _ref.register,
       name = _ref.name,
@@ -47,32 +39,28 @@ var RadioButtonsGroup = function RadioButtonsGroup(_ref) {
     name: name
   });
 
-  var _useState = (0, _react.useState)(currentValue),
-      _useState2 = (0, _slicedToArray2["default"])(_useState, 1),
-      defaultValue = _useState2[0];
-
   var _useTranslation = (0, _i18n.useTranslation)(),
       t = _useTranslation.t;
 
   return /*#__PURE__*/_react["default"].createElement(_Radio["default"], {
     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["default"].createElement(_RadioItem["default"], (0, _extends2["default"])({
-      ref: register,
-      key: v,
-      name: name,
+        optionDisabled = _ref2.disabled,
+        selected = _ref2.selected;
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      key: "".concat(name, ".").concat(v)
+    }, /*#__PURE__*/_react["default"].createElement(_RadioItem["default"], (0, _extends2["default"])({}, register(name), {
       value: v,
       disabled: disabled || optionDisabled
     }, (0, _extends2["default"])({}, props, {
       required: undefined,
       'aria-describedby': undefined,
       type: 'radio'
-    })), label && label.primary && t(label.primary) || v, label && label.secondary && /*#__PURE__*/_react["default"].createElement(_Hint["default"], null, t(label.secondary)));
+    })), label && label.primary && t(label.primary) || v, label && label.secondary && /*#__PURE__*/_react["default"].createElement(_Hint["default"], null, t(label.secondary))), selected && selected());
   }));
 };
 

package/internal.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 var _exportNames = {
   Field: true,
+  FieldArray: true,
   FieldConditional: true,
   Fieldset: true,
   FormBuilder: true,
@@ -38,6 +39,12 @@ Object.defineProperty(exports, "Field", {
     return _Field["default"];
   }
 });
+Object.defineProperty(exports, "FieldArray", {
+  enumerable: true,
+  get: function get() {
+    return _FieldArray["default"];
+  }
+});
 Object.defineProperty(exports, "FieldConditional", {
   enumerable: true,
   get: function get() {
@@ -113,6 +120,20 @@ Object.keys(_Field).forEach(function (key) {
   });
 });
 
+var _FieldArray = _interopRequireWildcard(require("@digigov/form/FieldArray"));
+
+Object.keys(_FieldArray).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _FieldArray[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _FieldArray[key];
+    }
+  });
+});
+
 var _FieldConditional = _interopRequireWildcard(require("@digigov/form/Field/FieldConditional"));
 
 Object.keys(_FieldConditional).forEach(function (key) {

package/libs/form/src/Field/types.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
-import { UseFormMethods } from 'react-hook-form';
-import { FieldSpec, FieldError } from '@digigov/form/types';
+import { ErrorOption, UseFormReturn } from 'react-hook-form';
+import { FieldSpec } from '@digigov/form/types';
 import { FieldCondition, FormData } from '@digigov/form/types';
 export interface ChildFieldMemoProps extends FieldConditionalProps {
     dependencies: FormData;
@@ -10,9 +10,9 @@ export interface FieldWithCondition extends Omit<CalculatedField, 'condition'> {
 }
 export interface FieldConditionalProps {
     field: FieldWithCondition;
-    control: UseFormMethods['control'];
-    register: UseFormMethods['register'];
-    error?: FieldError;
+    control: UseFormReturn['control'];
+    register: UseFormReturn['register'];
+    error?: ErrorOption;
 }
 export declare type FieldComponentItem = {
     component: any;
@@ -23,7 +23,7 @@ export interface FieldContainerProps {
     name?: FieldSpec['key'];
     layout?: FieldSpec['layout'];
     label?: FieldSpec['label'];
-    error?: FieldError;
+    error?: ErrorOption | Record<string, any>;
     children?: React.ReactNode;
     wrapper?: FieldSpec['wrapper'];
 }
@@ -43,8 +43,7 @@ export interface ControlledFieldProps {
 }
 export interface UncontrolledFieldProps {
     name: string;
-    register?: FieldBaseProps['register'];
-    ref?: FieldBaseProps['register'];
+    register: FieldBaseProps['register'];
     control?: FieldBaseProps['control'];
     error?: boolean;
     extra?: Record<string, never>;
@@ -55,21 +54,30 @@ export interface CalculatedField extends OmittedFieldSpec {
     name: string;
     component: any;
     defaultValue?: never;
-    error?: FieldError;
+    error?: ErrorOption;
     wrapper?: FieldComponentItem['wrapper'];
+    multiplicity?: boolean;
 }
 export interface FieldBaseProps extends CalculatedField {
-    control: UseFormMethods['control'];
-    register: UseFormMethods['register'];
+    control: UseFormReturn['control'];
+    register: UseFormReturn['register'];
 }
 export interface FieldProps extends FieldSpec {
     name: string;
-    children?: React.ElementType;
+    children?: React.ReactNode;
 }
 export interface UseFieldProps {
     field: FieldSpec;
     control: FieldBaseProps['control'];
     register: FieldBaseProps['register'];
-    error: FieldError;
+    watch: UseFormReturn['watch'];
+    formState: UseFormReturn['formState'];
+    getFieldState: UseFormReturn['getFieldState'];
+    setValue: UseFormReturn['setValue'];
+    getValues: UseFormReturn['getValues'];
+    unregister: UseFormReturn['unregister'];
+    trigger: UseFormReturn['trigger'];
+    clearErrors: UseFormReturn['clearErrors'];
+    error?: ErrorOption;
     componentRegistry?: FieldComponentRegistry;
 }

package/libs/form/src/FieldArray/FieldArray.stories.d.ts

@@ -0,0 +1,8 @@
+declare namespace _default {
+    export const title: string;
+    export { FieldArray as component };
+}
+export default _default;
+export * from "@digigov/form/FieldArray/__stories__/Default";
+export * from "@digigov/form/FieldArray/__stories__/WithExactLength";
+import FieldArray from "@digigov/form/FieldArray";

package/libs/form/src/FieldArray/__stories__/Default.d.ts

@@ -0,0 +1 @@
+export declare const Default: () => JSX.Element;

package/libs/form/src/FieldArray/__stories__/WithExactLength.d.ts

@@ -0,0 +1 @@
+export declare const WithExactLength: () => JSX.Element;

package/libs/form/src/FieldArray/index.d.ts

@@ -0,0 +1,11 @@
+import React from 'react';
+import { ErrorOption, UseFormReturn } from 'react-hook-form';
+import { FieldProps } from '@digigov/form/Field/types';
+export interface FieldArrayProps extends FieldProps {
+    control: UseFormReturn['control'];
+    register: UseFormReturn['register'];
+    formState: UseFormReturn['formState'];
+    error?: ErrorOption;
+}
+export declare const FieldArray: React.FC<FieldArrayProps>;
+export default FieldArray;

package/libs/form/src/FieldObject/index.d.ts

@@ -0,0 +1,20 @@
+import React from 'react';
+import { FieldProps } from '@digigov/form/Field/types';
+import { ErrorOption, UseFormReturn } from 'react-hook-form';
+import { FieldSpec } from '@digigov/form/types';
+export interface FieldObjectProps extends Omit<FieldProps, 'key'> {
+    control: UseFormReturn['control'];
+    register: UseFormReturn['register'];
+    formState: UseFormReturn['formState'];
+    error?: ErrorOption;
+}
+export declare const FieldObject: React.FC<FieldObjectProps>;
+export interface FieldObjectItemProps {
+    name: string;
+    field: FieldSpec;
+    control: UseFormReturn['control'];
+    register: UseFormReturn['register'];
+    formState: UseFormReturn['formState'];
+    error?: ErrorOption;
+}
+export default FieldObject;

package/libs/form/src/MultiplicityField/MultiplicityField.stories.d.ts

@@ -0,0 +1,11 @@
+declare namespace _default {
+    export const title: string;
+    export { MultiplicityField as component };
+}
+export default _default;
+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";
+import MultiplicityField from "@digigov/form/MultiplicityField";

package/libs/form/src/MultiplicityField/__stories__/Default.d.ts

@@ -0,0 +1 @@
+export declare const Default: () => JSX.Element;

package/libs/form/src/MultiplicityField/__stories__/WithExactLength.d.ts

@@ -0,0 +1 @@
+export declare const WithExactLength: () => JSX.Element;

package/libs/form/src/MultiplicityField/__stories__/WithMaxLength.d.ts

@@ -0,0 +1 @@
+export declare const WithMaxLength: () => JSX.Element;

package/libs/form/src/MultiplicityField/__stories__/WithMinAndMaxLength.d.ts

@@ -0,0 +1 @@
+export declare const WithMinAndMaxLength: () => JSX.Element;

package/libs/form/src/MultiplicityField/__stories__/WithMinLength.d.ts

@@ -0,0 +1 @@
+export declare const WithMinLength: () => JSX.Element;

package/libs/form/src/MultiplicityField/add-objects.d.ts

@@ -0,0 +1,13 @@
+import React from 'react';
+import { ErrorOption, FieldArrayWithId, UseFieldArrayReturn } from 'react-hook-form';
+import { MultiplicityProps, StashedObject } from '@digigov/form/MultiplicityField';
+export interface AddObjectsProps extends Omit<MultiplicityProps, 'key' | 'formState' | 'component'> {
+    fields: FieldArrayWithId[];
+    error?: ErrorOption;
+    append: UseFieldArrayReturn['append'];
+    remove: UseFieldArrayReturn['remove'];
+    stashedObjects: StashedObject[];
+    onStash: (arg0: StashedObject) => void;
+}
+export declare const AddObjects: React.FC<AddObjectsProps>;
+export default AddObjects;

package/libs/form/src/MultiplicityField/index.d.ts

@@ -0,0 +1,32 @@
+import React from 'react';
+import { ControlledFieldProps } from '@digigov/form/Field/types';
+import { FieldSpec } from '@digigov/form';
+import { ErrorOption, UseFormReturn } from 'react-hook-form';
+export interface MultiplicityProps extends Omit<ControlledFieldProps, 'value' | 'onChange' | 'error' | 'extra'> {
+    name: string;
+    control: UseFormReturn['control'];
+    register: UseFormReturn['register'];
+    trigger: UseFormReturn['trigger'];
+    clearErrors: UseFormReturn['clearErrors'];
+    formState: UseFormReturn['formState'];
+    setValue: UseFormReturn['setValue'];
+    getValues: UseFormReturn['getValues'];
+    unregister: UseFormReturn['unregister'];
+    error?: ErrorOption;
+    extra?: Record<string, any>;
+    label?: FieldSpec['label'];
+    layout?: FieldSpec['layout'];
+}
+export declare type StashedObject = Record<string, any>;
+export declare const Multiplicity: React.FC<MultiplicityProps>;
+export default Multiplicity;
+export interface ListObjectProps {
+    index: number;
+    name: string;
+    control: UseFormReturn['control'];
+    register: UseFormReturn['register'];
+    formState: UseFormReturn['formState'];
+    onDelete: (index: number) => void;
+    extra?: Record<string, any>;
+}
+export declare const ListObject: React.FC<ListObjectProps>;

package/libs/form/src/inputs/DateInput/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { UncontrolledFieldProps } from '@digigov/form/Field/types';
 export interface DateInputProps extends Omit<UncontrolledFieldProps, 'extra'> {
     extra?: {

package/libs/form/src/inputs/FileInput/index.d.ts

@@ -4,6 +4,7 @@ export interface FileInputProps extends Omit<UncontrolledFieldProps, 'extra'> {
     extra?: {
         className?: string;
         multiple?: boolean;
+        reset?: boolean;
         accept?: string;
         maxSize?: number;
     };

package/libs/form/src/inputs/Label/index.d.ts

@@ -4,6 +4,7 @@ export interface FieldOptionProps {
     label?: FieldLabelProps;
     value: string;
     disabled?: boolean;
+    selected?: () => React.FC;
 }
 export interface LabelProps {
     primary?: string;

package/libs/form/src/internal.d.ts

@@ -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/libs/form/src/types.d.ts

@@ -1,5 +1,5 @@
-import React from 'react';
-import { UseFormMethods, UseFormOptions } from 'react-hook-form';
+/// <reference types="react" />
+import { UseFormReturn, UseFormProps } from 'react-hook-form';
 import { GridProps } from '@digigov/ui/layouts/Grid';
 import { ValidatorSchema } from '@digigov/form/validators/types';
 import { FieldComponentRegistry } from '@digigov/form/Field/types';
@@ -17,7 +17,7 @@ export interface FieldCondition {
 }
 export interface FieldSpec {
     key: string;
-    type?: 'int' | 'string' | 'boolean' | 'choice:multiple' | 'choice:single' | 'mobile_phone' | 'afm' | 'iban' | 'postal_code' | 'phone_number' | 'array' | 'object';
+    type?: 'int' | 'string' | 'boolean' | 'choice:multiple' | 'choice:single' | 'mobile_phone' | 'afm' | 'iban' | 'file' | 'postal_code' | 'phone_number' | 'array' | 'object';
     component?: any;
     condition?: Record<string, FieldCondition>;
     controlled?: boolean;
@@ -36,15 +36,23 @@ export interface FieldsetSpec {
     label?: FieldLabelProps;
     body?: React.ReactNode;
 }
-export declare type FormData = UseFormOptions['defaultValues'];
+export declare type FormData = UseFormProps['defaultValues'];
 export interface FormContextProps {
     fieldsetsMap?: Record<string, FieldsetSpec>;
     fieldsMap: Record<string, FieldSpec>;
-    control: UseFormMethods['control'];
-    register: UseFormMethods['register'];
-    reset: UseFormMethods['reset'];
+    control: UseFormReturn['control'];
+    register: UseFormReturn['register'];
+    trigger: UseFormReturn['trigger'];
+    clearErrors: UseFormReturn['clearErrors'];
+    watch: UseFormReturn['watch'];
+    getFieldState: UseFormReturn['getFieldState'];
+    setValue: UseFormReturn['setValue'];
+    getValues: UseFormReturn['getValues'];
+    unregister: UseFormReturn['unregister'];
+    formState: UseFormReturn['formState'];
+    reset: UseFormReturn['reset'];
     registerField: (field: FieldSpec) => void;
-    errors: UseFormMethods['errors'];
+    errors: UseFormReturn['formState']['errors'];
     componentRegistry?: FieldComponentRegistry;
 }
 export interface FormBuilderProps {
@@ -52,13 +60,13 @@ export interface FormBuilderProps {
     fieldsets?: FieldsetSpec[];
     initial?: FormData;
     onSubmit?: (data: FormData) => void | null | FieldError[];
-    mode?: UseFormOptions['mode'];
-    reValidateMode?: UseFormOptions['reValidateMode'];
-    criteriaMode?: UseFormOptions['criteriaMode'];
+    mode?: UseFormProps['mode'];
+    reValidateMode?: UseFormProps['reValidateMode'];
+    criteriaMode?: UseFormProps['criteriaMode'];
     children?: React.ReactNode;
     shouldFocusError?: boolean;
     auto?: boolean;
-    validatorRegistry?: Record<string, ValidatorSchema>;
+    validatorRegistry?: Record<string, ValidatorSchema[]>;
     componentRegistry?: FieldComponentRegistry;
     grid?: boolean;
 }

package/libs/form/src/utils.d.ts

@@ -1,3 +1,8 @@
-import { Resolver, FieldValues } from 'react-hook-form';
-import Yup from 'yup';
-export declare const yupResolver: <TFieldValues extends FieldValues>(schema: Yup.ObjectSchema | Yup.Lazy, options?: Omit<Yup.ValidateOptions, 'context'>) => Resolver<TFieldValues, object>;
+import { FieldError } from 'react-hook-form';
+export declare const yupResolver: (schema: any, schemaOptions?: any, resolverOptions?: any) => (values: any, context: any, options: any) => Promise<{
+    values: any;
+    errors: {};
+} | {
+    values: {};
+    errors: Record<string, FieldError>;
+}>;

package/libs/form/src/validators/index.d.ts

@@ -1,8 +1,9 @@
-import * as yup from 'yup';
 import { FieldSpec } from '@digigov/form/types';
 import { ValidatorSchema } from '@digigov/form/validators/types';
 import { MutableRefObject } from 'react';
-export declare const getYUPTypeMap: () => Record<string, yup>;
+import Lazy from 'yup/lib/Lazy';
+import { AnyObjectSchema } from 'yup';
+export declare const getYUPTypeMap: () => Record<string, any>;
 export interface MutableRefObjectProps {
 }
-export declare function useValidationSchema(fields: FieldSpec[] | MutableRefObject<MutableRefObjectProps>, validatorRegistry?: Record<string, ValidatorSchema>): Record<string, unknown> | void;
+export declare function useValidationSchema(fields: FieldSpec[] | MutableRefObject<MutableRefObjectProps>, validatorRegistry?: Record<string, ValidatorSchema[]>): Lazy<any, unknown> | AnyObjectSchema | void;

package/libs/form/src/validators/types.d.ts

@@ -1,2 +1,2 @@
 import * as yup from 'yup';
-export declare type ValidatorSchema = yup.BaseTestOptions;
+export declare type ValidatorSchema = yup.TestConfig;

package/libs/form/src/validators/utils/file.d.ts

@@ -1 +1,3 @@
-export declare const FILE_MAX_SIZE_VALIDATOR: (field: any) => any;
+import { ValidatorSchema } from '@digigov/form/validators/types';
+import { FieldSpec } from '@digigov/form/types';
+export declare const FILE_MAX_SIZE_VALIDATOR: (field: FieldSpec) => ValidatorSchema;

package/libs/form/src/validators/utils/iban.d.ts

@@ -1,2 +1,4 @@
+import { FieldSpec } from '@digigov/form/types';
+import { ValidatorSchema } from '@digigov/form/validators/types';
 export declare function validateIban(value: string, countryCode: string): boolean;
-export declare const IBAN_VALIDATOR: (field: any) => any;
+export declare const IBAN_VALIDATOR: (field: FieldSpec) => ValidatorSchema;