@broxus/react-uikit 0.22.0 → 0.23.0

package/dist/esm/components/Nav/Group/InternalNavGroup.d.ts

@@ -0,0 +1,10 @@
+import * as React from 'react';
+import { type NavItemGroupType } from '../../../components/Nav/types';
+export interface NavGroupProps extends Omit<NavItemGroupType, 'children' | 'type' | 'label'> {
+    eventKey?: string;
+    title?: React.ReactNode;
+    warnKey?: boolean;
+}
+export declare const InternalNavGroup: React.ForwardRefExoticComponent<NavGroupProps & {
+    children?: React.ReactNode | undefined;
+} & React.RefAttributes<HTMLLIElement>>;

package/dist/esm/components/Nav/Group/InternalNavGroup.js

@@ -0,0 +1,16 @@
+import { stopEventPropagate } from '@broxus/js-utils';
+import { omit } from '@rc-component/util';
+import classNames from 'classnames';
+import * as React from 'react';
+import { NavContext } from '../../../components/Nav/context';
+export const InternalNavGroup = React.forwardRef(({ children, className, title, ...props }, ref) => {
+    const { prefixCls } = React.useContext(NavContext);
+    const groupRootCls = React.useMemo(() => `${prefixCls}-group`, [prefixCls]);
+    const subRootCls = React.useMemo(() => `${prefixCls}-sub`, [prefixCls]);
+    return (React.createElement("li", { ref: ref, className: classNames(groupRootCls, className), role: "presentation", ...omit(props, ['eventKey', 'warnKey']), onClick: stopEventPropagate },
+        React.createElement("div", { className: `${groupRootCls}-header`, "data-uk-tooltip": "", role: "presentation" }, title),
+        React.createElement("ul", { className: subRootCls, role: "group" }, children)));
+});
+if (process.env.NODE_ENV !== 'production') {
+    InternalNavGroup.displayName = 'Nav.InternalNavGroup';
+}

package/dist/esm/components/Nav/Group/index.d.ts

@@ -1,6 +1,5 @@
 import * as React from 'react';
-import { type NavItemGroupProps } from '../../../components/Nav/Group/InternalNavItemGroup';
-export declare function Group({ children, eventKey, ...restProps }: NavItemGroupProps): React.JSX.Element;
-export declare namespace Group {
-    var displayName: string;
-}
+import { type NavGroupProps } from '../../../components/Nav/Group/InternalNavGroup';
+export declare const Group: React.ForwardRefExoticComponent<NavGroupProps & {
+    children?: React.ReactNode | undefined;
+} & React.RefAttributes<HTMLLIElement>>;

package/dist/esm/components/Nav/Group/index.js

@@ -1,17 +1,17 @@
-import omit from '@rc-component/util/lib/omit';
+import { omit } from '@rc-component/util';
 import * as React from 'react';
-import { useFullPath, useMeasure } from '../../../components/Nav/context/PathContext';
-import { InternalNavItemGroup } from '../../../components/Nav/Group/InternalNavItemGroup';
-import { parseChildren } from '../../../components/Nav/utils/nodeUtil';
-export function Group({ children, eventKey, ...restProps }) {
+import { useFullPath, useMeasure } from '../../../components/Nav/context';
+import { InternalNavGroup } from '../../../components/Nav/Group/InternalNavGroup';
+import { parseChildren } from '../../../components/Nav/utils';
+export const Group = React.forwardRef(({ children, eventKey, ...props }, ref) => {
     const connectedKeyPath = useFullPath(eventKey);
     const measure = useMeasure();
     const childList = parseChildren(children, connectedKeyPath);
     if (measure) {
         return childList;
     }
-    return React.createElement(InternalNavItemGroup, { ...omit(restProps, ['warnKey']) }, childList);
-}
+    return (React.createElement(InternalNavGroup, { ref: ref, ...omit(props, ['warnKey']) }, childList));
+});
 if (process.env.NODE_ENV !== 'production') {
     Group.displayName = 'Nav.Group';
 }

package/dist/esm/components/Nav/Header.d.ts

@@ -2,13 +2,11 @@ import * as React from 'react';
 export interface HeaderProps {
     children: React.ReactNode;
     className?: string;
-    /** @private Internal filled key. Do not set it directly */
     eventKey?: string;
     style?: React.CSSProperties;
-    /** @private Do not use. Private warning empty usage */
     warnKey?: boolean;
 }
-export declare function Header({ className, ...props }: HeaderProps): React.JSX.Element;
+export declare function Header({ className, ...props }: HeaderProps): React.ReactElement;
 export declare namespace Header {
     var displayName: string;
 }

package/dist/esm/components/Nav/Header.js

