@digigov/form 0.13.2 → 1.0.0-480e3d97

package/es/index.mdx

@@ -4,12 +4,19 @@ title: Digigov Form
 sidebar_label: Introduction to Digigov Form
 ---
 
-import LeadText from "@site/src/components/LeadText";
+import LeadText from '@site/src/components/LeadText';
 
-<LeadText>Digigov Form is an off-the-shelf solution for managing web forms using Reactjs. It supports flexible and multi-step forms and easy-to-use validation. This page will guide you through everything you need to create accessible and
-dynamic forms that can handle all sorts of user inputs.</LeadText>
- 
-<img src="/img/form.svg" style={{margin: '3rem 0', maxWidth: '450px', width: '60%'}}/>
+<LeadText>
+  Digigov Form is an off-the-shelf solution for managing web forms using
+  Reactjs. It supports flexible and multi-step forms and easy-to-use validation.
+  This page will guide you through everything you need to create accessible and
+  dynamic forms that can handle all sorts of user inputs.
+</LeadText>
+
+<img
+  src="/img/form.svg"
+  style={{ margin: '3rem 0', maxWidth: '450px', width: '60%' }}
+/>
 
 ## Before we start
 
@@ -22,7 +29,7 @@ Finally, we also offer an easy way to spread your forms across multiple pages or
 steps and still be able to gather data in a single serialized object that you
 will be able to save via an JSON API.
 
-## Overview 
+## Overview
 
 The `@digigov/form` NPM package contains React components and validators. The
 library uses basic, semantically correct HTML5 input fields.

package/es/inputs/AutoComplete/__stories__/Default.js

@@ -1,8 +1,8 @@
 import React, { Suspense } from 'react';
-import FormBuilder from '@digigov/form/FormBuilder';
 import { Field } from '@digigov/form/Field';
