@digigov/form 0.5.3 → 0.6.2

package/CHANGELOG.md

@@ -1,6 +1,28 @@
 # Change Log - @digigov/form
 
-This log was last generated on Mon, 28 Feb 2022 15:04:49 GMT and should not be manually modified.
+This log was last generated on Thu, 14 Apr 2022 12:32:51 GMT and should not be manually modified.
+
+## 0.6.2
+Thu, 14 Apr 2022 12:32:51 GMT
+
+### Patches
+
+- fix FileInput component with input and custom button, fix Field component to add children inside fieldset 
+- Remove empty option from Select component
+
+## 0.6.1
+Tue, 05 Apr 2022 12:23:28 GMT
+
+### Patches
+
+- Allow passing custom props on form element
+
+## 0.6.0
+Wed, 30 Mar 2022 12:28:30 GMT
+
+### Minor changes
+
+- Add support for `characterWidth` and `cellWidth` props in `@digigov/form/Field`, these props will be used by the `@digigov/react-core/TextInput`
 
 ## 0.5.3
 Mon, 28 Feb 2022 15:04:49 GMT

package/Field/index.js

@@ -9,10 +9,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = exports.FieldBase = exports.Field = void 0;
 
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _ConditionalField = require("@digigov/form/Field/ConditionalField");
@@ -49,7 +49,8 @@ var _Label2 = _interopRequireDefault(require("@digigov/form/inputs/Label"));
 
 var _i18n = require("@digigov/ui/app/i18n");
 
