@salutejs/plasma-new-hope 0.340.0-canary.2314.18974837629.0 → 0.340.0-canary.2316.18997801446.0

package/emotion/cjs/components/Calendar/CalendarBase/CalendarBase.js

@@ -217,6 +217,12 @@ var calendarBaseRoot = function(Root) {
         var innerRootRef = (0, _plasmacore.useForkRef)(rootRef, outerRootRef);
         var min = minDate && new Date(minDate);
         var max = maxDate && new Date(maxDate);
+        if (min) {
+            min.setHours(0, 0, 0);
+        }
+        if (max) {
+            max.setHours(23, 59, 59);
+        }
         var renderFrom = renderFromDate && new Date(renderFromDate);
         var _useReducer = _sliced_to_array((0, _react.useReducer)(_reducer.reducer, (0, _reducer.getInitialState)(value, min, renderFrom, type)), 2), state = _useReducer[0], dispatch = _useReducer[1];
         var date = state.date, calendarState = state.calendarState, startYear = state.startYear, size = state.size;

package/emotion/cjs/components/Calendar/CalendarDouble/CalendarDouble.js

@@ -218,6 +218,12 @@ var calendarDoubleRoot = function(Root) {
         var innerRootRef = (0, _plasmacore.useForkRef)(rootRef, outerRootRef);
         var min = minDate && new Date(minDate);
         var max = maxDate && new Date(maxDate);
+        if (min) {
+            min.setHours(0, 0, 0);
+        }
+        if (max) {
+            max.setHours(23, 59, 59);
+        }
         var _useReducer = _sliced_to_array((0, _react.useReducer)(_reducer.reducer, (0, _reducer.getInitialState)(value, min, renderFromDate, type, true)), 2), state = _useReducer[0], dispatch = _useReducer[1];
         var date = state.date, calendarState = state.calendarState, startYear = state.startYear, size = state.size;
         var _useState5 = _sliced_to_array((0, _react.useState)(date), 2), firstDate = _useState5[0], setFirstDate = _useState5[1];

package/emotion/cjs/components/Combobox/ComboboxNew/Combobox.js

@@ -206,7 +206,7 @@ function _unsupported_iterable_to_array(o, minLen) {
 var comboboxRoot = function(Root) {
     return /*#__PURE__*/ (0, _react.forwardRef)(function(props, ref) {
         var _getItemByFocused;
-        var name = props.name, multiple = props.multiple, outerValue = props.value, outerOnChange = props.onChange, defaultValue = props.defaultValue, isTargetAmount = props.isTargetAmount, targetAmount = props.targetAmount, items = props.items, _props_treeView = props.treeView, treeView = _props_treeView === void 0 ? false : _props_treeView, _props_arrowPlacement = props.arrowPlacement, arrowPlacement = _props_arrowPlacement === void 0 ? 'left' : _props_arrowPlacement, _props_placement = props.placement, placement = _props_placement === void 0 ? 'bottom-start' : _props_placement, label = props.label, placeholder = props.placeholder, helperText = props.helperText, contentLeft = props.contentLeft, textBefore = props.textBefore, textAfter = props.textAfter, _props_variant = props.variant, variant = _props_variant === void 0 ? 'normal' : _props_variant, listOverflow = props.listOverflow, listHeight = props.listHeight, listMaxHeight = props.listMaxHeight, listWidth = props.listWidth, portal = props.portal, renderItem = props.renderItem, view = props.view, size = props.size, labelPlacement = props.labelPlacement, keepPlaceholder = props.keepPlaceholder, _props_readOnly = props.readOnly, readOnly = _props_readOnly === void 0 ? false : _props_readOnly, _props_disabled = props.disabled, disabled = _props_disabled === void 0 ? false : _props_disabled, _props_alwaysOpened = props.alwaysOpened, alwaysOpened = _props_alwaysOpened === void 0 ? false : _props_alwaysOpened, filter = props.filter, outerCloseAfterSelect = props.closeAfterSelect, renderValue = props.renderValue, zIndex = props.zIndex, beforeList = props.beforeList, afterList = props.afterList, _props_virtual = props.virtual, virtual = _props_virtual === void 0 ? false : _props_virtual, hintView = props.hintView, hintSize = props.hintSize, emptyStateDescription = props.emptyStateDescription, onChangeValue = props.onChangeValue, onScroll = props.onScroll, onToggle = props.onToggle, _props_mode = props.mode, mode = _props_mode === void 0 ? 'default' : _props_mode, _props_chipClickArea = props.chipClickArea, chipClickArea = _props_chipClickArea === void 0 ? 'full' : _props_chipClickArea, // @ts-ignore
+        var name = props.name, multiple = props.multiple, outerValue = props.value, outerOnChange = props.onChange, defaultValue = props.defaultValue, isTargetAmount = props.isTargetAmount, targetAmount = props.targetAmount, items = props.items, _props_placement = props.placement, placement = _props_placement === void 0 ? 'bottom-start' : _props_placement, label = props.label, placeholder = props.placeholder, helperText = props.helperText, contentLeft = props.contentLeft, textBefore = props.textBefore, textAfter = props.textAfter, _props_variant = props.variant, variant = _props_variant === void 0 ? 'normal' : _props_variant, listOverflow = props.listOverflow, listHeight = props.listHeight, listMaxHeight = props.listMaxHeight, listWidth = props.listWidth, portal = props.portal, renderItem = props.renderItem, view = props.view, size = props.size, labelPlacement = props.labelPlacement, keepPlaceholder = props.keepPlaceholder, _props_readOnly = props.readOnly, readOnly = _props_readOnly === void 0 ? false : _props_readOnly, _props_disabled = props.disabled, disabled = _props_disabled === void 0 ? false : _props_disabled, _props_alwaysOpened = props.alwaysOpened, alwaysOpened = _props_alwaysOpened === void 0 ? false : _props_alwaysOpened, filter = props.filter, outerCloseAfterSelect = props.closeAfterSelect, renderValue = props.renderValue, zIndex = props.zIndex, beforeList = props.beforeList, afterList = props.afterList, _props_virtual = props.virtual, virtual = _props_virtual === void 0 ? false : _props_virtual, hintView = props.hintView, hintSize = props.hintSize, emptyStateDescription = props.emptyStateDescription, onChangeValue = props.onChangeValue, onScroll = props.onScroll, onToggle = props.onToggle, _props_mode = props.mode, mode = _props_mode === void 0 ? 'default' : _props_mode, _props_chipClickArea = props.chipClickArea, chipClickArea = _props_chipClickArea === void 0 ? 'full' : _props_chipClickArea, // @ts-ignore
         _offset = props._offset, rest = _object_without_properties(props, [
             "name",
             "multiple",
@@ -216,8 +216,6 @@ var comboboxRoot = function(Root) {
             "isTargetAmount",
             "targetAmount",
             "items",
-            "treeView",
-            "arrowPlacement",
             "placement",
             "label",
             "placeholder",
@@ -266,7 +264,7 @@ var comboboxRoot = function(Root) {
             return (0, _getPathMaps.getTreeMaps)(transformedItems);
         }, [
             items
-        ]), 3), valueToCheckedMap = _useMemo[0], valueToItemMap = _useMemo[1], valueToPathMap = _useMemo[2];
+        ]), 2), valueToCheckedMap = _useMemo[0], valueToItemMap = _useMemo[1];
         var _useState = _sliced_to_array((0, _react.useState)((0, _utils2.getTextValue)(multiple, outerValue, valueToItemMap, renderValue)), 2), textValue = _useState[0], setTextValue = _useState[1];
         var _useState1 = _sliced_to_array((0, _react.useState)(multiple ? [] : ''), 2), internalValue = _useState1[0], setInternalValue = _useState1[1];
         var value = outerValue !== null && outerValue !== undefined ? outerValue : internalValue;
@@ -296,7 +294,6 @@ var comboboxRoot = function(Root) {
         var _useReducer = _sliced_to_array((0, _react.useReducer)(_reducers.pathReducer, initialPath), 2), path = _useReducer[0], dispatchPath = _useReducer[1];
         var _useReducer1 = _sliced_to_array((0, _react.useReducer)(_reducers.focusedPathReducer, []), 2), focusedPath = _useReducer1[0], dispatchFocusedPath = _useReducer1[1];
         var _useState2 = _sliced_to_array((0, _react.useState)(valueToCheckedMap), 2), checked = _useState2[0], setChecked = _useState2[1];
-        var _useReducer2 = _sliced_to_array((0, _react.useReducer)(_reducers.treePathReducer, {}), 2), treePath = _useReducer2[0], dispatchTreePath = _useReducer2[1];
         var isCurrentListOpen = Boolean(path[0]);
         var activeDescendantItemValue = ((_getItemByFocused = (0, _useKeyboardNavigation.getItemByFocused)(focusedPath, focusedToValueMap)) === null || _getItemByFocused === void 0 ? void 0 : _getItemByFocused.value) || '';
         var withArrowInverse = isCurrentListOpen ? _Comboboxtokens.classes.arrowInverse : undefined;
@@ -381,9 +378,6 @@ var comboboxRoot = function(Root) {
                 dispatchPath({
                     type: 'reset'
                 });
-                dispatchTreePath({
-                    type: 'reset'
-                });
                 // Скроллим чипы к левому краю при закрытии компонента
                 var el = rootRef === null || rootRef === void 0 ? void 0 : (_rootRef_current = rootRef.current) === null || _rootRef_current === void 0 ? void 0 : _rootRef_current.querySelector('.input-scrollable-wrapper');
                 if (multiple && value.length > 0 && el) {
@@ -447,9 +441,6 @@ var comboboxRoot = function(Root) {
                 dispatchFocusedPath({
                     type: 'reset'
                 });
-                dispatchTreePath({
-                    type: 'reset'
-                });
             }
             if (onChange) {
                 onChange(newValues, item);
@@ -475,9 +466,6 @@ var comboboxRoot = function(Root) {
                 dispatchFocusedPath({
                     type: 'reset'
                 });
-                dispatchTreePath({
-                    type: 'reset'
-                });
             }
             // Закрываем список, если элемент уже выбран.
             if (mode === 'radio' && isCurrentChecked) {
@@ -608,23 +596,6 @@ var comboboxRoot = function(Root) {
         }, [
             defaultValue
         ]);
-        // Эффект для раскрытия дерева при поиске.
-        (0, _react.useLayoutEffect)(function() {
-            if (treeView) {
-                if (textValue === '') {
-                    dispatchTreePath({
-                        type: 'reset'
-                    });
-                } else {
-                    dispatchTreePath({
-                        type: 'expand_all',
-                        value: filteredItems
-                    });
-                }
-            }
-        }, [
-            textValue
-        ]);
         return /*#__PURE__*/ _react.default.createElement(Root, {
             size: size,
             view: view,
@@ -657,11 +628,7 @@ var comboboxRoot = function(Root) {
                 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                 // @ts-ignore
                 // eslint-disable-next-line no-underscore-dangle
-                _checkboxAppearance: rest._checkboxAppearance,
-                treePath: treePath,
-                dispatchTreePath: dispatchTreePath,
-                arrowPlacement: arrowPlacement,
-                valueToPathMap: valueToPathMap
+                _checkboxAppearance: rest._checkboxAppearance
             }
         }, /*#__PURE__*/ _react.default.createElement(_FloatingPopover.FloatingPopover, {
             ref: floatingPopoverRef,
@@ -727,18 +694,7 @@ var comboboxRoot = function(Root) {
             disabled: disabled,
             readOnly: readOnly,
             name: name
-        }, (0, _utils.isEmpty)(filteredItems) ? /*#__PURE__*/ _react.default.createElement(_Comboboxstyles.StyledEmptyState, {
-            className: _Comboboxtokens.classes.emptyStateWrapper,
-            size: size,
-            description: emptyStateDescription || 'Ничего не найдено'
-        }) : /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, treeView ? /*#__PURE__*/ _react.default.createElement(_ui.TreeList, {
-            items: filteredItems,
-            listMaxHeight: listMaxHeight || listHeight,
-            onScroll: virtual ? undefined : onScroll,
-            virtual: virtual,
-            beforeList: beforeList,
-            afterList: afterList
-        }) : /*#__PURE__*/ _react.default.createElement(_Comboboxstyles.ListWrapper, {
+        }, /*#__PURE__*/ _react.default.createElement(_Comboboxstyles.ListWrapper, {
             ref: listWrapperRef,
             listWidth: listWidth
         }, /*#__PURE__*/ _react.default.createElement(_Comboboxstyles.Ul, {
@@ -748,7 +704,11 @@ var comboboxRoot = function(Root) {
             listMaxHeight: listMaxHeight || listHeight,
             virtual: virtual,
             onScroll: virtual ? undefined : onScroll
-        }, beforeList, props.multiple && props.selectAllOptions && // TODO: #2004
+        }, beforeList, (0, _utils.isEmpty)(filteredItems) ? /*#__PURE__*/ _react.default.createElement(_Comboboxstyles.StyledEmptyState, {
+            className: _Comboboxtokens.classes.emptyStateWrapper,
+            size: size,
+            description: emptyStateDescription || 'Ничего не найдено'
+        }) : /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, props.multiple && props.selectAllOptions && // TODO: #2004
         /*#__PURE__*/ _react.default.createElement(_ui.SelectAll, {
             selectAllOptions: props.selectAllOptions,
             variant: variant
@@ -767,7 +727,7 @@ var comboboxRoot = function(Root) {
                 listWidth: listWidth,
                 portal: listWrapperRef
             });
-        }), afterList))))))));
+        })), afterList)))))));
     });
 };
 var comboboxConfig = {

package/emotion/cjs/components/Combobox/ComboboxNew/Combobox.tokens.js

@@ -54,8 +54,6 @@ var tokens = {
     itemIconMargin: '--plasma-combobox-item-icon-margin',
     itemBackgroundHover: '--plasma-combobox-item-background-hover',
     itemIconColor: '--plasma-combobox-item-icon-color',
-    itemGap: '--plasma-select-item-gap',
-    itemTreeOffsetWidth: '--plasma-select-item-tree-offset-width',
     cellPadding: '--plasma-combobox-cell-padding',
     cellPaddingLeftContent: '--plasma-combobox-cell-padding-left-content',
     cellPaddingContent: '--plasma-combobox-cell-padding-content',

package/emotion/cjs/components/Combobox/ComboboxNew/hooks/getPathMaps.js

@@ -17,31 +17,6 @@ _export(exports, {
     }
 });
 var _utils = require("../../../../utils");
-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];
-    return arr2;
-}
-function _array_without_holes(arr) {
-    if (Array.isArray(arr)) return _array_like_to_array(arr);
-}
-function _iterable_to_array(iter) {
-    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
-}
-function _non_iterable_spread() {
-    throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-function _to_consumable_array(arr) {
-    return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
-}
-function _unsupported_iterable_to_array(o, minLen) {
-    if (!o) return;
-    if (typeof o === "string") return _array_like_to_array(o, minLen);
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-    if (n === "Object" && o.constructor) n = o.constructor.name;
-    if (n === "Map" || n === "Set") return Array.from(n);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
-}
 var getPathMap = function(items) {
     var pathMap = new Map();
     var focusedToValueMap = new Map();
@@ -67,29 +42,22 @@ var getPathMap = function(items) {
 var getTreeMaps = function(items) {
     var valueToCheckedMap = new Map();
     var valueToItemMap = new Map();
-    var valueToPathMap = new Map();
     var rec = function(items) {
-        var prevIndex = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : '', path = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : [];
+        var prevIndex = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : '';
         items === null || items === void 0 ? void 0 : items.forEach(function(item, index) {
             var value = item.value, innerItems = item.items;
             var currIndex = "".concat(prevIndex, "/").concat(index).replace(/^(\/)/, '');
             valueToCheckedMap.set(value, false);
-            valueToPathMap.set(value.toString(), _to_consumable_array(path).concat([
-                value.toString()
-            ]));
             if ((0, _utils.isEmpty)(innerItems) || !innerItems) {
                 valueToItemMap.set(value, item);
             } else {
-                rec(innerItems, currIndex, _to_consumable_array(path).concat([
-                    value.toString()
-                ]));
+                rec(innerItems, currIndex);
             }
         });
     };
     rec(items);
     return [
         valueToCheckedMap,
-        valueToItemMap,
-        valueToPathMap
+        valueToItemMap
     ];
 };

package/emotion/cjs/components/Combobox/ComboboxNew/reducers/index.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 _export_star(require("./pathReducer"), exports);
 _export_star(require("./focusedPathReducer"), exports);
-_export_star(require("./treePathReducer"), exports);
 function _export_star(from, to) {
     Object.keys(from).forEach(function(k) {
         if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {

package/emotion/cjs/components/Combobox/ComboboxNew/ui/index.js

@@ -6,7 +6,6 @@ _export_star(require("./Inner/Inner"), exports);
 _export_star(require("./Target/Target"), exports);
 _export_star(require("./VirtualList/VirtualList"), exports);
 _export_star(require("./SelectAll/SelectAll"), exports);
-_export_star(require("./TreeList/TreeList"), exports);
 function _export_star(from, to) {
     Object.keys(from).forEach(function(k) {
         if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {

package/emotion/cjs/components/DatePicker/utils/normalizeDates.js

@@ -15,14 +15,11 @@ var normalizeDates = function(param) {
     _datejs.customDayjs.locale(lang);
     if (min && includeEdgeDates && min > originalDate) {
         dateCandidate = min;
-    }
-    if (min && !includeEdgeDates && min >= originalDate) {
+    } else if (min && !includeEdgeDates && min >= originalDate) {
         dateCandidate = (0, _datejs.customDayjs)(min).add(1, 'd').toDate();
-    }
-    if (max && includeEdgeDates && max < originalDate) {
+    } else if (max && includeEdgeDates && max < originalDate) {
         dateCandidate = max;
-    }
-    if (max && !includeEdgeDates && max <= originalDate) {
+    } else if (max && !includeEdgeDates && max <= originalDate) {
         dateCandidate = (0, _datejs.customDayjs)(max).subtract(1, 'd').toDate();
     }
     var formattedDateCandidate = format ? (0, _datejs.customDayjs)(dateCandidate).format(format) : dateCandidate.toString();