@consta/uikit 3.15.0 → 3.17.0

package/__internal__/src/components/SliderCanary/SliderCanary.js

@@ -2,6 +2,7 @@ import { __assign, __read, __rest } from "tslib";
 import './Slider.css';
 import React, { forwardRef, useRef } from 'react';
 import { useFlag } from '../../hooks/useFlag/useFlag';
+import { useSortSteps } from '../../hooks/useSortSteps/useSortSteps';
 import { cn } from '../../utils/bem';
 import { getByMap } from '../../utils/getByMap';
 import { FieldCaption } from '../FieldCaption/FieldCaption';
@@ -25,6 +26,7 @@ function SliderRender(props, ref) {
     var leftButtonRef = useRef(null);
     var rightButtonRef = useRef(null);
     var sliderRef = useRef(null);
+    var sortedSteps = useSortSteps({ step: step, min: min, max: max });
     var IconRight = rightSide;
     var IconLeft = isNotRangeParams && props.leftSide && props.leftSide !== 'input' ? props.leftSide : undefined;
     var iconSize = getByMap(sizeMap, size);
@@ -34,13 +36,13 @@ function SliderRender(props, ref) {
         value: value,
         min: min,
         max: max,
-        step: step,
+        step: sortedSteps,
         onChange: onChange,
         onAfterChange: onAfterChange,
         sliderRef: sliderRef,
         buttonRefs: [leftButtonRef, rightButtonRef]
     }), onKeyPress = _l.onKeyPress, onFocus = _l.onFocus, handlePress = _l.handlePress, popoverPosition = _l.popoverPosition, activeButton = _l.activeButton, currentValue = _l.currentValue;
-    var _m = useSliderStationing(currentValue.length === 1 ? currentValue[0] : currentValue, min, max, view, range, step, [leftButtonRef, rightButtonRef], sliderRef), lineSizes = _m.lineSizes, buttonPositions = _m.buttonPositions;
+    var _m = useSliderStationing(currentValue.length === 1 ? currentValue[0] : currentValue, min, max, view, range, sortedSteps, [leftButtonRef, rightButtonRef], sliderRef), lineSizes = _m.lineSizes, buttonPositions = _m.buttonPositions;
     var changeHovered = function (status) {
         if (status)
             on();
@@ -51,7 +53,7 @@ function SliderRender(props, ref) {
         label && (React.createElement(FieldLabel, { className: cnSlider('Label'), size: size }, label)),
         React.createElement("div", { className: cnSlider('Container') },
             leftSide === 'input' && isNotRangeParams(props) && (React.createElement("div", { className: cnSlider('Side', { position: 'left' }) },
-                React.createElement(SliderInput, { value: props.value, onChange: function (params) { var _a; return isNotRangeParams(props) && ((_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, params)); }, size: size, min: min, max: max, status: status, step: step, disabled: disabled }))),
+                React.createElement(SliderInput, { value: props.value, onChange: function (params) { var _a; return isNotRangeParams(props) && ((_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, params)); }, size: size, min: min, max: max, status: status, step: sortedSteps, disabled: disabled }))),
             IconLeft && (React.createElement("div", { className: cnSlider('Side', { position: 'left' }) },
                 React.createElement(IconLeft, { size: iconSize, view: "secondary" }))),
             React.createElement("div", { className: cnSlider('Control'), ref: sliderRef },

package/__internal__/src/components/SliderCanary/SliderInput/SliderInput.d.ts

@@ -6,7 +6,7 @@ declare type Props = Omit<TextFieldProps<'number'>, 'value' | 'onChange' | 'min'
     min?: number;
     max?: number;
     onChange?: (props: {
-        e?: React.ChangeEvent | React.MouseEvent;
+        e?: React.ChangeEvent | React.MouseEvent | React.KeyboardEvent;
         value: number;
     }) => void;
 };

package/__internal__/src/components/SliderCanary/SliderInput/SliderInput.js

@@ -18,5 +18,5 @@ export var SliderInput = function (props) {
         setCurrentValue(validatedValue.toString());
     };
     useEffect(function () { return setCurrentValue(value.toString()); }, [value]);
-    return (React.createElement(TextField, __assign({ onBlur: commitChange, type: "number", min: min, max: max, step: Array.isArray(step) ? 1 : step, onChange: handleChange, value: currentValue }, otherProps)));
+    return (React.createElement(TextField, __assign({ onBlur: commitChange, type: "number", min: min, max: max, step: step, onChange: handleChange, value: currentValue }, otherProps)));
 };