-var _excluded = ["name", "children"];
+var _excluded = ["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); }
 
@@ -63,6 +64,7 @@ var FIELD_COMPONENTS = {
     component: _Input["default"]
   },
   file: {
+    wrapper: 'fieldset',
     component: _FileInput["default"]
   },
   date: {
@@ -102,7 +104,7 @@ 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"], null, t((error === null || error === void 0 ? void 0 : error.message) || ''))), children));
   } else {
     return /*#__PURE__*/_react["default"].createElement(_Field["default"], {
       error: !!error
@@ -129,7 +131,8 @@ var FieldBase = function FieldBase(props) {
       extra = _props$extra === void 0 ? {} : _props$extra,
       layout = props.layout,
       error = props.error,
-      register = props.register;
+      register = props.register,
+      componentProps = (0, _objectWithoutProperties2["default"])(props, _excluded);
 
   if (!enabled) {
     return null;
@@ -148,7 +151,7 @@ var FieldBase = function FieldBase(props) {
         var onChange = _ref2.onChange,
             onBlur = _ref2.onBlur,
             value = _ref2.value;
-        return /*#__PURE__*/_react["default"].createElement(Component, {
+        return /*#__PURE__*/_react["default"].createElement(Component, (0, _extends2["default"])({
           name: name,
           onChange: onChange,
           onBlur: onBlur,
@@ -158,7 +161,7 @@ var FieldBase = function FieldBase(props) {
           error: !!error,
           type: type,
           disabled: editable === false
-        });
+        }, componentProps));
       }
     }));
   }
@@ -168,7 +171,7 @@ var FieldBase = function FieldBase(props) {
     layout: layout,
     error: error,
     wrapper: wrapper
-  }, Component !== null && Component !== void 0 && Component.render ? /*#__PURE__*/_react["default"].createElement(Component, {
+  }, Component !== null && Component !== void 0 && Component.render ? /*#__PURE__*/_react["default"].createElement(Component, (0, _extends2["default"])({
     name: name,
     ref: register,
     control: control,
@@ -176,7 +179,7 @@ var FieldBase = function FieldBase(props) {
     extra: extra,
     type: type,
     disabled: editable === false
-  }) : /*#__PURE__*/_react["default"].createElement(Component, {
+  }, componentProps)) : /*#__PURE__*/_react["default"].createElement(Component, (0, _extends2["default"])({
     name: name,
     register: register,
     control: control,
@@ -184,7 +187,7 @@ var FieldBase = function FieldBase(props) {
     extra: extra,
     type: type,
     disabled: editable === false
-  }));
+  }, componentProps)));
 };
 
 exports.FieldBase = FieldBase;
@@ -250,7 +253,7 @@ function calculateField(children, field, componentRegistry) {
 var Field = function Field(_ref3) {
   var name = _ref3.name,
       children = _ref3.children,
-      customField = (0, _objectWithoutProperties2["default"])(_ref3, _excluded);
+      customField = (0, _objectWithoutProperties2["default"])(_ref3, _excluded2);
 
   var _useField = useField(name, customField !== null && customField !== void 0 && customField.type ? customField : null),
       field = _useField.field,

package/es/Field/index.js

@@ -1,6 +1,7 @@
-import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _extends from "@babel/runtime/helpers/extends";
-var _excluded = ["name", "children"];
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["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';
 import { Controller } from 'react-hook-form';
@@ -27,6 +28,7 @@ var FIELD_COMPONENTS = {
     component: Input
   },
   file: {
+    wrapper: 'fieldset',
     component: FileInput
   },
   date: {
@@ -66,7 +68,7 @@ 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, null, t((error === null || error === void 0 ? void 0 : error.message) || ''))), children));
   } else {
     return /*#__PURE__*/React.createElement(CoreField, {
       error: !!error
@@ -93,7 +95,8 @@ export var FieldBase = function FieldBase(props) {
       extra = _props$extra === void 0 ? {} : _props$extra,
       layout = props.layout,
       error = props.error,
-      register = props.register;
+      register = props.register,
+      componentProps = _objectWithoutProperties(props, _excluded);
 
   if (!enabled) {
     return null;
@@ -112,7 +115,7 @@ export var FieldBase = function FieldBase(props) {
         var onChange = _ref2.onChange,
             onBlur = _ref2.onBlur,
             value = _ref2.value;
-        return /*#__PURE__*/React.createElement(Component, {
+        return /*#__PURE__*/React.createElement(Component, _extends({
           name: name,
           onChange: onChange,
           onBlur: onBlur,
@@ -122,7 +125,7 @@ export var FieldBase = function FieldBase(props) {
           error: !!error,
           type: type,
           disabled: editable === false
-        });
+        }, componentProps));
       }
     }));
   }
@@ -132,7 +135,7 @@ export var FieldBase = function FieldBase(props) {
     layout: layout,
     error: error,
     wrapper: wrapper
-  }, Component !== null && Component !== void 0 && Component.render ? /*#__PURE__*/React.createElement(Component, {
+  }, Component !== null && Component !== void 0 && Component.render ? /*#__PURE__*/React.createElement(Component, _extends({
     name: name,
     ref: register,
     control: control,
@@ -140,7 +143,7 @@ export var FieldBase = function FieldBase(props) {
     extra: extra,
     type: type,
     disabled: editable === false
-  }) : /*#__PURE__*/React.createElement(Component, {
+  }, componentProps)) : /*#__PURE__*/React.createElement(Component, _extends({
     name: name,
     register: register,
     control: control,
@@ -148,7 +151,7 @@ export var FieldBase = function FieldBase(props) {
     extra: extra,
     type: type,
     disabled: editable === false
-  }));
+  }, componentProps)));
 };
 
 var useField = function useField(name, customField) {
@@ -213,7 +216,7 @@ function calculateField(children, field, componentRegistry) {
 export var Field = function Field(_ref3) {
   var name = _ref3.name,
       children = _ref3.children,
-      customField = _objectWithoutProperties(_ref3, _excluded);
+      customField = _objectWithoutProperties(_ref3, _excluded2);
 
   var _useField = useField(name, customField !== null && customField !== void 0 && customField.type ? customField : null),
       field = _useField.field,

package/es/index.js

@@ -1,6 +1,9 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _extends from "@babel/runtime/helpers/extends";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["onSubmit", "children", "registerField", "fieldsMap", "fieldsetsMap", "resolver", "mode", "initial", "reValidateMode", "shouldFocusError", "criteriaMode", "componentRegistry"],
+    _excluded2 = ["fields", "fieldsets", "initial", "onSubmit", "children", "reValidateMode", "mode", "shouldFocusError", "criteriaMode", "auto", "validatorRegistry", "componentRegistry"];
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import React, { createContext, useCallback, useRef } from 'react';
@@ -28,7 +31,9 @@ export var FormBase = function FormBase(_ref) {
       reValidateMode = _ref.reValidateMode,
       shouldFocusError = _ref.shouldFocusError,
       criteriaMode = _ref.criteriaMode,
-      componentRegistry = _ref.componentRegistry;
+      componentRegistry = _ref.componentRegistry,
+      props = _objectWithoutProperties(_ref, _excluded);
+
   var form = useForm({
     resolver: resolver,
     mode: mode,
@@ -58,9 +63,9 @@ export var FormBase = function FormBase(_ref) {
   };
   return /*#__PURE__*/React.createElement(FormContext.Provider, {
     value: ctx
-  }, /*#__PURE__*/React.createElement("form", {
+  }, /*#__PURE__*/React.createElement("form", _extends({
     onSubmit: form.handleSubmit(handleSubmit)
-  }, /*#__PURE__*/React.createElement(Grid, {
+  }, props), /*#__PURE__*/React.createElement(Grid, {
     container: true
   }, /*#__PURE__*/React.createElement(Grid, {
     item: true,
@@ -86,7 +91,9 @@ export function FormBuilder(_ref2) {
       _ref2$auto = _ref2.auto,
       auto = _ref2$auto === void 0 ? false : _ref2$auto,
       validatorRegistry = _ref2.validatorRegistry,
-      componentRegistry = _ref2.componentRegistry;
+      componentRegistry = _ref2.componentRegistry,
+      props = _objectWithoutProperties(_ref2, _excluded2);
+
   var fieldsState = useRef(fields);
   var setFieldsState = useCallback(function (newFields) {
     fieldsState.current = newFields;
@@ -128,7 +135,7 @@ export function FormBuilder(_ref2) {
     }
   }
 
-  return /*#__PURE__*/React.createElement(FormBase, {
+  return /*#__PURE__*/React.createElement(FormBase, _extends({
     resolver: resolver,
     fieldsetsMap: fieldsetsMap,
     fieldsMap: fieldsMap,
@@ -137,9 +144,10 @@ export function FormBuilder(_ref2) {
     reValidateMode: reValidateMode,
     mode: mode,
     shouldFocusError: shouldFocusError,
-    criteriaMode: criteriaMode,
+    criteriaMode: criteriaMode
+  }, props, {
     onSubmit: onSubmit,
     componentRegistry: componentRegistry
-  }, fieldChildren, children);
+  }), fieldChildren, children);
 }
 export default FormBuilder;

package/es/inputs/FileInput/index.js

@@ -1,7 +1,9 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React, { useState } from 'react';
-import NormalText from '@digigov/react-core/NormalText';
-import FileUpload from '@digigov/react-core/FileUpload';
+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';
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 var FileInput = /*#__PURE__*/React.forwardRef(function FileInput(_ref, ref) {
   var name = _ref.name,
@@ -9,20 +11,29 @@ var FileInput = /*#__PURE__*/React.forwardRef(function FileInput(_ref, ref) {
       extra = _ref$extra === void 0 ? {} : _ref$extra,
       disabled = _ref.disabled;
 
+  var _useTranslation = useTranslation(),
+      t = _useTranslation.t;
+
   var _useState = useState([]),
       _useState2 = _slicedToArray(_useState, 2),
       files = _useState2[0],
       setFiles = _useState2[1];
 
-  var filesLabel = extra.multiple ? 'αρχεία' : 'αρχείο';
   return /*#__PURE__*/React.createElement("div", {
-    className: extra.className
-  }, /*#__PURE__*/React.createElement(FileUpload, {
+    className: clsx(extra.className, files.length > 0 && 'govgr-uploaded-file', true && 'govgr-field-file')
+  }, files.length ? /*#__PURE__*/React.createElement(Paragraph, null, /*#__PURE__*/React.createElement("b", null, t('upload.file'), ":"), " ", "".concat(files.join(', '))) : /*#__PURE__*/React.createElement(CoreHint, null, t('upload.no_file')), /*#__PURE__*/React.createElement("label", {
+    tabIndex: 0,
+    role: "button",
+    className: clsx(extra.className, files.length === 0 && ['govgr-btn', 'govgr-btn-primary'], files.length > 0 && 'govgr-link', true && 'govgr-label-file')
+  }, /*#__PURE__*/React.createElement("input", {
     ref: ref,
+    type: "file",
     name: name,
-    id: name,
     disabled: disabled,
-    type: 'file',
+    style: {
+      display: 'none'
+    },
+    className: "govgr-file-upload",
     onChange: function onChange(e) {
       var target = e.target;
       var selectedFiles = Array.from(target.files).map(function (_ref2) {
@@ -31,6 +42,6 @@ var FileInput = /*#__PURE__*/React.forwardRef(function FileInput(_ref, ref) {
       });
       setFiles(selectedFiles);
     }
-  }), /*#__PURE__*/React.createElement(NormalText, null, files.length ? files.join(', ') : "\u0394\u03B5\u03BD \u03AD\u03C7\u03B5\u03C4\u03B5 \u03B5\u03C0\u03B9\u03BB\u03AD\u03BE\u03B5\u03B9 ".concat(filesLabel)));
+  }), files.length ? t('upload.change_file') : t('upload.choose_file')));
 });
 export default FileInput;

package/es/inputs/Select/index.js

@@ -1,11 +1,6 @@
 import React from 'react';
 import CoreSelect from '@digigov/react-core/Select';
 import SelectOption from '@digigov/react-core/SelectOption';
-
-var _ref2 = /*#__PURE__*/React.createElement(SelectOption, {
-  value: ""
-});
-
 export var Select = /*#__PURE__*/React.forwardRef(function WrappedSelect(_ref, ref) {
   var name = _ref.name,
       _ref$extra = _ref.extra,
@@ -17,9 +12,9 @@ export var Select = /*#__PURE__*/React.forwardRef(function WrappedSelect(_ref, r
     ref: ref,
     name: name,
     disabled: disabled
-  }, _ref2, options.map(function (_ref3) {
-    var value = _ref3.value,
-        label = _ref3.label;
+  }, options.map(function (_ref2) {
+    var value = _ref2.value,
+        label = _ref2.label;
     return /*#__PURE__*/React.createElement(SelectOption, {
       key: value,
       value: value

package/esm/Field/index.js

@@ -1,6 +1,7 @@
-import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _extends from "@babel/runtime/helpers/extends";
-var _excluded = ["name", "children"];
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["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';
 import { Controller } from 'react-hook-form';
@@ -27,6 +28,7 @@ var FIELD_COMPONENTS = {
     component: Input
   },
   file: {
+    wrapper: 'fieldset',
     component: FileInput
   },
   date: {
@@ -66,7 +68,7 @@ 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, null, t((error === null || error === void 0 ? void 0 : error.message) || ''))), children));
   } else {
     return /*#__PURE__*/React.createElement(CoreField, {
       error: !!error
@@ -93,7 +95,8 @@ export var FieldBase = function FieldBase(props) {
       extra = _props$extra === void 0 ? {} : _props$extra,
       layout = props.layout,
       error = props.error,
-      register = props.register;
+      register = props.register,
+      componentProps = _objectWithoutProperties(props, _excluded);
 
   if (!enabled) {
     return null;
@@ -112,7 +115,7 @@ export var FieldBase = function FieldBase(props) {
         var onChange = _ref2.onChange,
             onBlur = _ref2.onBlur,
             value = _ref2.value;
-        return /*#__PURE__*/React.createElement(Component, {
+        return /*#__PURE__*/React.createElement(Component, _extends({
           name: name,
           onChange: onChange,
           onBlur: onBlur,
@@ -122,7 +125,7 @@ export var FieldBase = function FieldBase(props) {
           error: !!error,
           type: type,
           disabled: editable === false
-        });
+        }, componentProps));
       }
     }));
   }
@@ -132,7 +135,7 @@ export var FieldBase = function FieldBase(props) {
     layout: layout,
     error: error,
     wrapper: wrapper
-  }, Component !== null && Component !== void 0 && Component.render ? /*#__PURE__*/React.createElement(Component, {
+  }, Component !== null && Component !== void 0 && Component.render ? /*#__PURE__*/React.createElement(Component, _extends({
     name: name,
     ref: register,
     control: control,
@@ -140,7 +143,7 @@ export var FieldBase = function FieldBase(props) {
     extra: extra,
     type: type,
     disabled: editable === false
-  }) : /*#__PURE__*/React.createElement(Component, {
+  }, componentProps)) : /*#__PURE__*/React.createElement(Component, _extends({
     name: name,
     register: register,
     control: control,
@@ -148,7 +151,7 @@ export var FieldBase = function FieldBase(props) {
     extra: extra,
     type: type,
     disabled: editable === false
-  }));
+  }, componentProps)));
 };
 
 var useField = function useField(name, customField) {
@@ -213,7 +216,7 @@ function calculateField(children, field, componentRegistry) {
 export var Field = function Field(_ref3) {
   var name = _ref3.name,
       children = _ref3.children,
-      customField = _objectWithoutProperties(_ref3, _excluded);
+      customField = _objectWithoutProperties(_ref3, _excluded2);
 
   var _useField = useField(name, customField !== null && customField !== void 0 && customField.type ? customField : null),
       field = _useField.field,

package/esm/index.js

@@ -1,11 +1,14 @@
-/** @license Digigov v0.5.3
+/** @license Digigov v0.6.2
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _extends from "@babel/runtime/helpers/extends";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["onSubmit", "children", "registerField", "fieldsMap", "fieldsetsMap", "resolver", "mode", "initial", "reValidateMode", "shouldFocusError", "criteriaMode", "componentRegistry"],
+    _excluded2 = ["fields", "fieldsets", "initial", "onSubmit", "children", "reValidateMode", "mode", "shouldFocusError", "criteriaMode", "auto", "validatorRegistry", "componentRegistry"];
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import React, { createContext, useCallback, useRef } from 'react';
@@ -33,7 +36,9 @@ export var FormBase = function FormBase(_ref) {
       reValidateMode = _ref.reValidateMode,
       shouldFocusError = _ref.shouldFocusError,
       criteriaMode = _ref.criteriaMode,
-      componentRegistry = _ref.componentRegistry;
+      componentRegistry = _ref.componentRegistry,
+      props = _objectWithoutProperties(_ref, _excluded);
+
   var form = useForm({
     resolver: resolver,
     mode: mode,
@@ -63,9 +68,9 @@ export var FormBase = function FormBase(_ref) {
   };
   return /*#__PURE__*/React.createElement(FormContext.Provider, {
     value: ctx
-  }, /*#__PURE__*/React.createElement("form", {
+  }, /*#__PURE__*/React.createElement("form", _extends({
     onSubmit: form.handleSubmit(handleSubmit)
-  }, /*#__PURE__*/React.createElement(Grid, {
+  }, props), /*#__PURE__*/React.createElement(Grid, {
     container: true
   }, /*#__PURE__*/React.createElement(Grid, {
     item: true,
@@ -91,7 +96,9 @@ export function FormBuilder(_ref2) {
       _ref2$auto = _ref2.auto,
       auto = _ref2$auto === void 0 ? false : _ref2$auto,
       validatorRegistry = _ref2.validatorRegistry,
-      componentRegistry = _ref2.componentRegistry;
+      componentRegistry = _ref2.componentRegistry,
+      props = _objectWithoutProperties(_ref2, _excluded2);
+
   var fieldsState = useRef(fields);
   var setFieldsState = useCallback(function (newFields) {
     fieldsState.current = newFields;
@@ -133,7 +140,7 @@ export function FormBuilder(_ref2) {
     }
   }
 
-  return /*#__PURE__*/React.createElement(FormBase, {
+  return /*#__PURE__*/React.createElement(FormBase, _extends({
     resolver: resolver,
     fieldsetsMap: fieldsetsMap,
     fieldsMap: fieldsMap,
@@ -142,9 +149,10 @@ export function FormBuilder(_ref2) {
     reValidateMode: reValidateMode,
     mode: mode,
     shouldFocusError: shouldFocusError,
-    criteriaMode: criteriaMode,
+    criteriaMode: criteriaMode
+  }, props, {
     onSubmit: onSubmit,
     componentRegistry: componentRegistry
-  }, fieldChildren, children);
+  }), fieldChildren, children);
 }
 export default FormBuilder;

package/esm/inputs/FileInput/index.js

@@ -1,7 +1,9 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React, { useState } from 'react';
-import NormalText from '@digigov/react-core/NormalText';
-import FileUpload from '@digigov/react-core/FileUpload';
+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';
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 var FileInput = /*#__PURE__*/React.forwardRef(function FileInput(_ref, ref) {
   var name = _ref.name,
@@ -9,20 +11,29 @@ var FileInput = /*#__PURE__*/React.forwardRef(function FileInput(_ref, ref) {
       extra = _ref$extra === void 0 ? {} : _ref$extra,
       disabled = _ref.disabled;
 
+  var _useTranslation = useTranslation(),
+      t = _useTranslation.t;
+
   var _useState = useState([]),
       _useState2 = _slicedToArray(_useState, 2),
       files = _useState2[0],
       setFiles = _useState2[1];
 
-  var filesLabel = extra.multiple ? 'αρχεία' : 'αρχείο';
   return /*#__PURE__*/React.createElement("div", {
-    className: extra.className
-  }, /*#__PURE__*/React.createElement(FileUpload, {
+    className: clsx(extra.className, files.length > 0 && 'govgr-uploaded-file', true && 'govgr-field-file')
+  }, files.length ? /*#__PURE__*/React.createElement(Paragraph, null, /*#__PURE__*/React.createElement("b", null, t('upload.file'), ":"), " ", "".concat(files.join(', '))) : /*#__PURE__*/React.createElement(CoreHint, null, t('upload.no_file')), /*#__PURE__*/React.createElement("label", {
+    tabIndex: 0,
+    role: "button",
+    className: clsx(extra.className, files.length === 0 && ['govgr-btn', 'govgr-btn-primary'], files.length > 0 && 'govgr-link', true && 'govgr-label-file')
+  }, /*#__PURE__*/React.createElement("input", {
     ref: ref,
+    type: "file",
     name: name,
-    id: name,
     disabled: disabled,
-    type: 'file',
+    style: {
+      display: 'none'
+    },
+    className: "govgr-file-upload",
     onChange: function onChange(e) {
       var target = e.target;
       var selectedFiles = Array.from(target.files).map(function (_ref2) {
@@ -31,6 +42,6 @@ var FileInput = /*#__PURE__*/React.forwardRef(function FileInput(_ref, ref) {
       });
       setFiles(selectedFiles);
     }
-  }), /*#__PURE__*/React.createElement(NormalText, null, files.length ? files.join(', ') : "\u0394\u03B5\u03BD \u03AD\u03C7\u03B5\u03C4\u03B5 \u03B5\u03C0\u03B9\u03BB\u03AD\u03BE\u03B5\u03B9 ".concat(filesLabel)));
+  }), files.length ? t('upload.change_file') : t('upload.choose_file')));
 });
 export default FileInput;

package/esm/inputs/Select/index.js

@@ -1,11 +1,6 @@
 import React from 'react';
 import CoreSelect from '@digigov/react-core/Select';
 import SelectOption from '@digigov/react-core/SelectOption';
-
-var _ref2 = /*#__PURE__*/React.createElement(SelectOption, {
-  value: ""
-});
-
 export var Select = /*#__PURE__*/React.forwardRef(function WrappedSelect(_ref, ref) {
   var name = _ref.name,
       _ref$extra = _ref.extra,
@@ -17,9 +12,9 @@ export var Select = /*#__PURE__*/React.forwardRef(function WrappedSelect(_ref, r
     ref: ref,
     name: name,
     disabled: disabled
-  }, _ref2, options.map(function (_ref3) {
-    var value = _ref3.value,
-        label = _ref3.label;
+  }, options.map(function (_ref2) {
+    var value = _ref2.value,
+        label = _ref2.label;
     return /*#__PURE__*/React.createElement(SelectOption, {
       key: value,
       value: value