@digigov/form 0.6.7 → 0.6.8

package/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Change Log - @digigov/form
 
-This log was last generated on Wed, 08 Jun 2022 12:26:07 GMT and should not be manually modified.
+This log was last generated on Tue, 14 Jun 2022 14:49:36 GMT and should not be manually modified.
+
+## 0.6.8
+Tue, 14 Jun 2022 14:49:36 GMT
+
+### Patches
+
+- add aria-required and aria-describedby in Field components, add id to ErrorMessage component, add and destructure props in CheckBoxes FileInput Input Radio and Select components",
 
 ## 0.6.7
 Wed, 08 Jun 2022 12:26:07 GMT

package/Field/index.js

@@ -49,7 +49,7 @@ var _Label2 = _interopRequireDefault(require("@digigov/form/inputs/Label"));
 
 var _i18n = require("@digigov/ui/app/i18n");
 
-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"];
 
 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); }
@@ -91,7 +91,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;
@@ -104,18 +105,23 @@ var FieldContainer = function FieldContainer(_ref) {
       error: !!error
     }, /*#__PURE__*/_react["default"].createElement(_Fieldset["default"], null, /*#__PURE__*/_react["default"].createElement(_FieldsetLegend["default"], {
       size: "s"
-    }, label && label.primary, label && label.secondary && /*#__PURE__*/_react["default"].createElement(_Hint["default"], null, t(label.secondary)), error && /*#__PURE__*/_react["default"].createElement(_ErrorMessage["default"], null, t((error === null || error === void 0 ? void 0 : error.message) || ''))), children));
+    }, label && label.primary, label && label.secondary && /*#__PURE__*/_react["default"].createElement(_Hint["default"], null, t(label.secondary)), error && /*#__PURE__*/_react["default"].createElement(_ErrorMessage["default"], {
+      id: "".concat(name, "-error")
+    }, t((error === null || error === void 0 ? void 0 : error.message) || ''))), children));
   } else {
     return /*#__PURE__*/_react["default"].createElement(_Field["default"], {
       error: !!error
     }, /*#__PURE__*/_react["default"].createElement(_Label["default"], null, label && /*#__PURE__*/_react["default"].createElement(_Label2["default"], {
       label: label
-    }), error && /*#__PURE__*/_react["default"].createElement(_ErrorMessage["default"], null, t((error === null || error === void 0 ? void 0 : error.message) || '')), children));
+    }), error && /*#__PURE__*/_react["default"].createElement(_ErrorMessage["default"], {
+      id: "".concat(name, "-error")
+    }, t((error === null || error === void 0 ? void 0 : error.message) || '')), children));
   }
 };
 
 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,
@@ -143,7 +149,8 @@ var FieldBase = function FieldBase(props) {
       label: label,
       layout: layout,
       error: error,
-      wrapper: wrapper
+      wrapper: wrapper,
+      name: name
     }, /*#__PURE__*/_react["default"].createElement(_reactHookForm.Controller, {
       control: control,
       name: name,
@@ -160,6 +167,9 @@ 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));
       }
@@ -170,7 +180,8 @@ 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["default"].createElement(Component, (0, _extends2["default"])({
     name: name,
     ref: register,
@@ -178,6 +189,9 @@ 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["default"].createElement(Component, (0, _extends2["default"])({
     name: name,
@@ -186,6 +200,9 @@ 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/es/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/es/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/es/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/es/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/es/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/es/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/es/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/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/index.js

@@ -1,4 +1,4 @@
-/** @license Digigov v0.6.7
+/** @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.

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

package/inputs/DateInput/index.js

@@ -146,7 +146,8 @@ 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["default"].createElement(DatePart, {
     label: t('form.label.month'),
     onChange: date.setMonth,
@@ -157,7 +158,8 @@ 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["default"].createElement(DatePart, {
     label: t('form.label.year'),
     onChange: date.setYear,
@@ -165,7 +167,8 @@ 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']
   }));
 };
 

package/inputs/FileInput/index.js

@@ -9,8 +9,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = exports.FileInput = 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 _clsx = _interopRequireDefault(require("clsx"));
@@ -21,6 +25,8 @@ var _Paragraph = _interopRequireDefault(require("@digigov/ui/typography/Paragrap
 
 var _Hint = _interopRequireDefault(require("@digigov/react-core/Hint"));
 
+var _excluded = ["name", "extra", "disabled", "type"];
+
 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; }
@@ -30,7 +36,9 @@ var FileInput = /*#__PURE__*/_react["default"].forwardRef(function FileInput(_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 = (0, _objectWithoutProperties2["default"])(_ref, _excluded);
 
   var _useTranslation = (0, _i18n.useTranslation)(),
       t = _useTranslation.t;
@@ -46,7 +54,7 @@ var FileInput = /*#__PURE__*/_react["default"].forwardRef(function FileInput(_re
     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')
-  }, /*#__PURE__*/_react["default"].createElement("input", {
+  }, /*#__PURE__*/_react["default"].createElement("input", (0, _extends2["default"])({
     ref: ref,
     type: "file",
     name: name,
@@ -63,7 +71,9 @@ var FileInput = /*#__PURE__*/_react["default"].forwardRef(function FileInput(_re
       });
       setFiles(selectedFiles);
     }
-  }), files.length ? t('upload.change_file') : t('upload.choose_file')));
+  }, (0, _extends2["default"])({}, props, {
+    required: undefined
+  }))), files.length ? t('upload.change_file') : t('upload.choose_file')));
 });
 
 exports.FileInput = FileInput;

package/inputs/Input/index.js

@@ -52,14 +52,19 @@ var Input = /*#__PURE__*/_react["default"].forwardRef(function WrappedInput(_ref
       className: className,
       rows: rows,
       ref: ref
-    }, props));
+    }, (0, _extends2["default"])({}, props, {
+      required: undefined,
+      type: fieldType
+    })));
   } else {
     return /*#__PURE__*/_react["default"].createElement(_TextInput["default"], (0, _extends2["default"])({
       name: name,
       type: fieldType,
       className: className,
       ref: ref
-    }, props));
+    }, (0, _extends2["default"])({}, props, {
+      required: undefined
+    })));
   }
 });
 

