@steroidsjs/core 3.0.0-beta.9 → 3.0.0-beta.91

package/ui/form/ImageField/ImageField.d.ts

@@ -1,8 +1,9 @@
 import ReactCropProps, { Crop } from 'react-image-crop';
 import { IModalProps } from '../../modal/Modal/Modal';
+import { IFileInput } from '../../../hooks/useFile';
 import { IFieldWrapperInputProps } from '../Field/fieldWrapper';
-import { IFileHocInput, IFileHocOutput } from '../../../hoc/file';
-export interface ICropInputProps {
+import { IButtonProps } from '../Button/Button';
+export interface ICropConfig {
     /**
      * Изначальные параметры обрезки изображения
      * @example {unit: 'px', aspect: 1, x: 0, y: 0, width: 200, height: 200}
@@ -19,16 +20,12 @@ export interface ICropInputProps {
      */
     reactImageCropProps?: ReactCropProps;
 }
-export interface IImageFieldProps extends IFieldWrapperInputProps, Omit<IFileHocInput, 'multiple' | 'imagesOnly'>, IFileHocOutput {
-    /**
-     * Дополнительный CSS-класс для компонента
-     */
-    className?: CssClassName;
-    /**
-     * Переопределение внешнего вида компонента
-     * @example MyCustomView
-     */
-    view?: CustomView;
+/**
+ * ImageField
+ *
+ * Компонент для загрузки изображений с возможностью обрезки и предпросмотра.
+ **/
+export interface IImageFieldProps extends IFieldWrapperInputProps, Omit<IFileInput, 'multiple' | 'imagesOnly'>, IUiComponent {
     /**
      * Переопределение внешнего вида модального окна
      * @example MyCustomModalView
@@ -41,15 +38,19 @@ export interface IImageFieldProps extends IFieldWrapperInputProps, Omit<IFileHoc
     /**
      * Параметры обрезки
      */
-    crop?: ICropInputProps;
+    crop?: ICropConfig;
     /**
      * Название кнопки
      * @example 'Загрузить'
      */
     label?: string;
+    /**
+     * Пропсы для кнопки
+     */
+    buttonProps?: IButtonProps;
     [key: string]: any;
 }
-export interface ICropOutputProps extends ICropInputProps {
+export interface ICropOutputProps extends ICropConfig {
     onSubmit: (crop: Crop, imageId: any) => void;
 }
 export interface IImageFieldModalViewProps extends IModalProps {

package/ui/form/ImageField/ImageField.js

@@ -144,6 +144,10 @@ ImageField.defaultProps = {
         initialValues: {
             aspect: 1
         }
+    },
+    buttonProps: {
+        color: 'basic',
+        outline: true
     }
 };
 exports["default"] = (0, fieldWrapper_1["default"])('ImageField', ImageField);

package/ui/form/InputField/InputField.d.ts

@@ -1,49 +1,46 @@
 import * as React from 'react';
-import { ChangeEventHandler, ReactNode } from 'react';
+import { InputHTMLAttributes, ReactNode } from 'react';
+import { MaskitoOptions } from '@maskito/core';
 import { IFieldWrapperInputProps, IFieldWrapperOutputProps } from '../Field/fieldWrapper';
+export declare const MASK_PRESETS: {
+    date: MaskitoOptions;
+    phone: {
+        mask: any[];
+    };
+    card: {
+        mask: any[];
+    };
+};
 type IElementInputType = 'button' | 'checkbox' | 'color' | 'date' | 'datetime-local' | 'email' | 'file' | 'hidden' | 'image' | 'month' | 'number' | 'password' | 'radio' | 'range' | 'reset' | 'search' | 'submit' | 'tel' | 'text' | 'time' | 'url' | 'week' | string;
+export interface IBaseFieldProps extends IFieldWrapperInputProps, IUiComponent {
+    /**
+     * Свойства для элемента input
+     * @example {onKeyDown: ...}
+     */
+    inputProps?: InputHTMLAttributes<HTMLInputElement>;
+    /**
+     * Показывать иконку очищения поля
+     * @example true
+    */
+    showClear?: boolean;
+    /**
+     * Свойства для компонента отображения
+     * @example {customHandler: () => {...}}
+     */
+    viewProps?: {
+        [key: string]: any;
+    };
+}
 /**
  * InputField
  * Поле ввода текста
  */
-export interface IInputFieldProps extends IFieldWrapperInputProps {
+export interface IInputFieldProps extends IBaseFieldProps {
     /**
      * HTML Тип
      * @example email
      */
     type?: IElementInputType;
-    /**
-     * Placeholder подсказка
-     * @example Your text...
-     */
-    placeholder?: string;
-    /**
-     * Свойства для элемента \<input /\>
-     * @example {onKeyDown: ...}
-     */
-    inputProps?: any;
-    /**
-     * Дополнительный CSS-класс для элемента отображения
-     */
-    className?: CssClassName;
-    /**
-     * Переопределение view React компонента для кастомизации отображения
-     * @example MyCustomView
-     */
-    view?: any;
-    /**
-     */
-    viewProps?: any;
-    /**
-     * Размер Input
-     * @example 'large'
-     */
-    size?: Size;
-    /**
-     * Объект CSS стилей
-     * @example {width: '45%'}
-     */
-    style?: any;
     /**
      * Изображение или React-нода, которая будет отрендерена слева от поля.
      * @example require('icon.png') | <component/>
@@ -66,34 +63,38 @@ export interface IInputFieldProps extends IFieldWrapperInputProps {
     addonAfter?: ReactNode | string;
     /**
      * Конфигурация маски
-     * @example { mask: '+7 (999) 999-99-99' }
+     * @example: {
+         mask: [
+             ...Array(4).fill(/\d/),
+             '-',
+             ...Array(4).fill(/\d/),
+             '-',
+             ...Array(4).fill(/\d/),
+             '-',
+             ...Array(4).fill(/\d/),
+         ],
+        }
+     */
+    maskOptions?: MaskitoOptions;
+    /**
+     * Пользовательская иконка svg или название иконки
      */
-    maskProps?: any;
-    success?: boolean;
-    failed?: boolean;
-    [key: string]: any;
+    leadIcon?: React.ReactElement | string;
 }
 export interface IInputFieldViewProps extends IInputFieldProps, IFieldWrapperOutputProps {
-    style?: any;
-    errors?: string[];
-    placeholder?: string;
-    type?: string;
     inputProps: {
         type: string;
         name: string;
-        onChange: ChangeEventHandler<Element>;
+        onInput: (event: any, value?: string) => void;
         value: string | number;
         placeholder: string;
-        disabled: string;
+        disabled: boolean;
     };
-    textBefore?: number | ReactNode | string;
-    textAfter?: number | ReactNode | string;
-    addonBefore?: ReactNode | string;
-    addonAfter?: ReactNode | string;
-    maskProps?: any;
+    onClear?: () => void;
     onFocus?: (e: Event | React.FocusEvent) => void;
     onBlur?: (e: Event | React.FocusEvent) => void;
     onMouseDown?: (e: Event | React.MouseEvent) => void;
+    defaultValue?: string;
 }
 declare const _default: import("../Field/fieldWrapper").FieldWrapperComponent<IInputFieldProps>;
 export default _default;

package/ui/form/InputField/InputField.js

@@ -33,43 +33,83 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
+exports.MASK_PRESETS = void 0;
 var React = __importStar(require("react"));
-var react_input_mask_1 = __importDefault(require("react-input-mask"));
 var react_1 = require("react");
+var react_2 = require("@maskito/react");
+var kit_1 = require("@maskito/kit");
 var fieldWrapper_1 = __importDefault(require("../Field/fieldWrapper"));
 var hooks_1 = require("../../../hooks");
+exports.MASK_PRESETS = {
+    date: (0, kit_1.maskitoDateOptionsGenerator)({
+        mode: 'dd/mm/yyyy'
+    }),
+    phone: {
+        mask: __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([
+            '+',
+            '7',
+            ' ',
+            '('
+        ], Array(3).fill(/\d/), true), [
+            ')',
+            ' '
+        ], false), Array(3).fill(/\d/), true), [
+            '-'
+        ], false), Array(2).fill(/\d/), true), [
+            ' '
+        ], false), Array(2).fill(/\d/), true)
+    },
+    card: {
+        mask: __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], Array(4).fill(/\d/), true), [
+            '-'
+        ], false), Array(4).fill(/\d/), true), [
+            '-'
+        ], false), Array(4).fill(/\d/), true), [
+            '-'
+        ], false), Array(4).fill(/\d/), true)
+    }
+};
 function InputField(props) {
     var components = (0, hooks_1.useComponents)();
+    var maskedInputRef = (0, react_2.useMaskito)({
+        options: props.maskOptions
+    });
+    var _a = (0, hooks_1.useSaveCursorPosition)(props.input), inputRef = _a.inputRef, onChange = _a.onChange;
+    React.useEffect(function () {
+        if (inputRef.current) {
+            maskedInputRef(inputRef.current);
+        }
+    }, [inputRef, maskedInputRef]);
+    var onClear = React.useCallback(function () { return props.input.onChange(''); }, [props.input]);
     var inputProps = (0, react_1.useMemo)(function () {
         var _a;
-        return (__assign({ type: props.type, name: props.input.name, value: (_a = props.input.value) !== null && _a !== void 0 ? _a : '', onChange: function (value) { return props.input.onChange(value); }, placeholder: props.placeholder, disabled: props.disabled }, props.inputProps));
-    }, [props.disabled, props.input, props.inputProps, props.placeholder, props.type]);
+        return (__assign({ type: props.type, name: props.input.name, value: (_a = props.input.value) !== null && _a !== void 0 ? _a : '', onInput: onChange, placeholder: props.placeholder, disabled: props.disabled }, props.inputProps));
+    }, [onChange, props.disabled, props.input.name, props.input.value, props.inputProps, props.placeholder, props.type]);
     // No render for hidden input
     if (props.type === 'hidden') {
         return null;
     }
