@digigov/form 0.6.5 → 0.6.8

package/es/validators.spec.js

@@ -1,4 +1,4 @@
-import { validateUUID4, validateIban } from '@digigov/form/validators';
+import { validateUUID4, validateIban, validatePostalCode, validatePhoneNumber } from '@digigov/form/validators';
 it('validates wrong uuid4 for empty value', function () {
   expect(validateUUID4('')).toBe(false);
 });
@@ -31,4 +31,55 @@ it('validates wrong iban for non existing country code', function () {
 });
 it('validates correct greek iban whithout country code', function () {
   expect(validateIban('7801100800000008009825202', '')).toBe(true);
+});
+it('validates wrong postal code without country code', function () {
+  expect(validatePostalCode('123', [])).toBe(true);
+});
+it('validates wrong postal code with wrong country code', function () {
+  expect(validatePostalCode('123', ['FR'])).toBe(true);
+});
+it('validates wrong postal code with greek country code', function () {
+  expect(validatePostalCode('123', ['GR'])).toBe(false);
+});
+it('validates postal code with greek country code', function () {
+  expect(validatePostalCode('11143', ['GR'])).toBe(true);
+});
+it('validates phone number type landline with greek country code', function () {
+  expect(validatePhoneNumber('2102934896', ['GR'], 'landline')).toBe(true);
+});
+it('validates phone number type landline with ch country code', function () {
+  expect(validatePhoneNumber('2102934896', ['CH'], 'landline')).toBe(false);
+});
+it('validates phone number type landline with ch  and  gr countries code', function () {
+  expect(validatePhoneNumber('2102934896', ['GR', 'CH'], 'landline')).toBe(true);
+});
+it('validatesphone number type landline with ch  and  gr countries code', function () {
+  expect(validatePhoneNumber('41446681800', ['GR', 'CH'], 'landline')).toBe(true);
+});
+it('validates phone number type landline with ch  and  gr countries code but phone number is mobile', function () {
+  expect(validatePhoneNumber('2102934896', ['GR', 'CH'], 'mobile')).toBe(false);
+});
+it('validates phone number type mobile with ch  and  gr countries code', function () {
+  expect(validatePhoneNumber('6934100982', ['GR', 'CH'], 'mobile')).toBe(true);
+});
+it('validates  phone number type mobile with gr country code', function () {
+  expect(validatePhoneNumber('6934100982', ['GR'], 'mobile')).toBe(true);
+});
+it('validates  phone number type mobile with ch country code', function () {
+  expect(validatePhoneNumber('6934100982', ['CH'], 'mobile')).toBe(false);
+});
+it('validates  phone number with no type and ch country code', function () {
+  expect(validatePhoneNumber('6934100982', ['CH'], null)).toBe(false);
+});
+it('validates  phone number with no type and gr country code', function () {
+  expect(validatePhoneNumber('6934100982', ['gr'], null)).toBe(true);
+});
+it('validates  phone number with no type and ch country code', function () {
+  expect(validatePhoneNumber('41446681800', ['CH'], null)).toBe(true);
+});
+it('validates  phone number with no type and gr country code', function () {
+  expect(validatePhoneNumber('41446681800', ['gr'], null)).toBe(false);
+});
+it('validates  phone number with no type and gr and ch countries code', function () {
+  expect(validatePhoneNumber('41446681800', ['gr', 'ch'], null)).toBe(true);
 });

package/esm/Field/index.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["name", "component", "wrapper", "control", "type", "controlled", "enabled", "editable", "defaultValue", "label", "extra", "layout", "error", "register"],
+var _excluded = ["required", "name", "component", "wrapper", "control", "type", "controlled", "enabled", "editable", "defaultValue", "label", "extra", "layout", "error", "register"],
     _excluded2 = ["name", "children"];
 import React, { useContext, useMemo } from 'react';
 import { ConditionalField } from '@digigov/form/Field/ConditionalField';