@@ -1,10 +1,10 @@
-import omit from '@rc-component/util/lib/omit';
+import { omit } from '@rc-component/util';
 import classNames from 'classnames';
 import * as React from 'react';
-import { NavContext } from '../../components/Nav/context/NavContext';
+import { NavContext } from '../../components/Nav/context';
 export function Header({ className, ...props }) {
     const { prefixCls } = React.useContext(NavContext);
-    return React.createElement("li", { className: classNames(`${prefixCls}-header`, className), ...omit(props, ['eventKey', 'warnKey']) });
+    return (React.createElement("li", { className: classNames(`${prefixCls}-header`, className), role: "presentation", ...omit(props, ['eventKey', 'warnKey']) }));
 }
 if (process.env.NODE_ENV !== 'production') {
     Header.displayName = 'Nav.Header';

package/dist/esm/components/Nav/Icon/index.d.ts

@@ -0,0 +1,7 @@
+import * as React from 'react';
+import { type RenderIconInfo, type RenderIconType } from '../../../components/Nav/types';
+export interface IconProps {
+    icon?: RenderIconType;
+    props: RenderIconInfo;
+}
+export default function Icon({ children, icon, props }: React.PropsWithChildren<IconProps>): React.ReactNode;

package/dist/esm/components/Nav/Icon/index.js

@@ -0,0 +1,14 @@
+import * as React from 'react';
+export default function Icon({ children, icon, props }) {
+    let iconNode;
+    if (icon === null || icon === false) {
+        return null;
+    }
+    if (typeof icon === 'function') {
+        iconNode = React.createElement(icon, { ...props });
+    }
+    else if (typeof icon !== 'boolean') {
+        iconNode = icon;
+    }
+    return iconNode || children || null;
+}

package/dist/esm/components/Nav/Item/InternalNavItem.d.ts

@@ -1,7 +1,6 @@
 import * as React from 'react';
 import { type NavItemType } from '../../../components/Nav/types';
 export interface NavItemProps extends Omit<NavItemType, 'label' | 'key'>, Omit<React.HTMLAttributes<HTMLLIElement>, 'onClick' | 'onMouseEnter' | 'onMouseLeave' | 'onSelect'> {
-    children?: React.ReactNode;
     /**
      * Internal filled key. Do not set it directly
      * @private
@@ -13,7 +12,4 @@ export interface NavItemProps extends Omit<NavItemType, 'label' | 'key'>, Omit<R
      */
     warnKey?: boolean;
 }
-export declare function InternalNavItem({ children, className, disabled, eventKey, itemIcon, role, style, warnKey, onClick, onFocus, onKeyDown, onMouseEnter, onMouseLeave, ...restProps }: NavItemProps): React.JSX.Element;
-export declare namespace InternalNavItem {
-    var displayName: string;
-}
+export declare const InternalNavItem: React.ForwardRefExoticComponent<NavItemProps & React.RefAttributes<HTMLElement>>;

package/dist/esm/components/Nav/Item/InternalNavItem.js

@@ -1,24 +1,21 @@
-import KeyCode from '@rc-component/util/lib/KeyCode';
-import warning from '@rc-component/util/lib/warning';
+import { omit, useComposeRef, warning } from '@rc-component/util';
 import classNames from 'classnames';
 import * as React from 'react';
 import { useConfig } from '../../../components/ConfigProvider';
-import { useNavId } from '../../../components/Nav/context/IdContext';
-import { NavContext } from '../../../components/Nav/context/NavContext';
-import { useFullPath } from '../../../components/Nav/context/PathContext';
-import { PrivateContext } from '../../../components/Nav/context/PrivateContext';
-import { useActive } from '../../../components/Nav/hooks/useActive';
-import { useDirectionStyle } from '../../../components/Nav/hooks/useDirectionStyle';
+import { NavContext, useFullPath, useNavId } from '../../../components/Nav/context';
+import { useActive, useDirectionStyle } from '../../../components/Nav/hooks';
+import Icon from '../../../components/Nav/Icon';
 import { LegacyNavItem } from '../../../components/Nav/Item/LegacyNavItem';
-import { warnItemProp } from '../../../components/Nav/utils/warnUtil';
-export function InternalNavItem({ children, className, disabled, eventKey, itemIcon, role, style, warnKey, onClick, onFocus, onKeyDown, onMouseEnter, onMouseLeave, ...restProps }) {
+import { warnItemProp } from '../../../components/Nav/utils';
+import { KeyCode } from '../../../constants';
+export const InternalNavItem = React.forwardRef(({ children, className, disabled, eventKey, itemIcon, role, style, warnKey, onClick, onFocus, onKeyDown, onMouseEnter, onMouseLeave, ...props }, ref) => {
     const config = useConfig();
     const domDataId = useNavId(eventKey);
     const { disabled: contextDisabled = disabled, itemIcon: contextItemIcon, overflowDisabled, selectedKeys, onActive, onItemClick, } = React.useContext(NavContext);
-    const { _internalRenderMenuItem } = React.useContext(PrivateContext);
     const legacyNavItemRef = React.useRef(null);
     const elementRef = React.useRef(null);
     const mergedDisabled = contextDisabled || disabled;
+    const mergedEleRef = useComposeRef(ref, elementRef);
     const connectedKeys = useFullPath(eventKey);
     // ================================ Warn ================================
     if (process.env.NODE_ENV !== 'production' && warnKey) {
@@ -32,6 +29,8 @@ export function InternalNavItem({ children, className, disabled, eventKey, itemI
         // Note: For legacy code is reversed which not like other antd component
         keyPath: [...connectedKeys].reverse(),
     });
+    // ============================= Icon =============================
+    const mergedItemIcon = itemIcon || contextItemIcon;
     // ============================ Active ============================
     const { active, ...activeProps } = useActive(eventKey, disabled, onMouseEnter, onMouseLeave);
     // ============================ Select ============================
@@ -49,7 +48,7 @@ export function InternalNavItem({ children, className, disabled, eventKey, itemI
     };
     const onInternalKeyDown = event => {
         onKeyDown?.(event);
-        if (event.which === KeyCode.ENTER) {
+        if (event.code === KeyCode.Enter) {
             const info = getEventInfo(event);
             // Legacy. Key will also trigger click event
             onClick?.(warnItemProp(info));
@@ -70,34 +69,14 @@ export function InternalNavItem({ children, className, disabled, eventKey, itemI
     if (role === 'option') {
         optionRoleProps['aria-selected'] = selected || false;
     }
-    let renderNode = (React.createElement(LegacyNavItem, { ref: legacyNavItemRef, "aria-disabled": disabled, className: classNames({
+    return (React.createElement(LegacyNavItem, { ref: legacyNavItemRef, "data-nav-id": overflowDisabled && domDataId ? null : domDataId, elementRef: mergedEleRef, role: (role === null || disabled) ? 'none' : role || 'menuitem', tabIndex: disabled ? null : -1, ...omit(props, ['extra']), ...activeProps, ...optionRoleProps, "aria-disabled": disabled, className: classNames(className, {
             [`${config.prefixCls}-active`]: selected,
             [`${config.prefixCls}-disabled`]: disabled,
             [`${config.prefixCls}-hover`]: active,
-        }, className), component: "li", "data-nav-id": overflowDisabled && domDataId ? null : domDataId, elementRef: elementRef, role: role === null ? 'none' : role || 'menuitem', style: {
-            ...directionStyle,
-            ...style,
-        }, tabIndex: disabled ? null : -1, ...optionRoleProps, ...restProps, ...activeProps, onClick: onInternalClick, onFocus: onInternalFocus, onKeyDown: onInternalKeyDown },
-        itemIcon || contextItemIcon,
-        children));
-    if (_internalRenderMenuItem) {
-        renderNode = _internalRenderMenuItem(renderNode, {
-            children,
-            className,
-            disabled,
-            itemIcon,
-            role,
-            style,
-            onClick,
-            onFocus,
-            onKeyDown,
-            onMouseEnter,
-            onMouseLeave,
-            ...restProps,
-        }, { selected });
-    }
-    return renderNode;
-}
+        }), component: "li", style: { ...directionStyle, ...style }, onClick: onInternalClick, onFocus: onInternalFocus, onKeyDown: onInternalKeyDown },
+        children,
+        React.createElement(Icon, { icon: mergedItemIcon, props: { ...props, isSelected: selected } })));
+});
 if (process.env.NODE_ENV !== 'production') {
     InternalNavItem.displayName = 'Nav.InternalNavItem';
 }

package/dist/esm/components/Nav/Item/LegacyNavItem.js

@@ -1,12 +1,18 @@
-import omit from '@rc-component/util/lib/omit';
-import warning from '@rc-component/util/lib/warning';
+import { omit, warning } from '@rc-component/util';
 import Overflow from 'rc-overflow';
 import * as React from 'react';
 export class LegacyNavItem extends React.Component {
     render() {
-        const { attribute, elementRef, title, ...restProps } = this.props;
-        const passedProps = omit(restProps, ['eventKey', 'warnKey']);
+        const { attribute, elementRef, ...props } = this.props;
+        const passedProps = omit(props, [
+            'eventKey',
+            'popupClassName',
+            'popupOffset',
+            'title',
+            'warnKey',
+            'onTitleClick',
+        ]);
         warning(!attribute, '`attribute` of Nav.Item is deprecated. Please pass attribute directly.');
-        return (React.createElement(Overflow.Item, { ...attribute, title: typeof title === 'string' ? title : undefined, ...passedProps, ref: elementRef }));
+        return React.createElement(Overflow.Item, { ref: elementRef, ...attribute, ...passedProps });
     }
 }

package/dist/esm/components/Nav/Item/index.d.ts

@@ -1,6 +1,3 @@
 import * as React from 'react';
 import { type NavItemProps } from '../../../components/Nav/Item/InternalNavItem';
-export declare function Item({ eventKey, ...restProps }: NavItemProps): React.JSX.Element | null;
-export declare namespace Item {
-    var displayName: string;
-}
+export declare const Item: React.ForwardRefExoticComponent<NavItemProps & React.RefAttributes<HTMLElement>>;

package/dist/esm/components/Nav/Item/index.js

@@ -1,12 +1,12 @@
 import { noop } from '@broxus/js-utils';
 import * as React from 'react';
-import { useFullPath, useMeasure } from '../../../components/Nav/context/PathContext';
+import { useFullPath, useMeasure } from '../../../components/Nav/context';
 import { InternalNavItem } from '../../../components/Nav/Item/InternalNavItem';
-export function Item({ eventKey, ...restProps }) {
+export const Item = React.forwardRef(({ eventKey, ...props }, ref) => {
     const measure = useMeasure();
     const connectedKeyPath = useFullPath(eventKey);
     React.useEffect(() => {
-        if (eventKey !== undefined) {
+        if (eventKey) {
             measure?.registerPath(eventKey, connectedKeyPath);
             return () => {
                 measure?.unregisterPath(eventKey, connectedKeyPath);
@@ -14,11 +14,8 @@ export function Item({ eventKey, ...restProps }) {
         }
         return noop;
     }, [connectedKeyPath, eventKey, measure]);
-    if (measure) {
-        return null;
-    }
-    return React.createElement(InternalNavItem, { eventKey: eventKey, ...restProps });
-}
+    return measure ? null : React.createElement(InternalNavItem, { ref: ref, eventKey: eventKey, ...props });
+});
 if (process.env.NODE_ENV !== 'production') {
     Item.displayName = 'Nav.Item';
 }

package/dist/esm/components/Nav/Nav.d.ts

@@ -1,28 +1,12 @@
-import { type CSSMotionProps } from 'rc-motion';
+import { type CSSMotionProps } from '@rc-component/motion';
 import * as React from 'react';
-import { type BuiltinPlacements, type ItemType, type NavClickEventHandler, type NavMode, type NavModifier, type NavRef, type RenderIconType, type SelectEventHandler, type TriggerSubNavAction } from '../../components/Nav/types';
+import { type SemanticName } from '../../components/Nav/Sub/InternalSubNav';
+import { type BuiltinPlacements, type ItemType, type NavClickEventHandler, type NavMode, type NavModifier, type NavPopupRender, type NavRef, type RenderIconType, type SelectEventHandler, type TriggerSubNavAction } from '../../components/Nav/types';
 import { type Direction } from '../../types';
 export interface NavProps extends Omit<React.HTMLAttributes<HTMLUListElement>, 'onClick' | 'onSelect' | 'dir'> {
-    /**
-     * @private Only used for `pro-layout`. Do not use in your prod directly,
-     * and we do not promise any compatibility for this.
-     */
-    _internalRenderMenuItem?: (originNode: React.ReactElement, menuItemProps: any, stateProps: {
-        selected: boolean;
-    }) => React.ReactElement;
-    /**
-     * @private Only used for `pro-layout`. Do not use in your prod directly,
-     * and we do not promise any compatibility for this.
-     */
-    _internalRenderSubMenuItem?: (originNode: React.ReactElement, subMenuItemProps: any, stateProps: {
-        active: boolean;
-        disabled: boolean;
-        open: boolean;
-        selected: boolean;
-    }) => React.ReactElement;
     activeKey?: string;
     builtinPlacements?: BuiltinPlacements;
-    children?: React.ReactNode;
+    classNames?: Partial<Record<SemanticName, string>>;
     defaultActiveFirst?: boolean;
     defaultMotions?: Partial<{
         [key in NavMode | 'other']: CSSMotionProps;
@@ -31,7 +15,6 @@ export interface NavProps extends Omit<React.HTMLAttributes<HTMLUListElement>, '
     defaultSelectedKeys?: string[];
     direction?: Direction;
     disabled?: boolean;
-    disabledOverflow?: boolean;
     expandIcon?: RenderIconType;
     forceSubNavRender?: boolean;
     getPopupContainer?: (node: HTMLElement) => HTMLElement;
@@ -43,12 +26,16 @@ export interface NavProps extends Omit<React.HTMLAttributes<HTMLUListElement>, '
     motion?: CSSMotionProps;
     multiple?: boolean;
     openKeys?: string[];
+    overflowDisabled?: boolean;
     overflowedIndicator?: React.ReactNode;
     overflowedIndicatorPopupClassName?: string;
     popupPrefixCls?: string;
+    popupRender?: NavPopupRender;
     prefixCls?: string;
+    rootClassName?: string;
     selectable?: boolean;
     selectedKeys?: string[];
+    styles?: Partial<Record<SemanticName, React.CSSProperties>>;
     subNavCloseDelay?: number;
     subNavOpenDelay?: number;
     triggerSubNavAction?: TriggerSubNavAction;

package/dist/esm/components/Nav/Nav.js

@@ -1,26 +1,20 @@
+import { useControlledState } from '@rc-component/util';
+import useId from '@rc-component/util/es/hooks/useId';
+import isEqual from '@rc-component/util/es/isEqual';
 import classNames from 'classnames';
 import Overflow from 'rc-overflow';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
-import isEqual from 'rc-util/lib/isEqual';
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { useConfig } from '../../components/ConfigProvider';
-import { getNavId, IdContext } from '../../components/Nav/context/IdContext';
-import { NavContextProvider } from '../../components/Nav/context/NavContext';
-import { PathRegisterContext, PathUserContext } from '../../components/Nav/context/PathContext';
-import { PrivateContext } from '../../components/Nav/context/PrivateContext';
-import { useAccessibility } from '../../components/Nav/hooks/useAccessibility';
-import { OVERFLOW_KEY, useKeyRecords } from '../../components/Nav/hooks/useKeyRecords';
-import { useMemoCallback } from '../../components/Nav/hooks/useMemoCallback';
-import { useUUID } from '../../components/Nav/hooks/useUUID';
+import { IdContext, NavContextProvider, PathRegisterContext, PathUserContext } from '../../components/Nav/context';
+import { getFocusableElements, OVERFLOW_KEY, refreshElements, useAccessibility, useKeyRecords, useMemoCallback, } from '../../components/Nav/hooks';
 import { Item } from '../../components/Nav/Item';
 import { Sub } from '../../components/Nav/Sub';
-import { parseItems } from '../../components/Nav/utils/nodeUtil';
-import { warnItemProp } from '../../components/Nav/utils/warnUtil';
+import { parseItems, warnItemProp } from '../../components/Nav/utils';
 import { useMounted } from '../../hooks';
 import { getCollapseMotion, getMotionName } from '../../utils';
-const EMPTY_LIST = [];
-export const Nav = React.forwardRef(({ _internalRenderMenuItem, _internalRenderSubMenuItem, activeKey, builtinPlacements, children, className, defaultActiveFirst, defaultOpenKeys, defaultSelectedKeys, direction, disabled, disabledOverflow, expandIcon, forceSubNavRender, id, inlineCollapsed, itemIcon, items, mode = 'inline', modifiers, motion, multiple = false, openKeys, overflowedIndicator = '...', overflowedIndicatorPopupClassName, selectable = false, selectedKeys, style, subNavCloseDelay = 0.1, subNavOpenDelay = 0.1, tabIndex = 0, triggerSubNavAction = 'hover', onClick, onDeselect, onKeyDown, onOpenChange, onSelect, ...props }, ref) => {
+const EmptyList = [];
+export const Nav = React.forwardRef(({ activeKey, builtinPlacements, children, className, classNames: navClassNames, defaultActiveFirst, defaultOpenKeys, defaultSelectedKeys, direction, disabled, expandIcon, forceSubNavRender, id, inlineCollapsed, itemIcon, items, mode = 'inline', modifiers, motion, multiple = false, openKeys, overflowDisabled, overflowedIndicator = '...', overflowedIndicatorPopupClassName, popupRender, selectable = false, selectedKeys, style, styles, subNavCloseDelay = 0.1, subNavOpenDelay = 0.1, tabIndex = 0, triggerSubNavAction = 'hover', onClick, onDeselect, onKeyDown, onOpenChange, onSelect, ...props }, ref) => {
     const config = useConfig();
     const { prefixCls = config.prefixCls, defaultMotions = {
         horizontal: {
@@ -32,16 +26,14 @@ export const Nav = React.forwardRef(({ _internalRenderMenuItem, _internalRenderS
             motionName: getMotionName(prefixCls || config.prefixCls, 'zoom'),
         },
     }, getPopupContainer = config.getPopupContainer, popupPrefixCls = `${config.prefixCls}-dropdown`, ...restProps } = props;
-    const childList = React.useMemo(() => parseItems(children, items, EMPTY_LIST), [children, items]);
+    const childList = React.useMemo(() => parseItems(children, items, EmptyList, {}, prefixCls), [children, items, prefixCls]);
     const mounted = useMounted();
     const containerRef = React.useRef(null);
-    const uuid = useUUID(id);
+    const uuid = useId(id);
     const isRtl = direction === 'rtl';
     // ========================= Open =========================
-    const [mergedOpenKeys, setMergedOpenKeys] = useMergedState(defaultOpenKeys, {
-        postState: keys => keys || EMPTY_LIST,
-        value: openKeys,
-    });
+    const [innerOpenKeys, setMergedOpenKeys] = useControlledState(defaultOpenKeys, openKeys);
+    const mergedOpenKeys = innerOpenKeys || EmptyList;
     // React 18 will merge mouse event which means we open key will not sync
     // ref: https://github.com/ant-design/ant-design/issues/38818
     const triggerOpenKeys = React.useCallback((keys, forceFlush = false) => {
@@ -68,7 +60,7 @@ export const Nav = React.forwardRef(({ _internalRenderMenuItem, _internalRenderS
     }, [mode, inlineCollapsed]);
     const isInlineMode = mergedMode === 'inline';
     const [internalMode, setInternalMode] = React.useState(mergedMode);
-    const [, setInternalInlineCollapsed] = React.useState(mergedInlineCollapsed);
+    const [internalInlineCollapsed, setInternalInlineCollapsed] = React.useState(mergedInlineCollapsed);
     React.useEffect(() => {
         setInternalMode(mergedMode);
         setInternalInlineCollapsed(mergedInlineCollapsed);
@@ -81,7 +73,7 @@ export const Nav = React.forwardRef(({ _internalRenderMenuItem, _internalRenderS
         }
         else {
             // Trigger open event in case it`s in control
-            triggerOpenKeys(EMPTY_LIST);
+            triggerOpenKeys(EmptyList);
         }
     }, [
         mergedMode,
@@ -95,7 +87,7 @@ export const Nav = React.forwardRef(({ _internalRenderMenuItem, _internalRenderS
     const [lastVisibleIndex, setLastVisibleIndex] = React.useState(0);
     const allVisible = lastVisibleIndex >= childList.length - 1
         || internalMode !== 'horizontal'
-        || disabledOverflow;
+        || overflowDisabled;
     // Cache
     React.useEffect(() => {
         if (isInlineMode) {
@@ -114,11 +106,11 @@ export const Nav = React.forwardRef(({ _internalRenderMenuItem, _internalRenderS
     const pathUserContext = React.useMemo(() => ({ isSubPathKey }), [isSubPathKey]);
     React.useEffect(() => {
         refreshOverflowKeys(allVisible
-            ? EMPTY_LIST
+            ? EmptyList
             : childList.slice(lastVisibleIndex + 1).map(child => child.key));
     }, [lastVisibleIndex, allVisible, refreshOverflowKeys, childList]);
     // ======================== Active ========================
-    const [mergedActiveKey, setMergedActiveKey] = useMergedState(activeKey || ((defaultActiveFirst && childList[0]?.key)), { value: activeKey });
+    const [mergedActiveKey, setMergedActiveKey] = useControlledState(activeKey || (defaultActiveFirst && childList[0]?.key), activeKey);
     const onActive = useMemoCallback((key) => {
         setMergedActiveKey(key);
     });
@@ -126,32 +118,49 @@ export const Nav = React.forwardRef(({ _internalRenderMenuItem, _internalRenderS
         setMergedActiveKey(undefined);
     });
     React.useImperativeHandle(ref, () => ({
+        findItem: ({ key: itemKey }) => {
+            const keys = getKeys();
+            const { key2element } = refreshElements(keys, uuid);
+            return key2element.get(itemKey) || null;
+        },
         focus: options => {
-            const shouldFocusKey = mergedActiveKey
-                ?? childList.find(node => !node.props.disabled)?.key;
-            if (shouldFocusKey) {
-                containerRef.current
-                    ?.querySelector(`li[data-nav-id='${getNavId(uuid, shouldFocusKey)}']`)
-                    ?.focus?.(options);
+            if (!containerRef.current) {
+                return;
+            }
+            const keys = getKeys();
+            const { element2key, elements, key2element } = refreshElements(keys, uuid);
+            const focusableElements = getFocusableElements(containerRef.current, elements);
+            let shouldFocusKey;
+            if (mergedActiveKey && keys.includes(mergedActiveKey)) {
+                shouldFocusKey = mergedActiveKey;
+            }
+            else {
+                shouldFocusKey = focusableElements[0]
+                    ? element2key.get(focusableElements[0])
+                    : childList.find(node => !node.props.disabled)?.key;
+            }
+            if (!shouldFocusKey) {
+                return;
+            }
+            const elementToFocus = key2element.get(shouldFocusKey);
+            if (shouldFocusKey && elementToFocus) {
+                elementToFocus?.focus?.(options);
             }
         },
         list: containerRef.current,
     }));
     // ======================== Select ========================
     // >>>>> Select keys
-    const [mergedSelectKeys, setMergedSelectKeys] = useMergedState(defaultSelectedKeys || [], {
-        // Legacy convert key to array
-        postState: keys => {
-            if (Array.isArray(keys)) {
-                return keys;
-            }
-            if (keys === null || keys === undefined) {
-                return EMPTY_LIST;
-            }
-            return [keys];
-        },
-        value: selectedKeys,
-    });
+    const [internalSelectKeys, setMergedSelectKeys] = useControlledState(defaultSelectedKeys || EmptyList, selectedKeys);
+    const mergedSelectKeys = React.useMemo(() => {
+        if (Array.isArray(internalSelectKeys)) {
+            return internalSelectKeys;
+        }
+        if (internalSelectKeys === null || internalSelectKeys === undefined) {
+            return EmptyList;
+        }
+        return [internalSelectKeys];
+    }, [internalSelectKeys]);
     // >>>>> Trigger select
     const triggerSelection = (info) => {
         if (selectable) {
@@ -172,10 +181,7 @@ export const Nav = React.forwardRef(({ _internalRenderMenuItem, _internalRenderS
             }
             setMergedSelectKeys(newSelectKeys);
             // Trigger event
-            const selectInfo = {
-                ...info,
-                selectedKeys: newSelectKeys,
-            };
+            const selectInfo = { ...info, selectedKeys: newSelectKeys };
             if (exist) {
                 onDeselect?.(selectInfo);
             }
@@ -185,7 +191,7 @@ export const Nav = React.forwardRef(({ _internalRenderMenuItem, _internalRenderS
         }
         // Whatever selectable, always close it
         if (!multiple && mergedOpenKeys?.length && internalMode !== 'inline') {
-            triggerOpenKeys(EMPTY_LIST);
+            triggerOpenKeys(EmptyList);
         }
     };
     // ========================= Open =========================
@@ -210,37 +216,28 @@ export const Nav = React.forwardRef(({ _internalRenderMenuItem, _internalRenderS
             triggerOpenKeys(newOpenKeys, true);
         }
     });
-    const getInternalPopupContainer = useMemoCallback(getPopupContainer);
     // ==================== Accessibility =====================
     const triggerAccessibilityOpen = (key, open) => {
         const nextOpen = open ?? !mergedOpenKeys?.includes(key);
         onInternalOpenChange?.(key, nextOpen);
     };
     const onInternalKeyDown = useAccessibility(internalMode, mergedActiveKey, isRtl, uuid, containerRef, getKeys, getKeyPath, setMergedActiveKey, triggerAccessibilityOpen, onKeyDown);
-    // ======================= Context ========================
-    const privateContext = React.useMemo(() => ({
-        _internalRenderMenuItem,
-        _internalRenderSubMenuItem,
-    }), [_internalRenderMenuItem, _internalRenderSubMenuItem]);
     // ======================== Render ========================
+    const rootCls = React.useMemo(() => config.getRootPrefixCls(prefixCls || config.prefixCls, 'nav'), [config, prefixCls]);
+    const modifiersClasses = React.useMemo(() => (Array.isArray(modifiers) ? modifiers : [modifiers])
+        .filter(e => e)
+        .map(mod => `${rootCls}-${mod}`), [modifiers, rootCls]);
     // >>>>> Children
-    const wrappedChildList = mergedMode !== 'horizontal' || disabledOverflow
+    const wrappedChildList = mergedMode !== 'horizontal' || overflowDisabled
         ? childList
         // Need wrap for overflow dropdown that do not response for open
         : childList.map((child, index) => (
         // Always wrap provider to avoid sub node re-mount
-        React.createElement(NavContextProvider, { key: child.key, overflowDisabled: index > lastVisibleIndex }, child)));
-    const rootCls = React.useMemo(() => config.getRootPrefixCls(prefixCls || config.prefixCls, 'nav'), [config, prefixCls]);
-    const container = (React.createElement(Overflow, { ref: containerRef, className: classNames({
-            [rootCls]: mergedMode !== 'horizontal',
-        }, (Array.isArray(modifiers) ? modifiers : [modifiers])
-            .filter(e => e)
-            .map(mod => `${rootCls}-${mod}`), {
-            [`${rootCls}-${mergedMode}`]: rootCls && mergedMode,
-            [`${rootCls}-rtl`]: rootCls && isRtl,
-        }, className), component: "ul", data: wrappedChildList, "data-menu-list": true, dir: direction, id: id, itemComponent: Item, maxCount: (mergedMode !== 'horizontal' || disabledOverflow)
-            ? Overflow.INVALIDATE
-            : Overflow.RESPONSIVE, prefixCls: rootCls, renderRawItem: node => node, renderRawRest: omitItems => {
+        React.createElement(NavContextProvider, { key: child.key, classNames: navClassNames, overflowDisabled: index > lastVisibleIndex, styles: styles }, child)));
+    const container = (React.createElement(Overflow, { ref: containerRef, className: classNames(className, { [rootCls]: internalMode !== 'horizontal' }, `${rootCls}-${internalMode}`, modifiersClasses, {
+            [`${rootCls}-inline-collapsed`]: internalInlineCollapsed,
+            [`${rootCls}-rtl`]: isRtl,
+        }), component: "ul", data: wrappedChildList, "data-nav-list": true, dir: direction, id: id, itemComponent: Item, maxCount: (internalMode !== 'horizontal' || overflowDisabled) ? Overflow.INVALIDATE : Overflow.RESPONSIVE, prefixCls: rootCls, renderRawItem: node => node, renderRawRest: omitItems => {
             // We use origin list since wrapped list use context to prevent open
             const len = omitItems.length;
             const originOmitItems = len ? childList.slice(-len) : null;
@@ -248,11 +245,9 @@ export const Nav = React.forwardRef(({ _internalRenderMenuItem, _internalRenderS
         }, role: "menu", ssr: "full", style: style, tabIndex: tabIndex, onKeyDown: onInternalKeyDown, onVisibleChange: newLastIndex => {
             setLastVisibleIndex(newLastIndex);
         }, ...restProps }));
-    // >>>>> Render
-    return (React.createElement(PrivateContext.Provider, { value: privateContext },
-        React.createElement(IdContext.Provider, { value: uuid },
-            React.createElement(NavContextProvider, { activeKey: mergedActiveKey, builtinPlacements: builtinPlacements, defaultMotions: mounted ? defaultMotions : undefined, disabled: disabled, expandIcon: expandIcon, forceSubNavRender: forceSubNavRender, getPopupContainer: getInternalPopupContainer, itemIcon: itemIcon, mode: mergedMode, motion: mounted ? motion : undefined, openKeys: mergedOpenKeys, popupPrefixCls: popupPrefixCls, prefixCls: rootCls, rtl: isRtl, selectedKeys: mergedSelectKeys, subNavCloseDelay: subNavCloseDelay, subNavOpenDelay: subNavOpenDelay, triggerSubNavAction: triggerSubNavAction, onActive: onActive, onInactive: onInactive, onItemClick: onInternalClick, onOpenChange: onInternalOpenChange },
-                React.createElement(PathUserContext.Provider, { value: pathUserContext }, container),
-                React.createElement("div", { "aria-hidden": true, style: { display: 'none' } },
-                    React.createElement(PathRegisterContext.Provider, { value: registerPathContext }, childList))))));
+    return (React.createElement(IdContext.Provider, { value: uuid },
+        React.createElement(NavContextProvider, { activeKey: mergedActiveKey, builtinPlacements: builtinPlacements, defaultMotions: mounted ? defaultMotions : undefined, disabled: disabled, expandIcon: expandIcon, forceSubNavRender: forceSubNavRender, getPopupContainer: getPopupContainer, itemIcon: itemIcon, mode: mergedMode, motion: mounted ? motion : undefined, openKeys: mergedOpenKeys, popupPrefixCls: popupPrefixCls, popupRender: popupRender, prefixCls: rootCls, rtl: isRtl, selectedKeys: mergedSelectKeys, subNavCloseDelay: subNavCloseDelay, subNavOpenDelay: subNavOpenDelay, triggerSubNavAction: triggerSubNavAction, onActive: onActive, onInactive: onInactive, onItemClick: onInternalClick, onOpenChange: onInternalOpenChange },
+            React.createElement(PathUserContext.Provider, { value: pathUserContext }, container),
+            React.createElement("div", { "aria-hidden": true, style: { display: 'none' } },
+                React.createElement(PathRegisterContext.Provider, { value: registerPathContext }, childList)))));
 });

package/dist/esm/components/Nav/Sub/InlineSubNavList.d.ts

@@ -5,7 +5,7 @@ export interface InlineSubNavListProps {
     keyPath: string[];
     open: boolean;
 }
-export declare function InlineSubNavList({ children, id, keyPath, open }: InlineSubNavListProps): React.JSX.Element | null;
+export declare function InlineSubNavList({ children, id, keyPath, open }: InlineSubNavListProps): React.ReactElement | null;
 export declare namespace InlineSubNavList {
     var displayName: string;
 }