@salutejs/plasma-new-hope 0.192.2-dev.0 → 0.192.3-canary.1550.11813906469.0

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

@@ -7,31 +7,19 @@ export var classes = {
   textfieldTarget: 'select-textfield-target',
   selectChipIsFocused: 'select-chip-is-focused',
   selectWithoutBoxShadow: 'select-without-box-shadow',
-  selectItemCheckbox: 'select-item-checkbox',
   selectSpinner: 'select-spinner'
 };
 export var tokens = {
   borderRadius: '--plasma-select-border-radius',
   padding: '--plasma-select-padding',
-  focusOffset: '--plasma-select-focus-offset',
   fontFamily: '--plasma-select-font-family',
   fontSize: '--plasma-select-font-size',
   fontStyle: '--plasma-select-font-style',
   fontWeight: '--plasma-select-font-weight',
   fontLetterSpacing: '--plasma-select-font-letter-spacing',
   fontLineHeight: '--plasma-select-font-line-height',
-  labelFontFamily: '--plasma-select-label-font-family',
-  labelFontSize: '--plasma-select-label-font-size',
-  labelFontStyle: '--plasma-select-label-font-style',
-  labelFontWeight: '--plasma-select-label-font-weight',
-  labelFontLetterSpacing: '--plasma-select-label-font-letter-spacing',
-  labelFontLineHeight: '--plasma-select-label-font-line-height',
-  helperTextFontFamily: '--plasma-select-helper-text-font-family',
-  helperTextFontSize: '--plasma-select-helper-text-font-size',
-  helperTextFontStyle: '--plasma-select-helper-text-font-style',
-  helperTextFontWeight: '--plasma-select-helper-text-font-weight',
-  helperTextFontLetterSpacing: '--plasma-select-helper-text-font-letter-spacing',
-  helperTextFontLineHeight: '--plasma-select-helper-text-font-line-height',
+  dropdownBorderColor: '--plasma-select-dropdown-border-color',
+  dropdownBorderWidth: '--plasma-select-dropdown-border-width',
   itemHeight: '--plasma-select-item-height',
   itemBorderRadius: '--plasma-select-item-border-radius',
   itemPadding: '--plasma-select-item-padding',
@@ -40,6 +28,18 @@ export var tokens = {
   itemIconSizeTight: '--plasma-select-item-icon-size-tight',
   itemIconMargin: '--plasma-select-item-icon-margin',
   itemBackgroundHover: '--plasma-select-item-background-hover',
+  cellPadding: '--plasma-select-cell-padding',
+  cellPaddingLeftContent: '--plasma-select-cell-padding-left-content',
+  cellPaddingContent: '--plasma-select-cell-padding-content',
+  cellPaddingRightContent: '--plasma-select-cell-padding-right-content',
+  cellTextboxGap: '--plasma-select-cell-textbox-gap',
+  cellGap: '--plasma-select-cell-gap',
+  cellTitleFontFamily: '--plasma-select-cell-title-font-family',
+  cellTitleFontSize: '--plasma-select-cell-title-font-size',
+  cellTitleFontStyle: '--plasma-select-cell-title-font-style',
+  cellTitleFontWeight: '--plasma-select-cell-title-font-weight',
+  cellTitleLetterSpacing: '--plasma-select-cell-title-letter-spacing',
+  cellTitleLineHeight: '--plasma-select-cell-title-line-height',
   checkboxTriggerSize: '--plasma-select-checkbox-trigger-size',
   checkboxTriggerSizeTight: '--plasma-select-checkbox-trigger-size-tight',
   checkboxTriggerBorderRadius: '--plasma-select-checkbox-trigger-border-radius',
@@ -48,53 +48,116 @@ export var tokens = {
   checkboxIconColor: '--plasma-select-checkbox-icon-color',
   checkboxTriggerBorderColor: '--plasma-select-checkbox-trigger-border-color',
   indicatorSize: '--plasma-select-indicator-size',
-  targetButtonColor: '--plasma-select-target-button-color',
-  targetButtonColorHover: '--plasma-select-target-button-color-hover',
-  targetButtonColorActive: '--plasma-select-target-button-color-active',
-  targetButtonArrowColor: '--plasma-select-target-button-arrow-color',
-  targetButtonArrowColorHover: '--plasma-select-target-button-arrow-color-hover',
-  targetButtonArrowColorActive: '--plasma-select-target-button-arrow-color-active',
-  targetTextfieldArrowColor: '--plasma-select-target-textfield-arrow-color',
-  targetTextfieldArrowColorHover: '--plasma-select-target-textfield-arrow-color-hover',
-  targetTextfieldArrowColorActive: '--plasma-select-target-textfield-arrow-color-active',
-  targetButtonArrowMargin: '--plasma-select-target-button-arrow-margin',
-  targetTextfieldArrowMargin: '--plasma-select-target-textfield-arrow-margin',
-  targetButtonBackgroundColor: '--plasma-select-target-button-background-color',
-  targetButtonBackgroundColorHover: '--plasma-select-target-button-background-color-hover',
-  targetButtonBackgroundColorActive: '--plasma-select-target-button-background-color-active',
-  targetTextfieldBackgroundColor: '--plasma-select-target-textfield-background-color',
-  targetTextfieldBackgroundColorOpened: '--plasma-select-target-textfield-background-color-opened',
-  targetTextfieldBorderColor: '--plasma-select-target-textfield-border-color',
-  targetTextfieldBorderColorHover: '--plasma-select-target-textfield-border-color-hover',
-  targetTextfieldBorderOpenedColor: '--plasma-select-target-textfield-border-opened-color',
-  targetTextfieldBorderSize: '--plasma-select-target-textfield-border-size',
-  targetButtonPadding: '--plasma-select-target-button-padding',
-  targetTextfieldPadding: '--plasma-select-target-textfield-padding',
-  targetTextfieldChipPadding: '--plasma-select-target-textfield-chip-padding',
   targetHeight: '--plasma-select-target-height',
-  chipColor: '--plasma-select-chip-color',
-  chipBackground: '--plasma-select-chip-background',
-  chipBackgroundHover: '--plasma-select-chip-background-hover',
-  chipBackgroundActive: '--plasma-select-chip-background-active',
-  chipGap: '--plasma-select-chip-gap',
-  chipBorderRadius: '--plasma-select-chip-border-radius',
-  chipHeight: '--plasma-select-chip-height',
-  chipPaddingRight: '--plasma-select-chip-padding-right',
-  chipPaddingLeft: '--plasma-select-chip-padding-left',
-  chipCloseIconSize: '--plasma-select-chip-close-icon-size',
-  chipClearContentMarginLeft: '--plasma-select-chip-clear-content-margin-left',
-  chipClearContentMarginRight: '--plasma-select-chip-clear-content-margin-right',
-  popoverBorderColor: '--plasma-select-popover-border-color',
-  popoverBorderWidth: '--plasma-select-popover-border-width',
-  labelOffset: '--plasma-select-label-offset',
-  innerLabelGap: '--plasma-select-inner-label-gap',
-  helperTextColor: '--plasma-select-helper-text-color',
-  helperTextOffset: '--plasma-select-helper-text-offset',
-  spinnerSize: '--plasma-select-spinner-size',
-  spinnerSizeTight: '--plasma-select-spinner-size-tight',
+  // Токены для Button
+  buttonColor: '--plasma-select-button-color',
+  buttonColorHover: '--plasma-select-button-color-hover',
+  buttonColorActive: '--plasma-select-button-color-active',
+  buttonArrowColor: '--plasma-select-button-arrow-color',
+  buttonArrowColorHover: '--plasma-select-button-arrow-color-hover',
+  buttonArrowColorActive: '--plasma-select-button-arrow-color-active',
+  buttonArrowMargin: '--plasma-select-button-arrow-margin',
+  buttonBackgroundColor: '--plasma-select-button-background-color',
+  buttonBackgroundColorHover: '--plasma-select-button-background-color-hover',
+  buttonBackgroundColorActive: '--plasma-select-button-background-color-active',
+  buttonPadding: '--plasma-select-button-padding',
+  // Токены для TextField
+  textFieldColor: '--plasma-select-textfield-color',
+  textFieldBackgroundColor: '--plasma-select-textfield-background-color',
+  textFieldBackgroundColorHover: '--plasma-select-textfield-background-color-hover',
+  textFieldBackgroundColorFocus: '--plasma-select-textfield-background-color-focus',
+  textFieldBorderColor: '--plasma-select-textfield-border-color',
+  textFieldBorderColorHover: '--plasma-select-textfield-border-color-hover',
+  textFieldBorderColorFocus: '--plasma-select-textfield-border-color-focus',
+  textFieldPlaceholderColor: '--plasma-select-textfield-placeholder-color',
+  textFieldPlaceholderColorFocus: '--plasma-select-textfield-placeholder-color-focus',
+  textFieldOptionalColor: '--plasma-select-textfield-optional-color',
+  textFieldHeight: '--plasma-select-textfield-height',
+  textFieldBorderWidth: '--plasma-select-textfield-border-width',
+  textFieldBorderRadius: '--plasma-select-textfield-border-radius',
+  textFieldPadding: '--plasma-select-textfield-padding',
+  textFieldPaddingWithChips: '--plasma-select-textfield-padding-with-chips',
+  textFieldLeftContentMargin: '--plasma-select-textfield-left-content-margin',
+  textFieldRightContentMargin: '--plasma-select-textfield-right-content-margin',
+  textFieldFontFamily: '--plasma-select-textfield-font-family',
+  textFieldFontStyle: '--plasma-select-textfield-font-style',
+  textFieldFontSize: '--plasma-select-textfield-font-size',
+  textFieldFontWeight: '--plasma-select-textfield-font-weight',
+  textFieldLetterSpacing: '--plasma-select-textfield-letter-spacing',
+  textFieldLineHeight: '--plasma-select-textfield-line-height',
+  textFieldContentSlotColor: '--plasma-select-textfield-content-slot-color',
+  textFieldContentSlotColorHover: '--plasma-select-textfield-content-slot-color-hover',
+  textFieldContentSlotColorActive: '--plasma-select-textfield-content-slot-color-active',
+  textFieldContentSlotRightColor: '--plasma-select-textfield-content-right-slot-color',
+  textFieldContentSlotRightColorHover: '--plasma-select-textfield-content-right-slot-color-hover',
+  textFieldContentSlotRightColorActive: '--plasma-select-textfield-content-right-slot-color-active',
+  textFieldLabelColor: '--plasma-select-textfield-label-color',
+  textFieldLabelOffset: '--plasma-select-textfield-label-offset',
+  textFieldLabelFontFamily: '--plasma-select-textfield-label-font-family',
+  textFieldLabelFontStyle: '--plasma-select-textfield-label-font-style',
+  textFieldLabelFontSize: '--plasma-select-textfield-label-font-size',
+  textFieldLabelFontWeight: '--plasma-select-textfield-label-font-weight',
+  textFieldLabelLetterSpacing: '--plasma-select-textfield-label-letter-spacing',
+  textFieldLabelLineHeight: '--plasma-select-textfield-label-line-height',
+  textFieldLabelInnerFontFamily: '--plasma-select-textfield-placement-inner-label-font-family',
+  textFieldLabelInnerFontStyle: '--plasma-select-textfield-placement-inner-label-font-style',
+  textFieldLabelInnerFontSize: '--plasma-select-textfield-placement-inner-label-font-size',
+  textFieldLabelInnerFontWeight: '--plasma-select-textfield-placement-inner-label-font-weight',
+  textFieldLabelInnerLetterSpacing: '--plasma-select-textfield-placement-inner-label-letter-spacing',
+  textFieldLabelInnerLineHeight: '--plasma-select-textfield-placement-inner-label-line-height',
+  textFieldLabelInnerPadding: '--plasma-select-textfield-placement-inner-label-padding',
+  textFieldContentLabelInnerPadding: '--plasma-select-textfield-placement-inner-content-padding',
+  textFieldTitleCaptionColor: '--plasma-select-textfield-title-caption-color',
+  textFieldTitleCaptionInnerLabelOffset: '--plasma-select-textfield-title-caption-label-inner-offset',
+  textFieldTitleCaptionFontFamily: '--plasma-select-textfield-title-caption-font-family',
+  textFieldTitleCaptionFontStyle: '--plasma-select-textfield-title-caption-font-style',
+  textFieldTitleCaptionFontSize: '--plasma-select-textfield-title-caption-font-size',
+  textFieldTitleCaptionFontWeight: '--plasma-select-textfield-title-caption-font-weight',
+  textFieldTitleCaptionLetterSpacing: '--plasma-select-textfield-title-caption-letter-spacing',
+  textFieldTitleCaptionLineHeight: '--plasma-select-textfield-title-caption-line-height',
+  textFieldLeftHelperColor: '--plasma-select-textfield-left-helper-color',
+  textFieldLeftHelperOffset: '--plasma-select-textfield-left-helper-offset',
+  textFieldLeftHelperFontFamily: '--plasma-select-textfield-left-helper-font-family',
+  textFieldLeftHelperFontStyle: '--plasma-select-textfield-left-helper-font-style',
+  textFieldLeftHelperFontSize: '--plasma-select-textfield-left-helper-font-size',
+  textFieldLeftHelperFontWeight: '--plasma-select-textfield-left-helper-font-weight',
+  textFieldLeftHelperLetterSpacing: '--plasma-select-textfield-left-helper-letter-spacing',
+  textFieldLeftHelperLineHeight: '--plasma-select-textfield-left-helper-line-height',
+  textFieldTextBeforeColor: '--plasma-select-textfield-before-text-color',
+  textFieldTextAfterColor: '--plasma-select-textfield-after-text-color',
+  textFieldTextBeforeMargin: '--plasma-select-textfield-before-text-margin',
+  textFieldTextAfterMargin: '--plasma-select-textfield-after-text-margin',
+  textFieldDisabledOpacity: '--plasma-select-textfield-disabled-opacity',
+  textFieldChipHeight: '--plasma-select-textfield-chip-height',
+  textFieldChipBorderRadius: '--plasma-select-textfield-chip-border-radius',
+  textFieldChipGap: '--plasma-select-textfield-chip-gap',
+  textFieldChipBackground: '--plasma-select-textfield--chip-background',
+  textFieldChipColor: '--plasma-select-textfield-chip-color',
+  textFieldChipBackgroundHover: '--plasma-select-textfield-chip-background-hover',
+  textFieldChipColorHover: '--plasma-select-textfield-chip-color-hover',
+  textFieldChipScaleHover: '--plasma-select-textfield-chip-scale-hover',
+  textFieldChipBackgroundActive: '--plasma-select-textfield-chip-background-active',
+  textFieldChipColorActive: '--plasma-select-textfield-chip-color-active',
+  textFieldChipScaleActive: '--plasma-select-textfield-chip-scale-active',
+  textFieldChipCloseIconColor: '--plasma-select-textfield-chip-close-icons-color',
+  textFieldChipOutlineSize: '--plasma-select-textfield-chip-outline-size',
+  textFieldChipWidth: '--plasma-select-textfield-chip-width',
+  textFieldChipPaddingTop: '--plasma-select-textfield-chip-padding-top',
+  textFieldChipPaddingRight: '--plasma-select-textfield-chip-padding-right',
+  textFieldChipPaddingBottom: '--plasma-select-textfield-chip-padding-bottom',
+  textFieldChipPaddingLeft: '--plasma-select-textfield-chip-padding-left',
+  textFieldChipCloseIconSize: '--plasma-select-textfield-chip-close-icon-size',
+  textFieldChipFontFamily: '--plasma-select-textfield-chip-font-family',
+  textFieldChipFontSize: '--plasma-select-textfield-chip-font-size',
+  textFieldChipFontStyle: '--plasma-select-textfield-chip-font-style',
+  textFieldChipFontWeight: '--plasma-select-textfield-chip-font-weight',
+  textFieldChipLetterSpacing: '--plasma-select-textfield-chip-letter-spacing',
+  textFieldChipLineHeight: '--plasma-select-textfield-chip-line-height',
+  textFieldChipClearContentMarginLeft: '--plasma-select-textfield-chip-clear-content-margin-left',
+  textFieldChipClearContentMarginRight: '--plasma-select-textfield-chip-clear-content-margin-right',
+  textFieldFocusColor: '--plasma-select-textfield-focus-color',
   disclosureIconColor: '--plasma-select-disclosure-icon-color',
-  disclosureIconColorHover: '--plasma-select-disclosure-icon-color-hover',
-  contentLeftColor: '--plasma-select-content-left-color'
+  disclosureIconColorHover: '--plasma-select-disclosure-icon-color-hover'
 };
 export var constants = {
   focusColor: '--surface-accent',
@@ -112,5 +175,7 @@ export var constants = {
   fontStyle: '--plasma-typo-body-xs-font-style',
   fontWeight: '--plasma-typo-body-xs-font-weight',
   fontLetterSpacing: '--plasma-typo-body-xs-letter-spacing',
-  fontLineHeight: '--plasma-typo-body-xs-line-height'
+  fontLineHeight: '--plasma-typo-body-xs-line-height',
+  cellTitleColor: '--text-primary',
+  cellBackgroundColor: '--plasma-colors-transparent'
 };

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

@@ -14,7 +14,7 @@ export var keys = {
   PageUp: 'PageUp',
   PageDown: 'PageDown'
 };
-var getFurtherPath = function getFurtherPath(focusedPath, focusedToValueMap) {
+export var getItemByFocused = function getItemByFocused(focusedPath, focusedToValueMap) {
   var focusedPathAsString = focusedPath.reduce(function (acc, n) {
     return "".concat(acc, "/").concat(n);
   }, '').replace(/^(\/)/, '');
@@ -27,14 +27,8 @@ export var useKeyNavigation = function useKeyNavigation(_ref) {
     dispatchPath = _ref.dispatchPath,
     pathMap = _ref.pathMap,
     focusedToValueMap = _ref.focusedToValueMap,
-    handleToggle = _ref.handleToggle,
-    handlePressDown = _ref.handlePressDown,
-    focusedChipIndex = _ref.focusedChipIndex,
-    dispatchFocusedChipIndex = _ref.dispatchFocusedChipIndex,
-    value = _ref.value,
-    valueToItemMap = _ref.valueToItemMap,
-    multiselect = _ref.multiselect,
-    isTargetAmount = _ref.isTargetAmount;
+    handleListToggle = _ref.handleListToggle,
+    handlePressDown = _ref.handlePressDown;
   var currentIndex = (focusedPath === null || focusedPath === void 0 ? void 0 : focusedPath[focusedPath.length - 1]) || 0;
   var currentLength = pathMap.get(path === null || path === void 0 ? void 0 : path[focusedPath.length - 1]) || 0;
   var onKeyDown = function onKeyDown(event) {
@@ -60,12 +54,7 @@ export var useKeyNavigation = function useKeyNavigation(_ref) {
             dispatchFocusedPath({
               type: 'set_initial_focus'
             });
-            handleToggle(true);
-          }
-          if (Array.isArray(value)) {
-            dispatchFocusedChipIndex({
-              type: 'reset'
-            });
+            handleListToggle(true);
           }
           break;
         }
@@ -90,12 +79,7 @@ export var useKeyNavigation = function useKeyNavigation(_ref) {
             dispatchFocusedPath({
               type: 'set_initial_focus'
             });
-            handleToggle(true);
-          }
-          if (Array.isArray(value)) {
-            dispatchFocusedChipIndex({
-              type: 'reset'
-            });
+            handleListToggle(true);
           }
           break;
         }
@@ -114,12 +98,8 @@ export var useKeyNavigation = function useKeyNavigation(_ref) {
               }
             }
             if (path.length === 1) {
-              handleToggle(false);
+              handleListToggle(false);
             }
-          } else if (Array.isArray(value) && !isTargetAmount) {
-            dispatchFocusedChipIndex({
-              type: 'moveLeft'
-            });
           }
           break;
         }
@@ -129,7 +109,7 @@ export var useKeyNavigation = function useKeyNavigation(_ref) {
             if (!focusedPath.length) {
               break;
             }
-            var currentItem = getFurtherPath(focusedPath, focusedToValueMap);
+            var currentItem = getItemByFocused(focusedPath, focusedToValueMap);
             if (currentItem !== null && currentItem !== void 0 && currentItem.items) {
               if (path.length > focusedPath.length) {
                 dispatchFocusedPath({
@@ -143,39 +123,13 @@ export var useKeyNavigation = function useKeyNavigation(_ref) {
                 });
               }
             }
-          } else if (Array.isArray(value) && !isTargetAmount) {
-            dispatchFocusedChipIndex({
-              type: 'moveRight',
-              total: value.length
-            });
-          }
-          break;
-        }
-      case keys.Backspace:
-        {
-          if (!multiselect || !Array.isArray(value)) break;
-          if (focusedChipIndex !== null) {
-            var _currentItem = valueToItemMap.get(value[focusedChipIndex]);
-            handlePressDown(_currentItem);
-            if (value.length === 1) {
-              dispatchFocusedChipIndex({
-                type: 'reset'
-              });
-              break;
-            }
-            if (focusedChipIndex === value.length - 1) {
-              dispatchFocusedChipIndex({
-                type: 'moveLeft'
-              });
-              break;
-            }
           }
           break;
         }
       case keys.Space:
         {
           event.preventDefault();
-          var _currentItem2 = getFurtherPath(focusedPath, focusedToValueMap);
+          var _currentItem = getItemByFocused(focusedPath, focusedToValueMap);
           if (!path[0]) {
             dispatchPath({
               type: 'opened_first_level'
@@ -185,22 +139,17 @@ export var useKeyNavigation = function useKeyNavigation(_ref) {
             });
             break;
           }
-          if (!_currentItem2 || _currentItem2 !== null && _currentItem2 !== void 0 && _currentItem2.disabled) {
+          if (!_currentItem || _currentItem !== null && _currentItem !== void 0 && _currentItem.disabled) {
             break;
           }
-          handlePressDown(_currentItem2);
+          handlePressDown(_currentItem);
           break;
         }
       case keys.Enter:
         {
           event.preventDefault();
-          if (Array.isArray(value)) {
-            dispatchFocusedChipIndex({
-              type: 'reset'
-            });
-          }
-          var _currentItem3 = getFurtherPath(focusedPath, focusedToValueMap);
-          if (_currentItem3 !== null && _currentItem3 !== void 0 && _currentItem3.disabled) {
+          var _currentItem2 = getItemByFocused(focusedPath, focusedToValueMap);
+          if (_currentItem2 !== null && _currentItem2 !== void 0 && _currentItem2.disabled) {
             break;
           }
           if (!path[0]) {
@@ -212,7 +161,7 @@ export var useKeyNavigation = function useKeyNavigation(_ref) {
             });
             break;
           }
-          if (_currentItem3 !== null && _currentItem3 !== void 0 && _currentItem3.items) {
+          if (_currentItem2 !== null && _currentItem2 !== void 0 && _currentItem2.items) {
             if (path.length > focusedPath.length) {
               dispatchFocusedPath({
                 type: 'add_focus',
@@ -221,12 +170,12 @@ export var useKeyNavigation = function useKeyNavigation(_ref) {
             } else {
               dispatchPath({
                 type: 'added_next_level',
-                value: _currentItem3.value.toString()
+                value: _currentItem2.value.toString()
               });
             }
             break;
           }
-          handlePressDown(_currentItem3);
+          handlePressDown(_currentItem2);
           break;
         }
       case keys.Tab:
@@ -238,10 +187,7 @@ export var useKeyNavigation = function useKeyNavigation(_ref) {
           dispatchPath({
             type: 'reset'
           });
-          dispatchFocusedChipIndex({
-            type: 'reset'
-          });
-          handleToggle(false);
+          handleListToggle(false);
           break;
         }
       case keys.Home:
@@ -263,7 +209,7 @@ export var useKeyNavigation = function useKeyNavigation(_ref) {
             dispatchFocusedPath({
               type: 'set_initial_focus'
             });
-            handleToggle(true);
+            handleListToggle(true);
           }
           break;
         }
@@ -287,7 +233,7 @@ export var useKeyNavigation = function useKeyNavigation(_ref) {
               type: 'change_last_focus',
               value: (pathMap.get('root') || 0) - 1
             });
-            handleToggle(true);
+            handleListToggle(true);
           }
           break;
         }

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

@@ -5,17 +5,20 @@ export var usePathMaps = function usePathMaps(items) {
   var focusedToValueMap = new Map();
   var valueToCheckedMap = new Map();
   var valueToItemMap = new Map();
+  var labelToItemMap = new Map();
   pathMap.set('root', (items === null || items === void 0 ? void 0 : items.length) || 0);
   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) {
       var value = item.value,
+        label = item.label,
         innerItems = item.items;
       var currIndex = "".concat(prevIndex, "/").concat(index).replace(/^(\/)/, '');
       focusedToValueMap.set(currIndex, item);
       valueToCheckedMap.set(value, false);
       if (isEmpty(innerItems) || !innerItems) {
         valueToItemMap.set(value, item);
+        labelToItemMap.set(label, item);
       } else {
         pathMap.set(value, innerItems.length);
         rec(innerItems, currIndex);
@@ -23,5 +26,5 @@ export var usePathMaps = function usePathMaps(items) {
     });
   };
   rec(items);
-  return [pathMap, focusedToValueMap, valueToCheckedMap, valueToItemMap];
+  return [pathMap, focusedToValueMap, valueToCheckedMap, valueToItemMap, labelToItemMap];
 };

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

@@ -1,3 +1,2 @@
 export * from './pathReducer';
-export * from './focusedPathReducer';
-export * from './focusedChipIndexReducer';
+export * from './focusedPathReducer';

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

@@ -1,6 +1,8 @@
 import React from 'react';
+import { safeUseId } from '@salutejs/plasma-core';
 import { isEmpty } from '../../../../utils';
-import { Ul, StyledPopover } from '../../Select.styles';
+import { Ul } from '../../Select.styles';
+import { FloatingPopover } from '../../FloatingPopover';
 import { Item } from './ui';
 export var Inner = function Inner(_ref) {
   var item = _ref.item,
@@ -24,15 +26,16 @@ export var Inner = function Inner(_ref) {
     }
   };
   var isCurrentListOpen = path[currentLevel + 1] === item.value.toString();
-  var listId = "tree_level_".concat(currentLevel + 2);
+  var treeId = safeUseId();
+  var listId = "".concat(treeId, "_tree_level_").concat(currentLevel + 2);
   var nextLevel = currentLevel + 1;
   if (!isEmpty(item === null || item === void 0 ? void 0 : item.items)) {
     var _item$items;
-    return /*#__PURE__*/React.createElement(StyledPopover, {
+    return /*#__PURE__*/React.createElement(FloatingPopover, {
+      placement: "right",
       opened: isCurrentListOpen,
-      usePortal: false,
-      placement: "right-start",
-      trigger: "click",
+      onToggle: handleToggle,
+      offset: 2,
       target: /*#__PURE__*/React.createElement(Item, {
         item: item,
         path: path,
@@ -42,10 +45,7 @@ export var Inner = function Inner(_ref) {
         ariaExpanded: isCurrentListOpen,
         ariaLevel: nextLevel,
         ariaLabel: item.label
-      }),
-      onToggle: handleToggle,
-      isFocusTrapped: false,
-      preventOverflow: false
+      })
     }, /*#__PURE__*/React.createElement(Ul, {
       role: "group",
       id: listId,

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

@@ -1,11 +1,12 @@
 var _StyledIndicator;
-import React, { useEffect, useRef, useContext } from 'react';
-import { sizeToIconSize } from '../../../../utils';
+import React, { useRef, useContext } from 'react';
+import { sizeToIconSize, getItemId } from '../../../../utils';
 import { classes } from '../../../../Select.tokens';
 import { cx, isEmpty } from '../../../../../../utils';
 import { IconDisclosureRightCentered, IconDone } from '../../../../../_Icon';
 import { Context } from '../../../../Select';
-import { StyledContentLeft, StyledContentRight, StyledText, Wrapper, DisclosureIconWrapper, StyledCheckbox, IconWrapper, StyledIndicator, StyledCheckboxWrapper } from './Item.styles';
+import { useDidMountEffect } from '../../../../../../hooks';
+import { StyledWrapper, StyledCell, StyledCheckbox, StyledIndicator, DisclosureIconWrapper, IconWrapper, StyledText, Wrapper, StyledCheckboxWrapper } from './Item.styles';
 export var Item = function Item(_ref) {
   var item = _ref.item,
     path = _ref.path,
@@ -19,7 +20,6 @@ export var Item = function Item(_ref) {
     label = item.label,
     disabled = item.disabled,
     isDisabled = item.isDisabled,
-    color = item.color,
     contentLeft = item.contentLeft,
     contentRight = item.contentRight;
   var ref = useRef(null);
@@ -32,12 +32,13 @@ export var Item = function Item(_ref) {
     handleItemClick = _useContext.handleItemClick,
     variant = _useContext.variant,
     renderItem = _useContext.renderItem,
-    valueToItemMap = _useContext.valueToItemMap;
+    valueToItemMap = _useContext.valueToItemMap,
+    treeId = _useContext.treeId;
   var itemDisabled = Boolean(disabled || isDisabled);
-  var isDisabledClassName = itemDisabled ? classes.dropdownItemIsDisabled : undefined;
+  var disabledClassName = itemDisabled ? 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 () {
+  useDidMountEffect(function () {
     if (focusedClass && ref !== null && ref !== void 0 && ref.current) {
       ref.current.scrollIntoView({
         behavior: 'smooth',
@@ -59,16 +60,17 @@ export var Item = function Item(_ref) {
     handleItemClick(item, e);
   };
   return /*#__PURE__*/React.createElement(Wrapper, {
-    className: cx(isDisabledClassName, focusedClass, activeClass),
-    id: value.toString(),
+    className: cx(disabledClassName, focusedClass, activeClass),
+    id: getItemId(treeId, value.toString()),
     ref: ref,
     onClick: handleClick,
     variant: variant,
+    role: "treeitem",
     "aria-controls": ariaControls,
     "aria-expanded": ariaExpanded,
     "aria-level": ariaLevel,
     "aria-label": ariaLabel,
-    role: "treeitem"
+    "aria-selected": Boolean(checked.get(item.value))
   }, /*#__PURE__*/React.createElement(IconWrapper, {
     variant: variant
   }, multiselect && /*#__PURE__*/React.createElement(StyledCheckboxWrapper, {
@@ -78,17 +80,22 @@ export var Item = function Item(_ref) {
   }, /*#__PURE__*/React.createElement(StyledCheckbox, {
     checked: Boolean(checked.get(item.value)),
     indeterminate: checked.get(item.value) === 'indeterminate',
-    onChange: handleChange,
-    className: classes.selectItemCheckbox
+    onChange: handleChange
   })), !multiselect && checked.get(item.value) === 'dot' && (_StyledIndicator || (_StyledIndicator = /*#__PURE__*/React.createElement(StyledIndicator, {
     size: "s",
     view: "default"
   }))), !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, {
+  })), renderItem ? /*#__PURE__*/React.createElement(StyledText, null, renderItem(valueToItemMap.get(value))) : /*#__PURE__*/React.createElement(StyledWrapper, null, /*#__PURE__*/React.createElement(StyledCell, {
+    contentLeft: contentLeft,
+    contentRight: contentRight
+    // TODO: #1548
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    ,
+    title: /*#__PURE__*/React.createElement("span", null, label)
+  })), !isEmpty(item.items) && /*#__PURE__*/React.createElement(DisclosureIconWrapper, null, /*#__PURE__*/React.createElement(IconDisclosureRightCentered, {
     size: sizeToIconSize(size, variant),
     color: "inherit"
   })));