@digigov/form 0.8.1 → 0.8.3

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);
+    }
+  };
+};

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

@@ -70,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/index.js

@@ -16,6 +16,7 @@ export var Field = function Field(_ref) {
       field = _useField.field,
       control = _useField.control,
       register = _useField.register,
+      reset = _useField.reset,
       error = _useField.error,
       componentRegistry = _useField.componentRegistry,
       formState = _useField.formState,
@@ -32,6 +33,7 @@ export var Field = function Field(_ref) {
   if (calculatedField.condition) {
     return /*#__PURE__*/React.createElement(FieldConditional, {
       control: control,
+      reset: reset,
       register: register,
       field: calculatedField,
       error: error
@@ -39,7 +41,6 @@ export var Field = function Field(_ref) {
   }
 
   if (calculatedField.type === 'array' && calculatedField.multiplicity) {
-    // if (error) debugger;
     calculatedField.name = name;
     return /*#__PURE__*/React.createElement(Multiplicity, _extends({
       control: control,
@@ -68,6 +69,7 @@ export var Field = function Field(_ref) {
     name: name,
     control: control,
     register: register,
+    reset: reset,
     error: error
   }));
 };

package/esm/Field/utils.js

@@ -80,6 +80,7 @@ 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,
@@ -101,6 +102,7 @@ export var useField = function useField(name, customField) {
     field: customField || fieldsMap[name],
     control: control,
     register: register,
+    reset: reset,
     trigger: trigger,
     watch: watch,
     componentRegistry: componentRegistry,

package/esm/FieldObject/index.js

@@ -12,6 +12,7 @@ export var FieldObject = function FieldObject(_ref) {
       error = _ref.error,
       control = _ref.control,
       register = _ref.register,
+      reset = _ref.reset,
       formState = _ref.formState;
 
   var _useTranslation = useTranslation(),
@@ -25,6 +26,7 @@ export var FieldObject = function FieldObject(_ref) {
       name: "".concat(name, ".").concat(field.key),
       control: control,
       register: register,
+      reset: reset,
       field: field,
       error: error && error[field.key],
       formState: formState
@@ -39,6 +41,7 @@ var FieldObjectItem = function FieldObjectItem(_ref2) {
       error = _ref2.error,
       control = _ref2.control,
       formState = _ref2.formState,
+      reset = _ref2.reset,
       register = _ref2.register;
   var calculatedField = useMemo(function () {
     return calculateField(children, field);
@@ -47,6 +50,7 @@ var FieldObjectItem = function FieldObjectItem(_ref2) {
   return /*#__PURE__*/React.createElement(FieldBase, _extends({}, calculatedField, {
     name: name,
     control: control,
+    reset: reset,
     register: register,
     error: customError
   }));

package/esm/Form.stories.js

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

package/esm/MultiplicityField/add-objects.js

@@ -108,6 +108,7 @@ export var AddObjects = function AddObjects(_ref) {
       field = _useField.field,
       control = _useField.control,
       register = _useField.register,
+      reset = _useField.reset,
       needsMoreError = _useField.error;
 
   var calculatedField = useMemo(function () {
@@ -150,6 +151,7 @@ export var AddObjects = function AddObjects(_ref) {
     name: calculatedField.key,
     control: control,
     register: register,
+    reset: reset,
     error: (extra === null || extra === void 0 ? void 0 : extra.max) - stashedObjects.length === 0 || (extra === null || extra === void 0 ? void 0 : extra.length) - stashedObjects.length === 0 ? error : needsMoreError
   })));
 };

package/esm/__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/esm/index.js

@@ -1,4 +1,4 @@
-/** @license Digigov v0.8.1
+/** @license Digigov v0.8.3
  *
  * This source code is licensed under the BSD-2-Clause license found in the
  * LICENSE file in the root directory of this source tree.

package/esm/inputs/Checkboxes/index.js

@@ -53,6 +53,7 @@ export var Checkboxes = function Checkboxes(_ref) {
       checked: value.includes(option.value),
       onChange: handleChange(option.value)
     }, option, _extends({}, props, {
+      reset: undefined,
       defaultValue: undefined,
       onBlur: undefined,
       required: undefined,

package/esm/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/esm/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/esm/inputs/FileInput/index.js

@@ -1,21 +1,23 @@
+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", "reset"];
+var _excluded = ["name", "extra", "disabled", "reset", "onChange"];
 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 FileUploadContainer from '@digigov/react-core/FileUploadContainer';
+import FileUpload from '@digigov/react-core/FileUpload';
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export var FileInput = function FileInput(_ref) {
+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,
-      _ref$reset = _ref.reset,
-      reset = _ref$reset === void 0 ? true : _ref$reset,
+      reset = _ref.reset,
+      onChange = _ref.onChange,
       props = _objectWithoutProperties(_ref, _excluded);
 
   var _useTranslation = useTranslation(),
@@ -26,35 +28,35 @@ export var FileInput = function FileInput(_ref) {
       files = _useState2[0],
       setFiles = _useState2[1];
 
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: clsx(extra.className, files.length > 0 && files && 'govgr-uploaded-file', true && 'govgr-field-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("label", {
-    tabIndex: 0,
-    role: "button",
-    className: clsx(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.createElement("input", _extends({
-    type: "file",
+  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(FileUploadContainer, {
+    hasUploadedFile: files && files.length > 0
+  }, 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,
+    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 !== null && files !== void 0 && files.length ? t('upload.change_file') : t('upload.choose_file')), reset && files !== undefined && files.length > 0 && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
+  })), 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() {
+    onClick: function onClick(event) {
+      event.preventDefault();
+      reset(_defineProperty({}, name, ''));
       setFiles(undefined);
     }
   }, t('upload.reset_file')))));
-};
+});
 export default FileInput;

package/esm/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'
 };
@@ -38,6 +38,7 @@ export var Input = /*#__PURE__*/React.forwardRef(function WrappedInput(_ref, ref
       rows: rows,
       ref: ref
     }, _extends({}, props, {
+      reset: undefined,
       required: undefined,
       type: fieldType
     })));
@@ -48,6 +49,7 @@ export var Input = /*#__PURE__*/React.forwardRef(function WrappedInput(_ref, ref
       className: className,
       ref: ref
     }, _extends({}, props, {
+      reset: undefined,
       required: undefined
     })));
   }

package/esm/inputs/Radio/index.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["register", "name", "control", "extra", "disabled"];
+var _excluded = ["name", "control", "extra", "disabled"];
 import React from 'react';
 import Radio from '@digigov/react-core/Radio';
 import RadioItem from '@digigov/react-core/RadioItem';
@@ -8,8 +8,7 @@ import { useTranslation } from '@digigov/ui/app/i18n';
 import { useWatch } from 'react-hook-form';
 import Hint from '@digigov/react-core/Hint';
 export var RadioButtonsGroup = function RadioButtonsGroup(_ref) {
-  var register = _ref.register,
-      name = _ref.name,
+  var name = _ref.name,
       control = _ref.control,
       _ref$extra = _ref.extra,
       options = _ref$extra.options,
@@ -36,10 +35,11 @@ export var RadioButtonsGroup = function RadioButtonsGroup(_ref) {
         selected = _ref2.selected;
     return /*#__PURE__*/React.createElement("div", {
       key: "".concat(name, ".").concat(v)
-    }, /*#__PURE__*/React.createElement(RadioItem, _extends({}, register(name), {
+    }, /*#__PURE__*/React.createElement(RadioItem, _extends({
       value: v,
       disabled: disabled || optionDisabled
     }, _extends({}, props, {
+      reset: undefined,
       required: undefined,
       'aria-describedby': undefined,
       type: 'radio'

package/esm/inputs/Select/index.js

@@ -18,6 +18,7 @@ export var Select = /*#__PURE__*/React.forwardRef(function WrappedSelect(_ref, r
     name: name,
     disabled: disabled
   }, _extends({}, props, {
+    reset: undefined,
     required: undefined
   })), options.map(function (_ref2) {
     var value = _ref2.value,

package/esm/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 = {};
@@ -52,7 +54,7 @@ export var getYUPTypeMap = function getYUPTypeMap() {
             max: field.extra.max
           }
         });
-        return arrayValidator; // .required(field.required)
+        return arrayValidator;
       } else if (typeof field.extra.of === 'string') {
         return yup.array().of(yupTypeMap[field.extra.of]());
       } else {
@@ -61,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');

package/esm/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);
+    }
+  };
+};

package/esm/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/inputs/Checkboxes/index.js

@@ -69,6 +69,7 @@ var Checkboxes = function Checkboxes(_ref) {
       checked: value.includes(option.value),
       onChange: handleChange(option.value)
     }, option, (0, _extends2["default"])({}, props, {
+      reset: undefined,
       defaultValue: undefined,
       onBlur: undefined,
       required: undefined,

package/inputs/FileInput/FileInput.stories.js

@@ -0,0 +1,30 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _exportNames = {};
+exports["default"] = void 0;
+
+var _FileInput = _interopRequireDefault(require("@digigov/form/inputs/FileInput"));
+
+var _Default = require("@digigov/form/inputs/FileInput/__stories__/Default");
+
+Object.keys(_Default).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _Default[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _Default[key];
+    }
+  });
+});
+var _default = {
+  title: 'Digigov Form/inputs/FileInput',
+  component: _FileInput["default"]
+};
+exports["default"] = _default;

package/inputs/FileInput/__stories__/Default.js

@@ -0,0 +1,43 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _typeof = require("@babel/runtime/helpers/typeof");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = exports.Default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _form = _interopRequireWildcard(require("@digigov/form"));
+
+var _core = require("@digigov/ui/core");
+
+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 _ref = /*#__PURE__*/_react["default"].createElement(_core.Button, null, "\u03A3\u03C5\u03BD\u03AD\u03C7\u03B5\u03B9\u03B1");
+
+var Default = function Default() {
+  return /*#__PURE__*/_react["default"].createElement(_form["default"], {
+    onSubmit: function onSubmit(data) {
+      debugger;
+      console.log(data);
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_form.Field, {
+    key: 'string',
+    name: "file",
+    type: "file",
+    required: true,
+    label: {
+      primary: 'Βιογραφικό σημείωμα'
+    }
+  }), _ref);
+};
+
+exports.Default = Default;
+var _default = Default;
+exports["default"] = _default;