@@ -55,7 +55,8 @@ var ALTERNATIVE_COMPONENTS = {
 };
 
 var FieldContainer = function FieldContainer(_ref) {
-  var wrapper = _ref.wrapper,
+  var name = _ref.name,
+      wrapper = _ref.wrapper,
       label = _ref.label,
       children = _ref.children,
       error = _ref.error;
@@ -68,18 +69,23 @@ var FieldContainer = function FieldContainer(_ref) {
       error: !!error
     }, /*#__PURE__*/React.createElement(CoreFieldset, null, /*#__PURE__*/React.createElement(FieldsetLegend, {
       size: "s"
-    }, label && label.primary, label && label.secondary && /*#__PURE__*/React.createElement(Hint, null, t(label.secondary)), error && /*#__PURE__*/React.createElement(ErrorMessage, null, t((error === null || error === void 0 ? void 0 : error.message) || ''))), children));
+    }, label && label.primary, label && label.secondary && /*#__PURE__*/React.createElement(Hint, null, t(label.secondary)), error && /*#__PURE__*/React.createElement(ErrorMessage, {
+      id: "".concat(name, "-error")
+    }, t((error === null || error === void 0 ? void 0 : error.message) || ''))), children));
   } else {
     return /*#__PURE__*/React.createElement(CoreField, {
       error: !!error
     }, /*#__PURE__*/React.createElement(CoreLabel, null, label && /*#__PURE__*/React.createElement(Label, {
       label: label
-    }), error && /*#__PURE__*/React.createElement(ErrorMessage, null, t((error === null || error === void 0 ? void 0 : error.message) || '')), children));
+    }), error && /*#__PURE__*/React.createElement(ErrorMessage, {
+      id: "".concat(name, "-error")
+    }, t((error === null || error === void 0 ? void 0 : error.message) || '')), children));
   }
 };
 
 export var FieldBase = function FieldBase(props) {
-  var name = props.name,
+  var required = props.required,
+      name = props.name,
       Component = props.component,
       wrapper = props.wrapper,
       control = props.control,
@@ -107,7 +113,8 @@ export var FieldBase = function FieldBase(props) {
       label: label,
       layout: layout,
       error: error,
-      wrapper: wrapper
+      wrapper: wrapper,
+      name: name
     }, /*#__PURE__*/React.createElement(Controller, {
       control: control,
       name: name,
@@ -124,6 +131,9 @@ export var FieldBase = function FieldBase(props) {
           extra: extra,
           error: !!error,
           type: type,
+          "aria-required": !!required,
+          "aria-describedby": error && "".concat(name, "-error"),
+          required: required,
           disabled: editable === false
         }, componentProps));
       }
@@ -134,7 +144,8 @@ export var FieldBase = function FieldBase(props) {
     label: label,
     layout: layout,
     error: error,
-    wrapper: wrapper
+    wrapper: wrapper,
+    name: name
   }, Component !== null && Component !== void 0 && Component.render ? /*#__PURE__*/React.createElement(Component, _extends({
     name: name,
     ref: register,
@@ -142,6 +153,9 @@ export var FieldBase = function FieldBase(props) {
     error: !!error,
     extra: extra,
     type: type,
+    "aria-required": !!required,
+    "aria-describedby": error && "".concat(name, "-error"),
+    required: required,
     disabled: editable === false
   }, componentProps)) : /*#__PURE__*/React.createElement(Component, _extends({
     name: name,
@@ -150,6 +164,9 @@ export var FieldBase = function FieldBase(props) {
     error: !!error,
     extra: extra,
     type: type,
+    "aria-required": !!required,
+    "aria-describedby": error && "".concat(name, "-error"),
+    required: required,
     disabled: editable === false
   }, componentProps)));
 };

package/esm/Questions/index.mdx

@@ -10,8 +10,6 @@ import Questions, {
   StepTitle,
 } from '@digigov/form/Questions';
 import { Field } from '@digigov/form';
