@itcase/forms 1.1.24 → 1.1.26

package/dist/itcase-forms.cjs.js

@@ -5,18 +5,13 @@ var React$1 = require('react');
 var finalForm = require('final-form');
 var reactFinalForm = require('react-final-form');
 var clsx = require('clsx');
-var Checkbox = require('@itcase/ui/components/Checkbox');
+var useDevicePropsGenerator = require('@itcase/ui/hooks/useDevicePropsGenerator');
+var camelCase = require('lodash/camelCase');
+var snakeCase = require('lodash/snakeCase');
 var Divider = require('@itcase/ui/components/Divider');
 var Text = require('@itcase/ui/components/Text');
 var useDeviceTargetClass = require('@itcase/ui/hooks/useDeviceTargetClass');
 var useStyles = require('@itcase/ui/hooks/useStyles');
-var camelCase = require('lodash/camelCase');
-var snakeCase = require('lodash/snakeCase');
-var Choice = require('@itcase/ui/components/Choice');
-var Icon = require('@itcase/ui/components/Icon');
-var Code = require('@itcase/ui/components/Code');
-var DatePicker = require('@itcase/ui/components/DatePicker');
-var useDevicePropsGenerator = require('@itcase/ui/hooks/useDevicePropsGenerator');
 var axios = require('axios');
 var fileSelector = require('file-selector');
 var castArray = require('lodash/castArray');
@@ -25,15 +20,20 @@ var common = require('@itcase/common');
 var Button = require('@itcase/ui/components/Button');
 var Loader = require('@itcase/ui/components/Loader');
 var Title = require('@itcase/ui/components/Title');
+var Checkbox = require('@itcase/ui/components/Checkbox');
+var Chips = require('@itcase/ui/components/Chips');
+var Choice = require('@itcase/ui/components/Choice');
+var Code = require('@itcase/ui/components/Code');
+var Icon = require('@itcase/ui/components/Icon');
+var DatePicker = require('@itcase/ui/components/DatePicker');
 var Input = require('@itcase/ui/components/Input');
-var Radio = require('@itcase/ui/components/Radio');
 var Segmented = require('@itcase/ui/components/Segmented');
 var Select = require('@itcase/ui/components/Select');
 var Switch = require('@itcase/ui/components/Switch');
 var Textarea = require('@itcase/ui/components/Textarea');
 var reactImask = require('react-imask');
-var Chips = require('@itcase/ui/components/Chips');
-var Group$1 = require('@itcase/ui/components/Group');
+var Radio = require('@itcase/ui/components/Radio');
+var Group = require('@itcase/ui/components/Group');
 var Notification = require('@itcase/ui/components/Notification');
 var createDecorator = require('final-form-focus');
 
@@ -127,29 +127,149 @@ function useYupValidationSchema(schema, language) {
   return validate;
 }
 
+// Whether to display an error message based on "fieldProps" and meta-objects
+function useFieldValidationState(props) {
+  const {
+    fieldProps = {},
+    meta = {},
+    input = {}
+  } = props;
+  // Determines if there's a submission error that hasn't been rectified since the last submission.
+  const submitError = !meta.modifiedSinceLastSubmit && meta.submitError;
+
+  // Determines a key for the error, defaulting to 'error' if no specific key is found.
+  const errorKey = meta.error?.key || 'error';
+  const successKey = 'success';
+
+  // Determines if the field is in an error state based on various conditions.
+  const isErrorState = React$1.useMemo(() => {
+    if (fieldProps.showErrorsOnSubmit) {
+      return Boolean(meta.submitFailed && meta.touched && (meta.error || submitError));
+    } else {
+      return Boolean(meta.touched && (meta.error || submitError));
+    }
+  }, [fieldProps.showErrorsOnSubmit, meta.submitFailed, meta.touched, meta.error, submitError]);
+
+  // Determines if the field's input state is valid
+  const isValidState = React$1.useMemo(() => {
+    const hasValue = Array.isArray(input?.value) ? input?.value.length : input?.value;
+    const isModifiedAfterSubmit = meta.modifiedSinceLastSubmit && !meta.error && submitError;
+    return Boolean(hasValue && (meta.valid || isModifiedAfterSubmit));
+  }, [input?.value, meta.valid, meta.error, submitError, meta.modifiedSinceLastSubmit]);
+  const errorMessage = React$1.useMemo(() => {
+    // If final-form field has error in "meta" render-property.
+    // If field not modified after last form submit - use submit error
+    const error = meta.error || submitError || false;
+    if (error) {
+      // And error in "meta" is string
+      if (typeof error === 'string') {
+        // Return error as message
+        return error;
+      }
+      // Or if error in "meta" has "message" property(is object of error)
+      if (error.message) {
+        // Return message from error
+        return error.message;
+      }
+    }
+
+    // Field doesn't have error message
+    return '';
+  }, [meta.error, submitError]);
+  return {
+    errorKey,
+    successKey,
+    isErrorState,
+    isValidState,
+    errorMessage
+  };
+}
+
+// This hook changes the props of the child component depending on the type of error,
+// looks at what props were in initialProps, if they are there then changes
+function useValidationAppearanceInputProps(props) {
+  const {
+    validationStateKey,
+    inputProps
+  } = props;
+
+  // TODO: need to add props that can change during errors in this field
+  const validationAppearanceInputProps = React$1.useMemo(() => {
+    // const resultAppearanceProps = {
+    //   messageTextColor: props.errorMessageTextColor,
+    //   messageTextSize: props.errorMessageTextSize,
+    //   messageTextWeight: props.errorMessageTextWeight,
+    //   // Override appearance(styled) props for child input
+    //   inputProps: {},
+    // }
+    const updatedInputProps = {};
+    if (validationStateKey) {
+      Object.entries(inputProps).forEach(([propKey, propValue]) => {
+        // Convert the input property key to "snake_case" format.
+        // e.g. "requiredBorderColor" -> "required_border_color".
+        const propKeySnake = snakeCase__default.default(propKey);
+        // Check if this property is for appearance.
+        // Key maybe starts with: "error", "required", "success", etc from validation config.
+        const isPropForValidationState = propKeySnake.startsWith(`${validationStateKey}_`);
+
+        // If property is for appearance
+        if (isPropForValidationState) {
+          // Remove validation state part from begin of property key, to make clean appearance property.
+          // e.g. "required_border_color" -> "border_color".
+          const stateTargetKeySnake = propKeySnake.replace(`${validationStateKey}_`, '');
+          // Convert clean appearance property key to "camelCase" format.
+          // e.g. "border_color" -> "borderColor"
+          const stateTargetKey = camelCase__default.default(stateTargetKeySnake);
+          // And save the value with a new clean property key
+          updatedInputProps[stateTargetKey] = propValue;
+          // Else if not already added earlier
+        } else if (!updatedInputProps[propKey]) {
+          // Just save original property
+          updatedInputProps[propKey] = propValue;
+        }
+      });
+    }
+    return updatedInputProps;
+  }, [validationStateKey, inputProps]);
+  return validationAppearanceInputProps;
+}
+
 const defaultFieldProps = {
   width: 'fill',
   direction: 'vertical',
-  size: 'm',
   labelTextColor: 'surfaceTextPrimary',
-  labelTextSize: 's',
   messageTextColor: 'surfaceTextSecondary',
-  messageTextSize: 's',
   errorMessageTextColor: 'errorTextSecondary',
-  errorMessageTextSize: 's',
   dividerFill: 'errorPrimary',
   helpTextColor: 'surfaceTextQuaternary',
-  helpTextSize: 's',
   requiredMessageTextColor: 'warningTextSecondary',
-  requiredMessageTextSize: 's',
   showMessage: true
 };
