@salutejs/plasma-new-hope 0.175.1-dev.0 → 0.175.2-canary.1505.11553165432.0

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

@@ -20,7 +20,7 @@ var _getPathMaps = /*#__PURE__*/require("./hooks/getPathMaps");
 var _Combobox2 = /*#__PURE__*/require("./Combobox.styles");
 var _base = /*#__PURE__*/require("./variations/_view/base");
 var _base2 = /*#__PURE__*/require("./variations/_size/base");
-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"];
+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"];
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 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); }
@@ -44,6 +44,7 @@ var comboboxRoot = exports.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,
@@ -71,10 +72,15 @@ var comboboxRoot = exports.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 = (0, _react.useMemo)(function () {
+      return (0, _utils3.initialItemsTransform)(items || []);
+    }, [items]);
+
     // Создаем структуры для быстрой работы с деревом
     var _useMemo = (0, _react.useMemo)(function () {
-        return (0, _getPathMaps.getTreeMaps)(items);
+        return (0, _getPathMaps.getTreeMaps)(transformedItems);
       }, [items]),
       _useMemo2 = _slicedToArray(_useMemo, 3),
       valueToCheckedMap = _useMemo2[0],
@@ -88,14 +94,11 @@ var comboboxRoot = exports.comboboxRoot = function comboboxRoot(Root) {
       _useState4 = _slicedToArray(_useState3, 2),
       internalValue = _useState4[0],
       setInternalValue = _useState4[1];
-    var value = outerValue || internalValue;
+    var value = outerValue !== null && outerValue !== undefined ? (0, _utils3.getInitialValue)(outerValue, valueToItemMap) : internalValue;
     var inputRef = (0, _react.useRef)(null);
     var floatingPopoverRef = (0, _react.useRef)(null);
     var inputForkRef = (0, _plasmaCore.useForkRef)(inputRef, ref);
     var treeId = (0, _plasmaCore.safeUseId)();
-    var transformedItems = (0, _react.useMemo)(function () {
-      return (0, _utils3.initialItemsTransform)(items || []);
-    }, [items]);
     var filteredItems = (0, _utils3.filterItems)(transformedItems, textValue, (_valueToItemMap$get2 = valueToItemMap.get(value)) === null || _valueToItemMap$get2 === void 0 ? void 0 : _valueToItemMap$get2.label, filter);
     var _useMemo3 = (0, _react.useMemo)(function () {
         return (0, _getPathMaps.getPathMap)(filteredItems);
@@ -262,16 +265,7 @@ var comboboxRoot = exports.comboboxRoot = function comboboxRoot(Root) {
       if (e) {
         e.stopPropagation();
       }
-      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');
-        (0, _utils3.updateSingleAncestors)(item, checkedCopy, 'dot');
-      }
-      setTextValue(isCurrentChecked ? '' : item.label);
+      var isCurrentChecked = checked.get(item.value);
       if (!alwaysOpened && closeAfterSelect) {
         dispatchPath({
           type: 'reset'
@@ -285,14 +279,18 @@ var comboboxRoot = exports.comboboxRoot = function comboboxRoot(Root) {
       }
     };
     var getChips = function getChips() {
-      if (multiple) {
+      if (multiple && Array.isArray(value)) {
         if (value.length === 0) return [];
         if (isTargetAmount) {
-          return ["\u0412\u044B\u0431\u0440\u0430\u043D\u043E ".concat(value.length)];
+          return ["\u0412\u044B\u0431\u0440\u0430\u043D\u043E ".concat(targetAmount || value.length)];
         }
-        return value.map(function (value) {
-          return valueToItemMap.get(value).label;
-        });
+        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 [];
     };
@@ -320,6 +318,7 @@ var comboboxRoot = exports.comboboxRoot = function comboboxRoot(Root) {
     // В данном эффекте мы следим за изменениями value снаружи и вносим коррективы в дерево чекбоксов.
     // Пример: когда юзер очистил value извне, тогда нужно пройтись по элементам и выключить все чекбоксы.
     (0, _react.useLayoutEffect)(function () {
+      var _valueToItemMap$get4;
       var checkedCopy = new Map(checked);
       checkedCopy.forEach(function (_, key) {
         checkedCopy.set(key, false);
@@ -337,7 +336,12 @@ var comboboxRoot = exports.comboboxRoot = function comboboxRoot(Root) {
         }
       }
       setChecked(checkedCopy);
-    }, [value]);
+      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]);
     return /*#__PURE__*/_react["default"].createElement(Root, {
       size: size,
       view: view,

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

@@ -0,0 +1,20 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getInitialValue = void 0;
+// Утилита предназначена для фильтрации элементов в value, которые отсутствуют в items.
+// Эти элементы игнорируются и не участвуют в дальнейшей работе компонента.
+var getInitialValue = exports.getInitialValue = function getInitialValue(outerValue, valueToItemMap) {
+  if (Array.isArray(outerValue)) {
+    if (outerValue.length === 0) {
+      return [];
+    }
+    return outerValue.filter(valueToItemMap.has.bind(valueToItemMap));
+  }
+  if (valueToItemMap.has(outerValue)) {
+    return outerValue;
+  }
+  return '';
+};

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

@@ -9,6 +9,12 @@ Object.defineProperty(exports, "filterItems", {
     return _filterItems.filterItems;
   }
 });
+Object.defineProperty(exports, "getInitialValue", {
+  enumerable: true,
+  get: function get() {
+    return _getInitialValue.getInitialValue;
+  }
+});
 Object.defineProperty(exports, "getItemId", {
   enumerable: true,
   get: function get() {
@@ -51,4 +57,5 @@ var _updateAncestors = /*#__PURE__*/require("./updateAncestors");
 var _updateSingleAncestors = /*#__PURE__*/require("./updateSingleAncestors");
 var _sizeToIconSize = /*#__PURE__*/require("./sizeToIconSize");
 var _filterItems = /*#__PURE__*/require("./filterItems");
-var _getItemId = /*#__PURE__*/require("./getItemId");
+var _getItemId = /*#__PURE__*/require("./getItemId");
+var _getInitialValue = /*#__PURE__*/require("./getInitialValue");

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

@@ -1,17 +1,31 @@
 "use strict";
 
+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); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.initialItemsTransform = void 0;
+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.
 var initialItemsTransform = exports.initialItemsTransform = function initialItemsTransform(items, parent) {
-  items.forEach(function (item) {
-    item.parent = parent;
-    if (item.items) {
-      item.items = initialItemsTransform(item.items, item);
+  return _toConsumableArray(items).map(function (item) {
+    var itemCopy = _objectSpread({}, item);
+    itemCopy.parent = parent;
+    if (itemCopy.items) {
+      itemCopy.items = initialItemsTransform(itemCopy.items, itemCopy);
     }
+    return itemCopy;
   });
-  return items;
 };

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

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

package/emotion/cjs/components/Select/Select.js

@@ -67,17 +67,6 @@ var selectRoot = exports.selectRoot = function selectRoot(Root) {
       separator = props.separator,
       outerCloseAfterSelect = props.closeAfterSelect,
       rest = _objectWithoutProperties(props, _excluded);
-    var _useState = (0, _react.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 = (0, _react.useMemo)(function () {
       return (0, _utils2.initialItemsTransform)(items || []);
     }, [items]);
@@ -87,6 +76,12 @@ var selectRoot = exports.selectRoot = function selectRoot(Root) {
       focusedToValueMap = _usePathMaps2[1],
       valueToCheckedMap = _usePathMaps2[2],
       valueToItemMap = _usePathMaps2[3];
+    var value = (0, _utils2.getInitialValue)(outerValue, valueToItemMap);
+    var onChange = function onChange(e) {
+      if (outerOnChange) {
+        outerOnChange(e);
+      }
+    };
     var _useReducer = (0, _react.useReducer)(_reducers.pathReducer, []),
       _useReducer2 = _slicedToArray(_useReducer, 2),
       path = _useReducer2[0],
@@ -99,10 +94,10 @@ var selectRoot = exports.selectRoot = function selectRoot(Root) {
       _useReducer6 = _slicedToArray(_useReducer5, 2),
       focusedChipIndex = _useReducer6[0],
       dispatchFocusedChipIndex = _useReducer6[1];
-    var _useState3 = (0, _react.useState)(valueToCheckedMap),
-      _useState4 = _slicedToArray(_useState3, 2),
-      checked = _useState4[0],
-      setChecked = _useState4[1];
+    var _useState = (0, _react.useState)(valueToCheckedMap),
+      _useState2 = _slicedToArray(_useState, 2),
+      checked = _useState2[0],
+      setChecked = _useState2[1];
     var closeAfterSelect = outerCloseAfterSelect !== null && outerCloseAfterSelect !== void 0 ? outerCloseAfterSelect : !props.multiselect;
     var targetRef = (0, _hooks.useOutsideClick)(function () {
       if (focusedChipIndex != null) {
@@ -168,15 +163,7 @@ var selectRoot = exports.selectRoot = function selectRoot(Root) {
         if (e) {
           e.stopPropagation();
         }
-        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');
-          (0, _utils2.updateSingleAncestors)(item, checkedCopy, 'dot');
-        }
+        var isCurrentChecked = checked.get(item.value);
         if (closeAfterSelect) {
           dispatchPath({
             type: 'reset'
@@ -248,7 +235,7 @@ var selectRoot = exports.selectRoot = function selectRoot(Root) {
         }
       }
       setChecked(checkedCopy);
-    }, [value]);
+    }, [outerValue, items]);
     return /*#__PURE__*/_react["default"].createElement(Root, _extends({
       ref: ref,
       size: size,

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

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

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

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