-    // react-input-mask HOC for mask
-    if (props.maskProps) {
-        var maskOnChange = function (e) { return props.input.onChange(e.target.value); };
-        return (React.createElement(react_input_mask_1["default"], __assign({}, inputProps, props.maskProps, { onChange: maskOnChange }), components.ui.renderView(props.view || 'form.InputFieldView', __assign(__assign(__assign({}, props), props.viewProps), { inputProps: inputProps, onChange: maskOnChange }))));
-    }
-    return components.ui.renderView(props.view || 'form.InputFieldView', __assign(__assign(__assign({}, props), props.viewProps), { inputProps: inputProps }));
+    return components.ui.renderView(props.view || 'form.InputFieldView', __assign(__assign(__assign({}, props), props.viewProps), { inputProps: inputProps, inputRef: inputRef, onClear: onClear }));
 }
 InputField.defaultProps = {
     type: 'text',
-    size: 'medium',
+    size: 'md',
     disabled: false,
     required: false,
-    className: '',
-    placeholder: '',
-    errors: null,
-    textBefore: null,
-    textAfter: null,
-    addonBefore: null,
-    addonAfter: null
+    showClear: false,
+    maskOptions: null
 };
 exports["default"] = (0, fieldWrapper_1["default"])('InputField', InputField);