+const defaultFieldSizeM = {
+  size: 'm',
+  labelTextSize: 's',
+  messageTextSize: 's',
+  errorMessageTextSize: 's',
+  helpTextSize: 's',
+  requiredMessageTextSize: 's',
+  ...defaultFieldProps
+};
+const defaultFieldSizeXL = {
+  size: 'xl',
+  labelTextSize: 's',
+  messageTextSize: 's',
+  errorMessageTextSize: 's',
+  helpTextSize: 's',
+  requiredMessageTextSize: 's',
+  ...defaultFieldProps
+};
 
 function FieldWrapperBase(props) {
   const {
     id,
+    dataTour,
     className,
-    type = 'normal',
+    type,
     label,
     labelHidden,
     labelTextColor,
@@ -157,6 +277,7 @@ function FieldWrapperBase(props) {
     labelTextSizeMobile,
     labelTextSizeTablet,
     labelTextWeight,
+    messageTextSize,
     desc,
     descTextColor,
     descTextSize,
@@ -169,7 +290,6 @@ function FieldWrapperBase(props) {
     isDisabled,
     afterItem,
     beforeItem,
-    dataTour,
     dividerDirection,
     dividerFill,
     dividerSize,
@@ -182,7 +302,6 @@ function FieldWrapperBase(props) {
     helpTextWeight,
     inputName,
     inputValue,
-    messageTextSize,
     metaActive,
     showDivider,
     showMessage,
@@ -231,13 +350,13 @@ function FieldWrapperBase(props) {
   const errorTextColor = props[`${errorKey}MessageTextColor`];
   const errorTextWeight = props[`${errorKey}MessageTextWeight`];
   return /*#__PURE__*/React__default.default.createElement(Tag, {
+    dataTestId: `${inputName}Field`,
+    dataTour: dataTour,
     className: clsx__default.default(formFieldClass, 'form__item', 'form-field', type && `form-field_type_${type}`, sizeClass, fillClass, shapeClass, isDisabled && `form-field_state_disabled`, isHidden && `form-field_state_hidden`, directionClass, widthClass),
-    "data-test-id": `${inputName}Field`,
-    "data-tour": dataTour,
     style: formFieldStyles
   }, before, (label || labelHidden) && /*#__PURE__*/React__default.default.createElement("div", {
+    dataTestId: `${inputName}FieldLabel`,
     className: clsx__default.default('form-field__label'),
-    "data-test-id": `${inputName}FieldLabel`,
     htmlFor: id
   }, /*#__PURE__*/React__default.default.createElement(Text.Text, {
     size: labelTextSize,
@@ -247,7 +366,7 @@ function FieldWrapperBase(props) {
     sizeTablet: labelTextSizeTablet
   }, label, labelHidden && '\u00A0')), desc && /*#__PURE__*/React__default.default.createElement("div", {
     className: "form-field__desc",
-    "data-test-id": `${inputName}FieldDesc`
+    dataTestId: `${inputName}FieldDesc`
   }, /*#__PURE__*/React__default.default.createElement(Text.Text, {
     size: descTextSize,
     textColor: descTextColor,
@@ -263,26 +382,26 @@ function FieldWrapperBase(props) {
     size: dividerSize,
     fill: dividerFill
   })), showMessage && /*#__PURE__*/React__default.default.createElement("div", {
-    className: "form-field__message",
-    "data-test-id": `${inputName}FieldMessage`
+    dataTestId: `${inputName}FieldMessage`,
+    className: "form-field__message"
   }, isErrorState && errorMessage && /*#__PURE__*/React__default.default.createElement(Text.Text, {
     id: `${inputName}-error`,
+    dataTestId: `${inputName}FieldMessageError`,
     className: "form-field__message-item form-field__message-item_type-error",
     size: errorTextSize,
     textColor: errorTextColor,
-    textWeight: errorTextWeight,
-    dataTestId: `${inputName}FieldMessageError`
+    textWeight: errorTextWeight
   }, errorMessage), Boolean(helpText) && (!isErrorState || !errorMessage) && /*#__PURE__*/React__default.default.createElement(Text.Text, {
+    dataTestId: `${inputName}FieldMessageHelpText`,
     className: "form-field__message-item form-field__message-item_type_help-text",
     size: helpTextSize,
     textColor: isValidState ? helpTextColorSuccess : helpTextColor,
     textWeight: helpTextWeight,
-    dataTestId: `${inputName}FieldMessageHelpText`,
     sizeMobile: helpTextSizeMobile
   }, helpText), (!isErrorState && !helpText || isErrorState && !helpText && !errorMessage) && /*#__PURE__*/React__default.default.createElement(Text.Text, {
+    dataTestId: `${inputName}FieldMessageHelpText`,
     className: "form-field__message-item form-field__message-item_type_help-text",
-    size: messageTextSize,
-    dataTestId: `${inputName}FieldMessageHelpText`
+    size: messageTextSize
   }, '\u00A0')), after);
 }
 function FieldWrapper(props) {
@@ -301,242 +420,425 @@ function FieldWrapper(props) {
   return /*#__PURE__*/React__default.default.createElement(FieldWrapperBase, props);
 }
 
-// Whether to display an error message based on "fieldProps" and meta-objects
-function useFieldValidationState(props) {
+const defaultDropzoneProps = {
+  fill: 'surfacePrimary',
+  borderColor: 'surfaceBorderTertiary',
+  borderColorHover: 'surfaceBorderQuaternary',
+  hintTitle: 'Перетащите изображение или выберите файл с компьютера',
+  hintTitleTextColor: 'surfaceTextPrimary',
+  hintTitleTextSize: 'm',
+  removeThumbText: 'удалить',
+  removeThumbTextColor: 'errorTextPrimary',
+  removeThumbTextHoverColor: 'errorTextPrimaryHover',
+  removeThumbTextSize: 's',
+  shape: 'rounded',
+  showFilename: true,
+  thumbBorderColor: 'surfaceBorderTertiary',
+  thumbBorderColorHover: 'surfaceBorderQuaternary',
+  thumbBorderWidth: 1,
+  thumbNameTextColor: 'surfaceTextPrimary',
+  thumbNameTextSize: 's',
+  isPreviews: true
+};
+
+const FileInputDropzone = /*#__PURE__*/React__default.default.memo(function FileInputDropzone(props) {
   const {
-    fieldProps = {},
-    meta = {},
-    input = {}
+    className,
+    maxFiles,
+    maxSize,
+    size,
+    fileErrorText,
+    dropzoneProps = {},
+    hintDescription,
+    hintTitle,
+    inputName,
+    inputValue,
+    showFilename,
+    thumbColumn,
+    isPreviews,
+    onAddFiles,
+    onDeleteFile
   } = props;
-  // Determines if there's a submission error that hasn't been rectified since the last submission.
-  const submitError = !meta.modifiedSinceLastSubmit && meta.submitError;
 
-  // Determines a key for the error, defaulting to 'error' if no specific key is found.
-  const errorKey = meta.error?.key || 'error';
-  const successKey = 'success';
+  // TODO: delete react-final-form things out of here?
+  const {
+    change
+  } = reactFinalForm.useForm();
+  const [fileError, setFileError] = React$1.useState('');
+  const [fileIsLoading, setFileIsLoading] = React$1.useState(false);
+  const filesList = React$1.useMemo(() => inputValue ? castArray__default.default(inputValue) : [], [inputValue]);
+  const changeFormState = React$1.useCallback(newFiles => {
+    // If max files in dropzone is 1 - return file as it self, else as array of files
+    // ps: for old projects compatibility
+    const toSave = dropzoneProps.maxFiles == 1 ? newFiles[0] : newFiles;
+    change(inputName, toSave);
+    return toSave;
+  },
+  // If "inputName" will be changes, then it should be a different field
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  [dropzoneProps, change]);
 
-  // Determines if the field is in an error state based on various conditions.
-  const isErrorState = React$1.useMemo(() => {
-    if (fieldProps.showErrorsOnSubmit) {
-      return Boolean(meta.submitFailed && meta.touched && (meta.error || submitError));
-    } else {
-      return Boolean(meta.touched && (meta.error || submitError));
+  //
+  const convertFiledValueAndSaveAsFiles = React$1.useCallback(async currentFilesList => {
+    setFileIsLoading(true);
+    const newFiles = [];
+    for (const fileItem of currentFilesList) {
+      if (typeof fileItem === 'string') {
+        const newFile = await convertToFile(fileItem, isPreviews);
+        if (newFile) {
+          newFiles.push(newFile);
+        }
+      } else {
+        newFiles.push(fileItem);
+      }
     }
-  }, [fieldProps.showErrorsOnSubmit, meta.submitFailed, meta.touched, meta.error, submitError]);
+    changeFormState(newFiles);
+    setFileIsLoading(false);
+  }, [isPreviews, changeFormState]);
 
-  // Determines if the field's input state is valid
-  const isValidState = React$1.useMemo(() => {
-    const hasValue = Array.isArray(input?.value) ? input?.value.length : input?.value;
-    const isModifiedAfterSubmit = meta.modifiedSinceLastSubmit && !meta.error && submitError;
-    return Boolean(hasValue && (meta.valid || isModifiedAfterSubmit));
-  }, [input?.value, meta.valid, meta.error, submitError, meta.modifiedSinceLastSubmit]);
-  const errorMessage = React$1.useMemo(() => {
-    // If final-form field has error in "meta" render-property.
-    // If field not modified after last form submit - use submit error
-    const error = meta.error || submitError || false;
-    if (error) {
-      // And error in "meta" is string
-      if (typeof error === 'string') {
-        // Return error as message
-        return error;
-      }
-      // Or if error in "meta" has "message" property(is object of error)
-      if (error.message) {
-        // Return message from error
-        return error.message;
-      }
+  // Delete file from dropzone
+  const removeFile = React$1.useCallback((event, index) => {
+    event.stopPropagation();
+    event.preventDefault();
+    const newFiles = [...filesList];
+    newFiles.splice(index, 1);
+    if (onDeleteFile) {
+      onDeleteFile(filesList[index], inputName);
     }
+    changeFormState(newFiles);
+  },
+  // If "inputName" will be changes, then it should be a different field
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  [filesList, changeFormState, onDeleteFile]);
 
-    // Field doesn't have error message
-    return '';
-  }, [meta.error, submitError]);
-  return {
-    errorKey,
-    successKey,
-    isErrorState,
-    isValidState,
-    errorMessage
-  };
-}
-
-// This hook changes the props of the child component depending on the type of error,
-// looks at what props were in initialProps, if they are there then changes
-function useValidationAppearanceInputProps(props) {
+  // Create dropzone options
   const {
-    validationStateKey,
-    inputProps
-  } = props;
-
-  // TODO: need to add props that can change during errors in this field
-  const validationAppearanceInputProps = React$1.useMemo(() => {
-    // const resultAppearanceProps = {
-    //   messageTextColor: props.errorMessageTextColor,
-    //   messageTextSize: props.errorMessageTextSize,
-    //   messageTextWeight: props.errorMessageTextWeight,
-    //   // Override appearance(styled) props for child input
-    //   inputProps: {},
-    // }
-    const updatedInputProps = {};
-    if (validationStateKey) {
-      Object.entries(inputProps).forEach(([propKey, propValue]) => {
-        // Convert the input property key to "snake_case" format.
-        // e.g. "requiredBorderColor" -> "required_border_color".
-        const propKeySnake = snakeCase__default.default(propKey);
-        // Check if this property is for appearance.
-        // Key maybe starts with: "error", "required", "success", etc from validation config.
-        const isPropForValidationState = propKeySnake.startsWith(`${validationStateKey}_`);
+    getInputProps,
+    getRootProps
+  } = reactDropzone.useDropzone({
+    maxFiles: maxFiles || 5,
+    maxSize: maxSize || 10485760,
+    // 10mb
+    // accept: { 'image/*': [] },
+    ...dropzoneProps,
+    getFilesFromEvent: async event => {
+      const result = await fileSelector.fromEvent(event);
+      const newFiles = result.filter(item => item instanceof File);
+      // Add exists and new files to accepted(or rejected)
+      return [...filesList, ...newFiles];
+    },
+    onDropAccepted: acceptedFiles => {
+      // If dropped files has accepted and we need a previews
+      if (isPreviews) {
+        // Add preview to every file
+        acceptedFiles.forEach(file => {
+          if (!file.error) {
+            file.preview = URL.createObjectURL(file);
+          }
+        });
+      }
+      // Save to form data (including empty when files are not valid)
+      const filesToSave = changeFormState(acceptedFiles);
+      setFileError('');
 
-        // If property is for appearance
-        if (isPropForValidationState) {
-          // Remove validation state part from begin of property key, to make clean appearance property.
-          // e.g. "required_border_color" -> "border_color".
-          const stateTargetKeySnake = propKeySnake.replace(`${validationStateKey}_`, '');
-          // Convert clean appearance property key to "camelCase" format.
-          // e.g. "border_color" -> "borderColor"
-          const stateTargetKey = camelCase__default.default(stateTargetKeySnake);
-          // And save the value with a new clean property key
-          updatedInputProps[stateTargetKey] = propValue;
-          // Else if not already added earlier
-        } else if (!updatedInputProps[propKey]) {
-          // Just save original property
-          updatedInputProps[propKey] = propValue;
+      // Save DataURL for all files
+      const readerPromisesList = acceptedFiles.map(file => {
+        return new Promise(resolve => setFileDataURL(file, resolve));
+      });
+      // Save files to form values
+      Promise.all(readerPromisesList).then(() => {
+        if (onAddFiles) {
+          onAddFiles(filesToSave, inputName);
         }
       });
-    }
-    return updatedInputProps;
-  }, [validationStateKey, inputProps]);
-  return validationAppearanceInputProps;
-}
-
-const defaultCheckboxProps = {
-  appearance: 'defaultPrimary',
-  width: 'fill',
-  errorBorderColor: 'errorBorderSecondary',
-  requiredBorderColor: 'warningBorderSecondary'
-};
-
-const CheckboxField = /*#__PURE__*/React__default.default.memo(function CheckboxField(props) {
-  const {
-    name,
-    initialValue,
-    isDisabled,
-    classNameGroupItem,
-    fieldProps = {},
-    inputProps = {},
-    showMessage,
-    isRequired,
-    onChange
-  } = props;
-  return /*#__PURE__*/React__default.default.createElement(reactFinalForm.Field, {
-    type: "checkbox",
-    name: name,
-    initialValue: initialValue
-  }, function Render({
-    input,
-    meta
-  }) {
-    /** Note:
-     * Create "Render" function by "eslint-react-hooks/rules-of-hooks":
-     * React Hooks cannot be called inside a callback.
-     * React Hooks must be called in a React function component or a
-     * custom React Hook function.
-     */
-
-    const onChangeField = React$1.useCallback(event => {
-      input.onChange(event);
-      if (onChange) {
-        onChange(event.target.checked, input.name);
+    },
+    onDropRejected: rejectedFiles => {
+      // If dropped files has rejected
+      if (rejectedFiles.length) {
+        let fileErrorMessage = 'Ошибка при добавлении файла';
+        const firstFileErrorItem = rejectedFiles[0].errors[0];
+        if (firstFileErrorItem) {
+          if (firstFileErrorItem.code === reactDropzone.ErrorCode.TooManyFiles) {
+            fileErrorMessage = `Максимальное количество файлов: ${maxFiles}`;
+          } else {
+            fileErrorMessage = firstFileErrorItem.message;
+          }
+        }
+        // Show error
+        setFileError(fileErrorMessage);
+      } else {
+        // Else clean error
+        setFileError('');
       }
-    }, [onChange, input.onChange]);
-    const {
-      errorKey,
-      errorMessage,
-      isErrorState,
-      isValidState
-    } = useFieldValidationState({
-      fieldProps: fieldProps,
-      input: input,
-      meta: meta
-    });
-    const updatedInputProps = useValidationAppearanceInputProps({
-      inputProps: inputProps,
-      validationStateKey: isErrorState ? errorKey : 'success'
-    });
-    return /*#__PURE__*/React__default.default.createElement(FieldWrapper, Object.assign({
-      className: clsx__default.default('form-field_type_checkbox', 'form__item_type_checkbox', classNameGroupItem),
-      errorKey: errorKey,
-      errorMessage: errorMessage,
-      isErrorState: isErrorState,
-      metaError: meta.error,
-      isDisabled: isDisabled,
-      fieldClassName: "form-checkbox",
-      inputName: input.name,
-      inputValue: input.checked,
-      metaActive: meta.active,
-      showMessage: showMessage,
-      tag: "label",
-      isRequired: isRequired,
-      isValidState: isValidState
-    }, fieldProps), /*#__PURE__*/React__default.default.createElement(Checkbox.Checkbox, Object.assign({
-      type: "checkbox",
-      name: input.name,
-      isDisabled: isDisabled,
-      autoComplete: "nope",
-      checked: input.checked,
-      onBlur: input.onBlur,
-      onChange: onChangeField,
-      onFocus: input.onFocus
-    }, updatedInputProps)));
+    }
   });
-});
-
-const defaultChoiceProps = {
-  width: 'fill',
-  borderColor: 'surfaceBorderTertiary',
-  // error
-  errorBorderColor: 'errorBorderPrimary',
-  fill: 'surfaceSecondary',
-  fillActive: 'accentPrimary',
-  fillActiveDisabled: 'surfaceTertiary',
-  fillHover: 'surfacePrimaryHover',
-  indicatorFill: 'accentPrimary',
-  labelTextActiveColor: 'accentTextPrimary',
-  labelTextActiveColorDisabled: 'surfaceTextDisabled',
-  labelTextColor: 'surfaceTextPrimary',
-  labelTextColorDisabled: 'surfaceTextDisabled',
-  labelTextSize: 'm',
-  requiredBorderColor: 'warningBorderPrimary',
-  shape: 'rounded'
-};
+  React$1.useEffect(() => {
+    const currentFilesList = castArray__default.default(inputValue);
+    const isNeedToConvert = currentFilesList.some(fileItem => typeof fileItem === 'string');
+    if (isNeedToConvert) {
+      // First time convert value to Files and save to local and form state
+      convertFiledValueAndSaveAsFiles(currentFilesList);
+    }
 
-const ChoiceField = /*#__PURE__*/React__default.default.memo(function ChoiceField(props) {
-  const {
-    name,
-    initialValue,
-    label,
-    isDisabled,
-    classNameGroupItem,
-    fieldProps,
-    inputProps,
-    messageType,
-    options,
-    placeholder,
-    showMessage,
-    isCheckbox,
-    isRequired,
-    onChange
-  } = props;
+    // Make sure to revoke the data uris to avoid memory leaks, will run on unmount
+    return () => {
+      filesList.forEach(file => {
+        if (file?.preview) {
+          URL.revokeObjectURL(file.preview);
+        }
+      });
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [inputValue]);
+  const propsGenerator = useDevicePropsGenerator.useDevicePropsGenerator(props);
   const {
-    change
-  } = reactFinalForm.useForm();
-  const setActiveSegment = React$1.useCallback((option, isChecked) => {
-    change(name, isChecked && option.value);
-    if (onChange) {
-      onChange(option.value, name, isChecked);
+    fillClass,
+    fillHoverClass,
+    borderColorClass,
+    borderColorHoverClass,
+    borderTypeClass,
+    borderWidthClass,
+    errorMessageTextColor,
+    errorMessageTextSize,
+    errorMessageTextWeight,
+    hintDescriptionTextColor,
+    hintDescriptionTextSize,
+    hintDescriptionTextWeight,
+    hintDescriptionTextWrap,
+    hintTitleTextColor,
+    hintTitleTextSize,
+    hintTitleTextWeight,
+    hintTitleTextWrap,
+    removeThumbAppearance,
+    removeThumbShape,
+    removeThumbText,
+    removeThumbTextWeight,
+    shapeClass,
+    thumbBorderColorClass,
+    thumbBorderColorHoverClass,
+    thumbBorderTypeClass,
+    thumbBorderWidthClass,
+    thumbDirectionClass,
+    thumbNameTextColor,
+    thumbNameTextSize,
+    thumbNameTextWeight,
+    thumbNameTextWrap
+  } = propsGenerator;
+  return /*#__PURE__*/React__default.default.createElement(React__default.default.Fragment, null, /*#__PURE__*/React__default.default.createElement("div", getRootProps({
+    className: `form-dropzone__dropzone dropzone ${className} form-dropzone__dropzone_size_${size} ${shapeClass}`
+  }), /*#__PURE__*/React__default.default.createElement("input", Object.assign({}, getInputProps(), {
+    name: inputName
+  })), /*#__PURE__*/React__default.default.createElement("div", {
+    className: clsx__default.default('form-dropzone__dropzone-wrapper', thumbColumn && `form-dropzone__dropzone-wrapper_column_${thumbColumn}`, fillClass, fillHoverClass, borderWidthClass, borderColorClass, borderColorHoverClass, borderTypeClass)
+  }, filesList.map((file, index) => /*#__PURE__*/React__default.default.createElement("aside", {
+    className: clsx__default.default('form-dropzone__thumb', fillClass, thumbDirectionClass, thumbBorderWidthClass, thumbBorderColorClass, thumbBorderColorHoverClass, thumbBorderTypeClass),
+    key: file.id || `${file.name}_${index}`
+  }, isPreviews && !file.error && /*#__PURE__*/React__default.default.createElement("div", {
+    className: "form-dropzone__thumb-image"
+  }, /*#__PURE__*/React__default.default.createElement("img", {
+    className: "form-dropzone__thumb-image-inner",
+    src: file.preview || file.image,
+    onLoad: () => {
+      // Revoke data uri after image is loaded
+      URL.revokeObjectURL(file.preview);
     }
-  }, [change, onChange]);
+  })), file.error && /*#__PURE__*/React__default.default.createElement("div", null, /*#__PURE__*/React__default.default.createElement(Text.Text, {
+    size: thumbNameTextSize,
+    textColor: thumbNameTextColor,
+    textWeight: thumbNameTextWeight,
+    textWrap: thumbNameTextWrap
+  }, fileErrorText || file.error)), showFilename && /*#__PURE__*/React__default.default.createElement("div", {
+    className: "form-dropzone__thumb-name"
+  }, /*#__PURE__*/React__default.default.createElement(Text.Text, {
+    className: "form-dropzone__thumb-name-inner",
+    size: thumbNameTextSize,
+    textColor: thumbNameTextColor,
+    textWeight: thumbNameTextWeight,
+    textWrap: thumbNameTextWrap
+  }, file.name)), fileIsLoading && /*#__PURE__*/React__default.default.createElement("div", {
+    className: "form-dropzone__thumb-loader"
+  }, /*#__PURE__*/React__default.default.createElement(Loader.Loader, {
+    width: "fill",
+    height: "fill",
+    fill: "surfacePrimary",
+    itemFill: "surfaceItemAccent",
+    set: "simple"
+  })), /*#__PURE__*/React__default.default.createElement("div", {
+    className: clsx__default.default('form-dropzone__thumb-remove')
+  }, /*#__PURE__*/React__default.default.createElement(Button.Button, {
+    className: "form-dropzone__thumb-remove-text",
+    appearance: removeThumbAppearance,
+    label: removeThumbText || 'Удалить',
+    labelTextWeight: removeThumbTextWeight,
+    shape: removeThumbShape,
+    onClick: event => removeFile(event, index)
+  })))), !filesList.length ? /*#__PURE__*/React__default.default.createElement("div", {
+    className: "form-dropzone__hint"
+  }, /*#__PURE__*/React__default.default.createElement(Text.Text, {
+    className: "form-dropzone__hint-title",
+    size: hintTitleTextSize,
+    textColor: hintTitleTextColor,
+    textWeight: hintTitleTextWeight,
+    textWrap: hintTitleTextWrap
+  }, hintTitle || 'Select a file or drag in form'), hintDescription && /*#__PURE__*/React__default.default.createElement(Text.Text, {
+    className: "form-dropzone__hint-text",
+    size: hintDescriptionTextSize,
+    textColor: hintDescriptionTextColor,
+    textWeight: hintDescriptionTextWeight,
+    textWrap: hintDescriptionTextWrap
+  }, hintDescription)) : /*#__PURE__*/React__default.default.createElement("div", {
+    className: "form-dropzone__hint form-dropzone__hint_type_add-more"
+  }, /*#__PURE__*/React__default.default.createElement(Text.Text, {
+    className: "form-dropzone__hint-title",
+    size: hintTitleTextSize,
+    textColor: hintTitleTextColor,
+    textWeight: hintTitleTextWeight,
+    textWrap: hintTitleTextWrap
+  }, hintTitle || 'Select a file or drag in form'), hintDescription && /*#__PURE__*/React__default.default.createElement(Text.Text, {
+    className: "form-dropzone__hint-text",
+    size: hintDescriptionTextSize,
+    textColor: hintDescriptionTextColor,
+    textWeight: hintDescriptionTextWeight,
+    textWrap: hintDescriptionTextWrap
+  }, hintDescription)))), fileError && /*#__PURE__*/React__default.default.createElement("div", {
+    className: "form-field__message"
+  }, /*#__PURE__*/React__default.default.createElement(Text.Text, {
+    className: "form-field__message-item form-field__message-item_type_message",
+    size: errorMessageTextSize,
+    textColor: errorMessageTextColor,
+    textWeight: errorMessageTextWeight
+  }, fileError)));
+});
+async function getFileByURL(url) {
+  try {
+    const response = await axios__default.default({
+      url: url,
+      responseType: 'blob'
+    });
+    const blobObject = response.data;
+    const dirtyFilename = response.headers['content-disposition']?.split('filename=')[1];
+    // Remove double quotes
+    let filename = dirtyFilename?.substring(1).slice(0, -1);
+    if (!filename) {
+      filename = url.split('/').at(-1);
+      // const typeParts = blobObject.type.split('/')
+      // const fileType = typeParts[typeParts.length - 1]
+      // filename = `${new Date().getTime()}.${fileType}`
+    }
+    return new File([blobObject], filename, {
+      type: blobObject.type
+    });
+  } catch (error) {
+    console.log('error: ', error);
+    return null;
+  }
+}
+async function convertToFile(inputValue, isPreviews) {
+  let newFile = null;
+
+  // Download image by url and save as File instance
+  const isURL = typeof inputValue === 'string' && inputValue.includes('/');
+  if (inputValue.image || isURL) {
+    newFile = await getFileByURL(inputValue.image || inputValue);
+    if (newFile) {
+      setFileDataURL(newFile);
+    }
+  }
+
+  // Convert dataURL to File instance
+  if (inputValue.dataURL) {
+    newFile = common.createFileFromDataURL(inputValue.name || inputValue.path, inputValue.dataURL);
+    newFile.dataURL = inputValue.dataURL;
+  }
+
+  // Save new File to state
+  if (newFile) {
+    newFile.id = inputValue.id;
+    if (isPreviews) {
+      newFile.preview = URL.createObjectURL(newFile);
+    }
+  }
+  return newFile;
+}
+function setFileDataURL(file, resolve) {
+  resolve = resolve || (() => {});
+  // Init reader and save his file
+  const reader = new FileReader();
+  reader._readedFile = file;
+
+  // Set handlers
+  reader.onabort = () => resolve();
+  reader.onerror = () => resolve();
+  reader.onload = event => {
+    event.target._readedFile.dataURL = reader.result;
+    resolve();
+  };
+  // Run reader
+  if (file instanceof File) {
+    reader.readAsDataURL(file);
+  } else {
+    resolve();
+  }
+}
+
+const FileInput = /*#__PURE__*/React__default.default.memo(function FileInput(props) {
+  const {
+    className,
+    name,
+    width,
+    maxFiles,
+    maxSize,
+    label,
+    fileErrorText,
+    classNameGroupItem,
+    dropzoneProps,
+    fieldProps,
+    hintDescription,
+    hintTitle,
+    showFilename,
+    showMessage,
+    isPreviews,
+    isRequired,
+    onAddFiles,
+    onDeleteFile
+  } = props;
+  const propsGenerator = useDevicePropsGenerator.useDevicePropsGenerator(props);
+  const {
+    size,
+    fill,
+    fillHover,
+    labelTextColor,
+    borderColorHover,
+    borderType,
+    borderWidth,
+    errorMessageTextColor,
+    errorMessageTextSize,
+    errorMessageTextWeight,
+    hintDescriptionTextColor,
+    hintDescriptionTextSize,
+    hintDescriptionTextWeight,
+    hintDescriptionTextWrap,
+    hintTitleTextColor,
+    hintTitleTextSize,
+    hintTitleTextWeight,
+    hintTitleTextWrap,
+    removeThumbAppearance,
+    removeThumbText,
+    removeThumbTextWeight,
+    removeThumbShape,
+    shape,
+    thumbBorderColor,
+    thumbBorderColorHover,
+    thumbBorderType,
+    thumbBorderWidth,
+    thumbColumn = 1,
+    thumbDirection = 'vertical',
+    thumbNameTextColor,
+    thumbNameTextSize,
+    thumbNameTextWeight,
+    thumbNameTextWrap
+  } = propsGenerator;
   return /*#__PURE__*/React__default.default.createElement(reactFinalForm.Field, {
-    initialValue: initialValue,
     name: name
   }, function Render({
     input,
@@ -548,81 +850,127 @@ const ChoiceField = /*#__PURE__*/React__default.default.memo(function ChoiceFiel
      * React Hooks must be called in a React function component or a
      * custom React Hook function.
      */
-    const activeOption = React$1.useMemo(() => {
-      const emptyOption = {
-        value: null,
-        label: null
-      };
-      if (input.value) {
-        const currentOption = options.find(option => option.value === input.value);
-        return currentOption || emptyOption;
-      }
-      return emptyOption;
-    }, [input.value]);
+
     const {
-      isErrorState,
-      isValidState,
       errorKey,
-      errorMessage
+      errorMessage,
+      isErrorState,
+      isValidState
     } = useFieldValidationState({
       fieldProps: fieldProps,
       input: input,
       meta: meta
     });
     const updatedInputProps = useValidationAppearanceInputProps({
-      inputProps: inputProps,
+      inputProps: props,
       validationStateKey: isErrorState ? errorKey : 'success'
     });
+
+    /** TODO:
+     * REFACTOR PROPERTIES
+     */
     return /*#__PURE__*/React__default.default.createElement(FieldWrapper, Object.assign({
-      className: clsx__default.default('form-field_type_choice', 'form__item_type_choice', classNameGroupItem),
+      className: clsx__default.default('form-field_type_dropzone', 'form__item_type_dropzone', classNameGroupItem),
+      width: width,
       label: label,
+      labelTextColor: labelTextColor,
       errorKey: errorKey,
       errorMessage: errorMessage,
       isErrorState: isErrorState,
       metaError: meta.error,
-      isDisabled: isDisabled,
-      fieldClassName: "form-choice",
+      fieldClassName: "form-dropzone",
       inputName: input.name,
-      inputValue: input.value || [],
-      messageType: messageType,
+      inputValue: input.value,
       metaActive: meta.active,
+      metaTouched: meta.touched,
       showMessage: showMessage,
       isRequired: isRequired,
       isValidState: isValidState
-    }, fieldProps), /*#__PURE__*/React__default.default.createElement(Choice.Choice, Object.assign({
-      className: clsx__default.default(meta.active && 'form-choice_state_focus', meta.error && meta.touched && `form-choice_state_${errorKey}`),
-      name: input.name,
-      isDisabled: isDisabled,
-      active: activeOption,
-      inputValue: input.value || [],
-      options: options,
-      placeholder: placeholder,
-      isCheckbox: isCheckbox,
-      isRequired: isRequired,
-      setActiveSegment: setActiveSegment
-    }, updatedInputProps)));
+    }, fieldProps), /*#__PURE__*/React__default.default.createElement(FileInputDropzone, {
+      className: className,
+      maxFiles: maxFiles,
+      maxSize: maxSize,
+      size: size,
+      fill: fill,
+      fillHover: fillHover,
+      borderColor: updatedInputProps.borderColor,
+      borderColorHover: borderColorHover,
+      borderType: borderType,
+      borderWidth: borderWidth,
+      errorMessageTextColor: errorMessageTextColor,
+      errorMessageTextSize: errorMessageTextSize,
+      errorMessageWeight: errorMessageTextWeight,
+      fileErrorText: fileErrorText,
+      metaError: meta.error,
+      dropzoneProps: dropzoneProps,
+      hintDescription: hintDescription,
+      hintDescriptionTextColor: hintDescriptionTextColor,
+      hintDescriptionTextSize: hintDescriptionTextSize,
+      hintDescriptionTextWeight: hintDescriptionTextWeight,
+      hintDescriptionTextWrap: hintDescriptionTextWrap,
+      hintTitle: hintTitle,
+      hintTitleTextColor: hintTitleTextColor,
+      hintTitleTextSize: hintTitleTextSize,
+      hintTitleTextWeight: hintTitleTextWeight,
+      hintTitleTextWrap: hintTitleTextWrap,
+      inputName: input.name,
+      inputValue: input.value,
+      metaTouched: meta.touched,
+      removeThumbAppearance: removeThumbAppearance,
+      removeThumbText: removeThumbText,
+      removeThumbTextWeight: removeThumbTextWeight,
+      removeThumbShape: removeThumbShape,
+      shape: shape,
+      showFilename: showFilename,
+      thumbBorderColor: thumbBorderColor,
+      thumbBorderColorHover: thumbBorderColorHover,
+      thumbBorderType: thumbBorderType,
+      thumbBorderWidth: thumbBorderWidth,
+      thumbColumn: thumbColumn,
+      thumbDirection: thumbDirection,
+      thumbNameTextColor: thumbNameTextColor,
+      thumbNameTextSize: thumbNameTextSize,
+      thumbNameTextWeight: thumbNameTextWeight,
+      thumbNameTextWrap: thumbNameTextWrap,
+      isPreviews: isPreviews,
+      onAddFiles: onAddFiles,
+      onDeleteFile: onDeleteFile
+    }));
   });
 });
 
-const CustomField = /*#__PURE__*/React__default.default.memo(function CustomField(props) {
+const defaultGroupProps = {
+  width: 'fill',
+  labelTextColor: 'surfaceTextPrimary',
+  labelTextSize: 'h5',
+  labelTextWeight: 500
+};
+
+const FormBlockGroup = /*#__PURE__*/React__default.default.memo(function Group(props) {
   const {
-    Component,
-    isDisabled,
-    isRequired,
+    className,
     name,
-    initialValue,
-    fieldProps = {},
-    classNameGroupItem,
-    showMessage,
-    clearIcon,
-    clearIconFill,
-    clearIconFillHover,
-    clearIconShape,
-    clearIconSize,
-    onClickClearIcon
+    label,
+    labelTextColor,
+    labelTextSize,
+    labelTextWeight,
+    message,
+    column,
+    dataTour,
+    title,
+    titleTextSize,
+    titleTextColor,
+    titleTextWeight,
+    messageTextColor = 'surfaceTextTertiary',
+    messageTextSize = 's',
+    messageTextWeight,
+    showGroupMessage,
+    before,
+    after,
+    isHidden,
+    children
   } = props;
   return /*#__PURE__*/React__default.default.createElement(reactFinalForm.Field, {
-    initialValue: initialValue,
     name: name
   }, function Render({
     input,
@@ -634,84 +982,70 @@ const CustomField = /*#__PURE__*/React__default.default.memo(function CustomFiel
      * React Hooks must be called in a React function component or a
      * custom React Hook function.
      */
-
     const {
       isErrorState,
-      isValidState,
       errorKey,
       errorMessage
     } = useFieldValidationState({
-      fieldProps: fieldProps,
+      fieldProps: props,
+      // or fieldProps?
       input: input,
       meta: meta
     });
-    const updatedInputProps = useValidationAppearanceInputProps({
-      validationStateKey: isErrorState ? errorKey : 'success',
-      // For "Custom" field we pass all props. Can contain some special props, we don't known.
-      inputProps: props
+    const updatedProps = useValidationAppearanceInputProps({
+      inputProps: props,
+      validationStateKey: isErrorState ? errorKey : 'success'
     });
-    return /*#__PURE__*/React__default.default.createElement(FieldWrapper, Object.assign({
-      className: clsx__default.default('form-field_type_custom', 'form__item_type_custom', classNameGroupItem),
-      errorKey: errorKey,
-      errorMessage: errorMessage,
-      fieldClassName: 'form-custom',
-      inputName: input.name,
-      inputValue: input.value,
-      isDisabled: isDisabled,
-      isErrorState: isErrorState,
-      isRequired: isRequired,
-      isValidState: isValidState,
-      metaActive: meta.active,
-      metaError: meta.error,
-      showMessage: showMessage
-    }, fieldProps), /*#__PURE__*/React__default.default.createElement(Component, Object.assign({}, updatedInputProps, {
-      input: input,
-      isDisabled: isDisabled,
-      meta: meta
-    })), clearIcon && /*#__PURE__*/React__default.default.createElement(Icon.Icon, {
-      className: "form-field__icon",
-      iconFill: clearIconFill,
-      iconFillHover: clearIconFillHover,
-      imageSrc: clearIcon,
-      shape: clearIconShape,
-      size: clearIconSize,
-      SvgImage: clearIcon,
-      onClick: onClickClearIcon
-    }));
+    return /*#__PURE__*/React__default.default.createElement("div", {
+      className: clsx__default.default('form__group', className, isHidden && 'form__group_hidden', column && `form__group_column_${column}`),
+      "data-tour": dataTour
+    }, /*#__PURE__*/React__default.default.createElement("div", {
+      className: "form__group-wrapper"
+    }, before, title && /*#__PURE__*/React__default.default.createElement("div", {
+      className: "form__group-title"
+    }, /*#__PURE__*/React__default.default.createElement(Title.Title, {
+      size: titleTextSize,
+      textColor: titleTextColor,
+      textWeight: titleTextWeight
+    }, title)), label && /*#__PURE__*/React__default.default.createElement("div", {
+      className: "form__group-label"
+    }, /*#__PURE__*/React__default.default.createElement(Text.Text, {
+      size: labelTextSize,
+      textColor: labelTextColor,
+      textWeight: labelTextWeight
+    }, label)), /*#__PURE__*/React__default.default.createElement("div", {
+      className: "form__group-items"
+    }, children), after), showGroupMessage && /*#__PURE__*/React__default.default.createElement(React__default.default.Fragment, null, isErrorState && errorMessage && /*#__PURE__*/React__default.default.createElement(Text.Text, {
+      className: `form__group-message form__group-message_type-${errorKey}`,
+      id: `${name}-error`,
+      size: updatedProps.messageTextSize,
+      textColor: updatedProps.messageTextColor,
+      textWeight: updatedProps.messageTextWeight
+    }, errorMessage), Boolean(message) && (!isErrorState || !errorMessage) && /*#__PURE__*/React__default.default.createElement(Text.Text, {
+      className: "form__group-message",
+      size: messageTextSize,
+      textColor: messageTextColor,
+      textWeight: messageTextWeight
+    }, message), !isErrorState && !message && /*#__PURE__*/React__default.default.createElement(Text.Text, {
+      className: "form__group-message",
+      size: messageTextSize
+    }, '\u00A0')));
   });
 });
 
-const defaultCodeProps = {
-  fieldProps: {
-    size: 'l',
-    labelTextColor: 'surfaceTextPrimary',
-    labelTextSize: 's',
-    labelTextWeight: 'normal',
-    helpText: 'Supporting text',
-    helpTextColor: 'surfaceTextPrimary',
-    helpTextSize: 's',
-    helpTextWeight: 'normal',
-    showMessage: true
-  },
-  inputProps: {
-    width: 'fill',
-    size: 'l',
-    fill: 'surfaceSecondary',
-    inputBorderColor: 'surfaceBorderTertiary',
-    inputBorderColorHover: 'surfaceBorderQuaternary',
-    inputBorderFocusColor: 'surfaceBorderAccent',
-    inputCaretColor: 'surfaceItemAccent',
-    inputFill: 'surfacePrimary',
-    inputFillHover: 'surfaceSecondary',
-    inputPlaceholderTextColor: 'surfaceSecondary',
-    inputSize: 'l',
-    inputTextColor: 'surfaceSecondary',
-    inputTextSize: 'xxl',
-    inputTextWeight: 'normal'
-  }
+const defaultCheckboxProps = {
+  appearance: 'defaultPrimary',
+  width: 'fill',
+  size: 'm',
+  labelTextColor: 'surfaceTextPrimary',
+  labelTextColorDisabled: 'surfaceTextDisabled',
+  labelTextSize: 's',
+  descTextSize: 's',
+  errorBorderColor: 'errorBorderSecondary',
+  requiredBorderColor: 'warningBorderSecondary'
 };
 
-const CodeField = /*#__PURE__*/React__default.default.memo(function CodeField(props) {
+const FormFieldCheckbox = /*#__PURE__*/React__default.default.memo(function FormFieldCheckbox(props) {
   const {
     name,
     initialValue,
@@ -720,9 +1054,11 @@ const CodeField = /*#__PURE__*/React__default.default.memo(function CodeField(pr
     fieldProps = {},
     inputProps = {},
     showMessage,
-    isRequired
+    isRequired,
+    onChange
   } = props;
   return /*#__PURE__*/React__default.default.createElement(reactFinalForm.Field, {
+    type: "checkbox",
     name: name,
     initialValue: initialValue
   }, function Render({
@@ -736,10 +1072,18 @@ const CodeField = /*#__PURE__*/React__default.default.memo(function CodeField(pr
      * custom React Hook function.
      */
 
+    const onChangeField = React$1.useCallback(event => {
+      input.onChange(event);
+      if (onChange) {
+        onChange(event.target.checked, input.name);
+      }
+    }, [onChange, input.onChange]);
     const {
+      errorKey,
+      errorMessage,
       isErrorState,
-      isValidState,
-      errorKey} = useFieldValidationState({
+      isValidState
+    } = useFieldValidationState({
       fieldProps: fieldProps,
       input: input,
       meta: meta
@@ -749,79 +1093,78 @@ const CodeField = /*#__PURE__*/React__default.default.memo(function CodeField(pr
       validationStateKey: isErrorState ? errorKey : 'success'
     });
     return /*#__PURE__*/React__default.default.createElement(FieldWrapper, Object.assign({
-      className: clsx__default.default('form-field_type_code', 'form__item_type_code', classNameGroupItem),
-      fieldClassName: 'form-code',
+      className: clsx__default.default('form-field_type_checkbox', 'form__item_type_checkbox', classNameGroupItem),
+      errorKey: errorKey,
+      errorMessage: errorMessage,
+      isErrorState: isErrorState,
+      metaError: meta.error,
+      isDisabled: isDisabled,
+      fieldClassName: "form-checkbox",
       inputName: input.name,
-      inputValue: input.value,
+      inputValue: input.checked,
       metaActive: meta.active,
       showMessage: showMessage,
+      tag: "label",
       isRequired: isRequired,
       isValidState: isValidState
-    }, fieldProps), /*#__PURE__*/React__default.default.createElement(Code.Code, Object.assign({
+    }, fieldProps), /*#__PURE__*/React__default.default.createElement(Checkbox.Checkbox, Object.assign({
+      type: "checkbox",
       name: input.name,
       isDisabled: isDisabled,
       autoComplete: "nope",
-      value: input.value,
+      checked: input.checked,
       onBlur: input.onBlur,
-      onChange: input.onChange,
+      onChange: onChangeField,
       onFocus: input.onFocus
     }, updatedInputProps)));
   });
 });
 
-const defaultDatepickerProps = {
-  dateFormat: 'dd/MM/yyyy - HH:mm',
-  readOnly: false,
-  selectsRange: false,
-  showTimeSelect: true,
-  timeCaption: 'Время',
-  timeFormat: 'p',
-  timeIntervals: 60,
-  isClearable: true,
-  isStartDefaultNull: true
+const defaultChipsProps = {
+  appearance: 'surfacePrimary sizeM rounded',
+  width: 'fill',
+  errorBorderColor: 'errorBorderSecondary',
+  requiredBorderColor: 'warningBorderSecondary'
 };
 
-function DatePickerField(props) {
+function FormFieldChips(props) {
   const {
     name,
+    initialValue,
     isDisabled,
     classNameGroupItem,
-    datePickerProps,
-    fieldProps = {},
-    inputProps = {},
+    emptyMessage,
+    emptyMessageTextColor,
+    emptyMessageTextSize,
+    fieldProps,
+    inputProps,
+    options,
     showMessage,
     isRequired,
     onChange
   } = props;
+  const {
+    change
+  } = reactFinalForm.useForm();
+
+  // Callback for value changes
+  const onChangeSomeInput = React$1.useCallback((inputValue, newOptionValue) => {
+    const updatedValues = inputValue.includes(newOptionValue) ? inputValue.filter(selectedValue => selectedValue !== newOptionValue) : [...inputValue, newOptionValue];
+    change(name, updatedValues);
+    onChange && onChange(updatedValues);
+  }, [change, name, onChange]);
+  React$1.useEffect(() => {
+    initialValue && change(name, initialValue);
+    // update the form value only when the initialValue changes, so use disable eslint to ignore the warning
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [initialValue]);
   return /*#__PURE__*/React__default.default.createElement(reactFinalForm.Field, {
-    name: name
+    name: name,
+    initialValue: initialValue
   }, function Render({
     input,
     meta
   }) {
-    /** Note:
-     * Create "Render" function by "eslint-react-hooks/rules-of-hooks":
-     * React Hooks cannot be called inside a callback.
-     * React Hooks must be called in a React function component or a
-     * custom React Hook function.
-     */
-
-    const onChangeField = React$1.useCallback((startDate, endDate) => {
-      if (!datePickerProps.selectsRange) {
-        // When we need to save single date, value is date
-        // TODO: make object with one date? need to check all forms with DatePickerField
-        input.onChange(startDate);
-      } else {
-        // When we need to save range, value is object with two date
-        input.onChange({
-          endDate,
-          startDate
-        });
-      }
-      if (onChange) {
-        onChange(startDate, endDate);
-      }
-    }, [input.onChange, onChange]);
     const {
       errorKey,
       errorMessage,
@@ -836,454 +1179,170 @@ function DatePickerField(props) {
       inputProps: inputProps,
       validationStateKey: isErrorState ? errorKey : 'success'
     });
+    const activeOptionsList = React$1.useMemo(() => {
+      const emptyOptionsList = [{
+        label: null,
+        value: null
+      }];
+      if (input?.value) {
+        const currentOptions = options.filter(option => input.value?.includes(option.value));
+        return currentOptions || emptyOptionsList;
+      }
+      return emptyOptionsList;
+    }, [input.value]);
     return /*#__PURE__*/React__default.default.createElement(FieldWrapper, Object.assign({
-      className: clsx__default.default('form-field_type_datepicker', 'form__item_type_datepicker', classNameGroupItem),
+      className: clsx__default.default('form-field_type_chips', 'form__item_type_chips', classNameGroupItem),
       errorKey: errorKey,
       errorMessage: errorMessage,
       isErrorState: isErrorState,
       metaError: meta.error,
       isDisabled: isDisabled,
-      fieldClassName: "form-datepicker",
+      fieldClassName: "form-chips",
       inputName: input.name,
-      inputValue: input.value || '',
+      inputValue: input.value,
       metaActive: meta.active,
       showMessage: showMessage,
       isRequired: isRequired,
       isValidState: isValidState
-    }, fieldProps), /*#__PURE__*/React__default.default.createElement(DatePicker.DatePickerInput, {
-      name: input.name,
-      isDisabled: isDisabled,
-      datePickerProps: datePickerProps,
-      endValue: datePickerProps.selectsRange ? input.value.endDate : null,
-      inputProps: updatedInputProps,
-      value: datePickerProps.selectsRange ? input.value.startDate : input.value,
-      onBlur: input.onBlur,
-      onChange: onChangeField,
-      onFocus: input.onFocus
-    }));
+    }, fieldProps), options.length ? /*#__PURE__*/React__default.default.createElement(Chips.ChipsGroup, {
+      direction: "horizontal",
+      gap: "1m",
+      wrap: "wrap"
+    }, options.map(option => /*#__PURE__*/React__default.default.createElement(Chips.Chips, Object.assign({
+      className: clsx__default.default(meta.active && 'form-chips_state_focus', meta.error && meta.touched && `form-chips_state_${errorKey}`),
+      key: option.value,
+      label: option.label,
+      isDisabled: option.isDisabled,
+      value: option.value,
+      isActive: activeOptionsList.some(activeOption => activeOption.value === option.value),
+      onClick: () => onChangeSomeInput(input.value, option.value)
+    }, updatedInputProps)))) : /*#__PURE__*/React__default.default.createElement(Text.Text, {
+      size: emptyMessageTextSize,
+      textColor: emptyMessageTextColor
+    }, emptyMessage));
   });
 }
 
-const defaultDropzoneProps = {
-  fill: 'surfacePrimary',
-  borderColor: 'surfaceBorderTertiary',
-  borderColorHover: 'surfaceBorderQuaternary',
-  hintTitle: 'Перетащите изображение или выберите файл с компьютера',
-  hintTitleTextColor: 'surfaceTextPrimary',
-  hintTitleTextSize: 'm',
-  removeThumbText: 'удалить',
-  removeThumbTextColor: 'errorTextPrimary',
-  removeThumbTextHoverColor: 'errorTextPrimaryHover',
-  removeThumbTextSize: 's',
-  shape: 'rounded',
-  showFilename: true,
-  thumbBorderColor: 'surfaceBorderTertiary',
-  thumbBorderColorHover: 'surfaceBorderQuaternary',
-  thumbBorderWidth: 1,
-  thumbNameTextColor: 'surfaceTextPrimary',
-  thumbNameTextSize: 's',
-  isPreviews: true
+const defaultChoiceProps = {
+  appearance: 'defaultPrimary sizeM solid rounded',
+  width: 'fill',
+  errorBorderColor: 'errorBorderPrimary',
+  requiredBorderColor: 'warningBorderPrimary'
 };
 
-const FileInputDropzone = /*#__PURE__*/React__default.default.memo(function FileInputDropzone(props) {
+const FormFieldChoice = /*#__PURE__*/React__default.default.memo(function FormFieldChoice(props) {
   const {
-    className,
-    maxFiles,
-    maxSize,
-    size,
-    fileErrorText,
-    dropzoneProps = {},
-    hintDescription,
-    hintTitle,
-    inputName,
-    inputValue,
-    showFilename,
-    thumbColumn,
-    isPreviews,
-    onAddFiles,
-    onDeleteFile
+    name,
+    initialValue,
+    label,
+    isDisabled,
+    classNameGroupItem,
+    fieldProps,
+    inputProps,
+    messageType,
+    options,
+    placeholder,
+    showMessage,
+    isCheckbox,
+    isRequired,
+    onChange
   } = props;
-
-  // TODO: delete react-final-form things out of here?
   const {
     change
   } = reactFinalForm.useForm();
-  const [fileError, setFileError] = React$1.useState('');
-  const [fileIsLoading, setFileIsLoading] = React$1.useState(false);
-  const filesList = React$1.useMemo(() => inputValue ? castArray__default.default(inputValue) : [], [inputValue]);
-  const changeFormState = React$1.useCallback(newFiles => {
-    // If max files in dropzone is 1 - return file as it self, else as array of files
-    // ps: for old projects compatibility
-    const toSave = dropzoneProps.maxFiles == 1 ? newFiles[0] : newFiles;
-    change(inputName, toSave);
-    return toSave;
-  },
-  // If "inputName" will be changes, then it should be a different field
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  [dropzoneProps, change]);
-
-  //
-  const convertFiledValueAndSaveAsFiles = React$1.useCallback(async currentFilesList => {
-    setFileIsLoading(true);
-    const newFiles = [];
-    for (const fileItem of currentFilesList) {
-      if (typeof fileItem === 'string') {
-        const newFile = await convertToFile(fileItem, isPreviews);
-        if (newFile) {
-          newFiles.push(newFile);
-        }
-      } else {
-        newFiles.push(fileItem);
-      }
-    }
-    changeFormState(newFiles);
-    setFileIsLoading(false);
-  }, [isPreviews, changeFormState]);
-
-  // Delete file from dropzone
-  const removeFile = React$1.useCallback((event, index) => {
-    event.stopPropagation();
-    event.preventDefault();
-    const newFiles = [...filesList];
-    newFiles.splice(index, 1);
-    if (onDeleteFile) {
-      onDeleteFile(filesList[index], inputName);
+  const setActiveSegment = React$1.useCallback((option, isChecked) => {
+    change(name, isChecked && option.value);
+    if (onChange) {
+      onChange(option.value, name, isChecked);
     }
-    changeFormState(newFiles);
-  },
-  // If "inputName" will be changes, then it should be a different field
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  [filesList, changeFormState, onDeleteFile]);
-
-  // Create dropzone options
-  const {
-    getInputProps,
-    getRootProps
-  } = reactDropzone.useDropzone({
-    maxFiles: maxFiles || 5,
-    maxSize: maxSize || 10485760,
-    // 10mb
-    // accept: { 'image/*': [] },
-    ...dropzoneProps,
-    getFilesFromEvent: async event => {
-      const result = await fileSelector.fromEvent(event);
-      const newFiles = result.filter(item => item instanceof File);
-      // Add exists and new files to accepted(or rejected)
-      return [...filesList, ...newFiles];
-    },
-    onDropAccepted: acceptedFiles => {
-      // If dropped files has accepted and we need a previews
-      if (isPreviews) {
-        // Add preview to every file
-        acceptedFiles.forEach(file => {
-          if (!file.error) {
-            file.preview = URL.createObjectURL(file);
-          }
-        });
+  }, [change, onChange]);
+  return /*#__PURE__*/React__default.default.createElement(reactFinalForm.Field, {
+    initialValue: initialValue,
+    name: name
+  }, function Render({
+    input,
+    meta
+  }) {
+    /** Note:
+     * Create "Render" function by "eslint-react-hooks/rules-of-hooks":
+     * React Hooks cannot be called inside a callback.
+     * React Hooks must be called in a React function component or a
+     * custom React Hook function.
+     */
+    const activeOption = React$1.useMemo(() => {
+      const emptyOption = {
+        value: null,
+        label: null
+      };
+      if (input.value) {
+        const currentOption = options.find(option => option.value === input.value);
+        return currentOption || emptyOption;
       }
-      // Save to form data (including empty when files are not valid)
-      const filesToSave = changeFormState(acceptedFiles);
-      setFileError('');
-
-      // Save DataURL for all files
-      const readerPromisesList = acceptedFiles.map(file => {
-        return new Promise(resolve => setFileDataURL(file, resolve));
-      });
-      // Save files to form values
-      Promise.all(readerPromisesList).then(() => {
-        if (onAddFiles) {
-          onAddFiles(filesToSave, inputName);
-        }
-      });
-    },
-    onDropRejected: rejectedFiles => {
-      // If dropped files has rejected
-      if (rejectedFiles.length) {
-        let fileErrorMessage = 'Ошибка при добавлении файла';
-        const firstFileErrorItem = rejectedFiles[0].errors[0];
-        if (firstFileErrorItem) {
-          if (firstFileErrorItem.code === reactDropzone.ErrorCode.TooManyFiles) {
-            fileErrorMessage = `Максимальное количество файлов: ${maxFiles}`;
-          } else {
-            fileErrorMessage = firstFileErrorItem.message;
-          }
-        }
-        // Show error
-        setFileError(fileErrorMessage);
-      } else {
-        // Else clean error
-        setFileError('');
-      }
-    }
-  });
-  React$1.useEffect(() => {
-    const currentFilesList = castArray__default.default(inputValue);
-    const isNeedToConvert = currentFilesList.some(fileItem => typeof fileItem === 'string');
-    if (isNeedToConvert) {
-      // First time convert value to Files and save to local and form state
-      convertFiledValueAndSaveAsFiles(currentFilesList);
-    }
-
-    // Make sure to revoke the data uris to avoid memory leaks, will run on unmount
-    return () => {
-      filesList.forEach(file => {
-        if (file?.preview) {
-          URL.revokeObjectURL(file.preview);
-        }
-      });
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [inputValue]);
-  const propsGenerator = useDevicePropsGenerator.useDevicePropsGenerator(props);
-  const {
-    fillClass,
-    fillHoverClass,
-    borderColorClass,
-    borderColorHoverClass,
-    borderTypeClass,
-    borderWidthClass,
-    errorMessageTextColor,
-    errorMessageTextSize,
-    errorMessageTextWeight,
-    hintDescriptionTextColor,
-    hintDescriptionTextSize,
-    hintDescriptionTextWeight,
-    hintDescriptionTextWrap,
-    hintTitleTextColor,
-    hintTitleTextSize,
-    hintTitleTextWeight,
-    hintTitleTextWrap,
-    removeThumbAppearance,
-    removeThumbShape,
-    removeThumbText,
-    removeThumbTextWeight,
-    shapeClass,
-    thumbBorderColorClass,
-    thumbBorderColorHoverClass,
-    thumbBorderTypeClass,
-    thumbBorderWidthClass,
-    thumbDirectionClass,
-    thumbNameTextColor,
-    thumbNameTextSize,
-    thumbNameTextWeight,
-    thumbNameTextWrap
-  } = propsGenerator;
-  return /*#__PURE__*/React__default.default.createElement(React__default.default.Fragment, null, /*#__PURE__*/React__default.default.createElement("div", getRootProps({
-    className: `form-dropzone__dropzone dropzone ${className} form-dropzone__dropzone_size_${size} ${shapeClass}`
-  }), /*#__PURE__*/React__default.default.createElement("input", Object.assign({}, getInputProps(), {
-    name: inputName
-  })), /*#__PURE__*/React__default.default.createElement("div", {
-    className: clsx__default.default('form-dropzone__dropzone-wrapper', thumbColumn && `form-dropzone__dropzone-wrapper_column_${thumbColumn}`, fillClass, fillHoverClass, borderWidthClass, borderColorClass, borderColorHoverClass, borderTypeClass)
-  }, filesList.map((file, index) => /*#__PURE__*/React__default.default.createElement("aside", {
-    className: clsx__default.default('form-dropzone__thumb', fillClass, thumbDirectionClass, thumbBorderWidthClass, thumbBorderColorClass, thumbBorderColorHoverClass, thumbBorderTypeClass),
-    key: file.id || `${file.name}_${index}`
-  }, isPreviews && !file.error && /*#__PURE__*/React__default.default.createElement("div", {
-    className: "form-dropzone__thumb-image"
-  }, /*#__PURE__*/React__default.default.createElement("img", {
-    className: "form-dropzone__thumb-image-inner",
-    src: file.preview || file.image,
-    onLoad: () => {
-      // Revoke data uri after image is loaded
-      URL.revokeObjectURL(file.preview);
-    }
-  })), file.error && /*#__PURE__*/React__default.default.createElement("div", null, /*#__PURE__*/React__default.default.createElement(Text.Text, {
-    size: thumbNameTextSize,
-    textColor: thumbNameTextColor,
-    textWeight: thumbNameTextWeight,
-    textWrap: thumbNameTextWrap
-  }, fileErrorText || file.error)), showFilename && /*#__PURE__*/React__default.default.createElement("div", {
-    className: "form-dropzone__thumb-name"
-  }, /*#__PURE__*/React__default.default.createElement(Text.Text, {
-    className: "form-dropzone__thumb-name-inner",
-    size: thumbNameTextSize,
-    textColor: thumbNameTextColor,
-    textWeight: thumbNameTextWeight,
-    textWrap: thumbNameTextWrap
-  }, file.name)), fileIsLoading && /*#__PURE__*/React__default.default.createElement("div", {
-    className: "form-dropzone__thumb-loader"
-  }, /*#__PURE__*/React__default.default.createElement(Loader.Loader, {
-    width: "fill",
-    height: "fill",
-    fill: "surfacePrimary",
-    itemFill: "surfaceItemAccent",
-    set: "simple"
-  })), /*#__PURE__*/React__default.default.createElement("div", {
-    className: clsx__default.default('form-dropzone__thumb-remove')
-  }, /*#__PURE__*/React__default.default.createElement(Button.Button, {
-    className: "form-dropzone__thumb-remove-text",
-    appearance: removeThumbAppearance,
-    label: removeThumbText || 'Удалить',
-    labelTextWeight: removeThumbTextWeight,
-    shape: removeThumbShape,
-    onClick: event => removeFile(event, index)
-  })))), !filesList.length ? /*#__PURE__*/React__default.default.createElement("div", {
-    className: "form-dropzone__hint"
-  }, /*#__PURE__*/React__default.default.createElement(Text.Text, {
-    className: "form-dropzone__hint-title",
-    size: hintTitleTextSize,
-    textColor: hintTitleTextColor,
-    textWeight: hintTitleTextWeight,
-    textWrap: hintTitleTextWrap
-  }, hintTitle || 'Select a file or drag in form'), hintDescription && /*#__PURE__*/React__default.default.createElement(Text.Text, {
-    className: "form-dropzone__hint-text",
-    size: hintDescriptionTextSize,
-    textColor: hintDescriptionTextColor,
-    textWeight: hintDescriptionTextWeight,
-    textWrap: hintDescriptionTextWrap
-  }, hintDescription)) : /*#__PURE__*/React__default.default.createElement("div", {
-    className: "form-dropzone__hint form-dropzone__hint_type_add-more"
-  }, /*#__PURE__*/React__default.default.createElement(Text.Text, {
-    className: "form-dropzone__hint-title",
-    size: hintTitleTextSize,
-    textColor: hintTitleTextColor,
-    textWeight: hintTitleTextWeight,
-    textWrap: hintTitleTextWrap
-  }, hintTitle || 'Select a file or drag in form'), hintDescription && /*#__PURE__*/React__default.default.createElement(Text.Text, {
-    className: "form-dropzone__hint-text",
-    size: hintDescriptionTextSize,
-    textColor: hintDescriptionTextColor,
-    textWeight: hintDescriptionTextWeight,
-    textWrap: hintDescriptionTextWrap
-  }, hintDescription)))), fileError && /*#__PURE__*/React__default.default.createElement("div", {
-    className: "form-field__message"
-  }, /*#__PURE__*/React__default.default.createElement(Text.Text, {
-    className: "form-field__message-item form-field__message-item_type_message",
-    size: errorMessageTextSize,
-    textColor: errorMessageTextColor,
-    textWeight: errorMessageTextWeight
-  }, fileError)));
-});
-async function getFileByURL(url) {
-  try {
-    const response = await axios__default.default({
-      url: url,
-      responseType: 'blob'
+      return emptyOption;
+    }, [input.value]);
+    const {
+      isErrorState,
+      isValidState,
+      errorKey,
+      errorMessage
+    } = useFieldValidationState({
+      fieldProps: fieldProps,
+      input: input,
+      meta: meta
     });
-    const blobObject = response.data;
-    const dirtyFilename = response.headers['content-disposition']?.split('filename=')[1];
-    // Remove double quotes
-    let filename = dirtyFilename?.substring(1).slice(0, -1);
-    if (!filename) {
-      filename = url.split('/').at(-1);
-      // const typeParts = blobObject.type.split('/')
-      // const fileType = typeParts[typeParts.length - 1]
-      // filename = `${new Date().getTime()}.${fileType}`
-    }
-    return new File([blobObject], filename, {
-      type: blobObject.type
+    const updatedInputProps = useValidationAppearanceInputProps({
+      inputProps: inputProps,
+      validationStateKey: isErrorState ? errorKey : 'success'
     });
-  } catch (error) {
-    console.log('error: ', error);
-    return null;
-  }
-}
-async function convertToFile(inputValue, isPreviews) {
-  let newFile = null;
-
-  // Download image by url and save as File instance
-  const isURL = typeof inputValue === 'string' && inputValue.includes('/');
-  if (inputValue.image || isURL) {
-    newFile = await getFileByURL(inputValue.image || inputValue);
-    if (newFile) {
-      setFileDataURL(newFile);
-    }
-  }
-
-  // Convert dataURL to File instance
-  if (inputValue.dataURL) {
-    newFile = common.createFileFromDataURL(inputValue.name || inputValue.path, inputValue.dataURL);
-    newFile.dataURL = inputValue.dataURL;
-  }
-
-  // Save new File to state
-  if (newFile) {
-    newFile.id = inputValue.id;
-    if (isPreviews) {
-      newFile.preview = URL.createObjectURL(newFile);
-    }
-  }
-  return newFile;
-}
-function setFileDataURL(file, resolve) {
-  resolve = resolve || (() => {});
-  // Init reader and save his file
-  const reader = new FileReader();
-  reader._readedFile = file;
+    return /*#__PURE__*/React__default.default.createElement(FieldWrapper, Object.assign({
+      className: clsx__default.default('form-field_type_choice', 'form__item_type_choice', classNameGroupItem),
+      label: label,
+      errorKey: errorKey,
+      errorMessage: errorMessage,
+      isErrorState: isErrorState,
+      metaError: meta.error,
+      isDisabled: isDisabled,
+      fieldClassName: "form-choice",
+      inputName: input.name,
+      inputValue: input.value || [],
+      messageType: messageType,
+      metaActive: meta.active,
+      showMessage: showMessage,
+      isRequired: isRequired,
+      isValidState: isValidState
+    }, fieldProps), /*#__PURE__*/React__default.default.createElement(Choice.Choice, Object.assign({
+      className: clsx__default.default(meta.active && 'form-choice_state_focus', meta.error && meta.touched && `form-choice_state_${errorKey}`),
+      name: input.name,
+      isDisabled: isDisabled,
+      active: activeOption,
+      inputValue: input.value || [],
+      options: options,
+      placeholder: placeholder,
+      isCheckbox: isCheckbox,
+      isRequired: isRequired,
+      setActiveSegment: setActiveSegment
+    }, updatedInputProps)));
+  });
+});
 
-  // Set handlers
-  reader.onabort = () => resolve();
-  reader.onerror = () => resolve();
-  reader.onload = event => {
-    event.target._readedFile.dataURL = reader.result;
-    resolve();
-  };
-  // Run reader
-  if (file instanceof File) {
-    reader.readAsDataURL(file);
-  } else {
-    resolve();
-  }
-}
+const defaultCodeProps = {
+  appearance: 'defaultPrimary sizeL solid rounded'
+};
 
-const FileInput = /*#__PURE__*/React__default.default.memo(function FileInput(props) {
+const FormFieldCode = /*#__PURE__*/React__default.default.memo(function FormFieldCode(props) {
   const {
-    className,
     name,
-    width,
-    maxFiles,
-    maxSize,
-    label,
-    fileErrorText,
+    initialValue,
+    isDisabled,
     classNameGroupItem,
-    dropzoneProps,
-    fieldProps,
-    hintDescription,
-    hintTitle,
-    showFilename,
+    fieldProps = {},
+    inputProps = {},
     showMessage,
-    isPreviews,
-    isRequired,
-    onAddFiles,
-    onDeleteFile
+    isRequired
   } = props;
-  const propsGenerator = useDevicePropsGenerator.useDevicePropsGenerator(props);
-  const {
-    size,
-    fill,
-    fillHover,
-    labelTextColor,
-    borderColorHover,
-    borderType,
-    borderWidth,
-    errorMessageTextColor,
-    errorMessageTextSize,
-    errorMessageTextWeight,
-    hintDescriptionTextColor,
-    hintDescriptionTextSize,
-    hintDescriptionTextWeight,
-    hintDescriptionTextWrap,
-    hintTitleTextColor,
-    hintTitleTextSize,
-    hintTitleTextWeight,
-    hintTitleTextWrap,
-    removeThumbAppearance,
-    removeThumbText,
-    removeThumbTextWeight,
-    removeThumbShape,
-    shape,
-    thumbBorderColor,
-    thumbBorderColorHover,
-    thumbBorderType,
-    thumbBorderWidth,
-    thumbColumn = 1,
-    thumbDirection = 'vertical',
-    thumbNameTextColor,
-    thumbNameTextSize,
-    thumbNameTextWeight,
-    thumbNameTextWrap
-  } = propsGenerator;
   return /*#__PURE__*/React__default.default.createElement(reactFinalForm.Field, {
-    name: name
+    name: name,
+    initialValue: initialValue
   }, function Render({
     input,
     meta
@@ -1296,125 +1355,57 @@ const FileInput = /*#__PURE__*/React__default.default.memo(function FileInput(pr
      */
 
     const {
-      errorKey,
-      errorMessage,
       isErrorState,
-      isValidState
-    } = useFieldValidationState({
+      isValidState,
+      errorKey} = useFieldValidationState({
       fieldProps: fieldProps,
       input: input,
       meta: meta
     });
     const updatedInputProps = useValidationAppearanceInputProps({
-      inputProps: props,
+      inputProps: inputProps,
       validationStateKey: isErrorState ? errorKey : 'success'
     });
-
-    /** TODO:
-     * REFACTOR PROPERTIES
-     */
     return /*#__PURE__*/React__default.default.createElement(FieldWrapper, Object.assign({
-      className: clsx__default.default('form-field_type_dropzone', 'form__item_type_dropzone', classNameGroupItem),
-      width: width,
-      label: label,
-      labelTextColor: labelTextColor,
-      errorKey: errorKey,
-      errorMessage: errorMessage,
-      isErrorState: isErrorState,
-      metaError: meta.error,
-      fieldClassName: "form-dropzone",
+      className: clsx__default.default('form-field_type_code', 'form__item_type_code', classNameGroupItem),
+      fieldClassName: 'form-code',
       inputName: input.name,
       inputValue: input.value,
       metaActive: meta.active,
-      metaTouched: meta.touched,
       showMessage: showMessage,
       isRequired: isRequired,
       isValidState: isValidState
-    }, fieldProps), /*#__PURE__*/React__default.default.createElement(FileInputDropzone, {
-      className: className,
-      maxFiles: maxFiles,
-      maxSize: maxSize,
-      size: size,
-      fill: fill,
-      fillHover: fillHover,
-      borderColor: updatedInputProps.borderColor,
-      borderColorHover: borderColorHover,
-      borderType: borderType,
-      borderWidth: borderWidth,
-      errorMessageTextColor: errorMessageTextColor,
-      errorMessageTextSize: errorMessageTextSize,
-      errorMessageWeight: errorMessageTextWeight,
-      fileErrorText: fileErrorText,
-      metaError: meta.error,
-      dropzoneProps: dropzoneProps,
-      hintDescription: hintDescription,
-      hintDescriptionTextColor: hintDescriptionTextColor,
-      hintDescriptionTextSize: hintDescriptionTextSize,
-      hintDescriptionTextWeight: hintDescriptionTextWeight,
-      hintDescriptionTextWrap: hintDescriptionTextWrap,
-      hintTitle: hintTitle,
-      hintTitleTextColor: hintTitleTextColor,
-      hintTitleTextSize: hintTitleTextSize,
-      hintTitleTextWeight: hintTitleTextWeight,
-      hintTitleTextWrap: hintTitleTextWrap,
-      inputName: input.name,
-      inputValue: input.value,
-      metaTouched: meta.touched,
-      removeThumbAppearance: removeThumbAppearance,
-      removeThumbText: removeThumbText,
-      removeThumbTextWeight: removeThumbTextWeight,
-      removeThumbShape: removeThumbShape,
-      shape: shape,
-      showFilename: showFilename,
-      thumbBorderColor: thumbBorderColor,
-      thumbBorderColorHover: thumbBorderColorHover,
-      thumbBorderType: thumbBorderType,
-      thumbBorderWidth: thumbBorderWidth,
-      thumbColumn: thumbColumn,
-      thumbDirection: thumbDirection,
-      thumbNameTextColor: thumbNameTextColor,
-      thumbNameTextSize: thumbNameTextSize,
-      thumbNameTextWeight: thumbNameTextWeight,
-      thumbNameTextWrap: thumbNameTextWrap,
-      isPreviews: isPreviews,
-      onAddFiles: onAddFiles,
-      onDeleteFile: onDeleteFile
-    }));
+    }, fieldProps), /*#__PURE__*/React__default.default.createElement(Code.Code, Object.assign({
+      name: input.name,
+      isDisabled: isDisabled,
+      autoComplete: "nope",
+      value: input.value,
+      onBlur: input.onBlur,
+      onChange: input.onChange,
+      onFocus: input.onFocus
+    }, updatedInputProps)));
   });
 });
 
-const defaultGroupProps = {
-  width: 'fill',
-  labelTextColor: 'surfaceTextPrimary',
-  labelTextSize: 'h5',
-  labelTextWeight: 500
-};
-
-const Group = /*#__PURE__*/React__default.default.memo(function Group(props) {
+const FormFieldCustom = /*#__PURE__*/React__default.default.memo(function FormFieldCustom(props) {
   const {
-    className,
+    Component,
+    isDisabled,
+    isRequired,
     name,
-    label,
-    labelTextColor,
-    labelTextSize,
-    labelTextWeight,
-    message,
-    column,
-    dataTour,
-    title,
-    titleTextSize,
-    titleTextColor,
-    titleTextWeight,
-    messageTextColor = 'surfaceTextTertiary',
-    messageTextSize = 's',
-    messageTextWeight,
-    showGroupMessage,
-    before,
-    after,
-    isHidden,
-    children
+    initialValue,
+    fieldProps = {},
+    classNameGroupItem,
+    showMessage,
+    clearIcon,
+    clearIconFill,
+    clearIconFillHover,
+    clearIconShape,
+    clearIconSize,
+    onClickClearIcon
   } = props;
   return /*#__PURE__*/React__default.default.createElement(reactFinalForm.Field, {
+    initialValue: initialValue,
     name: name
   }, function Render({
     input,
@@ -1426,111 +1417,80 @@ const Group = /*#__PURE__*/React__default.default.memo(function Group(props) {
      * React Hooks must be called in a React function component or a
      * custom React Hook function.
      */
+
     const {
       isErrorState,
+      isValidState,
       errorKey,
       errorMessage
     } = useFieldValidationState({
-      fieldProps: props,
-      // or fieldProps?
+      fieldProps: fieldProps,
       input: input,
       meta: meta
     });
-    const updatedProps = useValidationAppearanceInputProps({
-      inputProps: props,
-      validationStateKey: isErrorState ? errorKey : 'success'
+    const updatedInputProps = useValidationAppearanceInputProps({
+      validationStateKey: isErrorState ? errorKey : 'success',
+      // For "Custom" field we pass all props. Can contain some special props, we don't known.
+      inputProps: props
     });
-    return /*#__PURE__*/React__default.default.createElement("div", {
-      className: clsx__default.default('form__group', className, isHidden && 'form__group_hidden', column && `form__group_column_${column}`),
-      "data-tour": dataTour
-    }, /*#__PURE__*/React__default.default.createElement("div", {
-      className: "form__group-wrapper"
-    }, before, title && /*#__PURE__*/React__default.default.createElement("div", {
-      className: "form__group-title"
-    }, /*#__PURE__*/React__default.default.createElement(Title.Title, {
-      size: titleTextSize,
-      textColor: titleTextColor,
-      textWeight: titleTextWeight
-    }, title)), label && /*#__PURE__*/React__default.default.createElement("div", {
-      className: "form__group-label"
-    }, /*#__PURE__*/React__default.default.createElement(Text.Text, {
-      size: labelTextSize,
-      textColor: labelTextColor,
-      textWeight: labelTextWeight
-    }, label)), /*#__PURE__*/React__default.default.createElement("div", {
-      className: "form__group-items"
-    }, children), after), showGroupMessage && /*#__PURE__*/React__default.default.createElement(React__default.default.Fragment, null, isErrorState && errorMessage && /*#__PURE__*/React__default.default.createElement(Text.Text, {
-      className: `form__group-message form__group-message_type-${errorKey}`,
-      id: `${name}-error`,
-      size: updatedProps.messageTextSize,
-      textColor: updatedProps.messageTextColor,
-      textWeight: updatedProps.messageTextWeight
-    }, errorMessage), Boolean(message) && (!isErrorState || !errorMessage) && /*#__PURE__*/React__default.default.createElement(Text.Text, {
-      className: "form__group-message",
-      size: messageTextSize,
-      textColor: messageTextColor,
-      textWeight: messageTextWeight
-    }, message), !isErrorState && !message && /*#__PURE__*/React__default.default.createElement(Text.Text, {
-      className: "form__group-message",
-      size: messageTextSize
-    }, '\u00A0')));
+    return /*#__PURE__*/React__default.default.createElement(FieldWrapper, Object.assign({
+      className: clsx__default.default('form-field_type_custom', 'form__item_type_custom', classNameGroupItem),
+      errorKey: errorKey,
+      errorMessage: errorMessage,
+      fieldClassName: 'form-custom',
+      inputName: input.name,
+      inputValue: input.value,
+      isDisabled: isDisabled,
+      isErrorState: isErrorState,
+      isRequired: isRequired,
+      isValidState: isValidState,
+      metaActive: meta.active,
+      metaError: meta.error,
+      showMessage: showMessage
+    }, fieldProps), /*#__PURE__*/React__default.default.createElement(Component, Object.assign({}, updatedInputProps, {
+      input: input,
+      isDisabled: isDisabled,
+      meta: meta
+    })), clearIcon && /*#__PURE__*/React__default.default.createElement(Icon.Icon, {
+      className: "form-field__icon",
+      iconFill: clearIconFill,
+      iconFillHover: clearIconFillHover,
+      imageSrc: clearIcon,
+      shape: clearIconShape,
+      size: clearIconSize,
+      SvgImage: clearIcon,
+      onClick: onClickClearIcon
+    }));
   });
 });
 
-const defaultInputProps = {
-  appearance: 'sizeM defaultSecondary',
-  width: 'fill',
-  errorBorderColor: 'errorBorderSecondary',
-  requiredBorderColor: 'warningBorderSecondary',
-  shape: 'rounded'
+const defaultDatepickerProps = {
+  appearance: 'surfacePrimary sizeS',
+  dateFormat: 'dd/MM/yyyy - HH:mm',
+  readOnly: false,
+  selectsRange: false,
+  showTimeSelect: true,
+  timeCaption: 'Время',
+  timeFormat: 'p',
+  timeIntervals: 60,
+  isClearable: true,
+  isStartDefaultNull: true
 };
 
-const InputField = /*#__PURE__*/React__default.default.memo(function InputField(props) {
+function FormFieldDatePicker(props) {
   const {
     name,
-    initialValue,
     isDisabled,
     classNameGroupItem,
-    // dataTestId,
-    // iconBorder,
-    // iconBorderHover,
-    clearIcon,
-    clearIconFill,
-    clearIconFillHover,
-    clearIconShape,
-    clearIconSize,
+    datePickerProps,
     fieldProps = {},
-    iconFill,
-    iconFillHover,
-    iconRevealableHide,
-    iconRevealableShow,
-    iconShape,
-    iconSize,
     inputProps = {},
-    parse,
     showMessage,
-    isPassword,
     isRequired,
-    isRevealable,
-    onChange,
-    onClickClearIcon
+    onChange
   } = props;
-  const [isRevealed, setIsRevealed] = React$1.useState(false);
-  const inputType = React$1.useMemo(() => {
-    if (isPassword) {
-      return isRevealed ? 'text' : 'password';
-    } else {
-      return 'text';
-    }
-  }, [isRevealed, isPassword]);
-  const onClickIconReveal = React$1.useCallback(event => {
-    event.preventDefault();
-    setIsRevealed(prev => !prev);
-  }, []);
   return /*#__PURE__*/React__default.default.createElement(reactFinalForm.Field, {
-    name: name,
-    initialValue: initialValue,
-    parse: parse
+    name: name
   }, function Render({
     input,
     meta
@@ -1542,12 +1502,22 @@ const InputField = /*#__PURE__*/React__default.default.memo(function InputField(
      * custom React Hook function.
      */
 
-    const onChangeField = React$1.useCallback(event => {
-      input.onChange(event);
+    const onChangeField = React$1.useCallback((startDate, endDate) => {
+      if (!datePickerProps.selectsRange) {
+        // When we need to save single date, value is date
+        // TODO: make object with one date? need to check all forms with FormFieldDatePicker
+        input.onChange(startDate);
+      } else {
+        // When we need to save range, value is object with two date
+        input.onChange({
+          endDate,
+          startDate
+        });
+      }
       if (onChange) {
-        onChange(event.target.value, input.name);
+        onChange(startDate, endDate);
       }
-    }, [onChange, input.onChange]);
+    }, [input.onChange, onChange]);
     const {
       errorKey,
       errorMessage,
@@ -1562,200 +1532,87 @@ const InputField = /*#__PURE__*/React__default.default.memo(function InputField(
       inputProps: inputProps,
       validationStateKey: isErrorState ? errorKey : 'success'
     });
-    const isIconRevealableString = typeof iconRevealableHide === 'string' && typeof iconRevealableShow === 'string';
     return /*#__PURE__*/React__default.default.createElement(FieldWrapper, Object.assign({
-      className: clsx__default.default('form-field_type_input', 'form__item_type_input', classNameGroupItem),
+      className: clsx__default.default('form-field_type_datepicker', 'form__item_type_datepicker', classNameGroupItem),
       errorKey: errorKey,
       errorMessage: errorMessage,
       isErrorState: isErrorState,
       metaError: meta.error,
       isDisabled: isDisabled,
-      fieldClassName: isRevealable ? 'form-password' : 'form-input',
+      fieldClassName: "form-datepicker",
       inputName: input.name,
       inputValue: input.value || '',
       metaActive: meta.active,
       showMessage: showMessage,
       isRequired: isRequired,
       isValidState: isValidState
-    }, fieldProps), /*#__PURE__*/React__default.default.createElement(Input.Input, Object.assign({
-      className: clsx__default.default(meta.active && 'input_state_focus', meta.error && meta.touched && `input_state_${errorKey}`),
-      type: inputType,
+    }, fieldProps), /*#__PURE__*/React__default.default.createElement(DatePicker.DatePickerInput, {
       name: input.name,
       isDisabled: isDisabled,
-      autoComplete: "nope",
-      dataTestId: `${input.name}FieldInput`,
-      value: input.value || '',
+      datePickerProps: datePickerProps,
+      endValue: datePickerProps.selectsRange ? input.value.endDate : null,
+      inputProps: updatedInputProps,
+      value: datePickerProps.selectsRange ? input.value.startDate : input.value,
       onBlur: input.onBlur,
       onChange: onChangeField,
       onFocus: input.onFocus
-    }, updatedInputProps)), isRevealable && /*#__PURE__*/React__default.default.createElement(Icon.Icon, {
-      className: "form-field__icon",
-      size: iconSize,
-      iconFill: iconFill,
-      iconFillHover: iconFillHover,
-      imageSrc: isRevealed && isIconRevealableString ? iconRevealableHide : iconRevealableShow,
-      shape: iconShape,
-      SvgImage: isRevealed && !isIconRevealableString ? iconRevealableHide : iconRevealableShow,
-      onClick: onClickIconReveal
-    }), clearIcon && /*#__PURE__*/React__default.default.createElement(Icon.Icon, {
-      className: "form-field__icon",
-      size: clearIconSize,
-      iconFill: clearIconFill,
-      iconFillHover: clearIconFillHover,
-      imageSrc: typeof clearIcon === 'string' && clearIcon,
-      shape: clearIconShape,
-      SvgImage: typeof clearIcon !== 'string' && clearIcon,
-      onClick: onClickClearIcon
     }));
   });
-});
-
-const defaultRadioProps = {
-  fieldProps: {
-    width: 'fill',
-    size: 'm',
-    labelTextColor: 'surfaceTextPrimary',
-    labelTextSize: 's',
-    labelTextWeight: 'normal',
-    textColor: 'surfaceTextPrimary',
-    helpText: 'Supporting text',
-    helpTextColor: 'surfaceTextPrimary',
-    helpTextSize: 's',
-    helpTextWeight: 'normal',
-    showMessage: true
-  },
-  inputProps: {
-    width: 'fill',
-    size: 'm',
-    labelTextColor: 'surfaceTextPrimary',
-    labelTextSize: 's',
-    descTextColor: 'surfaceTextPrimary',
-    descTextSize: 's'
-  }
-};
-
-function RadioGroupInput(props) {
-  const {
-    input,
-    value,
-    onChange
-  } = props;
-  const onChangeField = React$1.useCallback(event => onChange(event.target.value), [onChange]);
-  return /*#__PURE__*/React.createElement(Input.Input, Object.assign({
-    name: input.name,
-    autoComplete: "nope",
-    value: value,
-    onBlur: input.onBlur,
-    onChange: onChangeField,
-    onFocus: input.onFocus
-  }, props));
-}
-
-function RadioGroupItem(props) {
-  const {
-    input,
-    inputProps,
-    option,
-    onChange
-  } = props;
-  const onChangeField = React$1.useCallback(event => {
-    if (event.target.checked) {
-      onChange(option.value);
-    }
-  }, [onChange]);
-  return /*#__PURE__*/React.createElement(Radio.Radio, Object.assign({
-    className: "form-radio__item",
-    type: "radio",
-    name: input.name,
-    label: option.label,
-    checked: option.value === input.value,
-    value: option.value,
-    onBlur: input.onBlur,
-    onChange: onChangeField,
-    onFocus: input.onFocus
-  }, inputProps));
 }
 
-function RadioGroupList(props) {
-  const {
-    editableProps,
-    input,
-    inputProps,
-    options,
-    onChange
-  } = props;
-  const [editableValue, setEditableValue] = React$1.useState(() => {
-    const isRadioValue = options.find(option => option.value === input.value);
-    if (!isRadioValue) {
-      return input.value;
-    }
-    return '';
-  });
-  React$1.useEffect(() => {
-    // When a new value from outside enters the form
-    if (input.value) {
-      // Check value for radio type
-      const isRadioValue = options.find(option => option.value === input.value && !option.editable);
-      // If new value not in radio list - set to editable input
-      setEditableValue(isRadioValue ? '' : input.value);
-    } else {
-      // If new value is empty - clear editable input
-      setEditableValue('');
-    }
-  }, [input.value]);
-
-  // Callback for value changes
-  const onChangeSomeInput = React$1.useCallback(value => {
-    // Save to form values
-    input.onChange(value);
-    if (onChange) {
-      // Pass to custom event
-      onChange(value, input.name);
-    }
-  }, [input, onChange]);
-
-  // Handle for radio inputs
-  const onChangeRadio = React$1.useCallback(value => {
-    setEditableValue('');
-    onChangeSomeInput(value);
-  }, [onChangeSomeInput]);
-
-  // Handle for text input
-  const onChangeEditable = React$1.useCallback(value => {
-    setEditableValue(value);
-    onChangeSomeInput(value);
-  }, [onChangeSomeInput]);
-  return /*#__PURE__*/React__default.default.createElement(React__default.default.Fragment, null, options.map(option => option.editable ? /*#__PURE__*/React__default.default.createElement(RadioGroupInput, {
-    key: option.label,
-    editableProps: editableProps,
-    input: input,
-    inputProps: inputProps,
-    option: option,
-    value: editableValue,
-    onChange: onChangeEditable
-  }) : /*#__PURE__*/React__default.default.createElement(RadioGroupItem, {
-    key: option.value,
-    input: input,
-    inputProps: inputProps,
-    option: option,
-    onChange: onChangeRadio
-  })));
-}
+const defaultInputProps = {
+  appearance: 'sizeM defaultSecondary solid rounded',
+  width: 'fill',
+  errorBorderColor: 'errorBorderSecondary',
+  requiredBorderColor: 'warningBorderSecondary'
+};
 
-const RadioGroup = /*#__PURE__*/React__default.default.memo(function RadioGroup(props) {
+const FormFieldInput = /*#__PURE__*/React__default.default.memo(function FormFieldInput(props) {
   const {
     name,
+    initialValue,
     isDisabled,
-    editableProps = {},
+    classNameGroupItem,
+    // dataTestId,
+    // iconBorder,
+    // iconBorderHover,
+    clearIcon,
+    clearIconFill,
+    clearIconFillHover,
+    clearIconShape,
+    clearIconSize,
     fieldProps = {},
+    iconFill,
+    iconFillHover,
+    iconRevealableHide,
+    iconRevealableShow,
+    iconShape,
+    iconSize,
     inputProps = {},
-    options = [],
+    parse,
     showMessage,
+    isPassword,
     isRequired,
-    onChange
+    isRevealable,
+    onChange,
+    onClickClearIcon
   } = props;
+  const [isRevealed, setIsRevealed] = React$1.useState(false);
+  const inputType = React$1.useMemo(() => {
+    if (isPassword) {
+      return isRevealed ? 'text' : 'password';
+    } else {
+      return 'text';
+    }
+  }, [isRevealed, isPassword]);
+  const onClickIconReveal = React$1.useCallback(event => {
+    event.preventDefault();
+    setIsRevealed(prev => !prev);
+  }, []);
   return /*#__PURE__*/React__default.default.createElement(reactFinalForm.Field, {
-    name: name
+    name: name,
+    initialValue: initialValue,
+    parse: parse
   }, function Render({
     input,
     meta
@@ -1767,6 +1624,12 @@ const RadioGroup = /*#__PURE__*/React__default.default.memo(function RadioGroup(
      * custom React Hook function.
      */
 
+    const onChangeField = React$1.useCallback(event => {
+      input.onChange(event);
+      if (onChange) {
+        onChange(event.target.value, input.name);
+      }
+    }, [onChange, input.onChange]);
     const {
       errorKey,
       errorMessage,
@@ -1781,40 +1644,62 @@ const RadioGroup = /*#__PURE__*/React__default.default.memo(function RadioGroup(
       inputProps: inputProps,
       validationStateKey: isErrorState ? errorKey : 'success'
     });
+    const isIconRevealableString = typeof iconRevealableHide === 'string' && typeof iconRevealableShow === 'string';
     return /*#__PURE__*/React__default.default.createElement(FieldWrapper, Object.assign({
-      className: clsx__default.default('form-field_type_radio', 'form__item_type_radio"', classNameGroupItem),
+      className: clsx__default.default('form-field_type_input', 'form__item_type_input', classNameGroupItem),
       errorKey: errorKey,
       errorMessage: errorMessage,
       isErrorState: isErrorState,
       metaError: meta.error,
       isDisabled: isDisabled,
-      fieldClassName: 'form-radio',
+      fieldClassName: isRevealable ? 'form-password' : 'form-input',
       inputName: input.name,
       inputValue: input.value || '',
       metaActive: meta.active,
       showMessage: showMessage,
       isRequired: isRequired,
       isValidState: isValidState
-    }, fieldProps), /*#__PURE__*/React__default.default.createElement(RadioGroupList, {
+    }, fieldProps), /*#__PURE__*/React__default.default.createElement(Input.Input, Object.assign({
+      dataTestId: `${input.name}FieldInput`,
+      className: clsx__default.default(meta.active && 'input_state_focus', meta.error && meta.touched && `input_state_${errorKey}`),
+      type: inputType,
+      name: input.name,
       isDisabled: isDisabled,
-      editableProps: editableProps,
-      input: input,
-      inputProps: updatedInputProps,
-      options: options,
-      onChange: onChange
+      autoComplete: "nope",
+      value: input.value || '',
+      onBlur: input.onBlur,
+      onChange: onChangeField,
+      onFocus: input.onFocus
+    }, updatedInputProps)), isRevealable && /*#__PURE__*/React__default.default.createElement(Icon.Icon, {
+      className: "form-field__icon",
+      size: iconSize,
+      iconFill: iconFill,
+      iconFillHover: iconFillHover,
+      imageSrc: isRevealed && isIconRevealableString ? iconRevealableHide : iconRevealableShow,
+      shape: iconShape,
+      SvgImage: isRevealed && !isIconRevealableString ? iconRevealableHide : iconRevealableShow,
+      onClick: onClickIconReveal
+    }), clearIcon && /*#__PURE__*/React__default.default.createElement(Icon.Icon, {
+      className: "form-field__icon",
+      size: clearIconSize,
+      iconFill: clearIconFill,
+      iconFillHover: clearIconFillHover,
+      imageSrc: typeof clearIcon === 'string' && clearIcon,
+      shape: clearIconShape,
+      SvgImage: typeof clearIcon !== 'string' && clearIcon,
+      onClick: onClickClearIcon
     }));
   });
 });
 
 const defaultSegmentedProps = {
-  appearance: 'sizeM surfacePrimary',
+  appearance: 'defaultPrimary sizeM solid rounded',
   width: 'fill',
   errorLabelTextColor: 'errorTextPrimary',
-  requiredLabelTextColor: 'warningTextPrimary',
-  shape: 'rounded'
+  requiredLabelTextColor: 'warningTextPrimary'
 };
 
-function SegmentedField(props) {
+function FormFieldSegmented(props) {
   const {
     name,
     isDisabled,
@@ -1892,36 +1777,7 @@ function SegmentedField(props) {
 }
 
 const defaultSelectProps = {
-  elevation: 8,
-  isClearable: true,
-  isSearchable: true,
-  badgeAppearance: 'accent',
-  badgeSize: 'm',
-  badgeTextSize: 'm',
-  // clearIcon: icon24.Clear,
-  clearIconFill: 'surfaceItemPrimary',
-  closeMenuOnSelect: true,
-  // optionSelected: <Icon iconFill="surfaceItemAccent" SvgImage={icon24.Check} />,
-
-  dividerDirection: 'horizontal',
-  dividerFill: 'surfaceTertiary',
-  dividerSize: 'xxs',
-  // dropdownIcon: icon24.ChevronDownSmall,
-  dropdownIconFill: 'surfaceItemPrimary',
-  // error
-  errorInputBorderColor: 'errorBorderPrimary',
-  headingFill: 'surfaceSecondary',
-  loadingMessage: /*#__PURE__*/React__default.default.createElement(Loader.Loader, {
-    width: "fill",
-    height: "fill",
-    fill: "surfacePrimary",
-    position: "absolute",
-    left: "0px",
-    right: "0px",
-    zIndex: "1",
-    itemFill: "surfaceItemAccent",
-    set: "simple"
-  })
+  appearance: 'defaultPrimary sizeM'
 };
 
 function getDefaultValue(options, selectValue) {
@@ -1942,7 +1798,7 @@ function getDefaultValue(options, selectValue) {
   });
   return result;
 }
-const SelectField = /*#__PURE__*/React__default.default.memo(function SelectField(props) {
+const FormFieldSelect = /*#__PURE__*/React__default.default.memo(function FormFieldSelect(props) {
   const {
     isDisabled,
     isRequired,
@@ -2025,10 +1881,10 @@ const SelectField = /*#__PURE__*/React__default.default.memo(function SelectFiel
       isValidState: isValidState
     }, fieldProps), /*#__PURE__*/React__default.default.createElement(Select.Select, Object.assign({
       className: "form-select-item",
+      ref: selectRef,
       isDisabled: isDisabled,
       instanceId: `id_${input.name}`,
       options: options,
-      ref: selectRef,
       value: selectedOptions,
       onChange: onChangeValue,
       onInputChange: onInputChange
@@ -2037,32 +1893,10 @@ const SelectField = /*#__PURE__*/React__default.default.memo(function SelectFiel
 });
 
 const defaultSwitchProps = {
-  fieldProps: {
-    width: 'fill',
-    size: 'xl',
-    labelTextColor: 'surfaceTextPrimary',
-    labelTextSize: 's',
-    labelTextWeight: 'normal',
-    textColor: 'surfaceTextPrimary',
-    helpText: 'Supporting text',
-    helpTextColor: 'surfaceTextPrimary',
-    helpTextSize: 's',
-    helpTextWeight: 'normal',
-    showMessage: true
-  },
-  inputProps: {
-    size: 'm',
-    fill: 'surfaceSecondary',
-    title: 'Switch',
-    titleTextColor: 'surfaceTextPrimary',
-    titleTextSize: 's',
-    desc: 'Description',
-    descTextColor: 'surfaceTextPrimary',
-    descTextSize: 'xs'
-  }
+  appearance: 'defaultPrimary sizeL solid rounded'
 };
 
-const SwitchField = /*#__PURE__*/React__default.default.memo(function SwitchField(props) {
+const FormFieldSwitch = /*#__PURE__*/React__default.default.memo(function FormFieldSwitch(props) {
   const {
     name,
     isDisabled,
@@ -2136,14 +1970,12 @@ const SwitchField = /*#__PURE__*/React__default.default.memo(function SwitchFiel
 });
 
 const defaultTextareaProps = {
-  appearance: 'sizeM defaultSecondary',
-  width: 'fill',
+  appearance: 'defaultPrimary sizeM solid rounded',
   errorBorderColor: 'errorBorderSecondary',
-  requiredBorderColor: 'warningBorderSecondary',
-  shape: 'rounded'
+  requiredBorderColor: 'warningBorderSecondary'
 };
 
-const TextareaField = /*#__PURE__*/React__default.default.memo(function TextareaField(props) {
+const FormFieldTextarea = /*#__PURE__*/React__default.default.memo(function FormFieldTextarea(props) {
   const {
     name,
     isDisabled,
@@ -2206,7 +2038,7 @@ const TextareaField = /*#__PURE__*/React__default.default.memo(function Textarea
   });
 });
 
-const MaskedInputField = /*#__PURE__*/React__default.default.memo(function MaskedInputField(props) {
+const FormFieldMaskedInput = /*#__PURE__*/React__default.default.memo(function FormFieldMaskedInput(props) {
   const {
     name,
     initialValue,
@@ -2303,51 +2135,144 @@ const MaskedInputField = /*#__PURE__*/React__default.default.memo(function Maske
   });
 });
 
-const defaultChipsProps = {
-  appearance: 'surfacePrimary',
-  width: 'fill',
-  errorBorderColor: 'errorBorderSecondary',
-  requiredBorderColor: 'warningBorderSecondary'
+const defaultRadioProps = {
+  appearance: 'defaultPrimary sizeM solid circular'
 };
 
-function ChipsField(props) {
+function RadioGroupInput(props) {
+  const {
+    input,
+    value,
+    onChange
+  } = props;
+  const onChangeField = React$1.useCallback(event => onChange(event.target.value), [onChange]);
+  return /*#__PURE__*/React.createElement(Input.Input, Object.assign({
+    name: input.name,
+    autoComplete: "nope",
+    value: value,
+    onBlur: input.onBlur,
+    onChange: onChangeField,
+    onFocus: input.onFocus
+  }, props));
+}
+
+function RadioGroupItem(props) {
+  const {
+    input,
+    inputProps,
+    option,
+    onChange
+  } = props;
+  const onChangeField = React$1.useCallback(event => {
+    if (event.target.checked) {
+      onChange(option.value);
+    }
+  }, [onChange]);
+  return /*#__PURE__*/React.createElement(Radio.Radio, Object.assign({
+    className: "form-radio__item",
+    type: "radio",
+    name: input.name,
+    label: option.label,
+    checked: option.value === input.value,
+    value: option.value,
+    onBlur: input.onBlur,
+    onChange: onChangeField,
+    onFocus: input.onFocus
+  }, inputProps));
+}
+
+function RadioGroupList(props) {
+  const {
+    editableProps,
+    input,
+    inputProps,
+    options,
+    onChange
+  } = props;
+  const [editableValue, setEditableValue] = React$1.useState(() => {
+    const isRadioValue = options.find(option => option.value === input.value);
+    if (!isRadioValue) {
+      return input.value;
+    }
+    return '';
+  });
+  React$1.useEffect(() => {
+    // When a new value from outside enters the form
+    if (input.value) {
+      // Check value for radio type
+      const isRadioValue = options.find(option => option.value === input.value && !option.editable);
+      // If new value not in radio list - set to editable input
+      setEditableValue(isRadioValue ? '' : input.value);
+    } else {
+      // If new value is empty - clear editable input
+      setEditableValue('');
+    }
+  }, [input.value]);
+
+  // Callback for value changes
+  const onChangeSomeInput = React$1.useCallback(value => {
+    // Save to form values
+    input.onChange(value);
+    if (onChange) {
+      // Pass to custom event
+      onChange(value, input.name);
+    }
+  }, [input, onChange]);
+
+  // Handle for radio inputs
+  const onChangeRadio = React$1.useCallback(value => {
+    setEditableValue('');
+    onChangeSomeInput(value);
+  }, [onChangeSomeInput]);
+
+  // Handle for text input
+  const onChangeEditable = React$1.useCallback(value => {
+    setEditableValue(value);
+    onChangeSomeInput(value);
+  }, [onChangeSomeInput]);
+  return /*#__PURE__*/React__default.default.createElement(React__default.default.Fragment, null, options.map(option => option.editable ? /*#__PURE__*/React__default.default.createElement(RadioGroupInput, {
+    key: option.label,
+    editableProps: editableProps,
+    input: input,
+    inputProps: inputProps,
+    option: option,
+    value: editableValue,
+    onChange: onChangeEditable
+  }) : /*#__PURE__*/React__default.default.createElement(RadioGroupItem, {
+    key: option.value,
+    input: input,
+    inputProps: inputProps,
+    option: option,
+    onChange: onChangeRadio
+  })));
+}
+
+const RadioGroup = /*#__PURE__*/React__default.default.memo(function RadioGroup(props) {
   const {
     name,
-    initialValue,
     isDisabled,
+    editableProps = {},
+    fieldProps = {},
+    inputProps = {},
+    options = [],
     classNameGroupItem,
-    emptyMessage,
-    emptyMessageTextColor,
-    emptyMessageTextSize,
-    fieldProps,
-    inputProps,
-    options,
     showMessage,
     isRequired,
     onChange
   } = props;
-  const {
-    change
-  } = reactFinalForm.useForm();
-
-  // Callback for value changes
-  const onChangeSomeInput = React$1.useCallback((inputValue, newOptionValue) => {
-    const updatedValues = inputValue.includes(newOptionValue) ? inputValue.filter(selectedValue => selectedValue !== newOptionValue) : [...inputValue, newOptionValue];
-    change(name, updatedValues);
-    onChange && onChange(updatedValues);
-  }, [change, name, onChange]);
-  React$1.useEffect(() => {
-    initialValue && change(name, initialValue);
-    // update the form value only when the initialValue changes, so use disable eslint to ignore the warning
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [initialValue]);
   return /*#__PURE__*/React__default.default.createElement(reactFinalForm.Field, {
-    name: name,
-    initialValue: initialValue
+    name: name
   }, function Render({
     input,
     meta
   }) {
+    /** Note:
+     * Create "Render" function by "eslint-react-hooks/rules-of-hooks":
+     * React Hooks cannot be called inside a callback.
+     * React Hooks must be called in a React function component or a
+     * custom React Hook function.
+     */
+
     const {
       errorKey,
       errorMessage,
@@ -2362,49 +2287,30 @@ function ChipsField(props) {
       inputProps: inputProps,
       validationStateKey: isErrorState ? errorKey : 'success'
     });
-    const activeOptionsList = React$1.useMemo(() => {
-      const emptyOptionsList = [{
-        label: null,
-        value: null
-      }];
-      if (input?.value) {
-        const currentOptions = options.filter(option => input.value?.includes(option.value));
-        return currentOptions || emptyOptionsList;
-      }
-      return emptyOptionsList;
-    }, [input.value]);
     return /*#__PURE__*/React__default.default.createElement(FieldWrapper, Object.assign({
-      className: clsx__default.default('form-field_type_chips', 'form__item_type_chips', classNameGroupItem),
+      className: clsx__default.default('form-field_type_radio', 'form__item_type_radio"', classNameGroupItem),
       errorKey: errorKey,
       errorMessage: errorMessage,
       isErrorState: isErrorState,
       metaError: meta.error,
       isDisabled: isDisabled,
-      fieldClassName: "form-chips",
+      fieldClassName: 'form-radio',
       inputName: input.name,
-      inputValue: input.value,
+      inputValue: input.value || '',
       metaActive: meta.active,
       showMessage: showMessage,
       isRequired: isRequired,
       isValidState: isValidState
-    }, fieldProps), options.length ? /*#__PURE__*/React__default.default.createElement(Chips.ChipsGroup, {
-      direction: "horizontal",
-      gap: "1m",
-      wrap: "wrap"
-    }, options.map(option => /*#__PURE__*/React__default.default.createElement(Chips.Chips, Object.assign({
-      className: clsx__default.default(meta.active && 'form-chips_state_focus', meta.error && meta.touched && `form-chips_state_${errorKey}`),
-      key: option.value,
-      label: option.label,
-      isDisabled: option.isDisabled,
-      value: option.value,
-      isActive: activeOptionsList.some(activeOption => activeOption.value === option.value),
-      onClick: () => onChangeSomeInput(input.value, option.value)
-    }, updatedInputProps)))) : /*#__PURE__*/React__default.default.createElement(Text.Text, {
-      size: emptyMessageTextSize,
-      textColor: emptyMessageTextColor
-    }, emptyMessage));
+    }, fieldProps), /*#__PURE__*/React__default.default.createElement(RadioGroupList, {
+      isDisabled: isDisabled,
+      editableProps: editableProps,
+      input: input,
+      inputProps: updatedInputProps,
+      options: options,
+      onChange: onChange
+    }));
   });
-}
+});
 
 const formTypes = {
   code: 'code',
@@ -2428,43 +2334,43 @@ function generateField(field, config, props) {
   switch (field.type) {
     case formTypes.checkbox:
       {
-        return /*#__PURE__*/React__default.default.createElement(CheckboxField, Object.assign({
+        return /*#__PURE__*/React__default.default.createElement(FormFieldCheckbox, Object.assign({
           key: config.key
         }, field, props));
       }
     case formTypes.choice:
       {
-        return /*#__PURE__*/React__default.default.createElement(ChoiceField, Object.assign({
+        return /*#__PURE__*/React__default.default.createElement(FormFieldChoice, Object.assign({
           key: config.key
         }, field, props));
       }
     case formTypes.chips:
       {
-        return /*#__PURE__*/React__default.default.createElement(ChipsField, Object.assign({
+        return /*#__PURE__*/React__default.default.createElement(FormFieldChips, Object.assign({
           key: config.key
         }, field, props));
       }
     case formTypes.code:
       {
-        return /*#__PURE__*/React__default.default.createElement(CodeField, Object.assign({
+        return /*#__PURE__*/React__default.default.createElement(FormFieldCode, Object.assign({
           key: config.key
         }, field, props));
       }
     case formTypes.switch:
       {
-        return /*#__PURE__*/React__default.default.createElement(SwitchField, Object.assign({
+        return /*#__PURE__*/React__default.default.createElement(FormFieldSwitch, Object.assign({
           key: config.key
         }, field, props));
       }
     case formTypes.segmented:
       {
-        return /*#__PURE__*/React__default.default.createElement(SegmentedField, Object.assign({
+        return /*#__PURE__*/React__default.default.createElement(FormFieldSegmented, Object.assign({
           key: config.key
         }, field, props));
       }
     case formTypes.datePicker:
       {
-        return /*#__PURE__*/React__default.default.createElement(DatePickerField, Object.assign({
+        return /*#__PURE__*/React__default.default.createElement(FormFieldDatePicker, Object.assign({
           key: config.key
         }, field, props));
       }
@@ -2482,37 +2388,37 @@ function generateField(field, config, props) {
       }
     case formTypes.select:
       {
-        return /*#__PURE__*/React__default.default.createElement(SelectField, Object.assign({
+        return /*#__PURE__*/React__default.default.createElement(FormFieldSelect, Object.assign({
           key: config.key
         }, field, props));
       }
     case formTypes.text:
       {
-        return /*#__PURE__*/React__default.default.createElement(InputField, Object.assign({
+        return /*#__PURE__*/React__default.default.createElement(FormFieldInput, Object.assign({
           key: config.key
         }, field, props));
       }
     case formTypes.textarea:
       {
-        return /*#__PURE__*/React__default.default.createElement(TextareaField, Object.assign({
+        return /*#__PURE__*/React__default.default.createElement(FormFieldTextarea, Object.assign({
           key: config.key
         }, field, props));
       }
     case formTypes.maskedInput:
       {
-        return /*#__PURE__*/React__default.default.createElement(MaskedInputField, Object.assign({
+        return /*#__PURE__*/React__default.default.createElement(FormFieldMaskedInput, Object.assign({
           key: config.key
         }, field, props));
       }
     case formTypes.custom:
       {
-        return /*#__PURE__*/React__default.default.createElement(CustomField, Object.assign({
+        return /*#__PURE__*/React__default.default.createElement(FormFieldCustom, Object.assign({
           key: config.key
         }, field, props));
       }
     case formTypes.group:
       {
-        return /*#__PURE__*/React__default.default.createElement(Group, Object.assign({
+        return /*#__PURE__*/React__default.default.createElement(FormBlockGroup, Object.assign({
           key: config.key
         }, field, props), Object.entries(field.group).map(([key, value]) => {
           const groupProps = {
@@ -2792,7 +2698,7 @@ const FinalForm = /*#__PURE__*/React__default.default.forwardRef(function FinalF
           values: true
         },
         onChange: onChangeFormValues
-      }), Boolean(Object.keys(config).length) && /*#__PURE__*/React__default.default.createElement(React__default.default.Fragment, null, renderFieldsWrapper(/*#__PURE__*/React__default.default.createElement(Group$1.Group, {
+      }), Boolean(Object.keys(config).length) && /*#__PURE__*/React__default.default.createElement(React__default.default.Fragment, null, renderFieldsWrapper(/*#__PURE__*/React__default.default.createElement(Group.Group, {
         className: "form__wrapper",
         direction: "vertical",
         gap: fieldsGap || groupGap,
@@ -2808,7 +2714,7 @@ const FinalForm = /*#__PURE__*/React__default.default.forwardRef(function FinalF
         text: loaderText,
         itemFill: loaderItemFill,
         shape: loaderShape
-      }))))), (primaryButtonLabel || primaryButton || secondaryButtonLabel || secondaryButton || tertiaryButton || tertiaryButtonLabel) && /*#__PURE__*/React__default.default.createElement(Group$1.Group, {
+      }))))), (primaryButtonLabel || primaryButton || secondaryButtonLabel || secondaryButton || tertiaryButton || tertiaryButtonLabel) && /*#__PURE__*/React__default.default.createElement(Group.Group, {
         className: "form__button",
         direction: buttonDirection,
         justifyContent: buttonJustifyContent,
@@ -3101,25 +3007,25 @@ Object.defineProperty(exports, "useFormState", {
   enumerable: true,
   get: function () { return reactFinalForm.useFormState; }
 });
-exports.CheckboxField = CheckboxField;
-exports.ChipsField = ChipsField;
-exports.ChoiceField = ChoiceField;
-exports.CodeField = CodeField;
-exports.CustomField = CustomField;
 exports.DEFAULT_MESSAGES_FIELDS = DEFAULT_MESSAGES_FIELDS;
-exports.DatePickerField = DatePickerField;
 exports.FieldWrapper = FieldWrapper;
 exports.FieldWrapperBase = FieldWrapperBase;
 exports.FileInput = FileInput;
 exports.FinalForm = FinalForm;
-exports.Group = Group;
-exports.InputField = InputField;
-exports.MaskedInputField = MaskedInputField;
+exports.FormBlockGroup = FormBlockGroup;
+exports.FormFieldCheckbox = FormFieldCheckbox;
+exports.FormFieldChips = FormFieldChips;
+exports.FormFieldChoice = FormFieldChoice;
+exports.FormFieldCode = FormFieldCode;
+exports.FormFieldCustom = FormFieldCustom;
+exports.FormFieldDatePicker = FormFieldDatePicker;
+exports.FormFieldInput = FormFieldInput;
+exports.FormFieldMaskedInput = FormFieldMaskedInput;
+exports.FormFieldSegmented = FormFieldSegmented;
+exports.FormFieldSelect = FormFieldSelect;
+exports.FormFieldSwitch = FormFieldSwitch;
+exports.FormFieldTextarea = FormFieldTextarea;
 exports.RadioGroup = RadioGroup;
-exports.SegmentedField = SegmentedField;
-exports.SelectField = SelectField;
-exports.SwitchField = SwitchField;
-exports.TextareaField = TextareaField;
 exports.addRequiredFieldsParamToSchema = addRequiredFieldsParamToSchema;
 exports.dateValidation = dateValidation;
 exports.defaultCheckboxProps = defaultCheckboxProps;
@@ -3129,6 +3035,8 @@ exports.defaultCodeProps = defaultCodeProps;
 exports.defaultDatepickerProps = defaultDatepickerProps;
 exports.defaultDropzoneProps = defaultDropzoneProps;
 exports.defaultFieldProps = defaultFieldProps;
+exports.defaultFieldSizeM = defaultFieldSizeM;
+exports.defaultFieldSizeXL = defaultFieldSizeXL;
 exports.defaultGroupProps = defaultGroupProps;
 exports.defaultInputProps = defaultInputProps;
 exports.defaultRadioProps = defaultRadioProps;