-import PropsDoc from '@docs-components/propsDoc';
-import StylesDoc from '@docs-components/stylesDoc';
 const steps = [
   {
     name: 'intro',

package/esm/index.js

@@ -1,4 +1,4 @@
-/** @license Digigov v0.6.5
+/** @license Digigov v0.6.8
  *
  * This source code is licensed under the BSD-2-Clause license found in the
  * LICENSE file in the root directory of this source tree.
@@ -55,7 +55,7 @@ export var FormBase = /*#__PURE__*/React.forwardRef(function FormBase(_ref, ref)
         form.setError(key, errors[key]);
       }
     }
-  }, []);
+  }, [onSubmit]);
   var ctx = {
     fieldsMap: fieldsMap,
     fieldsetsMap: fieldsetsMap,

package/esm/inputs/Checkboxes/index.js

@@ -1,4 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["name", "onChange", "value", "extra", "disabled"];
 import React from 'react';
 import { useTranslation } from '@digigov/ui/app/i18n';
 import CoreCheckboxes from '@digigov/react-core/Checkbox';
@@ -11,7 +13,9 @@ export var Checkboxes = function Checkboxes(_ref) {
       _ref$extra = _ref.extra,
       options = _ref$extra.options,
       className = _ref$extra.className,
-      disabled = _ref.disabled;
+      disabled = _ref.disabled,
+      props = _objectWithoutProperties(_ref, _excluded);
+
   if (!value) value = [];
 
   var handleChange = function handleChange(optionValue) {
@@ -48,7 +52,13 @@ export var Checkboxes = function Checkboxes(_ref) {
       ,
       checked: value.includes(option.value),
       onChange: handleChange(option.value)
-    }, option), option.label && option.label.primary && t(option.label.primary) || value, option.label && option.label.secondary && /*#__PURE__*/React.createElement(Hint, null, t(option.label.secondary)));
+    }, option, _extends({}, props, {
+      defaultValue: undefined,
+      onBlur: undefined,
+      required: undefined,
+      'aria-describedby': undefined,
+      type: 'checkbox'
+    })), option.label && option.label.primary && t(option.label.primary) || value, option.label && option.label.secondary && /*#__PURE__*/React.createElement(Hint, null, t(option.label.secondary)));
   }));
 };
 export default Checkboxes;

package/esm/inputs/DateInput/index.js

@@ -123,7 +123,8 @@ export var DateInput = function DateInput(_ref2) {
     width: 2,
     name: "".concat(name, "-day"),
     maxlength: "2",
-    disabled: props.disabled
+    disabled: props.disabled,
+    "aria-required": props['aria-required']
   }), /*#__PURE__*/React.createElement(DatePart, {
     label: t('form.label.month'),
     onChange: date.setMonth,
@@ -134,7 +135,8 @@ export var DateInput = function DateInput(_ref2) {
     width: 2,
     name: "".concat(props.name, "-month"),
     maxlength: "2",
-    disabled: props.disabled
+    disabled: props.disabled,
+    "aria-required": props['aria-required']
   }), /*#__PURE__*/React.createElement(DatePart, {
     label: t('form.label.year'),
     onChange: date.setYear,
@@ -142,7 +144,8 @@ export var DateInput = function DateInput(_ref2) {
     width: 4,
     name: "".concat(props.name, "-year"),
     maxlength: "4",
-    disabled: props.disabled
+    disabled: props.disabled,
+    "aria-required": props['aria-required']
   }));
 };
 export default DateInput;

package/esm/inputs/FileInput/index.js

@@ -1,4 +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 = ["name", "extra", "disabled", "type"];
 import React, { useState } from 'react';
 import clsx from 'clsx';
 import { useTranslation } from '@digigov/ui/app/i18n';