package/inputs/Radio/index.js

@@ -9,8 +9,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 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 _Radio = _interopRequireDefault(require("@digigov/react-core/Radio"));
@@ -23,6 +27,8 @@ var _reactHookForm = require("react-hook-form");
 
 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; }
@@ -34,7 +40,8 @@ var RadioButtonsGroup = function RadioButtonsGroup(_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);
   var currentValue = (0, _reactHookForm.useWatch)({
     control: control,
     name: name
@@ -55,13 +62,17 @@ var RadioButtonsGroup = function RadioButtonsGroup(_ref) {
     var label = _ref2.label,
         v = _ref2.value,
         optionDisabled = _ref2.disabled;
-    return /*#__PURE__*/_react["default"].createElement(_RadioItem["default"], {
+    return /*#__PURE__*/_react["default"].createElement(_RadioItem["default"], (0, _extends2["default"])({
       ref: register,
       key: v,
       name: name,
       value: v,
       disabled: disabled || optionDisabled
-    }, label && label.primary && t(label.primary) || v, label && label.secondary && /*#__PURE__*/_react["default"].createElement(_Hint["default"], null, t(label.secondary)));
+    }, (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)));
   }));
 };
 

package/inputs/Select/index.js

@@ -7,24 +7,33 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = exports.Select = void 0;
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
 var _react = _interopRequireDefault(require("react"));
 
 var _Select = _interopRequireDefault(require("@digigov/react-core/Select"));
 
 var _SelectOption = _interopRequireDefault(require("@digigov/react-core/SelectOption"));
 
+var _excluded = ["name", "extra", "disabled"];
+
 var Select = /*#__PURE__*/_react["default"].forwardRef(function WrappedSelect(_ref, ref) {
   var name = _ref.name,
       _ref$extra = _ref.extra,
       options = _ref$extra.options,
       className = _ref$extra.className,
-      disabled = _ref.disabled;
-  return /*#__PURE__*/_react["default"].createElement(_Select["default"], {
+      disabled = _ref.disabled,
+      props = (0, _objectWithoutProperties2["default"])(_ref, _excluded);
+  return /*#__PURE__*/_react["default"].createElement(_Select["default"], (0, _extends2["default"])({
     className: className,
     ref: ref,
     name: name,
     disabled: disabled
-  }, options.map(function (_ref2) {
+  }, (0, _extends2["default"])({}, props, {
+    required: undefined
+  })), options.map(function (_ref2) {
     var value = _ref2.value,
         label = _ref2.label;
     return /*#__PURE__*/_react["default"].createElement(_SelectOption["default"], {

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

@@ -8,6 +8,7 @@ export declare type FieldComponentItem = {
 };
 export declare type FieldComponentRegistry = Record<string, FieldComponentItem>;
 export interface FieldContainerProps {
+    name?: FieldSpec['key'];
     layout?: FieldSpec['layout'];
     label?: FieldSpec['label'];
     error?: FieldError;
@@ -17,6 +18,7 @@ export interface FieldContainerProps {
 export declare type OmittedFieldSpec = Omit<FieldSpec, 'component'>;
 export declare type UnknownValue = never | never[];
 export interface ControlledFieldProps {
+    type?: string;
     value: UnknownValue;
     onChange: (v: UnknownValue) => void;
     defaultValue?: UnknownValue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digigov/form",
-  "version": "0.6.7",
+  "version": "0.6.8",
   "description": "@digigov form builder",
   "author": "GRNET Developers <devs@lists.grnet.gr>",
   "license": "BSD-2-Clause",
@@ -17,7 +17,7 @@
     "dayjs": "1.10.4"
   },
   "peerDependencies": {
-    "@digigov/ui": "0.21.0",
+    "@digigov/ui": "0.21.1",
     "@material-ui/core": "4.11.3",
     "@material-ui/icons": "4.11.2",
     "clsx": "1.1.1",