@alfalab/core-components-number-input 1.3.0 → 2.0.0

package/esm/components/number-input/Component.js

@@ -1,101 +1,103 @@
 import { __rest, __assign } from 'tslib';
-import React, { useRef, useState } from 'react';
+import React, { forwardRef, useMemo, useState, useEffect } from 'react';
 import mergeRefs from 'react-merge-refs';
-import { createSeparatorsRegExp, getAllowedValue, SEPARATORS, SIGNS } from '../../utils.js';
+import { maskitoTransform } from '@maskito/core';
+import { useMaskito } from '@maskito/react';
+import cn from 'classnames';
+import { fnUtils, os } from '@alfalab/core-components-shared/esm';
+import { createMaskOptions, parseNumber, stringifyNumberWithoutExp, MAX_DIGITS, MIN_SAFE_INTEGER, MAX_SAFE_INTEGER, MINUS_SIGN } from '../../utils.js';
+import { Steppers } from '../steppers/Component.js';
+import '@alfalab/core-components-icon-button/esm';
+import '@alfalab/icons-glyph/MinusMIcon';
+import '@alfalab/icons-glyph/PlusMediumMIcon';
 
-var NumberInput = React.forwardRef(function (_a, ref) {
-    var propValue = _a.value, onChange = _a.onChange, onBlur = _a.onBlur, _b = _a.allowSigns, allowSigns = _b === void 0 ? true : _b, _c = _a.separator, separator = _c === void 0 ? ',' : _c, fractionLength = _a.fractionLength, defaultValue = _a.defaultValue, Input = _a.Input, restProps = __rest(_a, ["value", "onChange", "onBlur", "allowSigns", "separator", "fractionLength", "defaultValue", "Input"]);
-    var uncontrolled = propValue === undefined;
-    var inputRef = useRef(null);
-    var _d = useState(defaultValue || ''), value = _d[0], setValue = _d[1];
-    var getNumberValueFromStr = function (valueString) {
-        if (valueString === '')
-            return null;
-        if (valueString.includes(',')) {
-            return parseFloat(valueString.replace(',', '.'));
-        }
-        return parseFloat(valueString);
-    };
-    var restoreCaret = function (target) {
-        setTimeout(function () {
-            var input = target;
-            var positionCursor = input.selectionStart || 0;
-            var isEndPosition = input.value.length === positionCursor;
-            var enteredSign = SIGNS.some(function (s) { return s === input.value[positionCursor - 1]; });
-            var enteredSeparator = SEPARATORS.filter(function (s) { return s !== separator; }).some(function (s) { return s === input.value[positionCursor - 1]; });
-            var shouldRestore = enteredSeparator || enteredSign;
-            if (!isEndPosition && shouldRestore) {
-                input.selectionStart = positionCursor;
-                input.selectionEnd = positionCursor;
-            }
-        });
-    };
-    var handleChange = function (event) {
-        var input = event.target;
-        var newValue = input.value.replace(createSeparatorsRegExp(), separator);
-        var allowedValue = getAllowedValue({
-            value: newValue,
-            fractionLength: fractionLength,
-            allowSigns: allowSigns,
+var styles = {"steppers":"number-input__steppers_1g1qu","steppersFocused":"number-input__steppersFocused_1g1qu","steppersDisable":"number-input__steppersDisable_1g1qu","s":"number-input__s_1g1qu","m":"number-input__m_1g1qu"};
+require('./index.css')
+
+var NumberInput = forwardRef(function (_a, ref) {
+    var _b;
+    var propValue = _a.value, onChange = _a.onChange, _c = _a.separator, separator = _c === void 0 ? ',' : _c, _d = _a.fractionLength, fractionLength = _d === void 0 ? MAX_DIGITS : _d, defaultValue = _a.defaultValue, Input = _a.Input, minProp = _a.min, maxProp = _a.max, rightAddons = _a.rightAddons, dataTestId = _a.dataTestId, disabled = _a.disabled, onBlur = _a.onBlur, onFocus = _a.onFocus; _a.view; var stepProp = _a.step, _e = _a.size, size = _e === void 0 ? 's' : _e, disableUserInput = _a.disableUserInput, clearProp = _a.clear, restProps = __rest(_a, ["value", "onChange", "separator", "fractionLength", "defaultValue", "Input", "min", "max", "rightAddons", "dataTestId", "disabled", "onBlur", "onFocus", "view", "step", "size", "disableUserInput", "clear"]);
+    var min = Math.max(MIN_SAFE_INTEGER, minProp !== null && minProp !== void 0 ? minProp : MIN_SAFE_INTEGER);
+    var max = Math.min(MAX_SAFE_INTEGER, maxProp !== null && maxProp !== void 0 ? maxProp : MAX_SAFE_INTEGER);
+    var withStepper = stepProp !== undefined;
+    var maskOptions = useMemo(function () {
+        return createMaskOptions({
             separator: separator,
+            fractionLength: withStepper ? 0 : fractionLength,
+            min: min,
+            max: max,
         });
-        if (onChange) {
-            onChange(event, {
-                value: getNumberValueFromStr(allowedValue),
-                valueString: allowedValue,
-            });
-        }
-        if (uncontrolled) {
-            setValue(allowedValue);
-        }
-        restoreCaret(input);
-    };
-    var handleKeyDown = function (event) {
-        var disallowedSymbols = /[/|?!@#$%^&*()_=A-Za-zА-Яа-яЁё ]/;
-        var oneKeyPress = !event.altKey && !event.metaKey && !event.ctrlKey;
-        var target = event.target;
-        // Запрещаем вводить неразрешенные символы за исключением комбинаций клавиш
-        if (oneKeyPress && event.key.length === 1 && disallowedSymbols.test(event.key)) {
-            return event.preventDefault();
+    }, [separator, fractionLength, min, max, withStepper]);
+    var _f = useState(false), focused = _f[0], setFocused = _f[1];
+    var _g = useState(function () {
+        if (defaultValue == null) {
+            return withStepper ? fnUtils.clamp(0, min, max).toString() : '';
         }
-        var val = target.value;
-        var hasSeparator = (val.match(createSeparatorsRegExp()) || []).length > 0;
-        // Запрещаем вводить второй сепаратор
-        if (hasSeparator && SEPARATORS.some(function (s) { return s === event.key; })) {
-            return event.preventDefault();
-        }
-        // Запрещаем вводить лишний знак
-        if ((!allowSigns || SIGNS.some(function (s) { return s === val[0]; })) &&
-            SIGNS.some(function (s) { return s === event.key; })) {
-            return event.preventDefault();
-        }
-        var selectionStart = target.selectionStart || 0;
-        // Запрещаем вводить цифры в дробную часть, если кол-во цифр больше fractionLength
-        if (hasSeparator &&
-            fractionLength &&
-            event.key.length === 1 &&
-            selectionStart > val.indexOf(separator) &&
-            val.split(separator)[1].length >= fractionLength) {
-            return event.preventDefault();
+        return fnUtils
+            .clamp(parseNumber(maskitoTransform(defaultValue.toString(), maskOptions)), min, max)
+            .toString();
+    }), value = _g[0], setValue = _g[1];
+    var maskRef = useMaskito({ options: maskOptions });
+    useEffect(function () {
+        if (propValue !== undefined) {
+            setValue(function (prev) {
+                var parsedNumber = parseNumber(propValue);
+                if (parsedNumber !== parseNumber(prev)) {
+                    return maskitoTransform(stringifyNumberWithoutExp(parsedNumber), maskOptions);
+                }
+                return prev;
+            });
         }
-        return undefined;
+    }, [maskOptions, propValue, separator]);
+    var getMaxLength = function (valueString) {
+        var hasSeparator = valueString === null || valueString === void 0 ? void 0 : valueString.includes(separator);
+        var hasSigns = valueString === null || valueString === void 0 ? void 0 : valueString.startsWith(MINUS_SIGN);
+        return MAX_DIGITS + (hasSeparator ? 1 : 0) + (hasSigns ? 1 : 0);
     };
-    var handleBlur = function (event) {
-        var valueBlur = event.target.value.replace(new RegExp("\\".concat(separator, "$")), '');
-        if (onChange) {
-            onChange(event, {
-                value: getNumberValueFromStr(valueBlur),
-                valueString: valueBlur,
+    var getStep = function () { return Math.round(stepProp !== null && stepProp !== void 0 ? stepProp : 1); };
+    var changeValue = function (event, newValue) {
+        var _a, _b;
+        var isNaNValue = Number.isNaN(newValue);
+        var valueString = (_b = (_a = event === null || event === void 0 ? void 0 : event.target.value) !== null && _a !== void 0 ? _a : newValue === null || newValue === void 0 ? void 0 : newValue.toString()) !== null && _b !== void 0 ? _b : '';
+        setValue(valueString);
+        if (valueString === '' || !isNaNValue) {
+            onChange === null || onChange === void 0 ? void 0 : onChange(event, {
+                value: isNaNValue ? null : newValue,
             });
         }
-        if (uncontrolled) {
-            setValue(valueBlur);
+    };
+    var handleChange = function (event) {
+        var valueString = event.target.value;
+        changeValue(event, parseNumber(valueString));
+    };
+    var handleIncrement = function () {
+        var parsed = parseNumber(value);
+        var nextValue = maskitoTransform((Number.isNaN(parsed) ? min : parsed + getStep()).toString(), maskOptions);
+        changeValue(null, parseNumber(nextValue));
+    };
+    var handleDecrement = function () {
+        var parsed = parseNumber(value);
+        var nextValue = maskitoTransform((Number.isNaN(parsed) ? max : parsed - getStep()).toString(), maskOptions);
+        changeValue(null, parseNumber(nextValue));
+    };
+    var handleFocus = function (e) {
+        onFocus === null || onFocus === void 0 ? void 0 : onFocus(e);
+        if (!disableUserInput) {
+            setFocused(true);
         }
-        if (onBlur)
-            onBlur(event);
     };
-    var visibleValue = uncontrolled ? value : propValue === null || propValue === void 0 ? void 0 : propValue.toString();
-    return (React.createElement(Input, __assign({ ref: mergeRefs([ref, inputRef]), value: visibleValue, onBlur: handleBlur, onChange: handleChange, onKeyDown: handleKeyDown, inputMode: 'decimal' }, restProps)));
+    var handleBlur = function (e) {
+        onBlur === null || onBlur === void 0 ? void 0 : onBlur(e);
+        setFocused(false);
+    };
+    return (React.createElement(Input, __assign({ maxLength: getMaxLength(value) }, restProps, { 
+        // В iOS в цифровой клавиатуре невозможно ввести минус.
+        inputMode: min < 0 && os.isIOS() ? 'text' : 'decimal', ref: mergeRefs([ref, maskRef]), value: value, onInput: handleChange, dataTestId: dataTestId, disabled: disabled, onFocus: handleFocus, onBlur: handleBlur, size: size, disableUserInput: disableUserInput, clear: clearProp && /\d/.test(value), rightAddons: withStepper ? (React.createElement(React.Fragment, null,
+            rightAddons,
+            React.createElement(Steppers, { dataTestId: dataTestId, disabled: disabled, value: parseNumber(value), min: min, max: max, className: cn(styles.steppers, styles[size], (_b = {},
+                    _b[styles.steppersFocused] = focused,
+                    _b[styles.steppersDisable] = disabled,
+                    _b)), onIncrement: handleIncrement, onDecrement: handleDecrement }))) : (rightAddons) })));
 });
 
 export { NumberInput };

package/esm/components/number-input/index.css

@@ -0,0 +1,30 @@
+/* hash: ppwj9 */
+:root {
+} /* deprecated */ :root {
+    --color-light-neutral-0: #fff;
+    --color-light-neutral-translucent-200: rgba(30, 43, 68, 0.08); /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
+} :root { /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
+} :root {
+} :root {
+
+    /* Hard */
+
+    /* Up */
+
+    /* Hard up */
+} :root {
+} :root {
+    --gap-2xs-neg: -4px;
+    --gap-xs-neg: -8px;
+} :root {
+} :root {
+} .number-input__steppers_1g1qu {
+    background-color: var(--color-light-neutral-0);
+} .number-input__steppersFocused_1g1qu,
+.number-input__steppersDisable_1g1qu {
+    background-color: var(--color-light-neutral-translucent-200);
+} .number-input__s_1g1qu {
+    margin-right: var(--gap-xs-neg);
+} .number-input__m_1g1qu {
+    margin-right: var(--gap-2xs-neg);
+}

package/esm/components/number-input/index.js

@@ -2,4 +2,12 @@ export { NumberInput } from './Component.js';
 import 'tslib';
 import 'react';
 import 'react-merge-refs';
+import '@maskito/core';
+import '@maskito/react';
+import 'classnames';
+import '@alfalab/core-components-shared/esm';
 import '../../utils.js';
+import '../steppers/Component.js';
+import '@alfalab/core-components-icon-button/esm';
+import '@alfalab/icons-glyph/MinusMIcon';
+import '@alfalab/icons-glyph/PlusMediumMIcon';

package/esm/components/steppers/Component.d.ts

@@ -0,0 +1,14 @@
+/// <reference types="react" />
+import React from 'react';
+type SteppersProps = {
+    value: number;
+    min: number;
+    max: number;
+    className?: string;
+    disabled?: boolean;
+    onIncrement: () => void;
+    onDecrement: () => void;
+    dataTestId?: string;
+};
+declare const Steppers: React.FC<SteppersProps>;
+export { SteppersProps, Steppers };

package/esm/components/steppers/Component.js

@@ -0,0 +1,24 @@
+import React from 'react';
+import cn from 'classnames';
+import { IconButton } from '@alfalab/core-components-icon-button/esm';
+import { getDataTestId } from '@alfalab/core-components-shared/esm';
+import { MinusMIcon } from '@alfalab/icons-glyph/MinusMIcon';
+import { PlusMediumMIcon } from '@alfalab/icons-glyph/PlusMediumMIcon';
+
+var styles = {"component":"number-input__component_1k8eq","separator":"number-input__separator_1k8eq","button":"number-input__button_1k8eq"};
+require('./index.css')
+
+function preventDefault(e) {
+    e.preventDefault();
+}
+var Steppers = function (_a) {
+    var className = _a.className, onIncrement = _a.onIncrement, onDecrement = _a.onDecrement, value = _a.value, min = _a.min, max = _a.max, disabled = _a.disabled, dataTestId = _a.dataTestId;
+    var decButtonDisabled = disabled || value <= min;
+    var incButtonDisabled = disabled || value >= max;
+    return (React.createElement("div", { className: cn(styles.component, className) },
+        React.createElement(IconButton, { disabled: decButtonDisabled, className: styles.button, icon: React.createElement(MinusMIcon, null), "aria-label": '\u0443\u043C\u0435\u043D\u044C\u0448\u0438\u0442\u044C', onMouseDown: preventDefault, onClick: onDecrement, dataTestId: getDataTestId(dataTestId, 'decrement-button'), view: 'secondary' }),
+        React.createElement("div", { className: styles.separator }),
+        React.createElement(IconButton, { disabled: incButtonDisabled, className: styles.button, icon: React.createElement(PlusMediumMIcon, null), "aria-label": '\u0443\u0432\u0435\u043B\u0438\u0447\u0438\u0442\u044C', onMouseDown: preventDefault, onClick: onIncrement, dataTestId: getDataTestId(dataTestId, 'increment-button'), view: 'secondary' })));
+};
+
+export { Steppers };

package/esm/components/steppers/index.css

@@ -0,0 +1,32 @@
+/* hash: 1x7ch */
+:root {
+} /* deprecated */ :root {
+    --color-light-neutral-translucent-300: rgba(15, 25, 55, 0.1); /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
+} :root { /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */ /* deprecated */
+} :root {
+} :root {
+
+    /* Hard */
+
+    /* Up */
+
+    /* Hard up */
+} :root {
+} :root {
+} :root {
+} :root {
+} .number-input__component_1k8eq {
+    display: flex;
+    flex-flow: row nowrap;
+    align-items: center;
+    border-radius: 5px;
+    transition: background-color 0.2s ease;
+    overflow: visible;
+} .number-input__separator_1k8eq {
+    height: 18px;
+    width: 1px;
+    background-color: var(--color-light-neutral-translucent-300);
+} .number-input__button_1k8eq {
+    width: 40px;
+    height: 40px;
+}

package/esm/components/steppers/index.d.ts

@@ -0,0 +1 @@
+export * from "./Component";

package/esm/components/steppers/index.js

@@ -0,0 +1,7 @@
+export { Steppers } from './Component.js';
+import 'react';
+import 'classnames';
+import '@alfalab/core-components-icon-button/esm';
+import '@alfalab/core-components-shared/esm';
+import '@alfalab/icons-glyph/MinusMIcon';
+import '@alfalab/icons-glyph/PlusMediumMIcon';

package/esm/desktop/index.js

@@ -4,4 +4,12 @@ import 'react';
 import '@alfalab/core-components-input/esm/desktop';
 import '../components/number-input/Component.js';
 import 'react-merge-refs';
+import '@maskito/core';
+import '@maskito/react';
+import 'classnames';
+import '@alfalab/core-components-shared/esm';
 import '../utils.js';
+import '../components/steppers/Component.js';
+import '@alfalab/core-components-icon-button/esm';
+import '@alfalab/icons-glyph/MinusMIcon';
+import '@alfalab/icons-glyph/PlusMediumMIcon';

package/esm/index.js

@@ -2,6 +2,15 @@ export { NumberInputResponsive as NumberInput } from './Component.responsive.js'
 import 'tslib';
 import 'react';
 import '@alfalab/core-components-input/esm';
+import '@alfalab/core-components-mq/esm';
 import './components/number-input/Component.js';
 import 'react-merge-refs';
+import '@maskito/core';
+import '@maskito/react';
+import 'classnames';
+import '@alfalab/core-components-shared/esm';
 import './utils.js';
+import './components/steppers/Component.js';
+import '@alfalab/core-components-icon-button/esm';
+import '@alfalab/icons-glyph/MinusMIcon';
+import '@alfalab/icons-glyph/PlusMediumMIcon';

package/esm/mobile/index.js

@@ -4,4 +4,12 @@ import 'react';
 import '@alfalab/core-components-input/esm/mobile';
 import '../components/number-input/Component.js';
 import 'react-merge-refs';
+import '@maskito/core';
+import '@maskito/react';
+import 'classnames';
+import '@alfalab/core-components-shared/esm';
 import '../utils.js';
+import '../components/steppers/Component.js';
+import '@alfalab/core-components-icon-button/esm';
+import '@alfalab/icons-glyph/MinusMIcon';
+import '@alfalab/icons-glyph/PlusMediumMIcon';

package/esm/utils.d.ts

@@ -1,13 +1,23 @@
-declare const SIGNS: string[];
+import { MaskitoOptions, MaskitoPlugin } from '@maskito/core';
+declare const MINUS_SIGN = "-";
 declare const SEPARATORS: string[];
-declare function createSeparatorsRegExp(): RegExp;
+declare const MAX_SAFE_INTEGER: number;
+declare const MIN_SAFE_INTEGER: number;
+declare const MAX_DIGITS = 15;
+declare function parseNumber(value?: string | number | null): number;
 /**
- * Проверка вводимых значений.
+ * Преобразовать число в строку с заменой экспоненты на десятичную дробь
  */
-declare const getAllowedValue: ({ value, fractionLength, separator, allowSigns, }: {
-    value: string;
-    fractionLength?: number | undefined;
+declare function stringifyNumberWithoutExp(value: number): string;
+declare function createMaskOptions({ separator, fractionLength, min, max, }: {
     separator: string;
-    allowSigns: boolean;
-}) => string;
-export { SIGNS, SEPARATORS, createSeparatorsRegExp, getAllowedValue };
+    fractionLength: number;
+    min: number;
+    max: number;
+}): MaskitoOptions;
+declare function createMinMaxPlugin({ min, max }: {
+    min: number;
+    max: number;
+}): MaskitoPlugin;
+declare function createNotEmptyPartsPlugin(separator: string): MaskitoPlugin;
+export { MINUS_SIGN, SEPARATORS, MAX_SAFE_INTEGER, MIN_SAFE_INTEGER, MAX_DIGITS, parseNumber, stringifyNumberWithoutExp, createMaskOptions, createMinMaxPlugin, createNotEmptyPartsPlugin };