@@ -9,7 +12,9 @@ export var FileInput = /*#__PURE__*/React.forwardRef(function FileInput(_ref, re
   var name = _ref.name,
       _ref$extra = _ref.extra,
       extra = _ref$extra === void 0 ? {} : _ref$extra,
-      disabled = _ref.disabled;
+      disabled = _ref.disabled,
+      type = _ref.type,
+      props = _objectWithoutProperties(_ref, _excluded);
 
   var _useTranslation = useTranslation(),
       t = _useTranslation.t;
@@ -25,7 +30,7 @@ export var FileInput = /*#__PURE__*/React.forwardRef(function FileInput(_ref, re
     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", {
+  }, /*#__PURE__*/React.createElement("input", _extends({
     ref: ref,
     type: "file",
     name: name,
@@ -42,6 +47,8 @@ export var FileInput = /*#__PURE__*/React.forwardRef(function FileInput(_ref, re
       });
       setFiles(selectedFiles);
     }
-  }), files.length ? t('upload.change_file') : t('upload.choose_file')));
+  }, _extends({}, props, {
+    required: undefined
+  }))), files.length ? t('upload.change_file') : t('upload.choose_file')));
 });
 export default FileInput;

package/esm/inputs/Input/index.js

@@ -37,14 +37,19 @@ export var Input = /*#__PURE__*/React.forwardRef(function WrappedInput(_ref, ref
       className: className,
       rows: rows,
       ref: ref
-    }, props));
+    }, _extends({}, props, {
+      required: undefined,
+      type: fieldType
+    })));
   } else {
     return /*#__PURE__*/React.createElement(TextInput, _extends({
       name: name,
       type: fieldType,
       className: className,
       ref: ref
-    }, props));
+    }, _extends({}, props, {
+      required: undefined
+    })));
   }
 });
 export default Input;

package/esm/inputs/Radio/index.js

@@ -1,4 +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 Radio from '@digigov/react-core/Radio';
 import RadioItem from '@digigov/react-core/RadioItem';
@@ -12,7 +15,9 @@ export var RadioButtonsGroup = function RadioButtonsGroup(_ref) {
       _ref$extra = _ref.extra,
       options = _ref$extra.options,
       className = _ref$extra.className,
-      disabled = _ref.disabled;
+      disabled = _ref.disabled,
+      props = _objectWithoutProperties(_ref, _excluded);
+
   var currentValue = useWatch({
     control: control,
     name: name
@@ -33,13 +38,17 @@ export var RadioButtonsGroup = function RadioButtonsGroup(_ref) {
     var label = _ref2.label,
         v = _ref2.value,
         optionDisabled = _ref2.disabled;
-    return /*#__PURE__*/React.createElement(RadioItem, {
+    return /*#__PURE__*/React.createElement(RadioItem, _extends({
       ref: register,
       key: v,
       name: name,
       value: v,
       disabled: disabled || optionDisabled
-    }, label && label.primary && t(label.primary) || v, label && label.secondary && /*#__PURE__*/React.createElement(Hint, null, t(label.secondary)));
+    }, _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)));
   }));
 };
 export default RadioButtonsGroup;

package/esm/inputs/Select/index.js

@@ -1,3 +1,6 @@
+import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["name", "extra", "disabled"];
 import React from 'react';
 import CoreSelect from '@digigov/react-core/Select';
 import SelectOption from '@digigov/react-core/SelectOption';