package/ui/form/MaskField/MaskField.d.ts

@@ -0,0 +1,10 @@
+/// <reference types="react" />
+import { IInputFieldProps } from '../InputField/InputField';
+/**
+ * MaskField
+ *
+ * Компонент поля ввода текста с маской.
+ **/
+export type IMaskFieldProps = IInputFieldProps;
+declare function MaskField(props: IMaskFieldProps): JSX.Element;
+export default MaskField;

package/ui/form/MaskField/MaskField.js

@@ -0,0 +1,34 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+exports.__esModule = true;
+var react_1 = __importDefault(require("react"));
+var InputField_1 = __importDefault(require("../InputField/InputField"));
+function MaskField(props) {
+    var mask = props.mask, maskProps = props.maskProps, inputProps = __rest(props, ["mask", "maskProps"]);
+    return (react_1["default"].createElement(InputField_1["default"], __assign({}, inputProps, { maskOptions: props.maskOptions })));
+}
+exports["default"] = MaskField;

package/ui/form/MaskField/index.d.ts

@@ -0,0 +1,2 @@
+import MaskField from './MaskField';
+export default MaskField;

package/ui/form/MaskField/index.js

@@ -0,0 +1,7 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+exports.__esModule = true;
+var MaskField_1 = __importDefault(require("./MaskField"));
+exports["default"] = MaskField_1["default"];

