@ozen-ui/kit 0.17.0 → 0.19.0

package/__inner__/cjs/hooks/useFocusList/useFocusList.js

@@ -5,15 +5,24 @@ var react_1 = require("react");
 var getNextIndex_1 = require("../../utils/getNextIndex");
 var getPrevIndex_1 = require("../../utils/getPrevIndex");
 var isKey_1 = require("../../utils/isKey");
+var isKeys_1 = require("../../utils/isKeys");
 var useUniqueId_1 = require("../useUniqueId");
 function useFocusList() {
     var name = (0, useUniqueId_1.useUniqueId)();
     var onKeyDown = (0, react_1.useCallback)(function (event) {
-        if (!(0, isKey_1.isKey)(event, 'ArrowUp') && !(0, isKey_1.isKey)(event, 'ArrowDown')) {
+        if (!(0, isKeys_1.isKeys)(event, ['ArrowUp', 'ArrowDown', 'Home', 'End'])) {
             return;
         }
         event.preventDefault();
         var items = document.querySelectorAll("[data-focus-list=\"".concat(name, "\"]"));
+        if ((0, isKey_1.isKey)(event, 'Home')) {
+            items.item(0).focus();
+            return;
+        }
+        if ((0, isKey_1.isKey)(event, 'Home')) {
+            items.item(items.length - 1).focus();
+            return;
+        }
         var currentEl = event.target;
         var currentIndex = Array.from(items).indexOf(currentEl);
         var newIndex = (0, isKey_1.isKey)(event, 'ArrowUp')

package/__inner__/cjs/hooks/useMultiRef/useMultiRef.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useMultiRef = void 0;
 var react_1 = require("react");
+var setRef_1 = require("../../utils/setRef");
 /** Создает несколько ссылок (ref) на один DOM-элемент. */
 function useMultiRef(refs) {
     // Мемоизирует массив ref'ов
@@ -12,13 +13,7 @@ function useMultiRef(refs) {
         }
         return function (node) {
             arrRefs.current.forEach(function (ref) {
-                if (typeof ref === 'function') {
-                    ref(node);
-                }
-                else if (ref) {
-                    // eslint-disable-next-line no-param-reassign
-                    ref.current = node;
-                }
+                (0, setRef_1.setRef)(ref, node);
             });
         };
     }, [arrRefs]);

package/__inner__/cjs/utils/isKeys.d.ts

@@ -0,0 +1,3 @@
+import type { KeyboardEvent as ReactKeyboardEvent } from 'react';
+import type { KeyCode } from '../types/KeyCode';
+export declare const isKeys: (event: KeyboardEvent | ReactKeyboardEvent, keys: KeyCode[]) => boolean;

package/__inner__/cjs/utils/isKeys.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isKeys = void 0;
+var isKey_1 = require("./isKey");
+var isKeys = function (event, keys) { return keys.some(function (key) { return (0, isKey_1.isKey)(event, key); }); };
+exports.isKeys = isKeys;

package/__inner__/cjs/utils/renderContent/index.d.ts

@@ -0,0 +1 @@
+export * from './renderContent';

package/__inner__/cjs/utils/renderContent/index.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./renderContent"), exports);

package/__inner__/cjs/utils/renderContent/renderContent.d.ts

@@ -0,0 +1,6 @@
+import type { FC, ReactElement, ReactNode } from 'react';
+export type RenderContentType<Props extends object> = {
+    content?: string | number | FC<Props> | ReactElement<Props> | (() => ReactElement<Props>);
+    props?: Props;
+};
+export declare function renderContent<Props extends object>({ content, props, }: RenderContentType<Props>): ReactNode;

package/__inner__/cjs/utils/renderContent/renderContent.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.renderContent = void 0;
+var tslib_1 = require("tslib");
+var react_1 = tslib_1.__importStar(require("react"));
+var react_is_1 = require("react-is");
+var mergeDeep_1 = require("../../utils/mergeDeep");
+function renderContent(_a) {
+    var content = _a.content, props = _a.props;
+    // primitives: string or number
+    if (typeof content === 'string' || typeof content === 'number') {
+        return content;
+    }
+    // react-element
+    if ((0, react_is_1.isElement)(content)) {
+        return (0, react_1.cloneElement)(content, (0, mergeDeep_1.mergeDeep)(props, content.props));
+    }
+    // render-function
+    if (typeof content === 'function' && !(0, react_1.isValidElement)(content)) {
+        return content(props);
+    }
+    // react-component
+    if ((0, react_is_1.isValidElementType)(content)) {
+        var Content = content;
+        return react_1.default.createElement(Content, tslib_1.__assign({}, props));
+    }
+    return null;
+}
+exports.renderContent = renderContent;

package/__inner__/cjs/utils/setRef.d.ts

@@ -0,0 +1,4 @@
+import type { Dispatch, SetStateAction, Ref as ReactRef } from 'react';
+type Ref<T> = ReactRef<T> | Dispatch<SetStateAction<T | undefined>> | null;
+export declare const setRef: <T>(ref: Ref<T> | undefined, value: T) => void;
+export {};

package/__inner__/cjs/utils/setRef.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setRef = void 0;
+var setRef = function (ref, value) {
+    if (typeof ref === 'function') {
+        ref(value);
+    }
+    else if (ref) {
+        // eslint-disable-next-line no-param-reassign
+        ref.current = value;
+    }
+};
+exports.setRef = setRef;

package/__inner__/esm/components/Chip/Chip.d.ts

@@ -33,4 +33,7 @@ export type ChipBaseProps = {
     'data-testid'?: string;
 };
 export type ChipProps = ExtendableProps<InputHTMLAttributes<HTMLInputElement>, ChipBaseProps>;
+/**
+ * @deprecated Компонент устарел. Для замены используйте компонент ChipNext
+ */
 export declare const Chip: React.ForwardRefExoticComponent<ChipBaseProps & Omit<React.InputHTMLAttributes<HTMLInputElement>, keyof ChipBaseProps> & React.RefAttributes<HTMLLabelElement>>;

package/__inner__/esm/components/Chip/Chip.js

@@ -8,6 +8,9 @@ import { CHIP_DEFAULT_SIZE, CHIP_DEFAULT_VARIANT, CHIP_DEFAULT_DISABLED, } from
 export var cnChip = cn('Chip');
 export var chipSizeVariant = ['xs', 's', 'm', 'l'];
 export var chipColorVariant = ['primary', 'secondary'];
+/**
+ * @deprecated Компонент устарел. Для замены используйте компонент ChipNext
+ */
 export var Chip = forwardRef(function (inProps, ref) {
     var _a = useThemeProps({ name: 'Chip', props: inProps }), _b = _a.size, size = _b === void 0 ? CHIP_DEFAULT_SIZE : _b, _c = _a.color, color = _c === void 0 ? CHIP_DEFAULT_VARIANT : _c, _d = _a.disabled, disabled = _d === void 0 ? CHIP_DEFAULT_DISABLED : _d, IconLeft = _a.iconLeft, IconRight = _a.iconRight, labelProps = _a.labelProps, inputRef = _a.inputRef, className = _a.className, children = _a.children, dataTestId = _a["data-testid"], other = __rest(_a, ["size", "color", "disabled", "iconLeft", "iconRight", "labelProps", "inputRef", "className", "children", 'data-testid']);
     var iconSize = useMemo(function () { return getIconSizeToFormElement(size); }, [size]);

package/__inner__/esm/components/ChipNext/Chip.css

@@ -0,0 +1,108 @@
+/* stylelint-disable */
+.ChipNext {
+  --chip-border-radius: 24px;
+  --chip-text-wrap: nowrap;
+  background-color: var(--chip-bg-color);
+  border-radius: var(--chip-border-radius);
+  min-block-size: var(--chip-height);
+  padding: 0 var(--chip-padding-x);
+  min-inline-size: var(--chip-min-width);
+  color: var(--chip-text-color);
+  gap: var(--space-s);
+  display: inline-flex;
+  justify-content: center;
+  align-items: center;
+  cursor: pointer;
+  box-sizing: border-box;
+  text-decoration: none;
+  border: none;
+  outline: none;
+  transition:
+    border-color var(--transition-default),
+    color var(--transition-default),
+    background-color var(--transition-default),
+    box-shadow var(--transition-default);
+}
+.ChipNext-Content {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: var(--chip-text-wrap);
+  }
+.ChipNext-Icon {
+    color: inherit;
+    flex-shrink: 0;
+  }
+.ChipNext_multiline {
+    --chip-text-wrap: normal;
+  }
+.ChipNext_size_xs {
+      font: var(--typography-text-2xs-font);
+      letter-spacing: var(--typography-text-2xs-letter_spacing, 0);
+      text-transform: var(--typography-text-2xs-text_transform, none);
+
+      --chip-min-width: 64px;
+      --chip-height: var(--space-xl);
+      --chip-padding-x: var(--space-m);
+    }
+.ChipNext_size_s {
+      font: var(--typography-text-s-font);
+      letter-spacing: var(--typography-text-s-letter_spacing, 0);
+      text-transform: var(--typography-text-s-text_transform, none);
+
+      --chip-min-width: 72px;
+      --chip-height: var(--space-2xl);
+      --chip-padding-x: var(--space-l);
+    }
+.ChipNext_size_m {
+      font: var(--typography-text-m-font);
+      letter-spacing: var(--typography-text-m-letter_spacing, 0);
+      text-transform: var(--typography-text-m-text_transform, none);
+
+      --chip-min-width: 80px;
+      --chip-height: var(--space-3xl);
+      --chip-padding-x: 20px;
+    }
+.ChipNext_size_l {
+      font: var(--typography-text-l-font);
+      letter-spacing: var(--typography-text-l-letter_spacing, 0);
+      text-transform: var(--typography-text-l-text_transform, none);
+
+      --chip-min-width: 88px;
+      --chip-height: var(--space-4xl);
+      --chip-padding-x: var(--space-xl);
+    }
+.ChipNext_color_primary {
+      --chip-bg-color: var(--color-background-action-light);
+      --chip-bg-color-hover: var(--color-background-action-light-hover);
+      --chip-bg-color-active: var(--color-background-action-light-pressed);
+      --chip-text-color: var(--color-content-action-dark);
+    }
+.ChipNext_color_secondary {
+      --chip-bg-color: var(--color-background-secondary);
+      --chip-bg-color-hover: var(--color-background-secondary-hover);
+      --chip-bg-color-active: var(--color-background-secondary-pressed);
+      --chip-text-color: var(--color-content-primary);
+    }
+.ChipNext:hover {
+    --chip-bg-color: var(--chip-bg-color-hover);
+  }
+.ChipNext:active {
+    --chip-bg-color: var(--chip-bg-color-active);
+  }
+.ChipNext:focus {
+    box-shadow: var(--shadow-outline-focused);
+  }
+.ChipNext:focus:not(:focus-visible) {
+    box-shadow: none;
+  }
+.ChipNext_checked,
+  .ChipNext_checked:hover,
+  .ChipNext_checked:active {
+    --chip-bg-color: var(--color-background-action);
+    --chip-text-color: var(--color-content-action-on);
+  }
+.ChipNext_disabled {
+    --chip-bg-color: var(--color-background-disabled);
+    --chip-text-color: var(--color-content-disabled);
+    pointer-events: none;
+  }

package/__inner__/esm/components/ChipNext/Chip.d.ts

@@ -0,0 +1,42 @@
+import './Chip.css';
+import type { ReactNode, MouseEvent, ElementType } from 'react';
+import type { IconProps, IconSize } from '@ozen-ui/icons';
+import type { PolymorphicComponentPropsWithRef } from '../../utils/polymorphicComponentWithRef';
+import type { RenderContentType } from '../../utils/renderContent';
+import { CHIP_DEFAULT_TAG } from './constants';
+export declare const cnChip: import("@bem-react/classname").ClassNameFormatter;
+export declare const chipSizeVariant: readonly ["xs", "s", "m", "l"];
+export declare const chipColorVariant: readonly ["primary", "secondary"];
+export type ChipSizeVariant = (typeof chipSizeVariant)[number];
+export type ChipColorVariant = (typeof chipColorVariant)[number];
+export type ChipIcon = RenderContentType<IconProps & {
+    size?: IconSize;
+}>['content'];
+export type ChipBaseProps = {
+    /** Размер компонента */
+    size?: ChipSizeVariant;
+    /** Вариант представления компонента */
+    color?: ChipColorVariant;
+    /** Если {true} компонент отображается как заблокированный */
+    disabled?: boolean;
+    /** Если {true} делает элемент выбранным */
+    checked?: boolean;
+    /** Обработчик нажатия */
+    onClick?: (e: MouseEvent<HTMLElement>, payload: {
+        checked: boolean;
+    }) => void;
+    /** Иконка слева */
+    iconLeft?: ChipIcon;
+    /** Иконка справа */
+    iconRight?: ChipIcon;
+    /** Если {true} разбивает длинный текст на несколько строк */
+    multiline?: boolean;
+    /** Дополнительные СSS-классы */
+    className?: string;
+    /** Содержимое компонента */
+    children?: ReactNode;
+    /** Идентификатор компонента для тестов */
+    'data-testid'?: string;
+};
+export type ChipProps<As extends ElementType = typeof CHIP_DEFAULT_TAG> = PolymorphicComponentPropsWithRef<ChipBaseProps, As>;
+export declare const Chip: import("../../utils/polymorphicComponentWithRef").PolymorphicComponentWithRef<ChipBaseProps, "button">;

package/__inner__/esm/components/ChipNext/Chip.js

@@ -0,0 +1,43 @@
+import { __assign, __read, __rest } from "tslib";
+import './Chip.css';
+import React from 'react';
+import { useControlled } from '../../hooks/useControlled';
+import { useThemeProps } from '../../hooks/useThemeProps';
+import { cn } from '../../utils/classname';
+import { getIconSizeToFormElement } from '../../utils/getIconSizeToFormElement';
+import { polymorphicComponentWithRef } from '../../utils/polymorphicComponentWithRef';
+import { renderContent } from '../../utils/renderContent';
+import { CHIP_DEFAULT_TAG, CHIP_DEFAULT_SIZE, CHIP_DEFAULT_VARIANT, CHIP_DEFAULT_DISABLED, } from './constants';
+export var cnChip = cn('ChipNext');
+export var chipSizeVariant = ['xs', 's', 'm', 'l'];
+export var chipColorVariant = ['primary', 'secondary'];
+export var Chip = polymorphicComponentWithRef(function (inProps, ref) {
+    var _a = useThemeProps({ name: 'ChipNext', props: inProps }), _b = _a.size, size = _b === void 0 ? CHIP_DEFAULT_SIZE : _b, _c = _a.color, color = _c === void 0 ? CHIP_DEFAULT_VARIANT : _c, _d = _a.disabled, disabled = _d === void 0 ? CHIP_DEFAULT_DISABLED : _d, iconLeft = _a.iconLeft, iconRight = _a.iconRight, multiline = _a.multiline, className = _a.className, children = _a.children, onClick = _a.onClick, checkedProp = _a.checked, _e = _a.as, Tag = _e === void 0 ? CHIP_DEFAULT_TAG : _e, dataTestId = _a["data-testid"], other = __rest(_a, ["size", "color", "disabled", "iconLeft", "iconRight", "multiline", "className", "children", "onClick", "checked", "as", 'data-testid']);
+    var _f = __read(useControlled({
+        value: checkedProp,
+        defaultValue: false,
+        name: 'ChipNext',
+        state: 'open',
+    }), 2), checkedState = _f[0], setCheckedState = _f[1];
+    var handleClick = function (event) {
+        if (disabled) {
+            return;
+        }
+        setCheckedState(!checkedState);
+        onClick === null || onClick === void 0 ? void 0 : onClick(event, { checked: !checkedState });
+    };
+    var renderIcon = function (content) {
+        return renderContent({
+            content: content,
+            props: {
+                size: getIconSizeToFormElement(size),
+                className: cnChip('Icon'),
+            },
+        });
+    };
+    return (React.createElement(Tag, __assign({ type: "button", "data-testid": dataTestId, disabled: disabled }, other, { className: cnChip({ size: size, disabled: disabled, color: color, multiline: multiline, checked: checkedState }, [className]), onClick: handleClick, ref: ref }),
+        renderIcon(iconLeft),
+        children && React.createElement("span", { className: cnChip('Content') }, children),
+        renderIcon(iconRight)));
+});
+Chip.displayName = 'Chip';

package/__inner__/esm/components/ChipNext/constants.d.ts

@@ -0,0 +1,4 @@
+export declare const CHIP_DEFAULT_TAG = "button";
+export declare const CHIP_DEFAULT_VARIANT = "primary";
+export declare const CHIP_DEFAULT_SIZE = "m";
+export declare const CHIP_DEFAULT_DISABLED = false;

package/__inner__/esm/components/ChipNext/constants.js

@@ -0,0 +1,4 @@
+export var CHIP_DEFAULT_TAG = 'button';
+export var CHIP_DEFAULT_VARIANT = 'primary';
+export var CHIP_DEFAULT_SIZE = 'm';
+export var CHIP_DEFAULT_DISABLED = false;

package/__inner__/esm/components/ChipNext/index.d.ts

@@ -0,0 +1 @@
+export * from './Chip';

package/__inner__/esm/components/ChipNext/index.js

@@ -0,0 +1 @@
+export * from './Chip';

package/__inner__/esm/components/FieldIcon/FieldIcon.d.ts

@@ -1,18 +1,15 @@
 import './FieldIcon.css';
-import type { ComponentPropsWithRef, ComponentRef, FC, ReactElement } from 'react';
+import type { ComponentPropsWithRef, ComponentRef } from 'react';
 import React from 'react';
 import type { IconProps, IconSize } from '@ozen-ui/icons';
 import type { FormElementSizeVariant } from '../../types/FormElementSizeVariant';
+import type { RenderContentType } from '../../utils/renderContent';
 export declare const FIELD_ICON_DEFAULT_TAG = "div";
 export type FieldIconRef = ComponentRef<typeof FIELD_ICON_DEFAULT_TAG>;
 export type FieldIconProps = ComponentPropsWithRef<typeof FIELD_ICON_DEFAULT_TAG> & {
-    icon?: string | ReactElement<IconProps & {
+    icon?: RenderContentType<IconProps & {
         size?: IconSize;
-    }> | (() => ReactElement<IconProps & {
-        size?: IconSize;
-    }>) | FC<IconProps & {
-        size?: IconSize;
-    }>;
+    }>['content'];
     size?: FormElementSizeVariant;
     children?: never;
 };

package/__inner__/esm/components/FieldIcon/FieldIcon.js

@@ -1,31 +1,12 @@
 import { __assign, __read, __rest } from "tslib";
 import './FieldIcon.css';
 import React, { forwardRef, useContext } from 'react';
-import { isValidElementType, isElement } from 'react-is';
 import { cn } from '../../utils/classname';
 import { getIconSizeToFormElement } from '../../utils/getIconSizeToFormElement';
+import { renderContent } from '../../utils/renderContent';
 import { FieldControlContext } from '../FieldControl';
 export var FIELD_ICON_DEFAULT_TAG = 'div';
 export var cnFieldIcon = cn('FieldIcon');
-// TODO: взять за основу для всех рендер-функций
-var resolveChildren = function (content, size) {
-    if (typeof content === 'string') {
-        return content;
-    }
-    if (isElement(content)) {
-        return React.cloneElement(content, {
-            size: content.props.size || (size && getIconSizeToFormElement(size)),
-        });
-    }
-    if (typeof content === 'function' && !React.isValidElement(content)) {
-        return content({ size: size && getIconSizeToFormElement(size) });
-    }
-    if (isValidElementType(content)) {
-        var Content = content;
-        return React.createElement(Content, { size: size && getIconSizeToFormElement(size) });
-    }
-    return null;
-};
 export var FieldIcon = forwardRef(function (_a, ref) {
     var icon = _a.icon, className = _a.className, sizeProp = _a.size, other = __rest(_a, ["icon", "className", "size"]);
     var context = useContext(FieldControlContext);
@@ -40,6 +21,9 @@ export var FieldIcon = forwardRef(function (_a, ref) {
             size = fieldControl.size;
         }
     }
-    return (React.createElement(Tag, __assign({ className: cnFieldIcon({ size: size }, [className]) }, other, { ref: ref }), resolveChildren(icon, size)));
+    return (React.createElement(Tag, __assign({ className: cnFieldIcon({ size: size }, [className]) }, other, { ref: ref }), renderContent({
+        content: icon,
+        props: { size: size && getIconSizeToFormElement(size) },
+    })));
 });
 FieldIcon.displayName = 'FieldIcon';

package/__inner__/esm/components/List/List.css

@@ -8,6 +8,7 @@
   gap: var(--list-gap);
   padding: var(--list-gutter) 0;
   margin: 0;
+  position: relative;
   outline: none;
 }
 

package/__inner__/esm/components/Menu/Menu.css

@@ -27,7 +27,6 @@
     background: transparent;
   }
   .Menu {
-  scroll-behavior: smooth;
   overflow: hidden auto;
   max-block-size: 40vb;
 }

package/__inner__/esm/components/Menu/components/MenuItem/MenuItem.js

@@ -9,14 +9,14 @@ import { LIST_ITEM_BUTTON_DEFAULT_TAG } from '../../../List/constants';
 export var cnMenuItem = cn('MenuItem');
 export var MenuItem = polymorphicComponentWithRef(function (inProps, ref) {
     var props = useThemeProps({ props: inProps, name: 'MenuItem' });
-    var children = props.children, selected = props.selected, value = props.value, label = props.label, _a = props.autoFocus, autoFocus = _a === void 0 ? false : _a, className = props.className, _b = props.as, Tag = _b === void 0 ? LIST_ITEM_BUTTON_DEFAULT_TAG : _b, other = __rest(props, ["children", "selected", "value", "label", "autoFocus", "className", "as"]);
+    var children = props.children, selected = props.selected, value = props.value, label = props.label, _a = props.autoFocus, autoFocus = _a === void 0 ? false : _a, disabled = props.disabled, className = props.className, _b = props.as, Tag = _b === void 0 ? LIST_ITEM_BUTTON_DEFAULT_TAG : _b, other = __rest(props, ["children", "selected", "value", "label", "autoFocus", "disabled", "className", "as"]);
     var innerRef = useRef(null);
     useEffect(function () {
         var _a;
-        if (autoFocus) {
+        if (autoFocus && !disabled) {
             (_a = innerRef.current) === null || _a === void 0 ? void 0 : _a.focus();
         }
-    }, [autoFocus]);
-    return (React.createElement(ListItemButton, __assign({ role: "menuitem", as: Tag }, other, { ref: useMultiRef([ref, innerRef]), className: cnListItemButton({ selected: selected }, [className, cnMenuItem()]), "data-value": value, "data-label": label }), children));
+    }, [autoFocus, disabled]);
+    return (React.createElement(ListItemButton, __assign({ role: "menuitem", as: Tag, disabled: disabled }, other, { ref: useMultiRef([ref, innerRef]), className: cnListItemButton({ selected: selected }, [className, cnMenuItem()]), "data-value": value, "data-label": label }), children));
 });
 MenuItem.displayName = 'MenuItem';

package/__inner__/esm/components/Menu/components/MenuList/MenuList.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { ListProps } from '../../../List';
 export type MenuListProps = {
-    /** Если {true} устанавливает автофокус на первый или выбранный элемент в списке */
+    /** Если {true} устанавливает автофокус на первый активный элемент в списке */
     autoFocus?: boolean;
-} & ListProps;
+} & ListProps<'div'>;
 export declare const MenuList: React.ForwardRefExoticComponent<Omit<MenuListProps, "ref"> & React.RefAttributes<HTMLDivElement>>;

package/__inner__/esm/components/Menu/components/MenuList/MenuList.js

@@ -1,63 +1,81 @@
-import { __assign, __rest } from "tslib";
-import React, { forwardRef, useRef, isValidElement, Children } from 'react';
+import { __assign, __read, __rest } from "tslib";
+import React, { forwardRef, isValidElement, Children, useRef, useState, } from 'react';
 import { isFragment } from 'react-is';
 import { useMultiRef } from '../../../../hooks/useMultiRef';
 import { useThemeProps } from '../../../../hooks/useThemeProps';
+import { setRef } from '../../../../utils/setRef';
 import { List } from '../../../List';
 import { useMenuFocusList } from '../../useMenuFocusList';
 import { MenuItem } from '../MenuItem';
+var isNotSelectOption = function (child) {
+    return !isValidElement(child) || (child === null || child === void 0 ? void 0 : child.type) !== MenuItem || !!child.props.disabled;
+};
 export var MenuList = forwardRef(function (inProps, ref) {
     var props = useThemeProps({ props: inProps, name: 'MenuList' });
-    var children = props.children, _a = props.autoFocus, autoFocus = _a === void 0 ? false : _a, other = __rest(props, ["children", "autoFocus"]);
-    var nodesRef = useRef([]);
-    var onKeyDown = useMenuFocusList(nodesRef.current).onKeyDown;
+    var _a = props.autoFocus, autoFocus = _a === void 0 ? false : _a, children = props.children, onMouseDownProp = props.onMouseDown, other = __rest(props, ["autoFocus", "children", "onMouseDown"]);
+    var listRef = useRef(null);
+    var _b = __read(useState({}), 2), nodes = _b[0], setNodes = _b[1];
+    var onKeyDown = useMenuFocusList(Object.values(nodes)).onKeyDown;
     var activeItemIndex = -1;
+    var focusedItemIndex = -1;
     var resolvedChildren = isFragment(children)
         ? children.props.children
         : children;
     Children.forEach(resolvedChildren, function (child, index) {
-        if (!isValidElement(child) ||
-            (child === null || child === void 0 ? void 0 : child.type) !== MenuItem ||
-            child.props.disabled) {
+        if (isNotSelectOption(child)) {
             return;
         }
-        if (child.props.selected) {
+        if (child.props.autoFocus || child.props.selected) {
             activeItemIndex = index;
+            focusedItemIndex = index;
         }
         else if (activeItemIndex === -1) {
             activeItemIndex = index;
+            if (autoFocus) {
+                focusedItemIndex = index;
+            }
         }
     });
-    return (React.createElement(List, __assign({ role: "menu", as: "div", tabIndex: -1, onClick: function (e) {
-            var _a;
-            if (e.target === e.currentTarget) {
-                (_a = nodesRef.current[0]) === null || _a === void 0 ? void 0 : _a.focus();
-            }
-        }, ref: ref }, other), Children.map(resolvedChildren, function (child, index) {
-        if (!isValidElement(child) ||
-            (child === null || child === void 0 ? void 0 : child.type) !== MenuItem ||
-            child.props.disabled) {
+    var renderChildren = Children.map(resolvedChildren, function (child, index) {
+        if (isNotSelectOption(child)) {
             return child;
         }
         var isActiveElement = activeItemIndex === index;
+        var isFocusedElement = focusedItemIndex === index;
         var elementChild = child;
+        var ref = function (ref) {
+            setRef(elementChild.ref, ref);
+            if (ref) {
+                setNodes(function (prevNodes) {
+                    var _a;
+                    return (__assign(__assign({}, prevNodes), (_a = {}, _a[index] = ref, _a)));
+                });
+            }
+            else {
+                setNodes(function (prevNodes) {
+                    var obj = __assign({}, prevNodes);
+                    delete obj[index];
+                    return obj;
+                });
+            }
+        };
         var props = {
+            ref: ref,
             tabIndex: isActiveElement ? 0 : -1,
-            autoFocus: autoFocus && isActiveElement,
+            autoFocus: isFocusedElement,
             onKeyDown: function (event) {
                 var _a, _b;
                 onKeyDown(event);
                 (_b = (_a = child.props).onKeyDown) === null || _b === void 0 ? void 0 : _b.call(_a, event);
             },
         };
-        // eslint-disable-next-line react-hooks/rules-of-hooks
-        var ref = useMultiRef([
-            elementChild.ref,
-            function (ref) {
-                nodesRef.current.push(ref);
-            },
-        ]);
-        return React.cloneElement(elementChild, __assign(__assign({}, props), { ref: ref }));
-    })));
+        return React.cloneElement(elementChild, __assign({}, props));
+    });
+    return (React.createElement(List, __assign({ onMouseDown: function (event) {
+            if (event.target === listRef.current) {
+                event.preventDefault();
+            }
+            onMouseDownProp === null || onMouseDownProp === void 0 ? void 0 : onMouseDownProp(event);
+        }, role: "menu", as: "div", tabIndex: -1, ref: useMultiRef([ref, listRef]) }, other), renderChildren));
 });
 MenuList.displayName = 'MenuList';

package/__inner__/esm/components/Menu/useMenuFocusList.js

@@ -2,17 +2,27 @@ import { useCallback, useEffect, useRef } from 'react';
 import { getNextIndex } from '../../utils/getNextIndex';
 import { getPrevIndex } from '../../utils/getPrevIndex';
 import { isKey } from '../../utils/isKey';
+import { isKeys } from '../../utils/isKeys';
 export function useMenuFocusList(nodes) {
     var savedNodes = useRef(nodes);
     useEffect(function () {
         savedNodes.current = nodes;
     }, [nodes]);
     var onKeyDown = useCallback(function (event) {
-        if (!isKey(event, 'ArrowUp') && !isKey(event, 'ArrowDown')) {
+        var _a, _b;
+        if (!isKeys(event, ['ArrowUp', 'ArrowDown', 'Home', 'End'])) {
             return;
         }
         event.preventDefault();
         var items = savedNodes.current;
+        if (isKey(event, 'Home')) {
+            (_a = items === null || items === void 0 ? void 0 : items[0]) === null || _a === void 0 ? void 0 : _a.focus();
+            return;
+        }
+        if (isKey(event, 'End')) {
+            (_b = items === null || items === void 0 ? void 0 : items[items.length - 1]) === null || _b === void 0 ? void 0 : _b.focus();
+            return;
+        }
         var currentEl = event.target;
         var currentIndex = items.indexOf(currentEl);
         var newIndex = isKey(event, 'ArrowUp')