@salutejs/plasma-new-hope 0.78.0-canary.1201.8983771283.0 → 0.78.0-canary.1201.8985207823.0

package/styled-components/cjs/examples/plasma_web/components/Dropdown/Dropdown.stories.tsx

@@ -0,0 +1,292 @@
+import React from 'react';
+import type { ComponentProps } from 'react';
+import type { Meta, StoryObj } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+
+import { WithTheme } from '../../../_helpers';
+import { Button } from '../Button/Button';
+import type { DropdownPlacement, DropdownTrigger } from '../../../../components/Dropdown/Dropdown.types';
+
+import { Dropdown } from './Dropdown';
+
+type StoryDropdownProps = ComponentProps<typeof Dropdown>;
+
+const placements: Array<DropdownPlacement> = ['top', 'bottom', 'right', 'left', 'auto'];
+const triggers: Array<DropdownTrigger> = ['click', 'hover'];
+const size = ['xs', 's', 'm', 'l'];
+const variant = ['normal', 'tight'];
+
+const meta: Meta<StoryDropdownProps> = {
+    title: 'plasma_web/Dropdown',
+    decorators: [WithTheme],
+    component: Dropdown,
+    argTypes: {
+        placement: {
+            options: placements,
+            control: {
+                type: 'select',
+            },
+        },
+        trigger: {
+            options: triggers,
+            control: {
+                type: 'select',
+            },
+        },
+        size: {
+            options: size,
+            control: {
+                type: 'select',
+            },
+        },
+        variant: {
+            options: variant,
+            control: {
+                type: 'select',
+            },
+        },
+    },
+    args: {
+        trigger: 'click',
+        offset: [0, 0],
+        listWidth: 'auto',
+        hasArrow: true,
+        closeOnOverlayClick: true,
+        closeOnSelect: true,
+        size: 'm',
+        variant: 'normal',
+    },
+};
+
+export default meta;
+
+const items = [
+    {
+        value: 'north_america',
+        label: 'Северная Америка',
+    },
+    {
+        value: 'south_america',
+        label: 'Южная Америка',
+        items: [
+            {
+                value: 'brazil',
+                label: 'Бразилия',
+                items: [
+                    {
+                        value: 'rio_de_janeiro',
+                        label: 'Рио-де-Жанейро',
+                    },
+                    {
+                        value: 'sao_paulo',
+                        label: 'Сан-Паулу',
+                    },
+                ],
+            },
+            {
+                value: 'argentina',
+                label: 'Аргентина',
+                items: [
+                    {
+                        value: 'buenos_aires',
+                        label: 'Буэнос-Айрес',
+                    },
+                    {
+                        value: 'cordoba',
+                        label: 'Кордова',
+                    },
+                ],
+            },
+            {
+                value: 'colombia',
+                label: 'Колумбия',
+                items: [
+                    {
+                        value: 'bogota',
+                        label: 'Богота',
+                    },
+                    {
+                        value: 'medellin',
+                        label: 'Медельин',
+                    },
+                ],
+            },
+        ],
+    },
+    {
+        value: 'europe',
+        label: 'Европа',
+        items: [
+            {
+                value: 'france',
+                label: 'Франция',
+                items: [
+                    {
+                        value: 'paris',
+                        label: 'Париж',
+                    },
+                    {
+                        value: 'lyon',
+                        label: 'Лион',
+                    },
+                ],
+            },
+            {
+                value: 'germany',
+                label: 'Германия',
+                items: [
+                    {
+                        value: 'berlin',
+                        label: 'Берлин',
+                    },
+                    {
+                        value: 'munich',
+                        label: 'Мюнхен',
+                    },
+                ],
+            },
+            {
+                value: 'italy',
+                label: 'Италия',
+                items: [
+                    {
+                        value: 'rome',
+                        label: 'Рим',
+                    },
+                    {
+                        value: 'milan',
+                        label: 'Милан',
+                    },
+                ],
+            },
+            {
+                value: 'spain',
+                label: 'Испания',
+                items: [
+                    {
+                        value: 'madrid',
+                        label: 'Мадрид',
+                    },
+                    {
+                        value: 'barcelona',
+                        label: 'Барселона',
+                    },
+                ],
+            },
+            {
+                value: 'united_kingdom',
+                label: 'Великобритания',
+                items: [
+                    {
+                        value: 'london',
+                        label: 'Лондон',
+                    },
+                    {
+                        value: 'manchester',
+                        label: 'Манчестер',
+                    },
+                ],
+            },
+        ],
+    },
+    {
+        value: 'asia',
+        label: 'Азия',
+        items: [
+            {
+                value: 'china',
+                label: 'Китай',
+                items: [
+                    {
+                        value: 'beijing',
+                        label: 'Пекин',
+                    },
+                    {
+                        value: 'shanghai',
+                        label: 'Шанхай',
+                    },
+                ],
+            },
+            {
+                value: 'japan',
+                label: 'Япония',
+                items: [
+                    {
+                        value: 'tokyo',
+                        label: 'Токио',
+                    },
+                    {
+                        value: 'osaka',
+                        label: 'Осака',
+                    },
+                ],
+            },
+            {
+                value: 'india',
+                label: 'Индия',
+                items: [
+                    {
+                        value: 'delhi',
+                        label: 'Дели',
+                    },
+                    {
+                        value: 'mumbai',
+                        label: 'Мумбаи',
+                    },
+                ],
+            },
+            {
+                value: 'south_korea',
+                label: 'Южная Корея',
+                items: [
+                    {
+                        value: 'seoul',
+                        label: 'Сеул',
+                    },
+                    {
+                        value: 'busan',
+                        label: 'Пусан',
+                    },
+                ],
+            },
+            {
+                value: 'thailand',
+                label: 'Таиланд',
+                items: [
+                    {
+                        value: 'bangkok',
+                        label: 'Бангкок',
+                    },
+                    {
+                        value: 'phuket',
+                        label: 'Пхукет',
+                    },
+                ],
+            },
+        ],
+    },
+    {
+        value: 'africa',
+        label: 'Африка',
+        disabled: true,
+    },
+];
+
+const StoryNormal = (args: StoryDropdownProps) => {
+    return (
+        <Dropdown
+            {...args}
+            items={items}
+            onToggle={action('onToggle')}
+            onHover={action('onHover')}
+            onItemSelect={action('onItemSelect')}
+            onItemClick={action('onItemClick')}
+        >
+            <Button text="Список стран" />
+        </Dropdown>
+    );
+};
+
+export const Default: StoryObj<StoryDropdownProps> = {
+    render: (args) => <StoryNormal {...args} />,
+};

