@alfalab/core-components 27.14.0 → 28.1.0

package/slider/Component.js

@@ -2,14 +2,13 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
 var cn = require('classnames');
-var mergeRefs = require('react-merge-refs');
-var hooks = require('@alfalab/hooks');
+var noUiSlider = require('nouislider');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cn__default = /*#__PURE__*/_interopDefaultLegacy(cn);
-var mergeRefs__default = /*#__PURE__*/_interopDefaultLegacy(mergeRefs);
+var noUiSlider__default = /*#__PURE__*/_interopDefaultLegacy(noUiSlider);
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -37,62 +36,62 @@ var __assign = function () {
     };
     return __assign.apply(this, arguments);
 };
-function __rest(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 styles = {"component":"slider__component_13rsq","progress":"slider__progress_13rsq","rangeWrapper":"slider__rangeWrapper_13rsq","range":"slider__range_13rsq","focused":"slider__focused_13rsq"};
+var styles = {"component":"slider__component_duhs7","s":"slider__s_duhs7","m":"slider__m_duhs7"};
 require('./index.css');
 
-var Slider = React.forwardRef(function (_a, ref) {
-    var _b;
-    var _c = _a.min, min = _c === void 0 ? 0 : _c, _d = _a.max, max = _d === void 0 ? 100 : _d, _e = _a.step, step = _e === void 0 ? 1 : _e, _f = _a.value, value = _f === void 0 ? 0 : _f, steps = _a.steps, className = _a.className, onChange = _a.onChange, dataTestId = _a.dataTestId, restProps = __rest(_a, ["min", "max", "step", "value", "steps", "className", "onChange", "dataTestId"]);
-    var inputRef = React.useRef(null);
-    var focused = hooks.useFocus(inputRef, 'keyboard')[0];
-    var range = max - min;
-    var dividedWithoutRemainder = range % step === 0;
-    var validValue = Math.max(min, Math.min(value, max));
-    var rangeProps = {
-        className: cn__default['default'](styles.range, (_b = {}, _b[styles.focused] = focused, _b)),
-        type: 'range',
-        min: min,
-        max: max,
-        value: validValue,
-        step: dividedWithoutRemainder ? step : undefined,
-    };
-    var progressProps = {
-        className: styles.progress,
-        max: range,
-        value: validValue - min,
-    };
-    var handleInputChange = React.useCallback(function (event) {
-        if (onChange) {
-            onChange(event, { value: +event.target.value });
-        }
+var Slider = function (_a) {
+    var _b = _a.min, min = _b === void 0 ? 0 : _b, _c = _a.max, max = _c === void 0 ? 100 : _c, _d = _a.step, step = _d === void 0 ? 1 : _d, _e = _a.value, value = _e === void 0 ? 0 : _e, disabled = _a.disabled, pips = _a.pips, _f = _a.range, range = _f === void 0 ? { min: min, max: max } : _f, _g = _a.size, size = _g === void 0 ? 's' : _g, className = _a.className, onChange = _a.onChange, dataTestId = _a.dataTestId;
+    var sliderRef = React.useRef(null);
+    var busyRef = React.useRef(false);
+    var getSlider = function () { var _a; return (_a = sliderRef.current) === null || _a === void 0 ? void 0 : _a.noUiSlider; };
+    React.useEffect(function () {
+        if (!sliderRef.current)
+            return;
+        var slider = noUiSlider__default['default'].create(sliderRef.current, {
+            start: [value],
+            connect: [true, false],
+            step: step,
+            pips: __assign(__assign({}, pips), { density: 100 }),
+            range: range,
+        });
+        slider.on('start', function () {
+            busyRef.current = true;
+        });
+        slider.on('change', function () {
+            busyRef.current = false;
+        });
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
+    React.useEffect(function () {
+        var slider = getSlider();
+        // Пропускаем обновление, если происходит взаимодействие со слайдером
+        if (slider && busyRef.current === false)
+            slider.set(value, false);
+    }, [value]);
+    React.useEffect(function () {
+        var slider = getSlider();
+        if (!slider)
+            return;
+        var newOptions = {
+            step: step,
+            pips: __assign(__assign({}, pips), { density: 100 }),
+            range: range,
+        };
+        slider.updateOptions(newOptions, true);
+    }, [pips, range, step]);
+    React.useEffect(function () {
+        var slider = getSlider();
+        if (!slider)
+            return;
+        slider.off('update.onChange');
+        slider.on('update.onChange', function () {
+            if (onChange && busyRef.current) {
+                onChange({ value: Number(slider.get()) });
+            }
+        });
     }, [onChange]);
-    return (React__default['default'].createElement("div", { className: cn__default['default'](styles.component, className), "data-test-id": dataTestId },
-        React__default['default'].createElement("div", { className: styles.rangeWrapper },
-            React__default['default'].createElement("input", __assign({}, rangeProps, restProps, { ref: mergeRefs__default['default']([ref, inputRef]), onChange: handleInputChange })),
-            steps),
-        React__default['default'].createElement("progress", __assign({}, progressProps))));
-});
-/**
- * Для отображения в сторибуке
- */
-Slider.defaultProps = {
-    min: 0,
-    max: 100,
-    step: 1,
-    value: 0,
+    return (React__default['default'].createElement("div", __assign({ className: cn__default['default'](styles.component, className, styles[size]), ref: sliderRef, "data-test-id": dataTestId }, { disabled: disabled })));
 };
 
 exports.Slider = Slider;

package/slider/cssm/Component.d.ts

@@ -1,8 +1,22 @@
-/// <reference types="react" />
-import React from 'react';
-import { InputHTMLAttributes, ChangeEvent, ReactNode } from "react";
-type NativeProps = Omit<InputHTMLAttributes<HTMLInputElement>, 'min' | 'max' | 'step' | 'value' | 'type' | 'onChange'>;
-type SliderProps = NativeProps & {
+import { FC } from 'react';
+type SubRange = number | [number] | [number, number];
+interface Range {
+    min: SubRange;
+    max: SubRange;
+    [key: string]: SubRange;
+}
+type PipsType = -1 | 0 | 1 | 2;
+type Pips = {
+    mode: 'range' | 'steps' | 'positions' | 'count' | 'values';
+    values: number | number[];
+    filter?: (value: number, type: PipsType) => PipsType;
+    format?: {
+        to: (value: number) => string | number;
+        from?: (value: string) => number | false;
+    };
+    stepped?: boolean;
+};
+type SliderProps = {
     /**
      * Мин. допустимое число
      */
@@ -16,54 +30,41 @@ type SliderProps = NativeProps & {
      */
     step?: number;
     /**
-     * Слот для возможности рендера шагов
-     */
-    steps?: ReactNode;
-    /**
-     * Значение инпута
-     */
-    value?: number;
-    /**
-     * Обработчик поля ввода
-     */
-    onChange?: (event: ChangeEvent<HTMLInputElement>, payload: {
-        value: number;
-    }) => void;
-    /**
-     * Идентификатор для систем автоматизированного тестирования
+     * Отображение подписей
+     * https://refreshless.com/nouislider/pips/
      */
-    dataTestId?: string;
-};
-declare const Slider: React.ForwardRefExoticComponent<Pick<React.InputHTMLAttributes<HTMLInputElement>, "accept" | "alt" | "autoComplete" | "autoFocus" | "capture" | "checked" | "crossOrigin" | "disabled" | "form" | "formAction" | "formEncType" | "formMethod" | "formNoValidate" | "formTarget" | "height" | "list" | "maxLength" | "minLength" | "multiple" | "name" | "pattern" | "placeholder" | "readOnly" | "required" | "size" | "src" | "width" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "className" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "hidden" | "id" | "lang" | "slot" | "spellCheck" | "style" | "tabIndex" | "title" | "translate" | "radioGroup" | "role" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "color" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "children" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture"> & {
+    pips?: Pips;
     /**
-     * Мин. допустимое число
+     * Настройка шагов
+     * https://refreshless.com/nouislider/pips/#section-range
      */
-    min?: number | undefined;
+    range?: Range;
     /**
-     * Макс. допустимое число
+     * Значение инпута
      */
-    max?: number | undefined;
+    value?: number;
     /**
-     * Шаг (должен нацело делить отрезок между мин и макс)
+     * Заблокированное состояние
      */
-    step?: number | undefined;
+    disabled?: boolean;
     /**
-     * Слот для возможности рендера шагов
+     * Дополнительный класс
      */
-    steps?: React.ReactNode;
+    className?: string;
     /**
-     * Значение инпута
+     * Размер
      */
-    value?: number | undefined;
+    size?: 's' | 'm';
     /**
      * Обработчик поля ввода
      */
-    onChange?: ((event: React.ChangeEvent<HTMLInputElement>, payload: {
+    onChange?: (payload: {
         value: number;
-    }) => void) | undefined;
+    }) => void;
     /**
      * Идентификатор для систем автоматизированного тестирования
      */
-    dataTestId?: string | undefined;
-} & React.RefAttributes<HTMLInputElement>>;
+    dataTestId?: string;
+};
+declare const Slider: FC<SliderProps>;
 export { SliderProps, Slider };

package/slider/cssm/Component.js

@@ -2,15 +2,14 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
 var cn = require('classnames');
-var mergeRefs = require('react-merge-refs');
-var hooks = require('@alfalab/hooks');
+var noUiSlider = require('nouislider');
 var styles = require('./index.module.css');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cn__default = /*#__PURE__*/_interopDefaultLegacy(cn);
-var mergeRefs__default = /*#__PURE__*/_interopDefaultLegacy(mergeRefs);
+var noUiSlider__default = /*#__PURE__*/_interopDefaultLegacy(noUiSlider);
 var styles__default = /*#__PURE__*/_interopDefaultLegacy(styles);
 
 /*! *****************************************************************************
@@ -39,59 +38,59 @@ var __assign = function () {
     };
     return __assign.apply(this, arguments);
 };
-function __rest(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 Slider = React.forwardRef(function (_a, ref) {
-    var _b;
-    var _c = _a.min, min = _c === void 0 ? 0 : _c, _d = _a.max, max = _d === void 0 ? 100 : _d, _e = _a.step, step = _e === void 0 ? 1 : _e, _f = _a.value, value = _f === void 0 ? 0 : _f, steps = _a.steps, className = _a.className, onChange = _a.onChange, dataTestId = _a.dataTestId, restProps = __rest(_a, ["min", "max", "step", "value", "steps", "className", "onChange", "dataTestId"]);
-    var inputRef = React.useRef(null);
-    var focused = hooks.useFocus(inputRef, 'keyboard')[0];
-    var range = max - min;
-    var dividedWithoutRemainder = range % step === 0;
-    var validValue = Math.max(min, Math.min(value, max));
-    var rangeProps = {
-        className: cn__default['default'](styles__default['default'].range, (_b = {}, _b[styles__default['default'].focused] = focused, _b)),
-        type: 'range',
-        min: min,
-        max: max,
-        value: validValue,
-        step: dividedWithoutRemainder ? step : undefined,
-    };
-    var progressProps = {
-        className: styles__default['default'].progress,
-        max: range,
-        value: validValue - min,
-    };
-    var handleInputChange = React.useCallback(function (event) {
-        if (onChange) {
-            onChange(event, { value: +event.target.value });
-        }
+var Slider = function (_a) {
+    var _b = _a.min, min = _b === void 0 ? 0 : _b, _c = _a.max, max = _c === void 0 ? 100 : _c, _d = _a.step, step = _d === void 0 ? 1 : _d, _e = _a.value, value = _e === void 0 ? 0 : _e, disabled = _a.disabled, pips = _a.pips, _f = _a.range, range = _f === void 0 ? { min: min, max: max } : _f, _g = _a.size, size = _g === void 0 ? 's' : _g, className = _a.className, onChange = _a.onChange, dataTestId = _a.dataTestId;
+    var sliderRef = React.useRef(null);
+    var busyRef = React.useRef(false);
+    var getSlider = function () { var _a; return (_a = sliderRef.current) === null || _a === void 0 ? void 0 : _a.noUiSlider; };
+    React.useEffect(function () {
+        if (!sliderRef.current)
+            return;
+        var slider = noUiSlider__default['default'].create(sliderRef.current, {
+            start: [value],
+            connect: [true, false],
+            step: step,
+            pips: __assign(__assign({}, pips), { density: 100 }),
+            range: range,
+        });
+        slider.on('start', function () {
+            busyRef.current = true;
+        });
+        slider.on('change', function () {
+            busyRef.current = false;
+        });
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
+    React.useEffect(function () {
+        var slider = getSlider();
+        // Пропускаем обновление, если происходит взаимодействие со слайдером
+        if (slider && busyRef.current === false)
+            slider.set(value, false);
+    }, [value]);
+    React.useEffect(function () {
+        var slider = getSlider();
+        if (!slider)
+            return;
+        var newOptions = {
+            step: step,
+            pips: __assign(__assign({}, pips), { density: 100 }),
+            range: range,
+        };
+        slider.updateOptions(newOptions, true);
+    }, [pips, range, step]);
+    React.useEffect(function () {
+        var slider = getSlider();
+        if (!slider)
+            return;
+        slider.off('update.onChange');
+        slider.on('update.onChange', function () {
+            if (onChange && busyRef.current) {
+                onChange({ value: Number(slider.get()) });
+            }
+        });
     }, [onChange]);
-    return (React__default['default'].createElement("div", { className: cn__default['default'](styles__default['default'].component, className), "data-test-id": dataTestId },
-        React__default['default'].createElement("div", { className: styles__default['default'].rangeWrapper },
-            React__default['default'].createElement("input", __assign({}, rangeProps, restProps, { ref: mergeRefs__default['default']([ref, inputRef]), onChange: handleInputChange })),
-            steps),
-        React__default['default'].createElement("progress", __assign({}, progressProps))));
-});
-/**
- * Для отображения в сторибуке
- */
-Slider.defaultProps = {
-    min: 0,
-    max: 100,
-    step: 1,
-    value: 0,
+    return (React__default['default'].createElement("div", __assign({ className: cn__default['default'](styles__default['default'].component, className, styles__default['default'][size]), ref: sliderRef, "data-test-id": dataTestId }, { disabled: disabled })));
 };
 
 exports.Slider = Slider;

package/slider/cssm/index.js

@@ -3,8 +3,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var Component = require('./Component.js');
 require('react');
 require('classnames');
-require('react-merge-refs');
-require('@alfalab/hooks');
+require('nouislider');
 require('./index.module.css');