-import Button from '@digigov/ui/core/Button';
-import { results } from '@digigov/ui/admin/AutoComplete/utils';
+import FormBuilder from '@digigov/form/FormBuilder';
+import { results } from '@digigov/ui/form/AutoComplete/utils';
+import Button from '@digigov/ui/form/Button';
 var fields = [{
   key: 'autocomplete',
   label: {

package/es/inputs/AutoComplete/index.js

@@ -2,8 +2,8 @@ import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 var _excluded = ["name", "extra", "onChange", "value"];
 import React, { useCallback } from 'react';
-import UIAutoComplete from '@digigov/ui/admin/AutoComplete';
 import { Hint } from '@digigov/react-core';
+import UIAutoComplete from '@digigov/ui/form/AutoComplete';
 export var AutoComplete = function AutoComplete(_ref) {
   var name = _ref.name,
       options = _ref.extra.options,

package/es/inputs/Checkboxes/__stories__/Conditional.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import FormBuilder, { Field } from '@digigov/form';
-import { Button } from '@digigov/ui/core';
+import { Button } from '@digigov/ui/form/Button';
 var fields = [{
   key: 'landline',
   type: 'phone_number',

package/es/inputs/Checkboxes/__stories__/Default.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import FormBuilder, { Field } from '@digigov/form';
-import { Button } from '@digigov/ui/core';
+import { Button } from '@digigov/ui/form/Button';
 
 var _ref = /*#__PURE__*/React.createElement(Button, {
   type: "submit"

package/es/inputs/Checkboxes/__stories__/WithDivider.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import FormBuilder, { Field } from '@digigov/form';
-import { Button } from '@digigov/ui/core';
+import { Button } from '@digigov/ui/form/Button';
 
 var _ref = /*#__PURE__*/React.createElement(Button, {
   type: "submit"
@@ -35,7 +35,7 @@ export var WithDivider = function WithDivider() {
           primary: 'Αισθάνομαι κούραση'
         },
         value: 'fatigue',
-        divider: 'ή'
+        dividerText: 'ή'
       }]
     }
   }), _ref);

package/es/inputs/Checkboxes/index.js

@@ -4,12 +4,12 @@ import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProper
 var _excluded = ["name", "onChange", "value", "extra", "disabled"],
     _excluded2 = ["label", "value", "show", "disabled", "selected"];
 import React, { useState } from 'react';
-import { useTranslation } from '@digigov/ui/app/i18n';
+import { Field } from '@digigov/form';
+import { CheckboxConditional } from '@digigov/react-core';
 import CoreCheckboxes from '@digigov/react-core/Checkbox';
 import CheckboxItem from '@digigov/react-core/CheckboxItem';
 import Hint from '@digigov/react-core/Hint';
-import { Field } from '@digigov/form';
-import { CheckboxConditional } from '@digigov/react-core';
+import { useTranslation } from '@digigov/ui/i18n';
 export var Checkboxes = function Checkboxes(_ref) {
   var name = _ref.name,
       onChange = _ref.onChange,

package/es/inputs/DateInput/__stories__/Default.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import FormBuilder, { Field } from '@digigov/form';
-import { Button } from '@digigov/ui/core';
+import { Button } from '@digigov/ui/form/Button';
 
 var _ref = /*#__PURE__*/React.createElement(Button, {
   type: "submit"

package/es/inputs/DateInput/index.js

@@ -5,9 +5,9 @@ var _excluded = ["label"],
 import React, { useMemo, useState } from 'react';
 import dayjs from 'dayjs';
 import customParseFormat from 'dayjs/plugin/customParseFormat';
-import { useTranslation } from '@digigov/ui/app/i18n';
 import DateInputContainer from '@digigov/react-core/DateInputContainer';
 import CoreDateInputItem from '@digigov/react-core/DateInputItem';
+import { useTranslation } from '@digigov/ui/i18n';
 dayjs.extend(customParseFormat);
 
 function useDate(value, onChange) {

package/es/inputs/FileInput/__stories__/Default.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import FormBuilder, { Field } from '@digigov/form';
-import { Button } from '@digigov/ui/core';
+import { Button } from '@digigov/ui/form/Button';
 
 var _ref = /*#__PURE__*/React.createElement(Button, null, "\u03A3\u03C5\u03BD\u03AD\u03C7\u03B5\u03B9\u03B1");
 

package/es/inputs/FileInput/index.js

@@ -4,12 +4,12 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 var _excluded = ["name", "extra", "disabled", "reset", "onChange"];
 import React, { useState } from 'react';
-import { useTranslation } from '@digigov/ui/app/i18n';
-import Paragraph from '@digigov/ui/typography/Paragraph';
-import CoreHint from '@digigov/react-core/Hint';
-import Button from '@digigov/ui/core/Button';
-import FileUploadContainer from '@digigov/react-core/FileUploadContainer';
 import FileUpload from '@digigov/react-core/FileUpload';
+import FileUploadContainer from '@digigov/react-core/FileUploadContainer';
+import CoreHint from '@digigov/react-core/Hint';
+import Button from '@digigov/ui/form/Button';
+import { useTranslation } from '@digigov/ui/i18n';
+import Paragraph from '@digigov/ui/typography/Paragraph';
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export var FileInput = /*#__PURE__*/React.forwardRef(function FileInput(_ref, ref) {
   var name = _ref.name,
@@ -41,7 +41,7 @@ export var FileInput = /*#__PURE__*/React.forwardRef(function FileInput(_ref, re
   };
 
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FileUploadContainer, {
-    hasUploadedFile: files && files.length > 0
+    hasFiles: files && files.length > 0
   }, files !== null && files !== void 0 && files.length ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Paragraph, null, /*#__PURE__*/React.createElement("b", null, t('upload.file'), ":"), " ", "".concat(files.join(', ')))) : /*#__PURE__*/React.createElement(CoreHint, null, t('upload.no_file')), /*#__PURE__*/React.createElement(FileUpload, _extends({
     ref: ref,
     hasFiles: !!(files !== null && files !== void 0 && files.length),

package/es/inputs/Input/__stories__/AFM.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import FormBuilder, { Field } from '@digigov/form';
-import { Button } from '@digigov/ui/core';
+import { Button } from '@digigov/ui/form/Button';
 
 var _ref = /*#__PURE__*/React.createElement(Button, {
   type: "submit"

package/es/inputs/Input/__stories__/Boolean.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import FormBuilder, { Field } from '@digigov/form';
-import { Button } from '@digigov/ui/core';
+import { Button } from '@digigov/ui/form/Button';
 
 var _ref = /*#__PURE__*/React.createElement(Button, {
   type: "submit"

package/es/inputs/Input/__stories__/Default.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import FormBuilder, { Field } from '@digigov/form';
-import { Button } from '@digigov/ui/core';
+import { Button } from '@digigov/ui/form/Button';
 
 var _ref = /*#__PURE__*/React.createElement(Button, {
   type: "submit"

package/es/inputs/Input/__stories__/IBAN.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import FormBuilder, { Field } from '@digigov/form';
-import { Button } from '@digigov/ui/core';
+import { Button } from '@digigov/ui/form/Button';
 
 var _ref = /*#__PURE__*/React.createElement(Button, {
   type: "submit"

package/es/inputs/Input/__stories__/Integer.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import FormBuilder, { Field } from '@digigov/form';
-import { Button } from '@digigov/ui/core';
+import { Button } from '@digigov/ui/form/Button';
 
 var _ref = /*#__PURE__*/React.createElement(Button, {
   type: "submit"

package/es/inputs/Input/__stories__/MobilePhone.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import FormBuilder, { Field } from '@digigov/form';
-import { Button } from '@digigov/ui/core';
+import { Button } from '@digigov/ui/form/Button';
 
 var _ref = /*#__PURE__*/React.createElement(Button, {
   type: "submit"

package/es/inputs/Input/__stories__/PhoneNumber.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import FormBuilder, { Field } from '@digigov/form';
-import { Button } from '@digigov/ui/core';
+import { Button } from '@digigov/ui/form/Button';
 
 var _ref = /*#__PURE__*/React.createElement(Button, {
   type: "submit"

package/es/inputs/Input/__stories__/PostalCode.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import FormBuilder, { Field } from '@digigov/form';
-import { Button } from '@digigov/ui/core';
+import { Button } from '@digigov/ui/form/Button';
 
 var _ref = /*#__PURE__*/React.createElement(Button, {
   type: "submit"

package/es/inputs/Input/__stories__/TextWithCharacterLimit.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import FormBuilder, { Field } from '@digigov/form';
-import { Button } from '@digigov/ui/core';
+import { Button } from '@digigov/ui/form';
 
 var _ref = /*#__PURE__*/React.createElement(Button, {
   type: "submit"

package/es/inputs/Input/index.js

@@ -6,7 +6,7 @@ import TextInput from '@digigov/react-core/TextInput';
 import TextArea from '@digigov/react-core/TextArea';
 import { Hint } from '@digigov/react-core';
 import { useWatch } from 'react-hook-form';
-import { useTranslation } from '@digigov/ui/app/i18n';
+import { useTranslation } from '@digigov/ui/i18n';
 var TYPES_MAP = {
   string: 'text',
   "int": 'text',

package/es/inputs/Label/__stories__/Default.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import FormBuilder, { Field, Label } from '@digigov/form';
-import { Button } from '@digigov/ui/core';
+import { Button } from '@digigov/ui/form/Button';
 
 var _ref = /*#__PURE__*/React.createElement(Button, {
   type: "submit"

package/es/inputs/Label/index.js

@@ -1,7 +1,7 @@
 import React from 'react';
-import LabelTitle from '@digigov/react-core/LabelTitle';
 import Hint from '@digigov/react-core/Hint';
-import { useTranslation } from '@digigov/ui/app/i18n';
+import LabelTitle from '@digigov/react-core/LabelTitle';
+import { useTranslation } from '@digigov/ui/i18n';
 export var Label = function Label(_ref) {
   var className = _ref.className,
       label = _ref.label,
@@ -16,7 +16,7 @@ export var Label = function Label(_ref) {
 
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelTitle, {
     className: className,
-    size: "s"
+    size: "sm"
   }, label && label.primary && t(label.primary) || value), label && label.secondary && /*#__PURE__*/React.createElement(Hint, null, t(label.secondary)));
 };
 Label.defaultProps = {

package/es/inputs/OtpInput/__stories__/Default.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import FormBuilder, { Field, Fieldset } from '@digigov/form';
-import { Button } from '@digigov/ui/core';
+import { Button } from '@digigov/ui/form/Button';
 var FIELDS = [{
   key: 'otp',
   type: 'otp',

package/es/inputs/OtpInput/index.js

@@ -4,7 +4,7 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 var _excluded = ["name", "maxLength"];
 import React, { useState, useCallback } from 'react';
-import SingleCharacterInputContainer, { SingleCharacterInputItem } from '@digigov/ui/core/SingleCharacterInputContainer';
+import SingleCharacterInputs, { SingleCharacterInput } from '@digigov/ui/form/SingleCharacterInputs';
 export var RE_DIGIT = new RegExp(/^\d+$/);
 export var REMOVE_SPACES = new RegExp(/\s+/g);
 
@@ -113,10 +113,10 @@ function useOtp(onChange, maxLength) {
   };
 }
 
-var SingleCharacterInputItemPart = function SingleCharacterInputItemPart(_ref) {
+var SingleCharacterInputPart = function SingleCharacterInputPart(_ref) {
   var props = _extends({}, _ref);
 
-  return /*#__PURE__*/React.createElement(SingleCharacterInputItem, props);
+  return /*#__PURE__*/React.createElement(SingleCharacterInput, props);
 };
 
 export var OtpInput = function OtpInput(_ref2) {
@@ -126,8 +126,8 @@ export var OtpInput = function OtpInput(_ref2) {
       props = _objectWithoutProperties(_ref2, _excluded);
 
   var otp = useOtp(props.onChange, maxLength);
-  return /*#__PURE__*/React.createElement(SingleCharacterInputContainer, null, otp.otpValues.map(function (digit, idx) {
-    return /*#__PURE__*/React.createElement(SingleCharacterInputItemPart, {
+  return /*#__PURE__*/React.createElement(SingleCharacterInputs, null, otp.otpValues.map(function (digit, idx) {
+    return /*#__PURE__*/React.createElement(SingleCharacterInputPart, {
       name: "".concat(name, "-").concat(idx),
       type: "text",
       key: idx,

package/es/inputs/Radio/__stories__/Conditional.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import FormBuilder, { Field } from '@digigov/form';
-import { Button } from '@digigov/ui/core';
+import { Button } from '@digigov/ui/form/Button';
 var fields = [{
   key: 'landline',
   type: 'phone_number',

package/es/inputs/Radio/__stories__/Default.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import FormBuilder, { Field } from '@digigov/form';
-import { Button } from '@digigov/ui/core';
+import { Button } from '@digigov/ui/form/Button';
 
 var _ref = /*#__PURE__*/React.createElement(Button, {
   type: "submit"

package/es/inputs/Radio/__stories__/WithDivider.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import FormBuilder, { Field } from '@digigov/form';
-import { Button } from '@digigov/ui/core';
+import { Button } from '@digigov/ui/form/Button';
 
 var _ref = /*#__PURE__*/React.createElement(Button, {
   type: "submit"
@@ -40,7 +40,7 @@ export var WithDivider = function WithDivider() {
           primary: 'Ηνωμένες Πολιτείες της Αμερικής'
         },
         value: 'usa',
-        divider: 'ή'
+        dividerText: 'ή'
       }]
     }
   }), _ref);

package/es/inputs/Radio/index.js

@@ -3,13 +3,13 @@ import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProper
 var _excluded = ["name", "control", "register", "extra", "disabled"],
     _excluded2 = ["label", "value", "show", "disabled", "selected"];
 import React from 'react';
-import RadioContainer from '@digigov/react-core/RadioContainer';
-import RadioItem from '@digigov/react-core/RadioItem';
-import { useTranslation } from '@digigov/ui/app/i18n';
 import { useWatch } from 'react-hook-form';
-import Hint from '@digigov/react-core/Hint';
 import { Field } from '@digigov/form';
 import { RadioConditional } from '@digigov/react-core';
+import Hint from '@digigov/react-core/Hint';
+import RadioContainer from '@digigov/react-core/RadioContainer';
+import RadioItem from '@digigov/react-core/RadioItem';
+import { useTranslation } from '@digigov/ui/i18n';
 export var RadioButtonsGroup = function RadioButtonsGroup(_ref) {
   var name = _ref.name,
       control = _ref.control,

package/es/inputs/Select/__stories__/Default.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import FormBuilder, { Field } from '@digigov/form';
-import { Button } from '@digigov/ui/core';
+import { Button } from '@digigov/ui/form/Button';
 
 var _ref = /*#__PURE__*/React.createElement(Button, {
   type: "submit"

package/es/installation.mdx

@@ -7,39 +7,35 @@ sidebar_label: Installation
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 import CodeBlock from '@theme/CodeBlock';
-import LeadText from "@site/src/components/LeadText";
+import LeadText from '@site/src/components/LeadText';
 
 <LeadText>
-This page will help you install Digigov Form depending on the framework that you
-use and the application architecture.
+  This page will help you install Digigov Form depending on the framework that
+  you use and the application architecture.
 </LeadText>
 
 We assume that your stack uses some of the following tools.
 
-* React v16 or later
-* Nextjs or create-react-app to run your code
-* Digigov CSS, as a CSS import or as Tailwind plugin 
+- React v16 or later
+- Nextjs or create-react-app to run your code
+- Digigov CSS, as a CSS import or as Tailwind plugin
 
 ## Using create-digigov-app
 
 We highly recommend using `create-digigov-app`. Our scaffolder was created to save development teams time and effort. This way
 everything you need is already configured.
 
- If you choose to use our scaffolder tool, make sure you follow this
+If you choose to use our scaffolder tool, make sure you follow this
 [guide](/docs/building-apps) first, if you haven't already done so.
 
 Then you just install the `@digigov/form` package from NPM.
 
 <Tabs>
   <TabItem value="npm" label="NPM" default>
-    <CodeBlock>
-      npm install @digigov/form --save
-    </CodeBlock>
+    <CodeBlock>npm install @digigov/form --save</CodeBlock>
   </TabItem>
   <TabItem value="yarn" label="Yarn">
-    <CodeBlock>
-      yarn add @digigov/form
-    </CodeBlock>
+    <CodeBlock>yarn add @digigov/form</CodeBlock>
   </TabItem>
 </Tabs>
 
@@ -48,9 +44,9 @@ Then you just install the `@digigov/form` package from NPM.
 This method is not recommended and you should proceed at your own risk. For
 Digigov Form to work properly, it is essential to do some configuration.
 
-* A working React application, ideally [Nextjs](https://nextjs.org/) or [Create
+- A working React application, ideally [Nextjs](https://nextjs.org/) or [Create
   React App](https://create-react-app.dev/)
-* You should already have [installed and configured Digigov
+- You should already have [installed and configured Digigov
   CSS](https://guide.services.gov.gr/docs/installation)
 
 If you meet these prerequisites, now it is time to install the dependencies.
@@ -69,4 +65,4 @@ and install `@digigov/form` and it's dependencies.
       yarn add @digigov/form @digigov/ui @digigov/react-core
     </CodeBlock>
   </TabItem>
-</Tabs>
+</Tabs>

package/es/utils.js

@@ -6,11 +6,11 @@ function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyri
 
 import { validateFieldsNatively } from '@hookform/resolvers';
 import { appendErrors } from 'react-hook-form';
+
 /**
  * Why `path!` ? because it could be `undefined` in some case
  * https://github.com/jquense/yup#validationerrorerrors-string--arraystring-value-any-path-string
  */
-
 var parseErrorSchema = function parseErrorSchema(error, validateAllFieldCriteria) {
   return (error.inner || []).reduce(function (previous, error) {
     var _error$path;

package/es/validators/index.js

@@ -1,11 +1,11 @@
 import _typeof from "@babel/runtime/helpers/typeof";
-import * as yup from 'yup';
 import { useMemo } from 'react';
 import dayjs from 'dayjs';
 import customParseFormat from 'dayjs/plugin/customParseFormat';
+import * as yup from 'yup';
 import { getYupObjectShape, AFM_VALIDATOR, FILE_MAX_SIZE_VALIDATOR, IBAN_VALIDATOR, OTP_VALIDATOR, MOBILE_PHONE_VALIDATOR, PHONE_NUMBER_VALIDATOR, TEXT_LIMIT_VALIDATOR, POSTALCODE_VALIDATOR, UUID4_VALIDATOR } from '@digigov/form/validators/utils';
-import { NUMBER_VALIDATOR } from '@digigov/form/validators/utils/number';
 import { INT_VALIDATOR } from '@digigov/form/validators/utils/int';
+import { NUMBER_VALIDATOR } from '@digigov/form/validators/utils/number';
 dayjs.extend(customParseFormat);
 var VALID_DATE_FORMATS = ['DD/MM/YYYY'];
 var DATE_CACHE = {};

package/esm/Field/FieldBase.js

@@ -2,8 +2,8 @@ import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 var _excluded = ["required", "name", "component", "wrapper", "control", "type", "controlled", "enabled", "editable", "defaultValue", "label", "extra", "layout", "error", "register"];
 import React from 'react';
-import FieldBaseContainer from '@digigov/form/Field/FieldBaseContainer';
 import { Controller } from 'react-hook-form';
+import FieldBaseContainer from '@digigov/form/Field/FieldBaseContainer';
 export var FieldBase = function FieldBase(props) {
   var required = props.required,
       name = props.name,

package/esm/Field/FieldBaseContainer.js

@@ -1,13 +1,13 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
+import Label from '@digigov/form/inputs/Label';
+import ErrorMessage from '@digigov/react-core/ErrorMessage';
 import FieldContainer from '@digigov/react-core/FieldContainer';
-import LabelContainer from '@digigov/react-core/LabelContainer';
 import CoreFieldset from '@digigov/react-core/Fieldset';
-import Hint from '@digigov/react-core/Hint';
 import FieldsetLegend from '@digigov/react-core/FieldsetLegend';
-import ErrorMessage from '@digigov/react-core/ErrorMessage';
-import { useTranslation } from '@digigov/ui/app/i18n';
-import Label from '@digigov/form/inputs/Label';
+import Hint from '@digigov/react-core/Hint';
+import LabelContainer from '@digigov/react-core/LabelContainer';
+import { useTranslation } from '@digigov/ui/i18n';
 export var FieldBaseContainer = function FieldBaseContainer(_ref) {
   var name = _ref.name,
       wrapper = _ref.wrapper,
@@ -26,7 +26,7 @@ export var FieldBaseContainer = function FieldBaseContainer(_ref) {
     return /*#__PURE__*/React.createElement(FieldContainer, _extends({
       error: !!error
     }, layout), /*#__PURE__*/React.createElement(CoreFieldset, null, /*#__PURE__*/React.createElement(FieldsetLegend, {
-      size: "s"
+      size: "sm"
     }, label && label.primary), label && label.secondary && /*#__PURE__*/React.createElement(Hint, null, t(label.secondary)), error && /*#__PURE__*/React.createElement(ErrorMessage, {
       id: "".concat(name, "-error")
     }, t(errorMessage, errorContext)), children));

package/esm/Field/FieldConditional.js

@@ -2,8 +2,8 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import { useWatch } from 'react-hook-form';
-import { evaluateFieldWithConditions } from '@digigov/form/Field/utils';
 import { FieldBase } from '@digigov/form/Field/FieldBase';
+import { evaluateFieldWithConditions } from '@digigov/form/Field/utils';
 var ChildFieldMemo = /*#__PURE__*/React.memo(function ChildField(_ref) {
   var dependencies = _ref.dependencies,
       field = _ref.field,

package/esm/Field/utils.js

@@ -1,13 +1,13 @@
 import _extends from "@babel/runtime/helpers/extends";
 import { lazy, useContext, useMemo } from 'react';
-import Input from '@digigov/form/inputs/Input';
+import { FormContext } from '@digigov/form/FormContext';
 import Checkboxes from '@digigov/form/inputs/Checkboxes';
-import Radio from '@digigov/form/inputs/Radio';
-import Select from '@digigov/form/inputs/Select';
-import FileInput from '@digigov/form/inputs/FileInput';
 import DateInput from '@digigov/form/inputs/DateInput';
+import FileInput from '@digigov/form/inputs/FileInput';
+import Input from '@digigov/form/inputs/Input';
 import OtpInput from '@digigov/form/inputs/OtpInput';
-import { FormContext } from '@digigov/form/FormContext';
+import Radio from '@digigov/form/inputs/Radio';
+import Select from '@digigov/form/inputs/Select';
 var AutoComplete = /*#__PURE__*/lazy(function () {
   return import('@digigov/form/inputs/AutoComplete');
 });

package/esm/FieldArray/__stories__/Default.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import FormBuilder, { Field } from '@digigov/form';
-import { Button } from '@digigov/ui/core';
+import { Button } from '@digigov/ui/form/Button';
 var fields = [{
   key: 'string',
   type: 'string',

package/esm/FieldArray/__stories__/WithExactLength.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import FormBuilder, { Field } from '@digigov/form';
-import { Button } from '@digigov/ui/core';
+import { Button } from '@digigov/ui/form/Button';
 var fields = [{
   key: 'string',
   type: 'string',

package/esm/FieldArray/index.js

@@ -3,11 +3,11 @@ import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProper
 var _excluded = ["name", "register", "control", "formState", "error", "layout", "label"];
 import React from 'react';
 import { useFieldArray } from 'react-hook-form';
+import FieldContainer from '@digigov/form/Field/FieldBaseContainer';
 import FieldObject from '@digigov/form/FieldObject';
-import { Button, Card, Hint } from '@digigov/ui';
 import { FieldsetLabel } from '@digigov/form/Fieldset';
 import Fieldset from '@digigov/react-core/Fieldset';
-import FieldContainer from '@digigov/form/Field/FieldBaseContainer';
+import { Button, Card, Hint } from '@digigov/ui';
 export var FieldArray = function FieldArray(_ref) {
   var _customField$extra, _customField$extra$la, _customField$extra4, _customField$extra4$l;
 

package/esm/FieldObject/index.js

@@ -1,10 +1,10 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React, { useMemo } from 'react';
-import Fieldset, { FieldsetCaption } from '@digigov/form/Fieldset';
-import { useTranslation } from '@digigov/ui/app/i18n';
 import { FieldBase } from '@digigov/form/Field/FieldBase';
 import { calculateField } from '@digigov/form/Field/utils';
+import Fieldset, { FieldsetCaption } from '@digigov/form/Fieldset';
 import { FieldsetLegend } from '@digigov/react-core';
+import { useTranslation } from '@digigov/ui/i18n';
 export var FieldObject = function FieldObject(_ref) {
   var name = _ref.name,
       label = _ref.label,
@@ -18,7 +18,7 @@ export var FieldObject = function FieldObject(_ref) {
       t = _useTranslation.t;
 
   return /*#__PURE__*/React.createElement(Fieldset, null, (label === null || label === void 0 ? void 0 : label.primary) && /*#__PURE__*/React.createElement(FieldsetLegend, {
-    size: "s"
+    size: "sm"
   }, t(label.primary)), (label === null || label === void 0 ? void 0 : label.secondary) && /*#__PURE__*/React.createElement(FieldsetCaption, null, t(label.secondary)), extra === null || extra === void 0 ? void 0 : extra.fields.map(function (field) {
     return /*#__PURE__*/React.createElement(FieldObjectItem, {
       key: "".concat(name, ".").concat(field.key),