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

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

@@ -1,99 +1,97 @@
-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/modern';
+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/modern';
+import '@alfalab/icons-glyph/MinusMIcon';
+import '@alfalab/icons-glyph/PlusMediumMIcon';
 
-const NumberInput = React.forwardRef(({ value: propValue, onChange, onBlur, allowSigns = true, separator = ',', fractionLength, defaultValue, Input, ...restProps }, ref) => {
-    const uncontrolled = propValue === undefined;
-    const inputRef = useRef(null);
-    const [value, setValue] = useState(defaultValue || '');
-    const getNumberValueFromStr = (valueString) => {
-        if (valueString === '')
-            return null;
-        if (valueString.includes(',')) {
-            return parseFloat(valueString.replace(',', '.'));
+const 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')
+
+const NumberInput = forwardRef(({ value: propValue, onChange, separator = ',', fractionLength = MAX_DIGITS, defaultValue, Input, min: minProp, max: maxProp, rightAddons, dataTestId, disabled, onBlur, onFocus, view, step: stepProp, size = 's', disableUserInput, clear: clearProp, ...restProps }, ref) => {
+    const min = Math.max(MIN_SAFE_INTEGER, minProp ?? MIN_SAFE_INTEGER);
+    const max = Math.min(MAX_SAFE_INTEGER, maxProp ?? MAX_SAFE_INTEGER);
+    const withStepper = stepProp !== undefined;
+    const maskOptions = useMemo(() => createMaskOptions({
+        separator,
+        fractionLength: withStepper ? 0 : fractionLength,
+        min,
+        max,
+    }), [separator, fractionLength, min, max, withStepper]);
+    const [focused, setFocused] = useState(false);
+    const [value, setValue] = useState(() => {
+        if (defaultValue == null) {
+            return withStepper ? fnUtils.clamp(0, min, max).toString() : '';
         }
-        return parseFloat(valueString);
-    };
-    const restoreCaret = (target) => {
-        setTimeout(() => {
-            const input = target;
-            const positionCursor = input.selectionStart || 0;
-            const isEndPosition = input.value.length === positionCursor;
-            const enteredSign = SIGNS.some((s) => s === input.value[positionCursor - 1]);
-            const enteredSeparator = SEPARATORS.filter((s) => s !== separator).some((s) => s === input.value[positionCursor - 1]);
-            const shouldRestore = enteredSeparator || enteredSign;
-            if (!isEndPosition && shouldRestore) {
-                input.selectionStart = positionCursor;
-                input.selectionEnd = positionCursor;
-            }
-        });
-    };
-    const handleChange = (event) => {
-        const input = event.target;
-        const newValue = input.value.replace(createSeparatorsRegExp(), separator);
-        const allowedValue = getAllowedValue({
-            value: newValue,
-            fractionLength,
-            allowSigns,
-            separator,
-        });
-        if (onChange) {
-            onChange(event, {
-                value: getNumberValueFromStr(allowedValue),
-                valueString: allowedValue,
+        return fnUtils
+            .clamp(parseNumber(maskitoTransform(defaultValue.toString(), maskOptions)), min, max)
+            .toString();
+    });
+    const maskRef = useMaskito({ options: maskOptions });
+    useEffect(() => {
+        if (propValue !== undefined) {
+            setValue((prev) => {
+                const parsedNumber = parseNumber(propValue);
+                if (parsedNumber !== parseNumber(prev)) {
+                    return maskitoTransform(stringifyNumberWithoutExp(parsedNumber), maskOptions);
+                }
+                return prev;
             });
         }
-        if (uncontrolled) {
-            setValue(allowedValue);
-        }
-        restoreCaret(input);
-    };
-    const handleKeyDown = (event) => {
-        const disallowedSymbols = /[/|?!@#$%^&*()_=A-Za-zА-Яа-яЁё ]/;
-        const oneKeyPress = !event.altKey && !event.metaKey && !event.ctrlKey;
-        const target = event.target;
-        // Запрещаем вводить неразрешенные символы за исключением комбинаций клавиш
-        if (oneKeyPress && event.key.length === 1 && disallowedSymbols.test(event.key)) {
-            return event.preventDefault();
-        }
-        const val = target.value;
-        const hasSeparator = (val.match(createSeparatorsRegExp()) || []).length > 0;
-        // Запрещаем вводить второй сепаратор
-        if (hasSeparator && SEPARATORS.some((s) => s === event.key)) {
-            return event.preventDefault();
-        }
-        // Запрещаем вводить лишний знак
-        if ((!allowSigns || SIGNS.some((s) => s === val[0])) &&
-            SIGNS.some((s) => s === event.key)) {
-            return event.preventDefault();
-        }
-        const 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 undefined;
+    }, [maskOptions, propValue, separator]);
+    const getMaxLength = (valueString) => {
+        const hasSeparator = valueString?.includes(separator);
+        const hasSigns = valueString?.startsWith(MINUS_SIGN);
+        return MAX_DIGITS + (hasSeparator ? 1 : 0) + (hasSigns ? 1 : 0);
     };
-    const handleBlur = (event) => {
-        const valueBlur = event.target.value.replace(new RegExp(`\\${separator}$`), '');
-        if (onChange) {
-            onChange(event, {
-                value: getNumberValueFromStr(valueBlur),
-                valueString: valueBlur,
+    const getStep = () => Math.round(stepProp ?? 1);
+    const changeValue = (event, newValue) => {
+        const isNaNValue = Number.isNaN(newValue);
+        const valueString = event?.target.value ?? newValue?.toString() ?? '';
+        setValue(valueString);
+        if (valueString === '' || !isNaNValue) {
+            onChange?.(event, {
+                value: isNaNValue ? null : newValue,
             });
         }
-        if (uncontrolled) {
-            setValue(valueBlur);
+    };
+    const handleChange = (event) => {
+        const valueString = event.target.value;
+        changeValue(event, parseNumber(valueString));
+    };
+    const handleIncrement = () => {
+        const parsed = parseNumber(value);
+        const nextValue = maskitoTransform((Number.isNaN(parsed) ? min : parsed + getStep()).toString(), maskOptions);
+        changeValue(null, parseNumber(nextValue));
+    };
+    const handleDecrement = () => {
+        const parsed = parseNumber(value);
+        const nextValue = maskitoTransform((Number.isNaN(parsed) ? max : parsed - getStep()).toString(), maskOptions);
+        changeValue(null, parseNumber(nextValue));
+    };
+    const handleFocus = (e) => {
+        onFocus?.(e);
+        if (!disableUserInput) {
+            setFocused(true);
         }
-        if (onBlur)
-            onBlur(event);
     };
-    const visibleValue = uncontrolled ? value : propValue?.toString();
-    return (React.createElement(Input, { ref: mergeRefs([ref, inputRef]), value: visibleValue, onBlur: handleBlur, onChange: handleChange, onKeyDown: handleKeyDown, inputMode: 'decimal', ...restProps }));
+    const handleBlur = (e) => {
+        onBlur?.(e);
+        setFocused(false);
+    };
+    return (React.createElement(Input, { 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], {
+                    [styles.steppersFocused]: focused,
+                    [styles.steppersDisable]: disabled,
+                }), onIncrement: handleIncrement, onDecrement: handleDecrement }))) : (rightAddons) }));
 });
 
 export { NumberInput };

package/modern/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/modern/components/number-input/index.js

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

package/modern/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/modern/components/steppers/Component.js

@@ -0,0 +1,23 @@
+import React from 'react';
+import cn from 'classnames';
+import { IconButton } from '@alfalab/core-components-icon-button/modern';
+import { getDataTestId } from '@alfalab/core-components-shared/modern';
+import { MinusMIcon } from '@alfalab/icons-glyph/MinusMIcon';
+import { PlusMediumMIcon } from '@alfalab/icons-glyph/PlusMediumMIcon';
+
+const styles = {"component":"number-input__component_1k8eq","separator":"number-input__separator_1k8eq","button":"number-input__button_1k8eq"};
+require('./index.css')
+
+function preventDefault(e) {
+    e.preventDefault();
+}
+const Steppers = ({ className, onIncrement, onDecrement, value, min, max, disabled, dataTestId, }) => {
+    const decButtonDisabled = disabled || value <= min;
+    const 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/modern/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/modern/components/steppers/index.d.ts

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

package/modern/components/steppers/index.js

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

package/modern/desktop/index.d.ts

@@ -0,0 +1,2 @@
+export { NumberInputDesktop, NumberInputDesktopProps } from "../Component.desktop";
+export {};

package/modern/desktop/index.js

@@ -0,0 +1,14 @@
+export { NumberInputDesktop } from '../Component.desktop.js';
+import 'react';
+import '@alfalab/core-components-input/modern/desktop';
+import '../components/number-input/Component.js';
+import 'react-merge-refs';
+import '@maskito/core';
+import '@maskito/react';
+import 'classnames';
+import '@alfalab/core-components-shared/modern';
+import '../utils.js';
+import '../components/steppers/Component.js';
+import '@alfalab/core-components-icon-button/modern';
+import '@alfalab/icons-glyph/MinusMIcon';
+import '@alfalab/icons-glyph/PlusMediumMIcon';

package/modern/index.js

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

package/modern/mobile/index.d.ts

@@ -0,0 +1,2 @@
+export { NumberInputMobile, NumberInputMobileProps } from "../Component.mobile";
+export {};

package/modern/mobile/index.js

@@ -0,0 +1,14 @@
+export { NumberInputMobile } from '../Component.mobile.js';
+import 'react';
+import '@alfalab/core-components-input/modern/mobile';
+import '../components/number-input/Component.js';
+import 'react-merge-refs';
+import '@maskito/core';
+import '@maskito/react';
+import 'classnames';
+import '@alfalab/core-components-shared/modern';
+import '../utils.js';
+import '../components/steppers/Component.js';
+import '@alfalab/core-components-icon-button/modern';
+import '@alfalab/icons-glyph/MinusMIcon';
+import '@alfalab/icons-glyph/PlusMediumMIcon';

package/modern/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 };