@salutejs/plasma-new-hope 0.337.0-canary.2184.17981110340.0 → 0.337.0-canary.2184.18005913845.0

package/emotion/cjs/components/TimePicker/TimePicker.js

@@ -27,6 +27,7 @@ var _base1 = require("./variations/_view/base");
 var _base2 = require("./variations/_disabled/base");
 var _base3 = require("./variations/_readonly/base");
 var _useKeyboardNavigation = require("./hooks/useKeyboardNavigation");
+var _TimeColumn = require("./ui/TimeColumn/TimeColumn");
 function _array_like_to_array(arr, len) {
     if (len == null || len > arr.length) len = arr.length;
     for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
@@ -293,6 +294,7 @@ var timePickerRoot = function(Root) {
         var hours = (0, _utils1.range)(24);
         var minutes = (0, _utils1.range)(60);
         var seconds = (0, _utils1.range)(60);
+        var minScrollbarTrackHeight = 20;
         var calculateScrollbar = (0, _react.useCallback)(function(columnRef) {
             if (!columnRef.current) return {
                 thumbHeight: 0,
@@ -300,7 +302,7 @@ var timePickerRoot = function(Root) {
             };
             var _columnRef_current = columnRef.current, scrollTop = _columnRef_current.scrollTop, scrollHeight = _columnRef_current.scrollHeight, clientHeight = _columnRef_current.clientHeight;
             var trackHeight = clientHeight;
-            var thumbHeight = Math.max(trackHeight / scrollHeight * trackHeight, 20); // Минимальная высота 20px
+            var thumbHeight = Math.max(trackHeight / scrollHeight * trackHeight, minScrollbarTrackHeight);
             var maxScroll = scrollHeight - clientHeight;
             var thumbPosition = maxScroll > 0 ? scrollTop / maxScroll * (trackHeight - thumbHeight) : 0;
             return {
@@ -404,35 +406,37 @@ var timePickerRoot = function(Root) {
             };
         }, []);
         (0, _react.useEffect)(function() {
-            if (isInnerOpen) {
-                setTimeout(function() {
-                    updateScrollbar(hoursColumnRef, setHoursScrollbar);
-                    updateScrollbar(minutesColumnRef, setMinutesScrollbar);
-                    if (columnsQuantity === 3) {
-                        updateScrollbar(secondsColumnRef, setSecondsScrollbar);
-                    }
-                }, 100);
+            if (!isInnerOpen) {
+                return;
             }
+            setTimeout(function() {
+                updateScrollbar(hoursColumnRef, setHoursScrollbar);
+                updateScrollbar(minutesColumnRef, setMinutesScrollbar);
+                if (columnsQuantity === 3) {
+                    updateScrollbar(secondsColumnRef, setSecondsScrollbar);
+                }
+            }, 100);
         }, [
             isInnerOpen,
             columnsQuantity,
             updateScrollbar
         ]);
         (0, _react.useEffect)(function() {
-            if (viewValue) {
-                var timeString = viewValue;
-                if (format === 'HH:mm' && viewValue.length > 5) {
-                    timeString = viewValue.substring(0, 5);
-                }
-                setInnerTime(viewValue);
-                var _timeString_split_map = _sliced_to_array(timeString.split(':').map(Number), 3), hh = _timeString_split_map[0], mm = _timeString_split_map[1], ss = _timeString_split_map[2];
-                setActiveTime({
-                    hours: !Number.isNaN(hh) ? hh : null,
-                    minutes: !Number.isNaN(mm) ? mm : null,
-                    seconds: format === 'HH:mm:ss' && !Number.isNaN(ss) ? ss : null,
-                    currentColumn: null
-                });
+            if (!viewValue) {
+                return;
             }
+            var timeString = viewValue;
+            if (format === 'HH:mm' && viewValue.length > 5) {
+                timeString = viewValue.substring(0, 5);
+            }
+            setInnerTime(viewValue);
+            var _timeString_split_map = _sliced_to_array(timeString.split(_utils1.delimiter).map(Number), 3), hh = _timeString_split_map[0], mm = _timeString_split_map[1], ss = _timeString_split_map[2];
+            setActiveTime({
+                hours: !Number.isNaN(hh) ? hh : null,
+                minutes: !Number.isNaN(mm) ? mm : null,
+                seconds: format === 'HH:mm:ss' && !Number.isNaN(ss) ? ss : null,
+                currentColumn: null
+            });
         }, [
             outerValue,
             format
@@ -467,13 +471,7 @@ var timePickerRoot = function(Root) {
                     var scrollPosition = index * (itemHeight + gap);
                     (0, _utils1.animateScrollTo)(columnRef.current, scrollPosition);
                     setTimeout(function() {
-                        if (columnRef === hoursColumnRef) {
-                            updateScrollbar(hoursColumnRef, setHoursScrollbar);
-                        } else if (columnRef === minutesColumnRef) {
-                            updateScrollbar(minutesColumnRef, setMinutesScrollbar);
-                        } else if (columnRef === secondsColumnRef) {
-                            updateScrollbar(secondsColumnRef, setSecondsScrollbar);
-                        }
+                        updateScrollbar(columnRef, setHoursScrollbar);
                     }, 300);
                 }
             };
@@ -583,7 +581,7 @@ var timePickerRoot = function(Root) {
         };
         var handleTimeItemClick = function(value, column) {
             var isNextColumn = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : true;
-            var currentTime = innerTime.split(':');
+            var currentTime = innerTime.split(_utils1.delimiter);
             var newTime = [];
             if (format === 'HH:mm:ss') {
                 newTime = _to_consumable_array(currentTime);
@@ -603,10 +601,8 @@ var timePickerRoot = function(Root) {
                     if (!currentTime[1]) {
                         newTime[1] = '00';
                     }
-                    if (format === 'HH:mm:ss') {
-                        if (!currentTime[2]) {
-                            newTime[2] = '00';
-                        }
+                    if (format === 'HH:mm:ss' && !currentTime[2]) {
+                        newTime[2] = '00';
                     }
                     break;
                 case 'minutes':
@@ -614,10 +610,8 @@ var timePickerRoot = function(Root) {
                     if (!currentTime[0]) {
                         newTime[0] = '00';
                     }
-                    if (format === 'HH:mm:ss') {
-                        if (!currentTime[2]) {
-                            newTime[2] = '00';
-                        }
+                    if (format === 'HH:mm:ss' && !currentTime[2]) {
+                        newTime[2] = '00';
                     }
                     break;
                 case 'seconds':
@@ -634,7 +628,7 @@ var timePickerRoot = function(Root) {
                 default:
                     break;
             }
-            var newTimeString = newTime.join(':');
+            var newTimeString = newTime.join(_utils1.delimiter);
             setInnerTime(newTimeString);
             var nextColumn = null;
             if (column === 'hours' && isNextColumn) {
@@ -672,12 +666,14 @@ var timePickerRoot = function(Root) {
                     seconds: values.ss
                 });
             });
-            onChange === null || onChange === void 0 ? void 0 : onChange(_object_spread_props(_object_spread({}, event), {
-                target: _object_spread_props(_object_spread({}, event.target), {
-                    value: innerString,
-                    timeValues: values
-                })
-            }));
+            if (onChange) {
+                onChange(_object_spread_props(_object_spread({}, event), {
+                    target: _object_spread_props(_object_spread({}, event.target), {
+                        value: innerString,
+                        timeValues: values
+                    })
+                }));
+            }
             requestAnimationFrame(function() {
                 if (inputRef.current) {
                     inputRef.current.setSelectionRange(newCursorPosition, newCursorPosition);
@@ -696,9 +692,13 @@ var timePickerRoot = function(Root) {
                 onToggle === null || onToggle === void 0 ? void 0 : onToggle(true);
                 return;
             }
-            if (!isInnerOpen) return;
+            if (!isInnerOpen) {
+                return;
+            }
             var currentColumn = activeTime.currentColumn;
-            if (!currentColumn) return;
+            if (!currentColumn) {
+                return;
+            }
             var newIndex = null;
             var newColumn = currentColumn;
             if ([
@@ -751,8 +751,11 @@ var timePickerRoot = function(Root) {
                     }
                     break;
                 case 'ArrowLeft':
-                    if (currentColumn === 'minutes') newColumn = 'hours';
-                    else if (currentColumn === 'seconds') newColumn = 'minutes';
+                    if (currentColumn === 'minutes') {
+                        newColumn = 'hours';
+                    } else if (currentColumn === 'seconds') {
+                        newColumn = 'minutes';
+                    }
                     var _activeTime_newColumn1;
                     newIndex = (_activeTime_newColumn1 = activeTime[newColumn]) !== null && _activeTime_newColumn1 !== void 0 ? _activeTime_newColumn1 : 0;
                     setActiveTime(_object_spread_props(_object_spread({}, activeTime), _define_property({
@@ -772,11 +775,15 @@ var timePickerRoot = function(Root) {
                 handleTimeItemClick(value, column);
             }
         };
+        var handleOnKeyDown = function(e) {
+            onKeyDownNavigation(e);
+            handleKeyDown(e);
+        };
         var _useKeyNavigation = (0, _useKeyboardNavigation.useKeyNavigation)({
             isCalendarOpen: isInnerOpen,
             format: format,
             maskWithFormat: true,
-            delimiter: ':',
+            delimiter: _utils1.delimiter,
             closeOnEsc: closeOnEsc,
             onToggle: handleToggle
         }), onKeyDownNavigation = _useKeyNavigation.onKeyDown;
@@ -793,10 +800,7 @@ var timePickerRoot = function(Root) {
             textAfter: textAfter,
             onChange: handleInputChange,
             onFocus: onFocus,
-            onKeyDown: function(e) {
-                onKeyDownNavigation(e);
-                handleKeyDown(e);
-            },
+            onKeyDown: handleOnKeyDown,
             required: required,
             requiredPlacement: requiredPlacement,
             hasRequiredIndicator: hasRequiredIndicator,
@@ -804,43 +808,6 @@ var timePickerRoot = function(Root) {
             labelPlacement: labelPlacement,
             keepPlaceholder: keepPlaceholder
         });
-        var renderTimeColumn = function(values, column, columnRef, scrollbarState, setScrollbar, scrollbarRef, thumbRef, timeoutRef) {
-            return /*#__PURE__*/ _react.default.createElement("div", {
-                style: {
-                    position: 'relative',
-                    width: '100%'
-                }
-            }, /*#__PURE__*/ _react.default.createElement(_TimePickerstyles.StyledTimeColumn, {
-                key: column,
-                ref: columnRef,
-                height: dropdownHeight,
-                className: _TimePickertokens.classes.timeColumn
-            }, values.map(function(value, index) {
-                return /*#__PURE__*/ _react.default.createElement(_TimePickerstyles.StyledTimeItem, {
-                    key: value,
-                    ref: function(el) {
-                        timeItemRefs.current["".concat(column, "-").concat(value)] = el;
-                    },
-                    className: (0, _classnames.default)(_define_property({}, _TimePickertokens.classes.timeItemActive, activeTime[column] === index)),
-                    onClick: function() {
-                        return handleTimeItemClick(value, column);
-                    },
-                    onKeyDown: function(e) {
-                        return handleTimeItemKeyDown(e, column, value);
-                    }
-                }, value);
-            }), /*#__PURE__*/ _react.default.createElement(_TimePickerstyles.StyledEmpty, null)), /*#__PURE__*/ _react.default.createElement(_TimePickerstyles.CustomScrollbar, {
-                ref: scrollbarRef,
-                className: (0, _classnames.default)(_define_property({}, _TimePickertokens.classes.scrollbarVisible, scrollbarState.isVisible))
-            }, /*#__PURE__*/ _react.default.createElement(_TimePickerstyles.ScrollbarTrack, null, /*#__PURE__*/ _react.default.createElement(_TimePickerstyles.ScrollbarThumb, {
-                ref: thumbRef,
-                style: {
-                    height: "".concat(scrollbarState.thumbHeight, "px"),
-                    top: "".concat(scrollbarState.thumbPosition, "px")
-                },
-                onMouseDown: createScrollbarDragHandler(columnRef, setScrollbar, timeoutRef)
-            }))));
-        };
         return /*#__PURE__*/ _react.default.createElement(Root, _object_spread({
             stretched: stretched,
             view: view,
@@ -873,7 +840,52 @@ var timePickerRoot = function(Root) {
             stretched: stretched
         }, /*#__PURE__*/ _react.default.createElement(_TimePickerstyles.StyledTimePicker, {
             width: dropdownWidth
-        }, renderTimeColumn(hours, 'hours', hoursColumnRef, hoursScrollbar, setHoursScrollbar, hoursScrollbarRef, hoursThumbRef, hoursHideTimeoutRef), renderTimeColumn(minutes, 'minutes', minutesColumnRef, minutesScrollbar, setMinutesScrollbar, minutesScrollbarRef, minutesThumbRef, minutesHideTimeoutRef), columnsQuantity === 3 && renderTimeColumn(seconds, 'seconds', secondsColumnRef, secondsScrollbar, setSecondsScrollbar, secondsScrollbarRef, secondsThumbRef, secondsHideTimeoutRef)))));
+        }, (0, _TimeColumn.renderTimeColumn)({
+            values: hours,
+            dropdownHeight: dropdownHeight,
+            column: 'hours',
+            columnRef: hoursColumnRef,
+            scrollbarState: hoursScrollbar,
+            setScrollbar: setHoursScrollbar,
+            scrollbarRef: hoursScrollbarRef,
+            thumbRef: hoursThumbRef,
+            timeoutRef: hoursHideTimeoutRef,
+            timeItemRefs: timeItemRefs,
+            activeTime: activeTime,
+            handleTimeItemClick: handleTimeItemClick,
+            handleTimeItemKeyDown: handleTimeItemKeyDown,
+            createScrollbarDragHandler: createScrollbarDragHandler
+        }), (0, _TimeColumn.renderTimeColumn)({
+            values: minutes,
+            dropdownHeight: dropdownHeight,
+            column: 'minutes',
+            columnRef: minutesColumnRef,
+            scrollbarState: minutesScrollbar,
+            setScrollbar: setMinutesScrollbar,
+            scrollbarRef: minutesScrollbarRef,
+            thumbRef: minutesThumbRef,
+            timeoutRef: minutesHideTimeoutRef,
+            timeItemRefs: timeItemRefs,
+            activeTime: activeTime,
+            handleTimeItemClick: handleTimeItemClick,
+            handleTimeItemKeyDown: handleTimeItemKeyDown,
+            createScrollbarDragHandler: createScrollbarDragHandler
+        }), columnsQuantity === 3 && (0, _TimeColumn.renderTimeColumn)({
+            values: seconds,
+            dropdownHeight: dropdownHeight,
+            column: 'seconds',
+            columnRef: secondsColumnRef,
+            scrollbarState: secondsScrollbar,
+            setScrollbar: setSecondsScrollbar,
+            scrollbarRef: secondsScrollbarRef,
+            thumbRef: secondsThumbRef,
+            timeoutRef: secondsHideTimeoutRef,
+            timeItemRefs: timeItemRefs,
+            activeTime: activeTime,
+            handleTimeItemClick: handleTimeItemClick,
+            handleTimeItemKeyDown: handleTimeItemKeyDown,
+            createScrollbarDragHandler: createScrollbarDragHandler
+        })))));
     });
 };
 var timePickerConfig = {