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

package/esm/utils.js

@@ -1,29 +1,246 @@
-var SIGNS = ['-', '+'];
+import { maskitoTransform } from '@maskito/core';
+import { fnUtils } from '@alfalab/core-components-shared/esm';
+
+/* eslint-disable no-param-reassign */
+var MINUS_SIGN = '-';
 var SEPARATORS = [',', '.'];
-function createSeparatorsRegExp() {
-    return new RegExp("[".concat(SEPARATORS.map(function (s) { return "\\".concat(s); }).join(''), "]"), 'g');
+var MAX_SAFE_INTEGER = Math.pow(2, 53) - 1;
+var MIN_SAFE_INTEGER = -MAX_SAFE_INTEGER;
+var MAX_DIGITS = 15; // с 16 уже упираемся в MAX_SAFE_INTEGER
+function parseNumber(value) {
+    if (value === void 0) { value = ''; }
+    if (typeof value === 'number')
+        return value;
+    var pseudoSeparatorsRegExp = new RegExp("[".concat(SEPARATORS.join(''), "]"), 'gi');
+    return value
+        ? parseFloat(value
+            .replace(new RegExp("[^".concat(MINUS_SIGN).concat(SEPARATORS.join(''), "0-9]"), 'gi'), '')
+            .replace(pseudoSeparatorsRegExp, '.'))
+        : NaN;
 }
-var getNumberRegExp = function (fractionLength) {
-    var reStr = '[0-9]+';
+/**
+ * Преобразовать число в строку с заменой экспоненты на десятичную дробь
+ */
+function stringifyNumberWithoutExp(value) {
+    var valueString = String(value);
+    var _a = valueString.split('e-'), numberPart = _a[0], expPart = _a[1];
+    var valueWithoutExp = valueString;
+    if (expPart) {
+        var _b = numberPart.split('.'), fractionalPart = _b[1];
+        var decimalDigits = Number(expPart) + ((fractionalPart === null || fractionalPart === void 0 ? void 0 : fractionalPart.length) || 0);
+        valueWithoutExp = value.toFixed(decimalDigits);
+    }
+    return valueWithoutExp;
+}
+var getNumberRegExp = function (min, fractionLength) {
+    var reStr = '[0-9]*';
+    if (min < 0) {
+        reStr = "(\\".concat(MINUS_SIGN, ")?").concat(reStr);
+    }
     if (fractionLength !== 0) {
-        reStr = "".concat(reStr, "[").concat(SEPARATORS.map(function (s) { return "\\".concat(s); }).join(''), "]?[0-9]{0,").concat(fractionLength || Number.MAX_SAFE_INTEGER, "}");
+        reStr = "".concat(reStr, "[").concat(SEPARATORS.map(function (s) { return "\\".concat(s); }).join(''), "]?[0-9]{0,").concat(fractionLength || MAX_DIGITS, "}");
     }
     return new RegExp("^".concat(reStr, "$"));
 };
+function createMaskOptions(_a) {
+    var separator = _a.separator, fractionLength = _a.fractionLength, min = _a.min, max = _a.max;
+    return {
+        mask: getNumberRegExp(min, fractionLength),
+        preprocessors: [
+            createPseudoSeparatorPreprocessor(separator),
+            createNotEmptyIntegerPartPreprocessor({ separator: separator, fractionLength: fractionLength }),
+            createZeroFractionLengthPreprocessor(fractionLength, separator),
+            createRepeatedSeparatorPreprocessor(separator),
+        ],
+        postprocessors: [
+            createLeadingZeroesValidationPostprocessor(separator),
+            createMinMaxPostprocessor({ min: min, max: max, separator: separator }),
+        ],
+        plugins: [createNotEmptyPartsPlugin(separator), createMinMaxPlugin({ min: min, max: max })],
+    };
+}
 /**
- * Проверка вводимых значений.
+ *  Заполняет целочисленную часть при вводе separator.
+ *  @example Type , => 0,
  */
-var getAllowedValue = function (_a) {
-    var _b = _a.value, value = _b === void 0 ? '' : _b, fractionLength = _a.fractionLength, separator = _a.separator, allowSigns = _a.allowSigns;
-    var sign = allowSigns && SIGNS.some(function (s) { return s === value[0]; }) ? value[0] : '';
-    var testedValue = sign ? value.slice(1) : value;
-    if (getNumberRegExp(fractionLength).test(testedValue)) {
-        return value;
+function createNotEmptyIntegerPartPreprocessor(_a) {
+    var separator = _a.separator, fractionLength = _a.fractionLength;
+    var startWithDecimalSepRegExp = new RegExp("^\\D*\\".concat(separator));
+    return function (_a) {
+        var elementState = _a.elementState, data = _a.data;
+        var value = elementState.value, selection = elementState.selection;
+        var from = selection[0];
+        if (fractionLength <= 0 ||
+            value.includes(separator) ||
+            !data.match(startWithDecimalSepRegExp)) {
+            return { elementState: elementState, data: data };
+        }
+        var digitsBeforeCursor = value.slice(0, from).match(/\d+/);
+        return {
+            elementState: elementState,
+            data: digitsBeforeCursor ? data : "0".concat(data),
+        };
+    };
+}
+/**
+ * Не позволяет вводить невалидный разделитель.
+ */
+function createPseudoSeparatorPreprocessor(separator) {
+    var pseudoSeparatorsRegExp = new RegExp("[".concat(SEPARATORS.join(''), "]"), 'gi');
+    return function (_a) {
+        var elementState = _a.elementState, data = _a.data;
+        var value = elementState.value, selection = elementState.selection;
+        return {
+            elementState: {
+                selection: selection,
+                value: value.replace(pseudoSeparatorsRegExp, separator),
+            },
+            data: data.replace(pseudoSeparatorsRegExp, separator),
+        };
+    };
+}
+/**
+ * Помогает верно обрезать значения при вставке, если fractionLength===0
+ * @example paste 123,123 -> 123
+ */
+function createZeroFractionLengthPreprocessor(fractionLength, separator) {
+    if (fractionLength > 0) {
+        return function (state) { return state; };
     }
-    var _c = testedValue
-        .split(separator)
-        .map(function (v) { return v.replace(/[^0-9]/g, ''); }), majorPart = _c[0], minorPart = _c[1];
-    return "".concat(sign).concat(majorPart).concat(minorPart ? separator + minorPart.slice(0, fractionLength) : '');
-};
+    var decimalPartRegExp = new RegExp("\\".concat(separator, ".*$"), 'g');
+    return function (_a) {
+        var elementState = _a.elementState, data = _a.data;
+        var value = elementState.value, selection = elementState.selection;
+        var from = selection[0], to = selection[1];
+        var newValue = value.replace(decimalPartRegExp, '');
+        return {
+            elementState: {
+                selection: [Math.min(from, newValue.length), Math.min(to, newValue.length)],
+                value: newValue,
+            },
+            data: data.replace(decimalPartRegExp, ''),
+        };
+    };
+}
+/**
+ *  Запрещает вводить второй сепаратор
+ */
+function createRepeatedSeparatorPreprocessor(separator) {
+    return function (_a) {
+        var elementState = _a.elementState, data = _a.data;
+        var value = elementState.value, selection = elementState.selection;
+        var from = selection[0], to = selection[1];
+        return {
+            elementState: elementState,
+            data: !value.includes(separator) || value.slice(from, to + 1).includes(separator)
+                ? data
+                : data.replace(new RegExp("\\".concat(separator)), ''),
+        };
+    };
+}
+/**
+ * Удаляет лишние нули в начале целой части.
+ * @example 0,|00005 => Backspace => |5
+ * @example -0,|00005 => Backspace => -|5
+ * @example "000000" => 0|
+ * @example 0| => Type "5" => 5|
+ */
+function createLeadingZeroesValidationPostprocessor(separator) {
+    var trimLeadingZeroes = function (value) {
+        return value
+            .replace(new RegExp('^(\\D+)?0+(?=0)'), '$1')
+            .replace(new RegExp('^(\\D+)?0+(?=[1-9])'), '$1');
+    };
+    var countTrimmedZeroesBefore = function (value, index) {
+        var valueBefore = value.slice(0, index);
+        var followedByZero = value.slice(index).startsWith('0');
+        return (valueBefore.length - trimLeadingZeroes(valueBefore).length + (followedByZero ? 1 : 0));
+    };
+    return function (_a) {
+        var value = _a.value, selection = _a.selection;
+        var from = selection[0], to = selection[1];
+        var hasSeparator = value.includes(separator);
+        var _b = value.split(separator), integerPart = _b[0], _c = _b[1], decimalPart = _c === void 0 ? '' : _c;
+        var zeroTrimmedIntegerPart = trimLeadingZeroes(integerPart);
+        if (integerPart === zeroTrimmedIntegerPart) {
+            return { value: value, selection: selection };
+        }
+        var newFrom = from - countTrimmedZeroesBefore(value, from);
+        var newTo = to - countTrimmedZeroesBefore(value, to);
+        return {
+            value: zeroTrimmedIntegerPart + (hasSeparator ? separator : '') + decimalPart,
+            selection: [Math.max(newFrom, 0), Math.max(newTo, 0)],
+        };
+    };
+}
+/**
+ * Валидирует значение с учетом min max значений.
+ * Работает совместно с createMinMaxPlugin
+ */
+function createMinMaxPostprocessor(_a) {
+    var min = _a.min, max = _a.max, separator = _a.separator;
+    return function (_a) {
+        var value = _a.value, selection = _a.selection;
+        var parsedNumber = parseNumber(value);
+        var limitedValue = 
+        /**
+         * Здесь невозможно ограничить нижнюю границу, если пользователь вводит положительное число.
+         * То же самое для верхней границы и отрицательного числа.
+         * Если min=5, то без этого условия не получится ввести 40, похожая ситуация и с отрицательным max
+         */
+        parsedNumber > 0 ? Math.min(parsedNumber, max) : Math.max(parsedNumber, min);
+        if (!Number.isNaN(parsedNumber) && limitedValue !== parsedNumber) {
+            var newValue = "".concat(limitedValue).replace('.', separator);
+            return {
+                value: newValue,
+                selection: [newValue.length, newValue.length],
+            };
+        }
+        return {
+            value: value,
+            selection: selection,
+        };
+    };
+}
+function createMinMaxPlugin(_a) {
+    var min = _a.min, max = _a.max;
+    return function (element, options) {
+        var listener = function () {
+            var parsedNumber = parseNumber(element.value);
+            var clampedNumber = fnUtils.clamp(parsedNumber, min, max);
+            if (!Number.isNaN(parsedNumber) && parsedNumber !== clampedNumber) {
+                element.value = maskitoTransform(stringifyNumberWithoutExp(clampedNumber), options);
+                element.dispatchEvent(new Event('input', { bubbles: true }));
+            }
+        };
+        var evListenerOptions = { capture: true };
+        element.addEventListener('blur', listener, evListenerOptions);
+        return function () { return element.removeEventListener('blur', listener, evListenerOptions); };
+    };
+}
+function createNotEmptyPartsPlugin(separator) {
+    return function (element) {
+        var listener = function () {
+            var newValue = element.value
+                // 0,9000000 -> 0,9
+                .replace(new RegExp("(\\".concat(separator, "\\d*?)(0+$)")), '$1')
+                // ,2 => 0,2
+                .replace(new RegExp("^(\\D+)?\\".concat(separator)), "$10".concat(separator))
+                // 0, -> 0
+                .replace(new RegExp("\\".concat(separator, "$")), '')
+                // -0 -> 0
+                .replace(new RegExp("^".concat(MINUS_SIGN, "0$")), '0')
+                // - -> ''
+                .replace(new RegExp("^".concat(MINUS_SIGN, "$")), '');
+            if (newValue !== element.value) {
+                element.value = newValue;
+                element.dispatchEvent(new Event('input', { bubbles: true }));
+            }
+        };
+        var evListenerOptions = { capture: true };
+        element.addEventListener('blur', listener, evListenerOptions);
+        return function () { return element.removeEventListener('blur', listener, evListenerOptions); };
+    };
+}
 
-export { SEPARATORS, SIGNS, createSeparatorsRegExp, getAllowedValue };
+export { MAX_DIGITS, MAX_SAFE_INTEGER, MINUS_SIGN, MIN_SAFE_INTEGER, SEPARATORS, createMaskOptions, createMinMaxPlugin, createNotEmptyPartsPlugin, parseNumber, stringifyNumberWithoutExp };

package/index.js

@@ -6,9 +6,18 @@ var Component_responsive = require('./Component.responsive.js');
 require('tslib');
 require('react');
 require('@alfalab/core-components-input');
+require('@alfalab/core-components-mq');
 require('./components/number-input/Component.js');
 require('react-merge-refs');
+require('@maskito/core');
+require('@maskito/react');
+require('classnames');
+require('@alfalab/core-components-shared');
 require('./utils.js');
+require('./components/steppers/Component.js');
+require('@alfalab/core-components-icon-button');
+require('@alfalab/icons-glyph/MinusMIcon');
+require('@alfalab/icons-glyph/PlusMediumMIcon');
 
 
 

package/mobile/index.js

@@ -8,7 +8,15 @@ require('react');
 require('@alfalab/core-components-input/mobile');
 require('../components/number-input/Component.js');
 require('react-merge-refs');
+require('@maskito/core');
+require('@maskito/react');
+require('classnames');
+require('@alfalab/core-components-shared');
 require('../utils.js');
+require('../components/steppers/Component.js');
+require('@alfalab/core-components-icon-button');
+require('@alfalab/icons-glyph/MinusMIcon');
+require('@alfalab/icons-glyph/PlusMediumMIcon');
 
 
 

package/modern/Component.desktop.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import React from 'react';
 import { NumberInputProps } from "./components/number-input/index";
-type NumberInputDesktopProps = Omit<NumberInputProps, 'Input' | 'breakpoint'>;
+type NumberInputDesktopProps = Omit<NumberInputProps, 'Input' | 'breakpoint' | 'view'>;
 declare const NumberInputDesktop: React.ForwardRefExoticComponent<NumberInputDesktopProps & React.RefAttributes<HTMLInputElement>>;
 export { NumberInputDesktopProps, NumberInputDesktop };

package/modern/Component.desktop.js

@@ -2,8 +2,16 @@ import React, { forwardRef } from 'react';
 import { InputDesktop } from '@alfalab/core-components-input/modern/desktop';
 import { NumberInput } from './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';
 
-const NumberInputDesktop = forwardRef((props, ref) => React.createElement(NumberInput, { ...props, Input: InputDesktop, ref: ref }));
+const NumberInputDesktop = forwardRef((props, ref) => React.createElement(NumberInput, { ...props, Input: InputDesktop, ref: ref, view: 'desktop' }));
 
 export { NumberInputDesktop };

package/modern/Component.mobile.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import React from 'react';
 import { NumberInputProps } from "./components/number-input/index";
-type NumberInputMobileProps = Omit<NumberInputProps, 'Input' | 'breakpoint'>;
+type NumberInputMobileProps = Omit<NumberInputProps, 'Input' | 'breakpoint' | 'view'>;
 declare const NumberInputMobile: React.ForwardRefExoticComponent<NumberInputMobileProps & React.RefAttributes<HTMLInputElement>>;
 export { NumberInputMobileProps, NumberInputMobile };

package/modern/Component.mobile.js

@@ -2,8 +2,16 @@ import React, { forwardRef } from 'react';
 import { InputMobile } from '@alfalab/core-components-input/modern/mobile';
 import { NumberInput } from './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';
 
-const NumberInputMobile = forwardRef((props, ref) => React.createElement(NumberInput, { ...props, Input: InputMobile, ref: ref }));
+const NumberInputMobile = forwardRef((props, ref) => React.createElement(NumberInput, { ...props, Input: InputMobile, ref: ref, view: 'mobile' }));
 
 export { NumberInputMobile };

package/modern/Component.responsive.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import React from 'react';
 import { NumberInputProps } from "./components/number-input/index";
-type NumberInputResponsiveProps = Omit<NumberInputProps, 'Input'>;
+type NumberInputResponsiveProps = Omit<NumberInputProps, 'Input' | 'view'>;
 declare const NumberInputResponsive: React.ForwardRefExoticComponent<NumberInputResponsiveProps & React.RefAttributes<HTMLInputElement>>;
 export { NumberInputResponsiveProps, NumberInputResponsive };

package/modern/Component.responsive.js

@@ -1,9 +1,21 @@
 import React, { forwardRef } from 'react';
 import { Input } from '@alfalab/core-components-input/modern';
+import { useMatchMedia } from '@alfalab/core-components-mq/modern';
 import { NumberInput } from './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';
 
-const NumberInputResponsive = forwardRef((props, ref) => React.createElement(NumberInput, { ...props, Input: Input, ref: ref }));
+const NumberInputResponsive = forwardRef(({ breakpoint = 1024, defaultMatchMediaValue, ...restProps }, ref) => {
+    const [isDesktop] = useMatchMedia(`(min-width: ${breakpoint}px)`, defaultMatchMediaValue);
+    return (React.createElement(NumberInput, { ...restProps, Input: Input, ref: ref, view: isDesktop ? 'desktop' : 'mobile', breakpoint: breakpoint, defaultMatchMediaValue: defaultMatchMediaValue }));
+});
 
 export { NumberInputResponsive };

package/modern/components/number-input/Component.d.ts

@@ -1,80 +1,55 @@
 /// <reference types="react" />
 import React from 'react';
+import { ChangeEvent, FC, Ref } from "react";
 import { InputProps } from "@alfalab/core-components-input";
-type NumberInputProps = Omit<InputProps, 'value' | 'onChange' | 'type'> & {
+interface NumberInputProps extends Omit<InputProps, 'value' | 'onChange' | 'type' | 'defaultValue'> {
     /**
      * Значение поля ввода
      */
     value?: string | number | null;
     /**
-     * Учитывать знаки '+' и '-'
+     *  Значение по-умолчанию
      */
-    allowSigns?: boolean;
+    defaultValue?: string | number | null;
     /**
      * Разделитель ',' или '.'
      */
     separator?: '.' | ',';
     /**
      * Количество символов после разделителя
+     * Если указан проп step, то всегда 0
      */
     fractionLength?: number;
     /**
-     *  Компонент инпута
+     *  Шаг инкремента/декремента. Используйте только целочисленные значения
      */
-    Input: React.FC<InputProps & {
-        ref?: React.Ref<HTMLInputElement>;
-    }>;
+    step?: number;
     /**
-     * Обработчик события изменения значения
+     * Минимальное значение
+     * @default Number.MIN_SAFE_INTEGER
      */
-    onChange?: (e: React.ChangeEvent<HTMLInputElement>, payload: {
-        /**
-         * Числовое значение инпута
-         */
-        value: number | null;
-        /**
-         * Строковое значение инпута
-         * Используйте для изменения значения инпута
-         */
-        valueString: string;
-    }) => void;
-};
-declare const NumberInput: React.ForwardRefExoticComponent<Omit<InputProps, "value" | "onChange" | "type"> & {
+    min?: number;
     /**
-     * Значение поля ввода
+     * Максимальное значение
+     * @default Number.MAX_SAFE_INTEGER
      */
-    value?: string | number | null | undefined;
+    max?: number;
     /**
-     * Учитывать знаки '+' и '-'
+     * Отображение компонента в мобильном или десктопном виде
      */
-    allowSigns?: boolean | undefined;
-    /**
-     * Разделитель ',' или '.'
-     */
-    separator?: "," | "." | undefined;
-    /**
-     * Количество символов после разделителя
-     */
-    fractionLength?: number | undefined;
+    view?: 'desktop' | 'mobile';
     /**
      *  Компонент инпута
      */
-    Input: React.FC<InputProps & {
-        ref?: React.Ref<HTMLInputElement>;
+    Input: FC<InputProps & {
+        ref?: Ref<HTMLInputElement>;
     }>;
     /**
      * Обработчик события изменения значения
      */
-    onChange?: ((e: React.ChangeEvent<HTMLInputElement>, payload: {
-        /**
-         * Числовое значение инпута
-         */
+    onChange?: (e: ChangeEvent<HTMLInputElement> | null, payload: {
         value: number | null;
-        /**
-         * Строковое значение инпута
-         * Используйте для изменения значения инпута
-         */
-        valueString: string;
-    }) => void) | undefined;
-} & React.RefAttributes<HTMLInputElement>>;
+    }) => void;
+}
+declare const NumberInput: React.ForwardRefExoticComponent<NumberInputProps & React.RefAttributes<HTMLInputElement>>;
 export { NumberInputProps, NumberInput };