@tker-react/layout 0.2.4 → 0.2.5

package/dist/index.d.mts

@@ -87,6 +87,7 @@ interface LayoutContextValue {
     setCollapsed: (collapsed: boolean) => void;
     openKeys: Set<string>;
     toggleMenuOpen: (path: string, forceOpen?: boolean) => void;
+    menuItemClick: (path: string) => void;
     setExpandedWidth: (width: string) => void;
     setCollapsedWidth: (width: string) => void;
     setLayoutMode: (mode: "side-menu" | "top-menu") => void;

package/dist/index.d.ts

@@ -87,6 +87,7 @@ interface LayoutContextValue {
     setCollapsed: (collapsed: boolean) => void;
     openKeys: Set<string>;
     toggleMenuOpen: (path: string, forceOpen?: boolean) => void;
+    menuItemClick: (path: string) => void;
     setExpandedWidth: (width: string) => void;
     setCollapsedWidth: (width: string) => void;
     setLayoutMode: (mode: "side-menu" | "top-menu") => void;

package/dist/index.mjs

@@ -105,6 +105,8 @@ function LayoutProvider({ children }) {
   openKeysRef.current = openKeys;
   const collapsedRef = useRef(collapsed);
   collapsedRef.current = collapsed;
+  const menuDataRef = useRef(menuData);
+  menuDataRef.current = menuData;
   const toggleMenuOpen = useCallback((path, forceOpen) => {
     setOpenKeys((prev) => {
       const next = new Set(prev);
@@ -120,6 +122,25 @@ function LayoutProvider({ children }) {
       return next;
     });
   }, []);
+  const menuItemClick = useCallback((path) => {
+    const item = findMenuItemByPath(menuDataRef.current, path);
+    const hasChildren = !!(item?.children && item.children.length > 0);
+    if (hasChildren) {
+      if (collapsedRef.current) {
+        setCollapsedState(false);
+        const restored = new Set(savedOpenKeysRef.current);
+        restored.add(path);
+        setOpenKeys(restored);
+      } else {
+        toggleMenuOpen(path);
+      }
+    } else {
+      const fullPath = pathParamsMap.current.get(path) || path;
+      if (window.location.pathname + window.location.search !== fullPath) {
+        navigateRef.current?.(fullPath);
+      }
+    }
+  }, []);
   const toggleCollapse = useCallback(() => {
     const nextCollapsed = !collapsedRef.current;
     if (nextCollapsed) {
@@ -180,6 +201,7 @@ function LayoutProvider({ children }) {
       setMenus,
       setActivePath,
       toggleCollapse,
+      // setCollapsed 同样处理 openKeys 保存/恢复，与 toggleCollapse 逻辑一致
       setCollapsed: (val) => {
         if (val) {
           savedOpenKeysRef.current = new Set(openKeysRef.current);
@@ -191,6 +213,7 @@ function LayoutProvider({ children }) {
       },
       openKeys,
       toggleMenuOpen,
+      menuItemClick,
       setExpandedWidth,
       setCollapsedWidth,
       setLayoutMode,
@@ -222,6 +245,7 @@ function LayoutProvider({ children }) {
       toggleCollapse,
       openKeys,
       toggleMenuOpen,
+      menuItemClick,
       isConcretePage,
       getFullPath,
       setNavigateAdapter,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tker-react/layout",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "private": false,
   "license": "MIT",
   "type": "module",