@salutejs/plasma-new-hope 0.174.0-canary.1505.11518120718.0 → 0.174.0-dev.0

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

@@ -1,4 +1,4 @@
-var _excluded = ["multiple", "value", "onChange", "isTargetAmount", "targetAmount", "items", "placement", "label", "placeholder", "helperText", "contentLeft", "textBefore", "textAfter", "variant", "listOverflow", "listHeight", "listWidth", "portal", "renderItem", "view", "size", "labelPlacement", "readOnly", "disabled", "alwaysOpened", "filter", "closeAfterSelect", "renderValue"];
+var _excluded = ["multiple", "value", "onChange", "isTargetAmount", "items", "placement", "label", "placeholder", "helperText", "contentLeft", "textBefore", "textAfter", "variant", "listOverflow", "listHeight", "listWidth", "portal", "renderItem", "view", "size", "labelPlacement", "readOnly", "disabled", "alwaysOpened", "filter", "closeAfterSelect"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -16,7 +16,7 @@ import { sizeToIconSize } from '../../Select/utils';
 import { classes } from './Combobox.tokens';
 import { FloatingPopover } from './FloatingPopover';
 import { useKeyNavigation, getItemByFocused } from './hooks/useKeyboardNavigation';
-import { initialItemsTransform, updateAncestors, updateDescendants, updateSingleAncestors, filterItems, getItemId, getInitialValue } from './utils';
+import { initialItemsTransform, updateAncestors, updateDescendants, updateSingleAncestors, filterItems, getItemId } from './utils';
 import { Inner, StyledTextField } from './ui';
 import { pathReducer, focusedPathReducer } from './reducers';
 import { getPathMap, getTreeMaps } from './hooks/getPathMaps';
@@ -35,7 +35,6 @@ export var comboboxRoot = function comboboxRoot(Root) {
       outerValue = props.value,
       outerOnChange = props.onChange,
       isTargetAmount = props.isTargetAmount,
-      targetAmount = props.targetAmount,
       items = props.items,
       _props$placement = props.placement,
       placement = _props$placement === void 0 ? 'bottom-start' : _props$placement,
@@ -63,15 +62,10 @@ export var comboboxRoot = function comboboxRoot(Root) {
       alwaysOpened = _props$alwaysOpened === void 0 ? false : _props$alwaysOpened,
       filter = props.filter,
       outerCloseAfterSelect = props.closeAfterSelect,
-      renderValue = props.renderValue,
       rest = _objectWithoutProperties(props, _excluded);
-    var transformedItems = useMemo(function () {
-      return initialItemsTransform(items || []);
-    }, [items]);
-
     // Создаем структуры для быстрой работы с деревом
     var _useMemo = useMemo(function () {
-        return getTreeMaps(transformedItems);
+        return getTreeMaps(items);
       }, [items]),
       _useMemo2 = _slicedToArray(_useMemo, 3),
       valueToCheckedMap = _useMemo2[0],
@@ -85,11 +79,14 @@ export var comboboxRoot = function comboboxRoot(Root) {
       _useState4 = _slicedToArray(_useState3, 2),
       internalValue = _useState4[0],
       setInternalValue = _useState4[1];
-    var value = outerValue !== null && outerValue !== undefined ? getInitialValue(outerValue, valueToItemMap) : internalValue;
+    var value = outerValue || internalValue;
     var inputRef = useRef(null);
     var floatingPopoverRef = useRef(null);
     var inputForkRef = useForkRef(inputRef, ref);
     var treeId = safeUseId();
+    var transformedItems = useMemo(function () {
+      return initialItemsTransform(items || []);
+    }, [items]);
     var filteredItems = filterItems(transformedItems, textValue, (_valueToItemMap$get2 = valueToItemMap.get(value)) === null || _valueToItemMap$get2 === void 0 ? void 0 : _valueToItemMap$get2.label, filter);
     var _useMemo3 = useMemo(function () {
         return getPathMap(filteredItems);
@@ -256,7 +253,16 @@ export var comboboxRoot = function comboboxRoot(Root) {
       if (e) {
         e.stopPropagation();
       }
-      var isCurrentChecked = checked.get(item.value);
+      var checkedCopy = new Map(checked);
+      var isCurrentChecked = checkedCopy.get(item.value);
+      checkedCopy.forEach(function (_, key) {
+        checkedCopy.set(key, false);
+      });
+      if (!isCurrentChecked) {
+        checkedCopy.set(item.value, 'done');
+        updateSingleAncestors(item, checkedCopy, 'dot');
+      }
+      setTextValue(isCurrentChecked ? '' : item.label);
       if (!alwaysOpened && closeAfterSelect) {
         dispatchPath({
           type: 'reset'
@@ -270,18 +276,14 @@ export var comboboxRoot = function comboboxRoot(Root) {
       }
     };
     var getChips = function getChips() {
-      if (multiple && Array.isArray(value)) {
+      if (multiple) {
         if (value.length === 0) return [];
         if (isTargetAmount) {
-          return ["\u0412\u044B\u0431\u0440\u0430\u043D\u043E ".concat(targetAmount || value.length)];
+          return ["\u0412\u044B\u0431\u0440\u0430\u043D\u043E ".concat(value.length)];
         }
-        var renderValueMapper = renderValue && function (stringValue) {
-          return renderValue(valueToItemMap.get(stringValue));
-        };
-        var valueToItemMapper = function valueToItemMapper(stringValue) {
-          return valueToItemMap.get(stringValue).label;
-        };
-        return value.map(renderValueMapper || valueToItemMapper);
+        return value.map(function (value) {
+          return valueToItemMap.get(value).label;
+        });
       }
       return [];
     };
@@ -309,7 +311,6 @@ export var comboboxRoot = function comboboxRoot(Root) {
     // В данном эффекте мы следим за изменениями value снаружи и вносим коррективы в дерево чекбоксов.
     // Пример: когда юзер очистил value извне, тогда нужно пройтись по элементам и выключить все чекбоксы.
     useLayoutEffect(function () {
-      var _valueToItemMap$get4;
       var checkedCopy = new Map(checked);
       checkedCopy.forEach(function (_, key) {
         checkedCopy.set(key, false);
@@ -327,12 +328,7 @@ export var comboboxRoot = function comboboxRoot(Root) {
         }
       }
       setChecked(checkedCopy);
-      setTextValue(((_valueToItemMap$get4 = valueToItemMap.get(outerValue)) === null || _valueToItemMap$get4 === void 0 ? void 0 : _valueToItemMap$get4.label) || '');
-
-      // В deps мы кладем именно outerValue и internalValue, а не просто value.
-      // Т.к. вначале нужно отфильтровать и провалидировать outerValue и результат положить в переменную.
-      // А переменную, содержащую сложные типы данных, нельзя помещать в deps.
-    }, [outerValue, internalValue, items]);
+    }, [value]);
     return /*#__PURE__*/React.createElement(Root, {
       size: size,
       view: view,

package/emotion/es/components/Combobox/ComboboxNew/utils/index.js

@@ -4,5 +4,4 @@ export { updateAncestors } from './updateAncestors';
 export { updateSingleAncestors } from './updateSingleAncestors';
 export { sizeToIconSize } from './sizeToIconSize';
 export { filterItems } from './filterItems';
-export { getItemId } from './getItemId';
-export { getInitialValue } from './getInitialValue';
+export { getItemId } from './getItemId';

package/emotion/es/components/Combobox/ComboboxNew/utils/initialItemsTransform.js

@@ -1,25 +1,11 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { 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 _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(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(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-function _arrayLikeToArray(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; }
 // Проходимся по массиву items и добавляем в каждый item ключ parent, который ссылается на item родителя.
 // Дает возможность прохода к корневому элементу (снизу вверх).
-// На выходе получаем глубокую копию исходного массива items.
 export var initialItemsTransform = function initialItemsTransform(items, parent) {
-  return _toConsumableArray(items).map(function (item) {
-    var itemCopy = _objectSpread({}, item);
-    itemCopy.parent = parent;
-    if (itemCopy.items) {
-      itemCopy.items = initialItemsTransform(itemCopy.items, itemCopy);
+  items.forEach(function (item) {
+    item.parent = parent;
+    if (item.items) {
+      item.items = initialItemsTransform(item.items, item);
     }
-    return itemCopy;
   });
+  return items;
 };

package/emotion/es/components/Drawer/Drawer.js

@@ -3,13 +3,14 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import React, { forwardRef, useMemo } from 'react';
-import { useFocusTrap, useForkRef, safeUseId } from '@salutejs/plasma-core';
+import { useForkRef, safeUseId } from '@salutejs/plasma-core';
 import { component, mergeConfig } from '../../engines';
 import { usePopupContext } from '../Popup';
 import { Overlay } from '../Overlay';
 import { DEFAULT_Z_INDEX } from '../Popup/utils';
 import { panelConfig } from '../Panel';
 import { cx, getSizeValueFromProp } from '../../utils';
+import { useFocusTrap } from '../../hooks';
 import { classes, tokens } from './Drawer.tokens';
 import { base as viewCSS } from './variations/_view/base';
 import { base as sizeCSS } from './variations/_size/base';

package/emotion/es/components/Pagination/ui/PaginationSelectPerPage/PaginationSelectPerPage.js

@@ -17,8 +17,8 @@ export var PaginationSelectPerPage = function PaginationSelectPerPage(_ref) {
     listWidth = _ref.listWidth,
     rest = _objectWithoutProperties(_ref, _excluded);
   var handleSelectChange = function handleSelectChange(newValue) {
-    if (newValue && !Array.isArray(newValue) && onChangeValue) {
-      onChangeValue(Number(newValue));
+    if (newValue) {
+      onChangeValue === null || onChangeValue === void 0 || onChangeValue(Number(newValue));
     }
   };
   var transformedList = perPageList.map(function (num) {

package/emotion/es/components/Select/Select.js

@@ -12,7 +12,7 @@ import React, { forwardRef, useState, useReducer, useMemo, createContext, useLay
 import { isEmpty, getPlacements } from '../../utils';
 import { useOutsideClick } from '../../hooks';
 import { useKeyNavigation } from './hooks/useKeyboardNavigation';
-import { initialItemsTransform, updateAncestors, updateDescendants, updateSingleAncestors, getView, getInitialValue } from './utils';
+import { initialItemsTransform, updateAncestors, updateDescendants, updateSingleAncestors, getView } from './utils';
 import { Inner, Target } from './ui';
 import { pathReducer, focusedPathReducer, focusedChipIndexReducer } from './reducers';
 import { usePathMaps } from './hooks/usePathMaps';
@@ -58,6 +58,17 @@ export var selectRoot = function selectRoot(Root) {
       separator = props.separator,
       outerCloseAfterSelect = props.closeAfterSelect,
       rest = _objectWithoutProperties(props, _excluded);
+    var _useState = useState(outerValue || props.multiselect ? [] : ''),
+      _useState2 = _slicedToArray(_useState, 2),
+      internalValue = _useState2[0],
+      setInternalValue = _useState2[1];
+    var value = outerValue || internalValue;
+    var onChange = function onChange(e) {
+      if (outerOnChange) {
+        outerOnChange(e);
+      }
+      setInternalValue(e);
+    };
     var transformedItems = useMemo(function () {
       return initialItemsTransform(items || []);
     }, [items]);
@@ -67,12 +78,6 @@ export var selectRoot = function selectRoot(Root) {
       focusedToValueMap = _usePathMaps2[1],
       valueToCheckedMap = _usePathMaps2[2],
       valueToItemMap = _usePathMaps2[3];
-    var value = getInitialValue(outerValue, valueToItemMap);
-    var onChange = function onChange(e) {
-      if (outerOnChange) {
-        outerOnChange(e);
-      }
-    };
     var _useReducer = useReducer(pathReducer, []),
       _useReducer2 = _slicedToArray(_useReducer, 2),
       path = _useReducer2[0],
@@ -85,10 +90,10 @@ export var selectRoot = function selectRoot(Root) {
       _useReducer6 = _slicedToArray(_useReducer5, 2),
       focusedChipIndex = _useReducer6[0],
       dispatchFocusedChipIndex = _useReducer6[1];
-    var _useState = useState(valueToCheckedMap),
-      _useState2 = _slicedToArray(_useState, 2),
-      checked = _useState2[0],
-      setChecked = _useState2[1];
+    var _useState3 = useState(valueToCheckedMap),
+      _useState4 = _slicedToArray(_useState3, 2),
+      checked = _useState4[0],
+      setChecked = _useState4[1];
     var closeAfterSelect = outerCloseAfterSelect !== null && outerCloseAfterSelect !== void 0 ? outerCloseAfterSelect : !props.multiselect;
     var targetRef = useOutsideClick(function () {
       if (focusedChipIndex != null) {
@@ -154,7 +159,15 @@ export var selectRoot = function selectRoot(Root) {
         if (e) {
           e.stopPropagation();
         }
-        var isCurrentChecked = checked.get(item.value);
+        var checkedCopy = new Map(checked);
+        var isCurrentChecked = checkedCopy.get(item.value);
+        checkedCopy.forEach(function (_, key) {
+          checkedCopy.set(key, false);
+        });
+        if (!isCurrentChecked) {
+          checkedCopy.set(item.value, 'done');
+          updateSingleAncestors(item, checkedCopy, 'dot');
+        }
         if (closeAfterSelect) {
           dispatchPath({
             type: 'reset'
@@ -226,7 +239,7 @@ export var selectRoot = function selectRoot(Root) {
         }
       }
       setChecked(checkedCopy);
-    }, [outerValue, items]);
+    }, [value]);
     return /*#__PURE__*/React.createElement(Root, _extends({
       ref: ref,
       size: size,

package/emotion/es/components/Select/hooks/useKeyboardNavigation.js

@@ -153,7 +153,7 @@ export var useKeyNavigation = function useKeyNavigation(_ref) {
         }
       case keys.Backspace:
         {
-          if (!multiselect || !Array.isArray(value)) break;
+          if (!multiselect) break;
           if (focusedChipIndex !== null) {
             var _currentItem = valueToItemMap.get(value[focusedChipIndex]);
             handlePressDown(_currentItem);

package/emotion/es/components/Select/ui/Target/ui/Textfield/Textfield.js

@@ -34,7 +34,7 @@ var getLabel = function getLabel(_ref) {
         text: renderValue ? renderValue(valueToItemMap.get(currentValue)) : itemLabel,
         onClick: function onClick(e) {
           e.stopPropagation();
-          onChipClick(currentValue.toString());
+          onChipClick(currentValue);
         },
         focused: focusedChipIndex === index
       });