@salutejs/plasma-new-hope 0.123.0-canary.1349.10432639210.0 → 0.123.0-canary.1350.10448875530.0

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

@@ -22,7 +22,7 @@ var getLabel = function getLabel(_ref) {
     labelPlacement = _ref.labelPlacement,
     size = _ref.size,
     renderValue = _ref.renderValue;
-  if ((0, _utils.isEmpty)(value) && typeof value !== 'number') {
+  if ((0, _utils.isEmpty)(value)) {
     if (!label || labelPlacement === 'outer') {
       return /*#__PURE__*/_react["default"].createElement(_Textfield.Placeholder, null, placeholder);
     }
@@ -38,7 +38,7 @@ var getLabel = function getLabel(_ref) {
     return value.map(function (currentValue, index) {
       var itemLabel = valueToItemMap.get(currentValue).label;
       return /*#__PURE__*/_react["default"].createElement(_ui.Chip, {
-        text: renderValue ? renderValue(valueToItemMap.get(currentValue)) : itemLabel,
+        text: renderValue ? renderValue(currentValue, itemLabel) : itemLabel,
         onClick: function onClick(e) {
           e.stopPropagation();
           onChipClick(currentValue);
@@ -49,9 +49,9 @@ var getLabel = function getLabel(_ref) {
   }
   var itemLabel = valueToItemMap.get(value).label;
   if (!label || labelPlacement === 'outer') {
-    return /*#__PURE__*/_react["default"].createElement(_Textfield.Value, null, renderValue ? renderValue(valueToItemMap.get(value)) : itemLabel);
+    return /*#__PURE__*/_react["default"].createElement(_Textfield.Value, null, renderValue ? renderValue(value, itemLabel) : itemLabel);
   }
-  return /*#__PURE__*/_react["default"].createElement(_Textfield.InnerLabelWrapper, null, size !== 'xs' && /*#__PURE__*/_react["default"].createElement(_Textfield.InnerLabel, null, label), /*#__PURE__*/_react["default"].createElement(_Textfield.Value, null, renderValue ? renderValue(valueToItemMap.get(value)) : itemLabel));
+  return /*#__PURE__*/_react["default"].createElement(_Textfield.InnerLabelWrapper, null, size !== 'xs' && /*#__PURE__*/_react["default"].createElement(_Textfield.InnerLabel, null, label), /*#__PURE__*/_react["default"].createElement(_Textfield.Value, null, renderValue ? renderValue(value, itemLabel) : itemLabel));
 };
 var Textfield = exports.Textfield = function Textfield(_ref2) {
   var opened = _ref2.opened,
@@ -92,9 +92,7 @@ var Textfield = exports.Textfield = function Textfield(_ref2) {
     "aria-activedescendant": getActiveDescendant(),
     "aria-label": label,
     renderTarget: Boolean(selectProps.renderTarget)
-  }, /*#__PURE__*/_react["default"].createElement(_Textfield.Wrapper, null, selectProps !== null && selectProps !== void 0 && selectProps.renderTarget ? selectProps.renderTarget(Array.isArray(value) ? value.map(function (value) {
-    return valueToItemMap.get(value);
-  }) : valueToItemMap.get(value)) : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, contentLeft && (!selectProps.multiselect || (0, _utils.isEmpty)(value)) && /*#__PURE__*/_react["default"].createElement(_Textfield.ContentLeftWrapper, null, contentLeft), /*#__PURE__*/_react["default"].createElement(_Textfield.ChipWrapper, null, getLabel({
+  }, /*#__PURE__*/_react["default"].createElement(_Textfield.Wrapper, null, selectProps !== null && selectProps !== void 0 && selectProps.renderTarget ? selectProps.renderTarget(value) : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, contentLeft && (!selectProps.multiselect || (0, _utils.isEmpty)(value)) && /*#__PURE__*/_react["default"].createElement(_Textfield.ContentLeftWrapper, null, contentLeft), /*#__PURE__*/_react["default"].createElement(_Textfield.ChipWrapper, null, getLabel({
     value: value,
     valueToItemMap: valueToItemMap,
     onChipClick: onChipClick,

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

@@ -9,9 +9,9 @@ var getLabel = function getLabel(_ref) {
   var value = _ref.value,
     valueToItemMap = _ref.valueToItemMap,
     renderValue = _ref.renderValue;
-  var _ref2 = valueToItemMap.get(value),
+  var _ref2 = valueToItemMap.get(value === null || value === void 0 ? void 0 : value.toString()),
     label = _ref2.label;
-  return renderValue ? renderValue(valueToItemMap.get(value)) : label;
+  return renderValue ? renderValue(value, label) : label;
 };
 var getButtonLabel = exports.getButtonLabel = function getButtonLabel(_ref3) {
   var value = _ref3.value,
@@ -19,7 +19,7 @@ var getButtonLabel = exports.getButtonLabel = function getButtonLabel(_ref3) {
     label = _ref3.label,
     renderValue = _ref3.renderValue,
     selectProps = _ref3.selectProps;
-  if ((0, _utils.isEmpty)(value) && typeof value !== 'number') {
+  if ((0, _utils.isEmpty)(value)) {
     return label || '';
   }
   if (selectProps.multiselect && selectProps.isTargetAmount) {
@@ -35,8 +35,8 @@ var getButtonLabel = exports.getButtonLabel = function getButtonLabel(_ref3) {
     }).join(', ');
   }
   return getLabel({
+    renderValue: renderValue,
     value: value,
-    valueToItemMap: valueToItemMap,
-    renderValue: renderValue
+    valueToItemMap: valueToItemMap
   });
 };

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

@@ -15,12 +15,6 @@ Object.defineProperty(exports, "getCorrectHeight", {
     return _getCorrectHeight.getCorrectHeight;
   }
 });
-Object.defineProperty(exports, "getView", {
-  enumerable: true,
-  get: function get() {
-    return _getView.getView;
-  }
-});
 Object.defineProperty(exports, "initialItemsTransform", {
   enumerable: true,
   get: function get() {
@@ -57,5 +51,4 @@ var _updateAncestors = /*#__PURE__*/require("./updateAncestors");
 var _updateSingleAncestors = /*#__PURE__*/require("./updateSingleAncestors");
 var _sizeToIconSize = /*#__PURE__*/require("./sizeToIconSize");
 var _getCorrectHeight = /*#__PURE__*/require("./getCorrectHeight");
-var _getButtonLabel = /*#__PURE__*/require("./getButtonLabel");
-var _getView = /*#__PURE__*/require("./getView");
+var _getButtonLabel = /*#__PURE__*/require("./getButtonLabel");

package/emotion/cjs/examples/plasma_b2c/components/Select/Select.stories.tsx

@@ -60,23 +60,9 @@ const meta: Meta<StorySelectProps> = {
                 type: 'select',
             },
         },
-        listWidth: {
-            control: {
-                type: 'text',
-            },
-        },
-        listOverflow: {
-            control: {
-                type: 'text',
-            },
-        },
-        listHeight: {
-            control: {
-                type: 'text',
-            },
-        },
     },
     args: {
+        multiselect: false,
         target: 'textfield-like',
         label: 'Label',
         labelPlacement: 'outer',
@@ -89,27 +75,7 @@ const meta: Meta<StorySelectProps> = {
         isTargetAmount: false,
         variant: 'normal',
         disabled: false,
-    },
-    parameters: {
-        controls: {
-            include: [
-                'target',
-                'size',
-                'view',
-                'chipView',
-                'enableContentLeft',
-                'label',
-                'labelPlacement',
-                'placeholder',
-                'helperText',
-                'isTargetAmount',
-                'variant',
-                'disabled',
-                'listWidth',
-                'listOverflow',
-                'listHeight',
-            ],
-        },
+        separator: '',
     },
 };
 
@@ -388,8 +354,8 @@ const PredefinedStory = (args: StorySelectProps) => {
 
             <Select
                 {...args}
-                items={items}
                 multiselect
+                items={items}
                 value={valueMultiple}
                 onChange={setValueMultiple}
                 contentLeft={args.enableContentLeft ? <IconDone size="s" /> : undefined}
@@ -399,6 +365,11 @@ const PredefinedStory = (args: StorySelectProps) => {
 };
 
 export const Predefined: StoryObj<StorySelectProps> = {
+    parameters: {
+        controls: {
+            exclude: ['multiselect'],
+        },
+    },
     render: (args) => <PredefinedStory {...args} />,
 };
 
@@ -824,7 +795,19 @@ const CommonStory = (args: StorySelectProps) => {
 export const Common: StoryObj<StorySelectProps> = {
     parameters: {
         controls: {
-            exclude: ['target', 'view'],
+            include: [
+                'size',
+                'enableContentLeft',
+                'chipView',
+                'label',
+                'labelPlacement',
+                'placeholder',
+                'helperText',
+                'isTargetAmount',
+                'variant',
+                'disabled',
+                'separator',
+            ],
         },
     },
     argTypes: {

package/emotion/cjs/examples/plasma_web/components/Select/Select.stories.tsx

@@ -60,23 +60,9 @@ const meta: Meta<StorySelectProps> = {
                 type: 'select',
             },
         },
-        listWidth: {
-            control: {
-                type: 'text',
-            },
-        },
-        listOverflow: {
-            control: {
-                type: 'text',
-            },
-        },
-        listHeight: {
-            control: {
-                type: 'text',
-            },
-        },
     },
     args: {
+        multiselect: false,
         target: 'textfield-like',
         label: 'Label',
         labelPlacement: 'outer',
@@ -89,27 +75,7 @@ const meta: Meta<StorySelectProps> = {
         isTargetAmount: false,
         variant: 'normal',
         disabled: false,
-    },
-    parameters: {
-        controls: {
-            include: [
-                'target',
-                'size',
-                'view',
-                'chipView',
-                'enableContentLeft',
-                'label',
-                'labelPlacement',
-                'placeholder',
-                'helperText',
-                'isTargetAmount',
-                'variant',
-                'disabled',
-                'listWidth',
-                'listOverflow',
-                'listHeight',
-            ],
-        },
+        separator: '',
     },
 };
 
@@ -388,8 +354,8 @@ const PredefinedStory = (args: StorySelectProps) => {
 
             <Select
                 {...args}
-                items={items}
                 multiselect
+                items={items}
                 value={valueMultiple}
                 onChange={setValueMultiple}
                 contentLeft={args.enableContentLeft ? <IconDone size="s" /> : undefined}
@@ -399,6 +365,11 @@ const PredefinedStory = (args: StorySelectProps) => {
 };
 
 export const Predefined: StoryObj<StorySelectProps> = {
+    parameters: {
+        controls: {
+            exclude: ['multiselect'],
+        },
+    },
     render: (args) => <PredefinedStory {...args} />,
 };
 
@@ -824,7 +795,19 @@ const CommonStory = (args: StorySelectProps) => {
 export const Common: StoryObj<StorySelectProps> = {
     parameters: {
         controls: {
-            exclude: ['target', 'view'],
+            include: [
+                'size',
+                'enableContentLeft',
+                'chipView',
+                'label',
+                'labelPlacement',
+                'placeholder',
+                'helperText',
+                'isTargetAmount',
+                'variant',
+                'disabled',
+                'separator',
+            ],
         },
     },
     argTypes: {

package/emotion/es/components/Autocomplete/Autocomplete.js

@@ -61,7 +61,7 @@ export var autocompleteRoot = function autocompleteRoot(Root) {
       isOpen = _useState4[0],
       setIsOpen = _useState4[1];
     var listId = safeUseId();
-    var value = outerValue !== null && outerValue !== void 0 ? outerValue : innerValue;
+    var value = outerValue || innerValue;
     var helperTextId = safeUseId();
     var targetRef = useOutsideClick(function () {
       setIsOpen(false);

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

@@ -1,4 +1,4 @@
-var _excluded = ["value", "onChange", "target", "items", "placement", "label", "labelPlacement", "placeholder", "helperText", "disabled", "view", "size", "listOverflow", "listHeight", "listWidth", "contentLeft", "onScrollBottom", "chipView", "variant", "portal", "renderValue", "renderItem", "status", "onItemSelect", "separator"];
+var _excluded = ["value", "onChange", "target", "items", "placement", "label", "labelPlacement", "placeholder", "helperText", "disabled", "view", "size", "listOverflow", "listHeight", "listWidth", "contentLeft", "onScrollBottom", "chipView", "variant", "portal", "renderValue", "renderItem"];
 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."); }
@@ -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 } from './utils';
+import { initialItemsTransform, updateAncestors, updateDescendants, updateSingleAncestors } from './utils';
 import { Inner, Target } from './ui';
 import { pathReducer, focusedPathReducer, focusedChipIndexReducer } from './reducers';
 import { usePathMaps } from './hooks/usePathMaps';
@@ -53,9 +53,6 @@ export var selectRoot = function selectRoot(Root) {
       portal = props.portal,
       renderValue = props.renderValue,
       renderItem = props.renderItem,
-      status = props.status,
-      onItemSelect = props.onItemSelect,
-      separator = props.separator,
       rest = _objectWithoutProperties(props, _excluded);
     var _useState = useState(outerValue || props.multiselect ? [] : ''),
       _useState2 = _slicedToArray(_useState, 2),
@@ -69,7 +66,7 @@ export var selectRoot = function selectRoot(Root) {
       setInternalValue(e);
     };
     var transformedItems = useMemo(function () {
-      return initialItemsTransform(items || []);
+      return initialItemsTransform(items);
     }, [items]);
     var _usePathMaps = usePathMaps(transformedItems),
       _usePathMaps2 = _slicedToArray(_usePathMaps, 4),
@@ -161,9 +158,6 @@ export var selectRoot = function selectRoot(Root) {
         if (onChange) {
           onChange(isCurrentChecked ? '' : item.value);
         }
-        if (onItemSelect) {
-          onItemSelect(item, e);
-        }
       }
     };
     var handleChipClick = function handleChipClick(currentValue) {
@@ -208,7 +202,7 @@ export var selectRoot = function selectRoot(Root) {
       checkedCopy.forEach(function (_, key) {
         checkedCopy.set(key, false);
       });
-      if (!isEmpty(value) || typeof value === 'number') {
+      if (!isEmpty(value)) {
         if (Array.isArray(value)) {
           value.forEach(function (val) {
             checkedCopy.set(val, true);
@@ -225,7 +219,7 @@ export var selectRoot = function selectRoot(Root) {
     return /*#__PURE__*/React.createElement(Root, _extends({
       ref: ref,
       size: size,
-      view: status ? getView(status) : view,
+      view: view,
       chipView: chipView
     }, rest), label && labelPlacement === 'outer' && target !== 'button-like' && /*#__PURE__*/React.createElement(OuterLabel, null, label), /*#__PURE__*/React.createElement(Context.Provider, {
       value: {
@@ -236,8 +230,7 @@ export var selectRoot = function selectRoot(Root) {
         handleCheckboxChange: handleCheckboxChange,
         handleItemClick: handleItemClick,
         variant: variant,
-        renderItem: renderItem,
-        valueToItemMap: valueToItemMap
+        renderItem: renderItem
       }
     }, /*#__PURE__*/React.createElement(StyledPopover, {
       ref: targetRef,
@@ -267,7 +260,7 @@ export var selectRoot = function selectRoot(Root) {
       }),
       preventOverflow: false,
       closeOnOverlayClick: true
-    }, items && /*#__PURE__*/React.createElement(Root, _extends({
+    }, /*#__PURE__*/React.createElement(Root, _extends({
       size: size
     }, rest), /*#__PURE__*/React.createElement(Ul, {
       role: "tree",

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

@@ -5,10 +5,10 @@ export var usePathMaps = function usePathMaps(items) {
   var focusedToValueMap = new Map();
   var valueToCheckedMap = new Map();
   var valueToItemMap = new Map();
-  pathMap.set('root', (items === null || items === void 0 ? void 0 : items.length) || 0);
+  pathMap.set('root', items.length);
   var rec = function rec(items) {
     var prevIndex = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
-    items === null || items === void 0 || items.forEach(function (item, index) {
+    items.forEach(function (item, index) {
       var value = item.value,
         innerItems = item.items;
       var currIndex = "".concat(prevIndex, "/").concat(index).replace(/^(\/)/, '');

package/emotion/es/components/Select/ui/Inner/ui/Item/Item.js

@@ -18,8 +18,6 @@ export var Item = function Item(_ref) {
   var value = item.value,
     label = item.label,
     disabled = item.disabled,
-    isDisabled = item.isDisabled,
-    color = item.color,
     contentLeft = item.contentLeft,
     contentRight = item.contentRight;
   var ref = useRef(null);
@@ -31,9 +29,8 @@ export var Item = function Item(_ref) {
     handleCheckboxChange = _useContext.handleCheckboxChange,
     handleItemClick = _useContext.handleItemClick,
     variant = _useContext.variant,
-    renderItem = _useContext.renderItem,
-    valueToItemMap = _useContext.valueToItemMap;
-  var isDisabledClassName = disabled || isDisabled ? classes.dropdownItemIsDisabled : undefined;
+    renderItem = _useContext.renderItem;
+  var isDisabledClassName = disabled ? classes.dropdownItemIsDisabled : undefined;
   var focusedClass = currentLevel === focusedPath.length - 1 && index === (focusedPath === null || focusedPath === void 0 ? void 0 : focusedPath[currentLevel]) ? classes.dropdownItemIsFocused : undefined;
   var activeClass = value === (path === null || path === void 0 ? void 0 : path[currentLevel + 1]) ? classes.dropdownItemIsActive : undefined;
   useEffect(function () {
@@ -46,15 +43,12 @@ export var Item = function Item(_ref) {
     }
   }, [focusedClass]);
   var handleChange = function handleChange(e) {
-    if (disabled || isDisabled) return;
+    if (disabled) return;
     e.stopPropagation();
     handleCheckboxChange(item);
   };
   var handleClick = function handleClick(e) {
-    if (disabled || isDisabled) {
-      e.stopPropagation();
-      return;
-    }
+    if (disabled) return;
     handleItemClick(item, e);
   };
   return /*#__PURE__*/React.createElement(Wrapper, {
@@ -85,9 +79,7 @@ export var Item = function Item(_ref) {
   }))), !multiselect && checked.get(item.value) === 'done' && /*#__PURE__*/React.createElement(IconDone, {
     size: sizeToIconSize(size, variant),
     color: "inherit"
-  })), contentLeft && /*#__PURE__*/React.createElement(StyledContentLeft, null, contentLeft), /*#__PURE__*/React.createElement(StyledText, {
-    color: color
-  }, renderItem && renderItem(valueToItemMap.get(value)) || label), contentRight && /*#__PURE__*/React.createElement(StyledContentRight, null, contentRight), !isEmpty(item.items) && /*#__PURE__*/React.createElement(DisclosureIconWrapper, null, /*#__PURE__*/React.createElement(IconDisclosureRightCentered, {
+  })), contentLeft && /*#__PURE__*/React.createElement(StyledContentLeft, null, contentLeft), /*#__PURE__*/React.createElement(StyledText, null, renderItem && renderItem(value, label) || label), contentRight && /*#__PURE__*/React.createElement(StyledContentRight, null, contentRight), !isEmpty(item.items) && /*#__PURE__*/React.createElement(DisclosureIconWrapper, null, /*#__PURE__*/React.createElement(IconDisclosureRightCentered, {
     size: sizeToIconSize(size, variant),
     color: "inherit"
   })));