package/styled-components/es/components/Dropdown/Dropdown.js

@@ -122,7 +122,7 @@ export var dropdownRoot = function dropdownRoot(Root) {
       isFocusTrapped: false,
       target: childrenWithProps(children, {
         role: 'combobox',
-        'aria-controls': 'listbox1',
+        'aria-controls': 'tree_level_1',
         'aria-expanded': isCurrentListOpen,
         'aria-activedescendant': getActiveDescendant(),
         onKeyDown: onKeyDown
@@ -132,7 +132,7 @@ export var dropdownRoot = function dropdownRoot(Root) {
       listHeight: listHeight,
       listOverflow: listOverflow,
       role: "tree",
-      id: "listbox1",
+      id: "tree_level_1",
       listWidth: listWidth
     }, items.map(function (item, index) {
       return /*#__PURE__*/React.createElement(DropdownInner, {

package/styled-components/es/components/Dropdown/hooks/useHashMaps.js

@@ -1,6 +1,6 @@
 import { useMemo } from 'react';
-// Данный хук рекурсивно проходится по дереву items и создаем 2 мапы: мапу путей и мапу фокусов.
-// Нужно для получения информации всей об item, зная только путь до нее.
+// Данный хук рекурсивно проходится по дереву items и создает 2 мапы: мапу путей и мапу фокусов.
+// Нужно для получения всей информации об item, зная только путь до него.
 
 export var useHashMaps = function useHashMaps(items) {
   return useMemo(function () {

package/styled-components/es/components/Dropdown/hooks/useKeyboardNavigation.js

@@ -33,180 +33,207 @@ export var useKeyNavigation = function useKeyNavigation(_ref) {
   var currentLength = pathMap.get(path === null || path === void 0 ? void 0 : path[path.length - 1]) || 0;
   var currentIndex = (focusedPath === null || focusedPath === void 0 ? void 0 : focusedPath[focusedPath.length - 1]) || 0;
   var onKeyDown = function onKeyDown(event) {
-    var code = event.code;
-    if (code === keys.ArrowUp) {
-      if (focusedPath.length) {
-        if (currentIndex <= 0) {
-          return;
-        }
-        dispatchFocusedPath({
-          type: 'change_last_focus',
-          value: currentIndex - 1
-        });
-      } else {
-        dispatchPath({
-          type: 'opened_first_level'
-        });
-        dispatchFocusedPath({
-          type: 'set_initial_focus'
-        });
-        handleGlobalToggle(true, event);
-      }
-    }
-    if (code === keys.ArrowDown) {
-      if (focusedPath.length) {
-        if (currentIndex + 1 >= currentLength) {
-          return;
-        }
-        dispatchFocusedPath({
-          type: 'change_last_focus',
-          value: currentIndex + 1
-        });
-      } else {
-        dispatchPath({
-          type: 'opened_first_level'
-        });
-        dispatchFocusedPath({
-          type: 'set_initial_focus'
-        });
-        handleGlobalToggle(true, event);
-      }
-    }
-    if (code === keys.ArrowLeft) {
-      if (focusedPath.length) {
-        dispatchPath({
-          type: 'removed_last_level'
-        });
-        dispatchFocusedPath({
-          type: 'return_prev_focus'
-        });
-      }
-      if (focusedPath.length === 1) {
-        handleGlobalToggle(false, event);
-      }
-    }
-    if (code === keys.ArrowRight) {
-      if (focusedPath.length) {
-        var currentItem = getFurtherPath(focusedPath, focusedToValueMap);
-        if (currentItem !== null && currentItem !== void 0 && currentItem.items) {
-          dispatchPath({
-            type: 'added_next_level',
-            value: currentItem.value.toString()
-          });
-          dispatchFocusedPath({
-            type: 'add_focus',
-            value: 0
-          });
+    switch (event.code) {
+      case keys.ArrowUp:
+        {
+          if (focusedPath.length) {
+            if (currentIndex > 0) {
+              dispatchFocusedPath({
+                type: 'change_last_focus',
+                value: currentIndex - 1
+              });
+            }
+          } else {
+            dispatchPath({
+              type: 'opened_first_level'
+            });
+            dispatchFocusedPath({
+              type: 'set_initial_focus'
+            });
+            handleGlobalToggle(true, event);
+          }
+          break;
         }
-      }
-    }
-    if (code === keys.Enter || code === keys.Space) {
-      event.preventDefault();
-      if (path[0]) {
-        var _currentItem = getFurtherPath(focusedPath, focusedToValueMap);
-        if (_currentItem !== null && _currentItem !== void 0 && _currentItem.disabled || _currentItem !== null && _currentItem !== void 0 && _currentItem.isDisabled) {
-          return;
+      case keys.ArrowDown:
+        {
+          if (focusedPath.length) {
+            if (currentIndex + 1 < currentLength) {
+              dispatchFocusedPath({
+                type: 'change_last_focus',
+                value: currentIndex + 1
+              });
+            }
+          } else {
+            dispatchPath({
+              type: 'opened_first_level'
+            });
+            dispatchFocusedPath({
+              type: 'set_initial_focus'
+            });
+            handleGlobalToggle(true, event);
+          }
+          break;
         }
-        if (_currentItem !== null && _currentItem !== void 0 && _currentItem.items) {
-          dispatchPath({
-            type: 'added_next_level',
-            value: _currentItem.value.toString()
-          });
-          dispatchFocusedPath({
-            type: 'add_focus',
-            value: 0
-          });
-        } else {
-          if (closeOnSelect) {
+      case keys.ArrowLeft:
+        {
+          if (focusedPath.length) {
+            dispatchPath({
+              type: 'removed_last_level'
+            });
+            dispatchFocusedPath({
+              type: 'return_prev_focus'
+            });
+          }
+          if (focusedPath.length === 1) {
             handleGlobalToggle(false, event);
           }
-          if (onItemSelect && _currentItem) {
-            onItemSelect(_currentItem, event);
+          break;
+        }
+      case keys.ArrowRight:
+        {
+          if (focusedPath.length) {
+            var currentItem = getFurtherPath(focusedPath, focusedToValueMap);
+            if (currentItem !== null && currentItem !== void 0 && currentItem.items) {
+              dispatchPath({
+                type: 'added_next_level',
+                value: currentItem.value.toString()
+              });
+              dispatchFocusedPath({
+                type: 'add_focus',
+                value: 0
+              });
+            }
           }
-          if (onItemClick && _currentItem) {
-            onItemClick(_currentItem, event);
+          break;
+        }
+      case keys.Enter:
+      case keys.Space:
+        {
+          event.preventDefault();
+          if (path[0]) {
+            var _currentItem = getFurtherPath(focusedPath, focusedToValueMap);
+            if (_currentItem !== null && _currentItem !== void 0 && _currentItem.disabled || _currentItem !== null && _currentItem !== void 0 && _currentItem.isDisabled) {
+              break;
+            }
+            if (_currentItem !== null && _currentItem !== void 0 && _currentItem.items) {
+              dispatchPath({
+                type: 'added_next_level',
+                value: _currentItem.value.toString()
+              });
+              dispatchFocusedPath({
+                type: 'add_focus',
+                value: 0
+              });
+            } else {
+              if (closeOnSelect) {
+                handleGlobalToggle(false, event);
+              }
+              if (onItemSelect && _currentItem) {
+                onItemSelect(_currentItem, event);
+              }
+              if (onItemClick && _currentItem) {
+                onItemClick(_currentItem, event);
+              }
+            }
+          } else {
+            dispatchPath({
+              type: 'opened_first_level'
+            });
+            dispatchFocusedPath({
+              type: 'set_initial_focus'
+            });
           }
+          break;
         }
-      } else {
-        dispatchPath({
-          type: 'opened_first_level'
-        });
-        dispatchFocusedPath({
-          type: 'set_initial_focus'
-        });
-      }
-    }
-    if (code === keys.Tab || code === keys.Escape) {
-      dispatchFocusedPath({
-        type: 'reset'
-      });
-      dispatchPath({
-        type: 'reset'
-      });
-      handleGlobalToggle(false, event);
-    }
-    if (code === keys.Home) {
-      if (path[0]) {
-        dispatchFocusedPath({
-          type: 'change_last_focus',
-          value: 0
-        });
-      } else {
-        dispatchPath({
-          type: 'opened_first_level'
-        });
-        dispatchFocusedPath({
-          type: 'set_initial_focus'
-        });
-        handleGlobalToggle(true, event);
-      }
-    }
-    if (code === keys.End) {
-      if (path[0]) {
-        dispatchFocusedPath({
-          type: 'change_last_focus',
-          value: currentLength - 1
-        });
-      } else {
-        dispatchPath({
-          type: 'opened_first_level'
-        });
-        dispatchFocusedPath({
-          type: 'change_last_focus',
-          value: (pathMap.get('root') || 0) - 1
-        });
-        handleGlobalToggle(true, event);
-      }
-    }
-    if (code === keys.PageUp) {
-      if (path[0]) {
-        if (currentIndex <= JUMP_SIZE) {
+      case keys.Tab:
+      case keys.Escape:
+        {
           dispatchFocusedPath({
-            type: 'change_last_focus',
-            value: 0
+            type: 'reset'
           });
-        } else {
-          dispatchFocusedPath({
-            type: 'change_last_focus',
-            value: currentIndex - JUMP_SIZE
+          dispatchPath({
+            type: 'reset'
           });
+          handleGlobalToggle(false, event);
+          break;
         }
-      }
-    }
-    if (code === keys.PageDown) {
-      if (path[0]) {
-        if (currentLength - currentIndex <= JUMP_SIZE) {
-          dispatchFocusedPath({
-            type: 'change_last_focus',
-            value: currentLength - 1
-          });
-        } else {
-          dispatchFocusedPath({
-            type: 'change_last_focus',
-            value: currentIndex + JUMP_SIZE
-          });
+      case keys.Home:
+        {
+          if (path[0]) {
+            dispatchFocusedPath({
+              type: 'change_last_focus',
+              value: 0
+            });
+          } else {
+            dispatchPath({
+              type: 'opened_first_level'
+            });
+            dispatchFocusedPath({
+              type: 'set_initial_focus'
+            });
+            handleGlobalToggle(true, event);
+          }
+          break;
+        }
+      case keys.End:
+        {
+          if (path[0]) {
+            dispatchFocusedPath({
+              type: 'change_last_focus',
+              value: currentLength - 1
+            });
+          } else {
+            dispatchPath({
+              type: 'opened_first_level'
+            });
+            dispatchFocusedPath({
+              type: 'change_last_focus',
+              value: (pathMap.get('root') || 0) - 1
+            });
+            handleGlobalToggle(true, event);
+          }
+          break;
+        }
+      case keys.PageUp:
+        {
+          if (!path[0]) {
+            break;
+          }
+          if (currentIndex <= JUMP_SIZE) {
+            dispatchFocusedPath({
+              type: 'change_last_focus',
+              value: 0
+            });
+          } else {
+            dispatchFocusedPath({
+              type: 'change_last_focus',
+              value: currentIndex - JUMP_SIZE
+            });
+          }
+          break;
+        }
+      case keys.PageDown:
+        {
+          if (!path[0]) {
+            break;
+          }
+          if (currentLength - currentIndex <= JUMP_SIZE) {
+            dispatchFocusedPath({
+              type: 'change_last_focus',
+              value: currentLength - 1
+            });
+          } else {
+            dispatchFocusedPath({
+              type: 'change_last_focus',
+              value: currentIndex + JUMP_SIZE
+            });
+          }
+          break;
+        }
+      default:
+        {
+          break;
         }
-      }
     }
   };
   return {

package/styled-components/es/components/Dropdown/ui/DropdownInner/DropdownInner.js

@@ -35,7 +35,7 @@ var DropdownInner = function DropdownInner(_ref) {
     }
   };
   var isCurrentListOpen = path[currentLevel + 1] === item.value.toString();
-  var listId = "listbox".concat(currentLevel + 2);
+  var listId = "tree_level_".concat(currentLevel + 2);
   var nextLevel = currentLevel + 1;
   if (item !== null && item !== void 0 && item.items) {
     return /*#__PURE__*/React.createElement(StyledPopover, {