package/ui/form/NavField/NavField.d.ts

@@ -3,9 +3,12 @@ import { IFieldWrapperInputProps, IFieldWrapperOutputProps } from '../../form/Fi
 import { IDataProviderConfig } from '../../../hooks/useDataProvider';
 /**
  * NavField
- * Навигация как часть формы
- */
-export interface INavFieldProps extends IFieldWrapperInputProps, IFieldWrapperOutputProps, IDataProviderConfig {
+ * Компонент навигации как часть формы.
+ *
+ * Этот компонент представляет собой навигационное меню, которое можно использовать
+ * как часть формы для выбора различных элементов или вкладок.
+ **/
+export interface INavFieldProps extends IFieldWrapperInputProps, IFieldWrapperOutputProps, IDataProviderConfig, IUiComponent {
     /**
      * Свойства для компонента Nav
      */

package/ui/form/NumberField/NumberField.d.ts

@@ -1,11 +1,12 @@
-import * as React from 'react';
-import { IInputFieldProps } from '../InputField/InputField';
-import { IFieldWrapperInputProps, IFieldWrapperOutputProps } from '../Field/fieldWrapper';
+import React, { ChangeEvent } from 'react';
+import { IBaseFieldProps } from '../InputField/InputField';
+import { IFieldWrapperOutputProps } from '../Field/fieldWrapper';
 /**
  * NumberField
- * Числовое поле ввода
- */
-export interface INumberFieldProps extends IInputFieldProps, IFieldWrapperInputProps {
+ *
+ * Числовое поле ввода. Этот компонент представляет собой поле ввода для числовых значений.
+ **/
+export interface INumberFieldProps extends IBaseFieldProps {
     /**
      * Минимальное значение
      * @example 1
@@ -20,21 +21,24 @@ export interface INumberFieldProps extends IInputFieldProps, IFieldWrapperInputP
      * Шаг увеличения/уменьшения значения
      * @example 5
      */
-    step?: string | number;
-    [key: string]: any;
+    step?: number;
 }
 export interface INumberFieldViewProps extends INumberFieldProps, IFieldWrapperOutputProps {
     inputProps: {
         type: string;
         name: string;
-        onChange: (value: Event | React.ChangeEvent) => void;
+        onChange: (value: ChangeEvent<HTMLInputElement> | string) => void;
         value: number;
         placeholder: string;
         disabled: boolean;
-        min: string | number;
-        max: string | number;
+        min: number;
+        max: number;
         step: string | number;
     };
+    inputRef: React.MutableRefObject<any>;
+    onStepUp: VoidFunction;
+    onStepDown: VoidFunction;
+    onKeyDown: VoidFunction;
 }
 declare const _default: import("../Field/fieldWrapper").FieldWrapperComponent<INumberFieldProps>;
 export default _default;

package/ui/form/NumberField/NumberField.js

@@ -14,25 +14,48 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
+/* eslint-disable max-len */
 var react_1 = require("react");
 var hooks_1 = require("../../../hooks");
 var fieldWrapper_1 = __importDefault(require("../Field/fieldWrapper"));
+var useInputTypeNumber_1 = __importDefault(require("./hooks/useInputTypeNumber"));
+var DEFAULT_STEP = 1;
 function NumberField(props) {
     var components = (0, hooks_1.useComponents)();
-    props.inputProps = (0, react_1.useMemo)(function () {
+    var _a = (0, hooks_1.useSaveCursorPosition)(props.input), currentInputRef = _a.inputRef, onChange = _a.onChange;
+    var onInputChange = (0, useInputTypeNumber_1["default"])(currentInputRef, {
+        max: props.max,
+        min: props.min,
+        value: props.input.value
+    }, onChange).onInputChange;
+    var onStep = (0, react_1.useCallback)(function (isIncrement) {
         var _a;
-        return (__assign({ name: props.input.name, value: (_a = props.input.value) !== null && _a !== void 0 ? _a : '', onChange: function (value) { return props.input.onChange(value); }, type: 'number', min: props.min, max: props.max, step: props.step, placeholder: props.placeholder, disabled: props.disabled }, props.inputProps));
-    }, [props.disabled, props.input, props.inputProps, props.placeholder, props.min, props.max, props.step]);
-    return components.ui.renderView(props.view || 'form.NumberFieldView', props);
+        var step = props.step || DEFAULT_STEP;
+        onChange(null, String(Number((_a = currentInputRef === null || currentInputRef === void 0 ? void 0 : currentInputRef.current) === null || _a === void 0 ? void 0 : _a.value) + (isIncrement ? step : -step)));
+    }, [currentInputRef, onChange, props.step]);
+    var onStepUp = (0, react_1.useCallback)(function () {
+        onStep(true);
+    }, [onStep]);
+    var onStepDown = (0, react_1.useCallback)(function () {
+        onStep(false);
+    }, [onStep]);
+    var onKeyDown = (0, react_1.useCallback)(function (event) {
+        if (event.key === 'ArrowUp') {
+            onStepUp();
+        }
+        else if (event.key === 'ArrowDown') {
+            onStepDown();
+        }
+    }, [onStepDown, onStepUp]);
+    var inputProps = (0, react_1.useMemo)(function () {
+        var _a;
+        return (__assign({ name: props.input.name, value: (_a = props.input.value) !== null && _a !== void 0 ? _a : '', onChange: onInputChange, type: 'text', min: props.min, max: props.max, step: props.step, placeholder: props.placeholder, disabled: props.disabled, autoComplete: 'off', onKeyDown: onKeyDown }, props.inputProps));
+    }, [props.input.name, props.input.value, props.min, props.max, props.step, props.placeholder, props.disabled, props.inputProps, onInputChange, onKeyDown]);
+    return components.ui.renderView(props.view || 'form.NumberFieldView', __assign(__assign({}, props), { inputProps: inputProps, onStepUp: onStepUp, onStepDown: onStepDown, inputRef: currentInputRef }));
 }
 NumberField.defaultProps = {
     disabled: false,
     required: false,
-    className: '',
-    placeholder: '',
-    min: null,
-    max: null,
-    step: null,
-    errors: null
+    size: 'md'
 };
 exports["default"] = (0, fieldWrapper_1["default"])('NumberField', NumberField);

package/ui/form/NumberField/hooks/useInputTypeNumber.d.ts

@@ -0,0 +1,10 @@
+import React from 'react';
+interface IInputTypeNumberProps {
+    max: any;
+    min: any;
+    value: any;
+}
+declare const useInputTypeNumber: (currentInputRef: React.MutableRefObject<HTMLInputElement>, inputTypeNumberProps: IInputTypeNumberProps, onChange: (event: React.ChangeEvent<HTMLInputElement>, value?: any) => void) => {
+    onInputChange: (event: React.ChangeEvent<HTMLInputElement>) => void;
+};
+export default useInputTypeNumber;

package/ui/form/NumberField/hooks/useInputTypeNumber.js

@@ -0,0 +1,45 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+exports.__esModule = true;
+var react_1 = __importDefault(require("react"));
+var useInputTypeNumber = function (currentInputRef, inputTypeNumberProps, onChange) {
+    var setValidity = react_1["default"].useCallback(function (message) {
+        var _a;
+        (_a = currentInputRef.current) === null || _a === void 0 ? void 0 : _a.setCustomValidity(message);
+    }, [currentInputRef]);
+    var checkIsValueFalsy = function (value) { return value === '' || value === null || value === undefined; };
+    react_1["default"].useEffect(function () {
+        var defaultValidity = 'The number is not included in the range';
+        // eslint-disable-next-line no-unused-expressions
+        inputTypeNumberProps.value > inputTypeNumberProps.max
+            || inputTypeNumberProps.value < inputTypeNumberProps.min
+            || checkIsValueFalsy(inputTypeNumberProps.value)
+            ? setValidity(__(defaultValidity) + " ".concat(inputTypeNumberProps.min, " \u2014 ").concat(inputTypeNumberProps.max))
+            : setValidity('');
+    }, [currentInputRef, inputTypeNumberProps.value, inputTypeNumberProps.max, inputTypeNumberProps.min, setValidity]);
+    var isValueNumeric = function (value) {
+        if (checkIsValueFalsy(value)) {
+            return true;
+        }
+        /**
+        * Подходят как отрицательные так и положительные числа
+        * @example -1
+        * @example 1
+        */
+        var numericRegex = /^-?\d*\.?\d+$/;
+        return numericRegex.test(value);
+    };
+    var onInputChange = function (event) {
+        var _a;
+        var value = (_a = event === null || event === void 0 ? void 0 : event.target) === null || _a === void 0 ? void 0 : _a.value;
+        if (isValueNumeric(value)) {
+            onChange(event);
+        }
+    };
+    return {
+        onInputChange: onInputChange
+    };
+};
+exports["default"] = useInputTypeNumber;

package/ui/form/PasswordField/PasswordField.d.ts

@@ -1,33 +1,39 @@
-import * as React from 'react';
-import { IInputFieldProps } from '../InputField/InputField';
+import { ChangeEvent } from 'react';
+import { IBaseFieldProps } from '../InputField/InputField';
 import { IFieldWrapperOutputProps } from '../Field/fieldWrapper';
+export declare enum InputType {
+    TEXT = "text",
+    PASSWORD = "password"
+}
 /**
  * PasswordField
- * Поле ввода пароля
- */
-export interface IPasswordFieldProps extends IInputFieldProps {
+ *
+ * Поле ввода пароля. Этот компонент представляет собой поле ввода для паролей.
+ *
+ **/
+export interface IPasswordFieldProps extends IBaseFieldProps {
     /**
-     * Если true, то отображается шкала сложности пароля и иконка 'отображения' пароля
+     * Если true, то отображается шкала сложности пароля
      * @example true
      */
-    security?: boolean;
-    [key: string]: any;
+    showSecurityBar?: boolean;
+    /**
+     * Если true, то отображается иконка скрытия/показа пароля
+     */
+    showSecurityIcon?: boolean;
 }
 export interface IPasswordFieldViewProps extends IPasswordFieldProps, IFieldWrapperOutputProps {
     inputProps: {
         type: string;
         name: string;
-        onChange: (value: Event | React.ChangeEvent) => void;
+        onChange: (value: Event | ChangeEvent) => void;
         value: string | number;
         placeholder: string;
         disabled: boolean;
     };
-    security?: boolean;
-    errors?: string[];
-    className?: CssClassName;
+    onShowButtonClick: () => void;
+    onClear?: () => void;
     securityLevel?: 'success' | 'warning' | 'danger';
-    onShowPassword: () => void;
-    onHidePassword: () => void;
 }
 export declare const checkPassword: (password: any) => "success" | "warning" | "danger";
 declare const _default: import("../Field/fieldWrapper").FieldWrapperComponent<IPasswordFieldProps>;

package/ui/form/PasswordField/PasswordField.js

@@ -14,10 +14,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-exports.checkPassword = void 0;
+exports.checkPassword = exports.InputType = void 0;
+/* eslint-disable no-unused-expressions */
 var react_1 = require("react");
 var hooks_1 = require("../../../hooks");
 var fieldWrapper_1 = __importDefault(require("../Field/fieldWrapper"));
+var InputType;
+(function (InputType) {
+    InputType["TEXT"] = "text";
+    InputType["PASSWORD"] = "password";
+})(InputType = exports.InputType || (exports.InputType = {}));
 var checkPassword = function (password) {
     if (!password) {
         return null;
@@ -47,20 +53,24 @@ var checkPassword = function (password) {
 };
 exports.checkPassword = checkPassword;
 function PasswordField(props) {
-    var _a = (0, react_1.useState)('password'), type = _a[0], setType = _a[1];
+    var _a = (0, react_1.useState)(InputType.PASSWORD), type = _a[0], setType = _a[1];
     var components = (0, hooks_1.useComponents)();
-    props.inputProps = (0, react_1.useMemo)(function () { return (__assign({ name: props.input.name, value: props.input.value || '', onChange: function (e) { return props.input.onChange(e.target ? e.target.value : e.nativeEvent.text); }, type: type, placeholder: props.placeholder, disabled: props.disabled }, props.inputProps)); }, [props.disabled, props.input, props.inputProps, props.placeholder, type]);
-    props.securityLevel = props.security ? (0, exports.checkPassword)(props.input.value) : null;
-    props.onShowPassword = function () { return setType('text'); };
-    props.onHidePassword = function () { return setType('password'); };
-    return components.ui.renderView(props.view || 'form.PasswordFieldView' || 'form.InputFieldView', props);
+    var _b = (0, hooks_1.useSaveCursorPosition)(props.input), inputRef = _b.inputRef, onChange = _b.onChange;
+    var onClear = (0, react_1.useCallback)(function () { return props.input.onChange(''); }, [props.input]);
+    var onShowButtonClick = (0, react_1.useCallback)(function () {
+        type === InputType.PASSWORD ? setType(InputType.TEXT) : setType(InputType.PASSWORD);
+    }, [type]);
+    var inputProps = (0, react_1.useMemo)(function () {
+        var _a;
+        return (__assign({ name: props.input.name, defaultValue: (_a = props.input.value) !== null && _a !== void 0 ? _a : '', onChange: onChange, type: type, placeholder: props.placeholder, disabled: props.disabled, ref: inputRef }, props.inputProps));
+    }, [inputRef, onChange, props.disabled, props.input.name, props.input.value, props.inputProps, props.placeholder, type]);
+    return components.ui.renderView(props.view || 'form.PasswordFieldView' || 'form.InputFieldView', __assign(__assign({}, props), { inputProps: inputProps, securityLevel: props.showSecurityBar ? (0, exports.checkPassword)(props.input.value) : null, onClear: onClear, onShowButtonClick: onShowButtonClick }));
 }
 PasswordField.defaultProps = {
     disabled: false,
-    security: false,
+    showSecurityBar: false,
+    showSecurityIcon: true,
     required: false,
-    className: '',
-    placeholder: '',
-    errors: null
+    size: 'md'
 };
 exports["default"] = (0, fieldWrapper_1["default"])('PasswordField', PasswordField);