@broxus/react-uikit 0.21.0 → 0.23.0

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

@@ -1,28 +1,22 @@
+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((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 { _internalRenderMenuItem, _internalRenderSubMenuItem, activeKey, builtinPlacements, children, className, defaultActiveFirst, prefixCls = config.prefixCls, defaultMotions = {
+    const { prefixCls = config.prefixCls, defaultMotions = {
         horizontal: {
             motionName: getMotionName(prefixCls || config.prefixCls, 'slide-bottom-small'),
         },
@@ -31,17 +25,15 @@ export const Nav = React.forwardRef((props, ref) => {
             leavedClassName: `${prefixCls || config.prefixCls}-hidden`,
             motionName: getMotionName(prefixCls || config.prefixCls, 'zoom'),
         },
-    }, defaultOpenKeys, defaultSelectedKeys, direction, disabled, disabledOverflow, expandIcon, forceSubNavRender, getPopupContainer = config.getPopupContainer, id, inlineCollapsed, itemIcon, items, mode = 'inline', modifiers, motion, multiple = false, openKeys, overflowedIndicator = '...', overflowedIndicatorPopupClassName, popupPrefixCls = `${config.prefixCls}-dropdown`, selectable = false, selectedKeys, style, subNavCloseDelay = 0.1, subNavOpenDelay = 0.1, tabIndex = 0, triggerSubNavAction = 'hover', onClick, onDeselect, onKeyDown, onOpenChange, onSelect, ...restProps } = props;
-    const childList = React.useMemo(() => parseItems(children, items, EMPTY_LIST), [children, items]);
+    }, getPopupContainer = config.getPopupContainer, popupPrefixCls = `${config.prefixCls}-dropdown`, ...restProps } = props;
+    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((props, ref) => {
     }, [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((props, ref) => {
         }
         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((props, ref) => {
     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((props, ref) => {
     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((props, ref) => {
         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((props, ref) => {
             }
             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((props, ref) => {
         }
         // 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((props, ref) => {
             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((props, ref) => {
         }, 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;
 }

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

@@ -1,12 +1,12 @@
 import CSSMotion from '@rc-component/motion';
 import * as React from 'react';
 import { useConfig } from '../../../components/ConfigProvider';
-import { NavContext, NavContextProvider } from '../../../components/Nav/context/NavContext';
+import { NavContext, NavContextProvider } from '../../../components/Nav/context';
 import { SubNavList } from '../../../components/Nav/Sub/SubNavList';
-import { getMotion } from '../../../components/Nav/utils/motionUtil';
+import { getMotion } from '../../../components/Nav/utils';
+const fixedMode = 'inline';
 export function InlineSubNavList({ children, id, keyPath, open }) {
     const config = useConfig();
-    const fixedMode = 'inline';
     const { defaultMotions, forceSubNavRender, mode, motion, prefixCls, } = React.useContext(NavContext);
     // Always use the latest mode check
     const sameModeRef = React.useRef(false);

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

@@ -0,0 +1,15 @@
+import * as React from 'react';
+import { type NavPopupRender, type SubNavType } from '../../../components/Nav/types';
+export type SemanticName = 'list' | 'listTitle';
+export interface SubNavProps extends Omit<SubNavType, 'children' | 'key' | 'label'> {
+    classNames?: Partial<Record<SemanticName, string>>;
+    eventKey?: string;
+    internalPopupClose?: boolean;
+    popupRender?: NavPopupRender;
+    styles?: Partial<Record<SemanticName, React.CSSProperties>>;
+    title?: React.ReactNode;
+    warnKey?: boolean;
+}
+export declare const InternalSubNav: React.ForwardRefExoticComponent<SubNavProps & {
+    children?: React.ReactNode | undefined;
+} & React.RefAttributes<HTMLLIElement>>;

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

@@ -0,0 +1,157 @@
+/* eslint-disable jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions */
+import { warning } from '@rc-component/util';
+import classNames from 'classnames';
+import Overflow from 'rc-overflow';
+import * as React from 'react';
+import { useConfig } from '../../../components/ConfigProvider';
+import { NavContext, NavContextProvider, PathUserContext, useFullPath, useNavId } from '../../../components/Nav/context';
+import { useActive, useDirectionStyle, useMemoCallback } from '../../../components/Nav/hooks';
+import { InlineSubNavList } from '../../../components/Nav/Sub/InlineSubNavList';
+import { PopupTrigger } from '../../../components/Nav/Sub/PopupTrigger';
+import { SubNavList } from '../../../components/Nav/Sub/SubNavList';
+import { warnItemProp } from '../../../components/Nav/utils';
+export const InternalSubNav = React.forwardRef(({ children, className, classNames: navClassNames, disabled, eventKey, expandIcon, internalPopupClose, itemIcon, popupClassName, popupOffset, popupRender: propsPopupRender, popupStyle, style, styles, title, warnKey, onClick, onMouseEnter, onMouseLeave, onTitleClick, onTitleMouseEnter, onTitleMouseLeave, ...props }, ref) => {
+    const config = useConfig();
+    const connectedPath = useFullPath();
+    const domDataId = useNavId(eventKey);
+    const { activeKey, disabled: contextDisabled, expandIcon: contextExpandIcon, itemIcon: contextItemIcon, mode, openKeys, overflowDisabled, popupPrefixCls, popupRender: contextPopupRender, selectedKeys, onActive, onItemClick, onOpenChange, } = React.useContext(NavContext);
+    const pathUser = React.useContext(PathUserContext);
+    const elementRef = React.useRef(null);
+    const popupRef = React.useRef(null);
+    const mergedDisabled = contextDisabled || disabled;
+    // ================================ Warn ================================
+    if (process.env.NODE_ENV !== 'production' && warnKey) {
+        warning(false, 'SubNav should not leave undefined `key`.');
+    }
+    // ================================ Icon ================================
+    const mergedItemIcon = itemIcon || contextItemIcon;
+    const mergedExpandIcon = expandIcon || contextExpandIcon;
+    // ================================ Open ================================
+    const originOpen = eventKey ? openKeys.includes(eventKey) : false;
+    const open = !overflowDisabled && originOpen;
+    // =============================== Select ===============================
+    const childrenSelected = eventKey ? pathUser?.isSubPathKey(selectedKeys, eventKey) : false;
+    // =============================== Active ===============================
+    const { active, ...activeProps } = useActive(eventKey, mergedDisabled, onTitleMouseEnter, onTitleMouseLeave);
+    // Fallback of active check to avoid hover on menu title or disabled item
+    const [childrenActive, setChildrenActive] = React.useState(false);
+    const triggerChildrenActive = (newActive) => {
+        if (!mergedDisabled) {
+            setChildrenActive(newActive);
+        }
+    };
+    const onInternalMouseEnter = domEvent => {
+        triggerChildrenActive(true);
+        if (eventKey) {
+            onMouseEnter?.({ domEvent, key: eventKey });
+        }
+    };
+    const onInternalMouseLeave = domEvent => {
+        triggerChildrenActive(false);
+        if (eventKey) {
+            onMouseLeave?.({ domEvent, key: eventKey });
+        }
+    };
+    const mergedActive = React.useMemo(() => {
+        if (active) {
+            return active;
+        }
+        if (mode !== 'inline' && eventKey) {
+            return childrenActive || pathUser?.isSubPathKey([activeKey], eventKey);
+        }
+        return false;
+    }, [active, mode, eventKey, childrenActive, pathUser, activeKey]);
+    // ========================== DirectionStyle ==========================
+    const directionStyle = useDirectionStyle(connectedPath.length);
+    // =============================== Events ===============================
+    // Title click
+    const onInternalTitleClick = domEvent => {
+        // Skip if disabled
+        if (mergedDisabled) {
+            return;
+        }
+        if (eventKey) {
+            onTitleClick?.({ domEvent, key: eventKey });
+        }
+        // Trigger open by click when mode is `inline`
+        if (mode === 'inline' && eventKey) {
+            onOpenChange(eventKey, !originOpen);
+        }
+    };
+    // Context for children click
+    const onMergedItemClick = useMemoCallback((info) => {
+        onClick?.(warnItemProp(info));
+        onItemClick?.(info);
+    });
+    // Visible change
+    const onPopupVisibleChange = (newVisible) => {
+        if (mode !== 'inline' && eventKey) {
+            onOpenChange(eventKey, newVisible);
+        }
+    };
+    /**
+     * Used for accessibility. Helper will focus element without keyboard.
+     * We should manually trigger an active
+     */
+    const onInternalFocus = () => {
+        if (eventKey) {
+            onActive(eventKey);
+        }
+    };
+    // =============================== Render ===============================
+    const popupId = domDataId ? `${domDataId}-dropdown` : undefined;
+    // Title
+    let titleNode = (React.createElement("a", { ref: elementRef, "aria-controls": popupId, "aria-disabled": mergedDisabled, "aria-expanded": open, "aria-haspopup": true, "data-nav-id": overflowDisabled && domDataId ? null : domDataId, role: mergedDisabled ? undefined : 'menuitem', style: { ...directionStyle }, tabIndex: mergedDisabled ? undefined : -1, onClick: onInternalTitleClick, onFocus: onInternalFocus, ...activeProps },
+        React.createElement(React.Fragment, { key: "children" },
+            title,
+            typeof mergedExpandIcon === 'function' ? mergedExpandIcon({
+                disabled: mergedDisabled,
+                isOpen: open,
+                isSubNav: true,
+            }) : mergedExpandIcon)));
+    // Cache mode if it changes to `inline` which do not have popup motion
+    const triggerModeRef = React.useRef(mode);
+    if (mode !== 'inline' && connectedPath.length > 1) {
+        triggerModeRef.current = 'vertical';
+    }
+    else {
+        triggerModeRef.current = mode;
+    }
+    const popupContentTriggerMode = triggerModeRef.current;
+    const renderPopupContent = React.useMemo(() => {
+        const originNode = (React.createElement(NavContextProvider, { classNames: navClassNames, mode: popupContentTriggerMode === 'horizontal' ? 'vertical' : popupContentTriggerMode, styles: styles },
+            React.createElement(SubNavList, { ref: popupRef, className: `${popupPrefixCls}-nav`, id: popupId }, children)));
+        const mergedPopupRender = propsPopupRender || contextPopupRender;
+        if (mergedPopupRender) {
+            return mergedPopupRender(originNode, { item: props, keys: connectedPath });
+        }
+        return originNode;
+    }, [
+        navClassNames,
+        popupContentTriggerMode,
+        styles,
+        popupPrefixCls,
+        popupId,
+        children,
+        propsPopupRender,
+        contextPopupRender,
+        props,
+        connectedPath,
+    ]);
+    if (!overflowDisabled) {
+        const triggerMode = triggerModeRef.current;
+        // Still wrap with Trigger here since we need avoid react re-mount dom node
+        // Which makes motion failed
+        titleNode = (React.createElement(PopupTrigger, { disabled: mergedDisabled, mode: triggerMode, popup: renderPopupContent, popupClassName: popupClassName, popupOffset: popupOffset, popupStyle: popupStyle, prefixCls: popupPrefixCls, visible: !internalPopupClose && open && mode !== 'inline', onVisibleChange: onPopupVisibleChange }, titleNode));
+    }
+    // List node
+    const listNode = (React.createElement(Overflow.Item, { ref: ref, className: classNames(`${config.prefixCls}-parent`, className, {
+            [`${config.prefixCls}-active`]: childrenSelected,
+            [`${config.prefixCls}-disabled`]: mergedDisabled,
+            [`${config.prefixCls}-hover`]: mergedActive,
+            [`${config.prefixCls}-open`]: open,
+        }), role: "none", ...props, component: "li", style: style, onMouseEnter: onInternalMouseEnter, onMouseLeave: onInternalMouseLeave },
+        titleNode,
+        !overflowDisabled && (React.createElement(InlineSubNavList, { id: popupId, keyPath: connectedPath, open: open }, children))));
+    return (React.createElement(NavContextProvider, { classNames: navClassNames, expandIcon: mergedExpandIcon, itemIcon: mergedItemIcon, mode: mode === 'horizontal' ? 'vertical' : mode, styles: styles, onItemClick: onMergedItemClick }, listNode));
+});

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

@@ -7,11 +7,12 @@ export interface PopupTriggerProps {
     popup: React.ReactNode;
     popupClassName?: string;
     popupOffset?: number[];
+    popupStyle?: React.CSSProperties;
     prefixCls: string;
     visible: boolean;
     onVisibleChange: (visible: boolean) => void;
 }
-export declare function PopupTrigger({ children, disabled, mode, popup, popupClassName, popupOffset, prefixCls, visible, onVisibleChange, }: PopupTriggerProps): React.JSX.Element;
+export declare function PopupTrigger({ children, disabled, mode, popup, popupClassName, popupOffset, popupStyle, prefixCls, visible, onVisibleChange, }: PopupTriggerProps): React.ReactElement;
 export declare namespace PopupTrigger {
     var displayName: string;
 }

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

@@ -1,11 +1,12 @@
 import Trigger from '@rc-component/trigger';
-import raf from '@rc-component/util/lib/raf';
+import { merge } from '@rc-component/util';
+import raf from '@rc-component/util/es/raf';
 import classNames from 'classnames';
 import * as React from 'react';
 import { useConfig } from '../../../components/ConfigProvider';
-import { NavContext } from '../../../components/Nav/context/NavContext';
+import { NavContext } from '../../../components/Nav/context';
 import { placements, placementsRtl } from '../../../components/Nav/placements';
-import { getMotion } from '../../../components/Nav/utils/motionUtil';
+import { getMotion } from '../../../components/Nav/utils';
 const popupPlacementMap = {
     horizontal: 'bottom-left',
     inline: null,
@@ -13,13 +14,13 @@ const popupPlacementMap = {
     'vertical-left': 'right-top',
     'vertical-right': 'left-top',
 };
-export function PopupTrigger({ children, disabled, mode, popup, popupClassName, popupOffset, prefixCls, visible, onVisibleChange, }) {
+export function PopupTrigger({ children, disabled, mode, popup, popupClassName, popupOffset, popupStyle, prefixCls, visible, onVisibleChange, }) {
     const config = useConfig();
-    const { builtinPlacements, defaultMotions, forceSubNavRender, getPopupContainer, motion, rtl, subNavCloseDelay = 300, subNavOpenDelay, triggerSubNavAction = 'hover', } = React.useContext(NavContext);
+    const { builtinPlacements, defaultMotions, forceSubNavRender, getPopupContainer, motion, rootClassName, rtl, subNavCloseDelay = 300, subNavOpenDelay, triggerSubNavAction = 'hover', } = React.useContext(NavContext);
     const [innerVisible, setInnerVisible] = React.useState(false);
     const placement = rtl
-        ? { ...placementsRtl, ...builtinPlacements }
-        : { ...placements, ...builtinPlacements };
+        ? merge(placementsRtl, builtinPlacements || {})
+        : merge(placements, builtinPlacements || {});
     const popupPlacement = popupPlacementMap[mode];
     const targetMotion = getMotion(mode, motion, defaultMotions);
     const targetMotionRef = React.useRef(targetMotion);
@@ -48,9 +49,7 @@ export function PopupTrigger({ children, disabled, mode, popup, popupClassName,
             }
         };
     }, [visible]);
-    return (React.createElement(Trigger, { action: disabled || !triggerSubNavAction ? [] : [triggerSubNavAction], builtinPlacements: placement, forceRender: forceSubNavRender, getPopupContainer: getPopupContainer, hideAction: disabled || !triggerSubNavAction ? [] : [triggerSubNavAction], mouseEnterDelay: subNavOpenDelay, mouseLeaveDelay: subNavCloseDelay, popup: popup, popupAlign: popupOffset && { offset: popupOffset }, popupClassName: classNames({
-            [`${prefixCls}-rtl`]: rtl,
-        }, popupClassName), popupMotion: mergedMotion, popupPlacement: popupPlacement, popupVisible: innerVisible, prefixCls: prefixCls, stretch: mode === 'horizontal' ? 'minWidth' : undefined, onPopupVisibleChange: onVisibleChange }, children));
+    return (React.createElement(Trigger, { action: disabled || !triggerSubNavAction ? [] : [triggerSubNavAction], builtinPlacements: placement, forceRender: forceSubNavRender, fresh: true, getPopupContainer: getPopupContainer, hideAction: disabled || !triggerSubNavAction ? [] : [triggerSubNavAction], mouseEnterDelay: subNavOpenDelay, mouseLeaveDelay: subNavCloseDelay, popup: popup, popupAlign: popupOffset && { offset: popupOffset }, popupClassName: classNames(`${config.prefixCls}-drop`, { [`${prefixCls}-rtl`]: rtl }, popupClassName, rootClassName), popupMotion: mergedMotion, popupPlacement: popupPlacement, popupStyle: popupStyle, popupVisible: innerVisible, prefixCls: prefixCls, stretch: mode === 'horizontal' ? 'minWidth' : undefined, onOpenChange: onVisibleChange }, children));
 }
 if (process.env.NODE_ENV !== 'production') {
     PopupTrigger.displayName = 'Nav.PopupTrigger';

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

@@ -1,3 +1,2 @@
 import * as React from 'react';
-export type SubNavListProps = React.HTMLAttributes<HTMLUListElement>;
-export declare const SubNavList: React.ForwardRefExoticComponent<SubNavListProps & React.RefAttributes<HTMLUListElement>>;
+export declare const SubNavList: React.ForwardRefExoticComponent<React.HTMLAttributes<HTMLUListElement> & React.RefAttributes<HTMLUListElement>>;

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

@@ -1,13 +1,13 @@
 import classNames from 'classnames';
 import * as React from 'react';
-import { NavContext } from '../../../components/Nav/context/NavContext';
-export const SubNavList = React.forwardRef(({ children, className, ...restProps }, ref) => {
+import { NavContext } from '../../../components/Nav/context';
+export const SubNavList = React.forwardRef(({ children, className, ...props }, ref) => {
     const { mode, prefixCls, rtl } = React.useContext(NavContext);
-    return (React.createElement("ul", { className: classNames({
+    return (React.createElement("ul", { ref: ref, className: classNames({
             [`${prefixCls}-sub-rtl`]: rtl && mode === 'inline',
             [`${prefixCls}-sub`]: mode === 'inline',
             [prefixCls]: mode !== 'inline',
-        }, className), ...restProps, ref: ref, "data-nav-list": "" }, children));
+        }, className), ...props, "data-nav-list": true, role: "menu" }, children));
 });
 if (process.env.NODE_ENV !== 'production') {
     SubNavList.displayName = 'Nav.SubNavList';

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

@@ -1,16 +1,5 @@
 import * as React from 'react';
-import { type SubNavType } from '../../../components/Nav/types';
-export interface SubNavProps extends Omit<SubNavType, 'children' | 'key' | 'label'> {
-    children?: React.ReactNode;
-    /** @private Internal filled key. Do not set it directly */
-    eventKey?: string;
-    /** @private Used for rest popup. Do not use in your prod */
-    internalPopupClose?: boolean;
-    title?: React.ReactNode;
-    /** @private Do not use. Private warning empty usage */
-    warnKey?: boolean;
-}
-export declare function Sub({ children, eventKey, ...restProps }: SubNavProps): React.JSX.Element;
-export declare namespace Sub {
-    var displayName: string;
-}
+import { type SubNavProps } from '../../../components/Nav/Sub/InternalSubNav';
+export declare const Sub: React.ForwardRefExoticComponent<SubNavProps & {
+    children?: React.ReactNode | undefined;
+} & React.RefAttributes<HTMLLIElement>>;