@@ -6,13 +9,17 @@ export var Select = /*#__PURE__*/React.forwardRef(function WrappedSelect(_ref, r
       _ref$extra = _ref.extra,
       options = _ref$extra.options,
       className = _ref$extra.className,
-      disabled = _ref.disabled;
-  return /*#__PURE__*/React.createElement(CoreSelect, {
+      disabled = _ref.disabled,
+      props = _objectWithoutProperties(_ref, _excluded);
+
+  return /*#__PURE__*/React.createElement(CoreSelect, _extends({
     className: className,
     ref: ref,
     name: name,
     disabled: disabled
-  }, options.map(function (_ref2) {
+  }, _extends({}, props, {
+    required: undefined
+  })), options.map(function (_ref2) {
     var value = _ref2.value,
         label = _ref2.label;
     return /*#__PURE__*/React.createElement(SelectOption, {

package/esm/validators.js

@@ -14,6 +14,19 @@ import dayjs from 'dayjs';
 import customParseFormat from 'dayjs/plugin/customParseFormat';
 dayjs.extend(customParseFormat);
 var DEFAULT_FILE_MAX_SIZE = 10000000;
+export function validatePostalCode(number, countries) {
+  if (!countries) {
+    return false;
+  } else {
+    if (countries.length === 1 && countries[0].toUpperCase() === 'GR') {
+      // Greek postal code must be 5 digits long and shouldn't start with 0 or 9.
+      var CODE_REGEX = /^[12345678][0-9]{4}$/;
+      return CODE_REGEX.test(number);
+    } else {
+      return true;
+    }
+  }
+}
 export function validateAFM(afm) {
   if (afm.length !== 9) {
     // "afm should be 9 digits"
@@ -38,6 +51,58 @@ export function validateAFM(afm) {
   var valid = calc % 10 === d9;
   return valid;
 }
+export function validatePhoneNumber(phoneNumber) {
+  var countries = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ['gr'];
+  var typeOfPhoneNumber = arguments.length > 2 ? arguments[2] : undefined;
+  var phoneUtil = gPhoneNumber.PhoneNumberUtil.getInstance();
+
+  if (!countries || countries.length === 0) {
+    return true;
+  }
+
+  return countries.some(function (country) {
+    try {
+      var phone = phoneUtil.parse(phoneNumber, country.toUpperCase());
+
+      if (phoneUtil.isValidNumber(phone)) {
+        if (typeOfPhoneNumber) {
+          if (matchTypeOfPhoneNumber(phone, typeOfPhoneNumber, phoneUtil)) {
+            return true;
+          } else {
+            return false;
+          }
+        } else {
+          return true;
+        }
+      }
+
+      return false;
+    } catch (error) {
+      console.error(error);
+      return false;
+    }
+  });
+}
+var phoneNumberTypes = {
+  0: 'landline',
+  1: 'mobile',
+  2: 'landline_or_mobile'
+};
+export function matchTypeOfPhoneNumber(phone, type, phoneUtil) {
+  try {
+    var phoneNumberType = phoneUtil.getNumberType(phone);
+    var numberType = phoneNumberTypes[phoneNumberType];
+
+    if (numberType === 'landline_or_mobile' || numberType === type) {
+      return true;
+    } else {
+      return false;
+    }
+  } catch (error) {
+    console.error(error);
+    return false;
+  }
+}
 
 function validateMobile(value) {
   var phoneUtil = gPhoneNumber.PhoneNumberUtil.getInstance();
@@ -69,6 +134,23 @@ function validateMobile(value) {
   }
 }
 
+var POSTALCODE_VALIDATOR = function POSTALCODE_VALIDATOR(field) {
+  var _field$extra;
+
+  var countryCode = field === null || field === void 0 ? void 0 : (_field$extra = field.extra) === null || _field$extra === void 0 ? void 0 : _field$extra.countries;
+  return {
+    name: 'postal-code-validator',
+    message: 'form.error.postalCode',
+    test: function test(value) {
+      if (!value) {
+        return true;
+      }
+
+      return validatePostalCode(value, countryCode);
+    }
+  };
+};
+
 var MOBILE_PHONE_VALIDATOR = {
   name: 'mobile-phone-validator',
   message: 'form.error.mobile_phone',
@@ -80,6 +162,35 @@ var MOBILE_PHONE_VALIDATOR = {
     return true;
   }
 };
+
+var PHONE_NUMBER_VALIDATOR = function PHONE_NUMBER_VALIDATOR(field) {
+  var _field$extra2, _field$extra3;
+
+  var countryCode = field === null || field === void 0 ? void 0 : (_field$extra2 = field.extra) === null || _field$extra2 === void 0 ? void 0 : _field$extra2.countries;
+  var typeOfPhone = field === null || field === void 0 ? void 0 : (_field$extra3 = field.extra) === null || _field$extra3 === void 0 ? void 0 : _field$extra3.phoneType;
+  return {
+    name: 'phone-number-validator',
+    message: function message() {
+      if (typeOfPhone === 'mobile') {
+        return 'form.error.mobile_phone';
+      }
+
+      if (typeOfPhone === 'landline') {
+        return 'form.error.landline';
+      } else {
+        return 'form.error.phone_number';
+      }
+    },
+    test: function test(value) {
+      if (!value) {
+        return true;
+      }
+
+      return validatePhoneNumber(value, countryCode, typeOfPhone);
+    }
+  };
+};
+
 var AFM_VALIDATOR = {
   name: 'afm-validator',
   message: 'form.error.afm',
@@ -267,14 +378,14 @@ export function validateIban(value, countryCode) {
 }
 
 var IBAN_VALIDATOR = function IBAN_VALIDATOR(field) {
-  var _field$extra;
+  var _field$extra4;
 
-  var countryCode = field === null || field === void 0 ? void 0 : (_field$extra = field.extra) === null || _field$extra === void 0 ? void 0 : _field$extra.country;
+  var countryCode = field === null || field === void 0 ? void 0 : (_field$extra4 = field.extra) === null || _field$extra4 === void 0 ? void 0 : _field$extra4.country;
   return {
     name: 'iban-validator',
     message: 'form.error.iban',
     test: function test(value) {
-      if (!value || value.length === 0) {
+      if (!value) {
         return true;
       }
 
@@ -418,9 +529,15 @@ var getYUPTypeMap = function getYUPTypeMap() {
     iban: function iban(field) {
       return yup.string().test(IBAN_VALIDATOR(field));
     },
+    postal_code: function postal_code(field) {
+      return yup.string().test(POSTALCODE_VALIDATOR(field));
+    },
     mobile_phone: function mobile_phone() {
       return yup.string().test(MOBILE_PHONE_VALIDATOR);
     },
+    phone_number: function phone_number(field) {
+      return yup.string().test(PHONE_NUMBER_VALIDATOR(field));
+    },
     'choice:multiple': function choiceMultiple() {
       return yup.array().of(yup.string()).nullable();
     },

package/esm/validators.spec.js

@@ -1,4 +1,4 @@
-import { validateUUID4, validateIban } from '@digigov/form/validators';
+import { validateUUID4, validateIban, validatePostalCode, validatePhoneNumber } from '@digigov/form/validators';
 it('validates wrong uuid4 for empty value', function () {
   expect(validateUUID4('')).toBe(false);
 });
@@ -31,4 +31,55 @@ it('validates wrong iban for non existing country code', function () {
 });
 it('validates correct greek iban whithout country code', function () {
   expect(validateIban('7801100800000008009825202', '')).toBe(true);
+});
+it('validates wrong postal code without country code', function () {
+  expect(validatePostalCode('123', [])).toBe(true);
+});
+it('validates wrong postal code with wrong country code', function () {
+  expect(validatePostalCode('123', ['FR'])).toBe(true);
+});
+it('validates wrong postal code with greek country code', function () {
+  expect(validatePostalCode('123', ['GR'])).toBe(false);
+});
+it('validates postal code with greek country code', function () {
+  expect(validatePostalCode('11143', ['GR'])).toBe(true);
+});
+it('validates phone number type landline with greek country code', function () {
+  expect(validatePhoneNumber('2102934896', ['GR'], 'landline')).toBe(true);
+});
+it('validates phone number type landline with ch country code', function () {
+  expect(validatePhoneNumber('2102934896', ['CH'], 'landline')).toBe(false);
+});
+it('validates phone number type landline with ch  and  gr countries code', function () {
+  expect(validatePhoneNumber('2102934896', ['GR', 'CH'], 'landline')).toBe(true);
+});
+it('validatesphone number type landline with ch  and  gr countries code', function () {
+  expect(validatePhoneNumber('41446681800', ['GR', 'CH'], 'landline')).toBe(true);
+});
+it('validates phone number type landline with ch  and  gr countries code but phone number is mobile', function () {
+  expect(validatePhoneNumber('2102934896', ['GR', 'CH'], 'mobile')).toBe(false);
+});
+it('validates phone number type mobile with ch  and  gr countries code', function () {
+  expect(validatePhoneNumber('6934100982', ['GR', 'CH'], 'mobile')).toBe(true);
+});
+it('validates  phone number type mobile with gr country code', function () {
+  expect(validatePhoneNumber('6934100982', ['GR'], 'mobile')).toBe(true);
+});
+it('validates  phone number type mobile with ch country code', function () {
+  expect(validatePhoneNumber('6934100982', ['CH'], 'mobile')).toBe(false);
+});
+it('validates  phone number with no type and ch country code', function () {
+  expect(validatePhoneNumber('6934100982', ['CH'], null)).toBe(false);
+});
+it('validates  phone number with no type and gr country code', function () {
+  expect(validatePhoneNumber('6934100982', ['gr'], null)).toBe(true);
+});
+it('validates  phone number with no type and ch country code', function () {
+  expect(validatePhoneNumber('41446681800', ['CH'], null)).toBe(true);
+});
+it('validates  phone number with no type and gr country code', function () {
+  expect(validatePhoneNumber('41446681800', ['gr'], null)).toBe(false);
+});
+it('validates  phone number with no type and gr and ch countries code', function () {
+  expect(validatePhoneNumber('41446681800', ['gr', 'ch'], null)).toBe(true);
 });

package/index.js

@@ -102,7 +102,7 @@ var FormBase = /*#__PURE__*/_react["default"].forwardRef(function FormBase(_ref,
         form.setError(key, errors[key]);
       }
     }
-  }, []);
+  }, [onSubmit]);
   var ctx = {
     fieldsMap: fieldsMap,
     fieldsetsMap: fieldsetsMap,

package/inputs/Checkboxes/index.js

@@ -9,6 +9,8 @@ exports["default"] = exports.Checkboxes = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
 var _react = _interopRequireDefault(require("react"));
 
 var _i18n = require("@digigov/ui/app/i18n");
@@ -19,6 +21,8 @@ var _CheckboxItem = _interopRequireDefault(require("@digigov/react-core/Checkbox
 
 var _Hint = _interopRequireDefault(require("@digigov/react-core/Hint"));
 
+var _excluded = ["name", "onChange", "value", "extra", "disabled"];
+
 var Checkboxes = function Checkboxes(_ref) {
   var name = _ref.name,
       onChange = _ref.onChange,
@@ -26,7 +30,8 @@ var Checkboxes = function Checkboxes(_ref) {
       _ref$extra = _ref.extra,
       options = _ref$extra.options,
       className = _ref$extra.className,
-      disabled = _ref.disabled;
+      disabled = _ref.disabled,
+      props = (0, _objectWithoutProperties2["default"])(_ref, _excluded);
   if (!value) value = [];
 
   var handleChange = function handleChange(optionValue) {
@@ -63,7 +68,13 @@ var Checkboxes = function Checkboxes(_ref) {
       ,
       checked: value.includes(option.value),
       onChange: handleChange(option.value)
-    }, option), option.label && option.label.primary && t(option.label.primary) || value, option.label && option.label.secondary && /*#__PURE__*/_react["default"].createElement(_Hint["default"], null, t(option.label.secondary)));
+    }, option, (0, _extends2["default"])({}, props, {
+      defaultValue: undefined,
+      onBlur: undefined,
+      required: undefined,
+      'aria-describedby': undefined,
+      type: 'checkbox'
+    })), option.label && option.label.primary && t(option.label.primary) || value, option.label && option.label.secondary && /*#__PURE__*/_react["default"].createElement(_Hint["default"], null, t(option.label.secondary)));
   }));
 };