package/__internal__/src/components/SliderCanary/useSlider/helper.js

@@ -1,4 +1,4 @@
-import { __read, __spread } from "tslib";
+import { __read } from "tslib";
 import { getSteps } from '../useSliderStationing';
 export var isRangeParams = function (params) {
     return !!params.range;
@@ -53,25 +53,18 @@ export var getValidValue = function (value, min, max, step) {
             return (Math.ceil(Number(value.toFixed(division ? division.length : 0)) / stepValue) * stepValue);
         }
         var resultValue_1 = value;
-        var stepsArr_1 = step;
-        if (step[0] !== min) {
-            stepsArr_1 = __spread([min], stepsArr_1);
-        }
-        else if (step[step.length - 1] !== max) {
-            stepsArr_1 = __spread(stepsArr_1, [max]);
-        }
-        stepsArr_1.forEach(function (stepPoint, index) {
+        step.forEach(function (stepPoint, index) {
             var minValue = min;
             var maxValue = max;
             if (index === 0) {
-                maxValue = stepsArr_1[index + 1];
+                maxValue = step[index + 1];
             }
-            else if (index === stepsArr_1.length - 1) {
+            else if (index === step.length - 1) {
                 minValue = stepPoint;
                 maxValue = max;
             }
             else {
-                maxValue = stepsArr_1[index + 1];
+                maxValue = step[index + 1];
                 minValue = stepPoint;
             }
             if (value <= maxValue && value >= minValue) {

package/__internal__/src/components/SliderCanary/useSlider/useSlider.js

@@ -52,7 +52,7 @@ export function useSlider(props) {
         });
     }, [step]);
     useEffect(function () {
-        if (typeof value !== 'undefined' && typeof step !== 'undefined') {
+        if (typeof value !== 'undefined') {
             var targetValue = isRangeParams(props)
                 ? [
                     getValidValue(props.value[0], min, max, step),
@@ -93,32 +93,24 @@ export function useSlider(props) {
             }
             if (validKeyCode) {
                 if (Array.isArray(step)) {
-                    var stepsArr_1 = __spread(step);
-                    if (step[0] !== minValue) {
-                        stepsArr_1 = __spread([minValue], stepsArr_1);
-                    }
-                    if (step[step.length - 1] !== maxValue) {
-                        stepsArr_1 = __spread(stepsArr_1, [maxValue]);
-                    }
-                    stepsArr_1.forEach(function (stepPoint, index) {
+                    step.forEach(function (stepPoint, index) {
                         if (typeof typeButton === 'number' && changedValue_1 === stepPoint) {
                             if (stepIncrement_1 >= 0) {
                                 if (index === 0) {
-                                    stepIncrement_1 = stepsArr_1[1] - minValue;
+                                    stepIncrement_1 = step[1] - minValue;
                                 }
                                 else {
                                     stepIncrement_1 =
-                                        (typeof stepsArr_1[index + 1] !== 'undefined'
-                                            ? stepsArr_1[index + 1]
-                                            : maxValue) - stepPoint;
+                                        (typeof step[index + 1] !== 'undefined' ? step[index + 1] : maxValue) -
+                                            stepPoint;
                                 }
                             }
                             else if (index === 0) {
-                                stepIncrement_1 = minValue - stepsArr_1[1];
+                                stepIncrement_1 = minValue - step[1];
                             }
                             else {
                                 stepIncrement_1 =
-                                    (typeof stepsArr_1[index - 1] !== 'undefined' ? stepsArr_1[index - 1] : minValue) -
+                                    (typeof step[index - 1] !== 'undefined' ? step[index - 1] : minValue) -
                                         stepPoint;
                             }
                         }

package/__internal__/src/components/SliderCanary/useSliderStationing.js

@@ -4,17 +4,10 @@ export var getSteps = function (step, min, max) {
     var stepsArray = [];
     var size = min;
     if (Array.isArray(step)) {
-        step.forEach(function (stepSize) {
+        for (var i = 0; i < step.length - 1; i++) {
             stepsArray.push({
-                min: size,
-                max: stepSize
-            });
-            size += stepSize - size;
-        });
-        if (size !== max) {
-            stepsArray.push({
-                min: size,
-                max: max
+                min: step[i],
+                max: step[i + 1]
             });
         }
     }
@@ -30,6 +23,7 @@ export var getSteps = function (step, min, max) {
     return stepsArray;
 };
 export var useSliderStationing = function (value, min, max, view, range, step, buttonRefs, sliderLineRef) {
+    if (step === void 0) { step = 1; }
     var _a = __read(useState([]), 2), lineSizes = _a[0], setLineSizes = _a[1];
     var _b = __read(useState([]), 2), buttonPositions = _b[0], setButtonPositions = _b[1];
     var calculateLines = function () {

package/__internal__/src/components/SnackBar/SnackBar.d.ts

@@ -1,5 +1,5 @@
 import './SnackBar.css';
-import React from 'react';
-import { SnackBarProps } from './helper';
+import { SnackBarComponent } from './types';
 export declare const cnSnackBar: import("@bem-react/classname").ClassNameFormatter;
-export declare const SnackBar: React.FC<SnackBarProps>;
+export declare const SnackBar: SnackBarComponent;
+export * from './types';

package/__internal__/src/components/SnackBar/SnackBar.js

@@ -1,24 +1,24 @@
 import { __assign, __rest } from "tslib";
 import './SnackBar.css';
-import React, { createRef, useMemo } from 'react';
+import React, { forwardRef } from 'react';
 import { CSSTransition, TransitionGroup } from 'react-transition-group';
+import { useRefs } from '../../hooks/useRefs/useRefs';
 import { cn } from '../../utils/bem';
 import { cnForCssTransition } from '../../utils/cnForCssTransition';
 import { usePropsHandler } from '../EventInterceptor/usePropsHandler';
 import { SnackBarItem } from './SnackBarItem/SnackBarItem';
+import { getItem, withDefaultGetters } from './helper';
 export var cnSnackBar = cn('SnackBar');
 var cssTransitionClassNames = cnForCssTransition(cnSnackBar, 'Item');
-export var SnackBar = function (props) {
-    var _a = usePropsHandler('SnackBar', props), items = _a.items, className = _a.className, otherProps = __rest(_a, ["items", "className"]);
-    var refs = useMemo(function () {
-        var refArray = [];
-        for (var i = 0; i < items.length; i++) {
-            refArray[i] = createRef();
-        }
-        return refArray;
-    }, [items]);
-    return (React.createElement(TransitionGroup, __assign({}, otherProps, { className: cnSnackBar(null, [className]), appear: true, enter: true, exit: true }), items.map(function (item, index) {
-        return (React.createElement(CSSTransition, { nodeRef: refs[index], classNames: cssTransitionClassNames, key: item.key, timeout: 200 },
-            React.createElement(SnackBarItem, { item: item, ref: refs[index], className: cnSnackBar('Item') })));
-    })));
-};
+function SnackBarRender(propsComponent, ref) {
+    var props = usePropsHandler('SnackBar', withDefaultGetters(propsComponent));
+    var items = props.items, className = props.className, getItemKey = props.getItemKey, getItemActions = props.getItemActions, getItemAutoClose = props.getItemAutoClose, getItemIcon = props.getItemIcon, getItemMessage = props.getItemMessage, getItemOnAutoClose = props.getItemOnAutoClose, getItemOnClose = props.getItemOnClose, getItemShowProgress = props.getItemShowProgress, getItemStatus = props.getItemStatus, onItemClose = props.onItemClose, onItemAutoClose = props.onItemAutoClose, otherProps = __rest(props, ["items", "className", "getItemKey", "getItemActions", "getItemAutoClose", "getItemIcon", "getItemMessage", "getItemOnAutoClose", "getItemOnClose", "getItemShowProgress", "getItemStatus", "onItemClose", "onItemAutoClose"]);
+    var refs = useRefs(items.length);
+    return (React.createElement("div", __assign({ className: cnSnackBar(null, [className]), ref: ref }, otherProps),
+        React.createElement(TransitionGroup, { component: null, appear: true, enter: true, exit: true }, items.map(function (item, index) {
+            return (React.createElement(CSSTransition, { nodeRef: refs[index], classNames: cssTransitionClassNames, key: cnSnackBar('Item', { key: getItemKey(item) }), timeout: 200 },
+                React.createElement(SnackBarItem, __assign({ ref: refs[index], className: cnSnackBar('Item') }, getItem(item, props)))));
+        }))));
+}
+export var SnackBar = forwardRef(SnackBarRender);
+export * from './types';

package/__internal__/src/components/SnackBar/SnackBarActionButton/SnackBarActionButton.d.ts

@@ -1,4 +1,4 @@
 import './SnackBarActionButton.css';
 import React from 'react';
-import { SnackBarActionButtonProps } from '../helper';
+import { SnackBarActionButtonProps } from '../types';
 export declare const SnackBarActionButton: React.FC<SnackBarActionButtonProps>;

package/__internal__/src/components/SnackBar/SnackBarItem/SnackBarItem.d.ts

@@ -1,9 +1,7 @@
 import '../../Theme/_color/Theme_color_gpnDark.css';
 import './SnackBarItem.css';
 import React from 'react';
-import { PropsWithHTMLAttributesAndRef } from '../../../utils/types/PropsWithHTMLAttributes';
-import { SnackBarItemProps } from '../helper';
-declare type SnackBarItemComponent = (props: PropsWithHTMLAttributesAndRef<SnackBarItemProps, HTMLDivElement>) => React.ReactElement | null;
+import { SnackBarItemComponent, SnackBarItemProps } from '../types';
 export declare const cnSnackBarItem: import("@bem-react/classname").ClassNameFormatter;
+export declare function SnackBarItemRender(props: SnackBarItemProps, ref: React.Ref<HTMLDivElement>): JSX.Element;
 export declare const SnackBarItem: SnackBarItemComponent;
-export {};

package/__internal__/src/components/SnackBar/SnackBarItem/SnackBarItem.js

@@ -1,4 +1,4 @@
-import { __read } from "tslib";
+import { __assign, __read, __rest } from "tslib";
 import '../../Theme/_color/Theme_color_gpnDark.css';
 import './SnackBarItem.css';
 import React, { useEffect, useState } from 'react';
@@ -9,10 +9,10 @@ import { isNumber, isString } from '../../../utils/type-guards';
 import { Button } from '../../Button/Button';
 import { Text } from '../../Text/Text';
 import { cnTheme } from '../../Theme/Theme';
-import { snackBarItemStatusDefault, } from '../helper';
 import { SnackBarActionButton } from '../SnackBarActionButton/SnackBarActionButton';
 import { SnackBarLine } from '../SnackBarLine/SnackBarLine';
 import { SnackBarTimer } from '../SnackBarTimer/SnackBarTimer';
+import { snackBarItemStatusDefault, } from '../types';
 var defaultInitialTimerTime = 3;
 export var cnSnackBarItem = cn('SnackBarItem');
 var getAutoCloseTime = function (autoClose) {
@@ -24,9 +24,8 @@ var getAutoCloseTime = function (autoClose) {
     }
     return false;
 };
-export var SnackBarItem = React.forwardRef(function (props, ref) {
-    var item = props.item, className = props.className;
-    var onClose = item.onClose, autoClose = item.autoClose, showProgress = item.showProgress, Icon = item.icon, message = item.message, actions = item.actions, _a = item.status, status = _a === void 0 ? snackBarItemStatusDefault : _a, onAutoCloseProp = item.onAutoClose;
+export function SnackBarItemRender(props, ref) {
+    var onClose = props.onClose, autoClose = props.autoClose, showProgress = props.showProgress, Icon = props.icon, message = props.message, actions = props.actions, _a = props.status, status = _a === void 0 ? snackBarItemStatusDefault : _a, onAutoCloseProp = props.onAutoClose, className = props.className, otherProps = __rest(props, ["onClose", "autoClose", "showProgress", "icon", "message", "actions", "status", "onAutoClose", "className"]);
     var _b = __read(useState(null), 2), timerFunctions = _b[0], setTimerFunctions = _b[1];
     var _c = __read(useFlag(false), 2), hover = _c[0], _d = _c[1], onHover = _d.on, offHover = _d.off;
     var _e = __read(useFlag(false), 2), timeIsOver = _e[0], onTimeIsOver = _e[1].on;
@@ -37,12 +36,12 @@ export var SnackBarItem = React.forwardRef(function (props, ref) {
     var handleMouseLeave = function () { return offHover(); };
     var autoCloseTime = getAutoCloseTime(autoClose);
     var hideAutoCloseTimer = showProgress === undefined || !(isNumber(autoCloseTime) && autoCloseTime > 0);
-    var onAutoClose = function (item) {
+    var onAutoClose = function () {
         if (onAutoCloseProp) {
-            onAutoCloseProp(item);
+            onAutoCloseProp();
         }
         else {
-            onClose && onClose(item);
+            onClose === null || onClose === void 0 ? void 0 : onClose();
         }
     };
     useEffect(function () {
@@ -57,13 +56,13 @@ export var SnackBarItem = React.forwardRef(function (props, ref) {
     }, [hover, timeIsOver, timerFunctions]);
     var handleTimeIsOver = function () {
         onTimeIsOver();
-        onAutoClose(item);
+        onAutoClose();
     };
-    var handleClose = onClose ? function () { return onClose(item); } : undefined;
-    return (React.createElement("div", { ref: ref, className: cnSnackBarItem({ status: status, showProgress: showProgress }, [
+    var handleClose = onClose ? function () { return onClose(); } : undefined;
+    return (React.createElement("div", __assign({ ref: ref, className: cnSnackBarItem({ status: status, showProgress: showProgress }, [
             cnTheme({ color: 'gpnDark' }),
             className,
-        ]), onMouseEnter: autoCloseTime ? handleMouseEnter : undefined, onMouseLeave: autoCloseTime ? handleMouseLeave : undefined },
+        ]), onMouseEnter: autoCloseTime ? handleMouseEnter : undefined, onMouseLeave: autoCloseTime ? handleMouseLeave : undefined }, otherProps),
         autoCloseTime && showProgress !== 'line' && (React.createElement(SnackBarTimer, { className: cnSnackBarItem('Timer'), onMount: handleMountTimer, onTimeIsOver: handleTimeIsOver, startTime: autoCloseTime, hidden: hideAutoCloseTimer })),
         hideAutoCloseTimer && Icon && React.createElement(Icon, { className: cnSnackBarItem('Icon'), size: "m" }),
         React.createElement("div", { className: cnSnackBarItem('Content') },
@@ -71,4 +70,5 @@ export var SnackBarItem = React.forwardRef(function (props, ref) {
             actions && (React.createElement(SnackBarActionButton, { actions: actions, className: cnSnackBarItem('ActionButton') }))),
         onClose && (React.createElement(Button, { className: cnSnackBarItem('CloseButton'), view: "clear", iconLeft: IconClose, form: "round", size: "xs", onClick: handleClose })),
         autoCloseTime && showProgress === 'line' && (React.createElement(SnackBarLine, { className: cnSnackBarItem('Line'), onMount: handleMountTimer, onTimeIsOver: handleTimeIsOver, startTime: autoCloseTime }))));
-});
+}
+export var SnackBarItem = React.forwardRef(SnackBarItemRender);

package/__internal__/src/components/SnackBar/SnackBarLine/SnackBarLine.d.ts

@@ -1,4 +1,4 @@
 import './SnackBarLine.css';
 import React from 'react';
-import { SnackBarTimerProps } from '../helper';
+import { SnackBarTimerProps } from '../types';
 export declare const SnackBarLine: React.FC<Omit<SnackBarTimerProps, 'hidden'>>;

package/__internal__/src/components/SnackBar/SnackBarTimer/SnackBarTimer.d.ts

@@ -1,4 +1,4 @@
 import './SnackBarTimer.css';
 import React from 'react';
-import { SnackBarTimerProps } from '../helper';
+import { SnackBarTimerProps } from '../types';
 export declare const SnackBarTimer: React.FC<SnackBarTimerProps>;