@tker-react/layout 0.2.7 → 0.2.9

package/dist/index.d.mts

@@ -55,7 +55,6 @@ interface TabAdapterProps {
     onClose: (path: string) => void;
     onCloseOther: (path?: string) => void;
     onCloseAll: () => void;
-    onRefresh: () => void;
     onSetFixed: (path: string, fixed: boolean) => void;
 }
 interface UserAvatarAdapterProps {

package/dist/index.d.ts

@@ -55,7 +55,6 @@ interface TabAdapterProps {
     onClose: (path: string) => void;
     onCloseOther: (path?: string) => void;
     onCloseAll: () => void;
-    onRefresh: () => void;
     onSetFixed: (path: string, fixed: boolean) => void;
 }
 interface UserAvatarAdapterProps {

package/dist/index.mjs

@@ -52,6 +52,14 @@ function useLayoutInteractionContext() {
   }
   return ctx;
 }
+const LayoutOpenKeysContext = createContext(null);
+function useLayoutOpenKeysContext() {
+  const ctx = useContext(LayoutOpenKeysContext);
+  if (!ctx) {
+    throw new Error("useLayoutOpenKeysContext \u5FC5\u987B\u5728 <Layout> \u5185\u90E8\u4F7F\u7528");
+  }
+  return ctx;
+}
 function useLayoutContext() {
   const ctx = useContext(LayoutContext);
   if (!ctx) {
@@ -209,11 +217,13 @@ function LayoutProvider({ children }) {
       collapsed,
       toggleCollapse,
       setCollapsed,
-      openKeys,
-      toggleMenuOpen,
       menuItemClick
     }),
-    [collapsed, toggleCollapse, setCollapsed, openKeys, toggleMenuOpen, menuItemClick]
+    [collapsed, toggleCollapse, setCollapsed, menuItemClick]
+  );
+  const openKeysValue = useMemo(
+    () => ({ openKeys, toggleMenuOpen }),
+    [openKeys, toggleMenuOpen]
   );
   const value = useMemo(
     () => ({
@@ -268,7 +278,7 @@ function LayoutProvider({ children }) {
       setMaxTabs
     ]
   );
-  return /* @__PURE__ */ jsx(LayoutContext.Provider, { value, children: /* @__PURE__ */ jsx(LayoutInteractionContext.Provider, { value: interactionValue, children }) });
+  return /* @__PURE__ */ jsx(LayoutContext.Provider, { value, children: /* @__PURE__ */ jsx(LayoutInteractionContext.Provider, { value: interactionValue, children: /* @__PURE__ */ jsx(LayoutOpenKeysContext.Provider, { value: openKeysValue, children }) }) });
 }
 
 function LayoutAside() {
@@ -282,7 +292,8 @@ function LayoutAside() {
     getFullPath,
     navigate
   } = useLayoutContext();
-  const { collapsed, toggleCollapse, openKeys, menuItemClick } = useLayoutInteractionContext();
+  const { collapsed, toggleCollapse, menuItemClick } = useLayoutInteractionContext();
+  const { openKeys } = useLayoutOpenKeysContext();
   const menuMode = layoutMode === "top-menu" ? "top" : "side";
   const handleMenuSelect = useCallback(
     (path) => {
@@ -346,7 +357,6 @@ function LayoutContent({ children }) {
   const isTopMenu = layoutMode === "top-menu";
   const [tabData, setTabData] = useState([]);
   const [activeTab, setActiveTab] = useState("");
-  const [refreshKey, setRefreshKey] = useState(0);
   const menuDataRef = useRef(menuData);
   menuDataRef.current = menuData;
   const activeTabRef = useRef(activeTab);
@@ -430,9 +440,6 @@ function LayoutContent({ children }) {
       (prev) => prev.map((t) => t.path === path ? { ...t, fixed } : t)
     );
   }, []);
-  const handleRefresh = useCallback(() => {
-    setRefreshKey((k) => k + 1);
-  }, []);
   const TabAdapter = adapters.tab;
   return /* @__PURE__ */ jsxs("main", { className: "tker-layout-content", children: [
     !isTopMenu && TabAdapter && /* @__PURE__ */ jsx(
@@ -444,11 +451,10 @@ function LayoutContent({ children }) {
         onClose: handleTabClose,
         onCloseOther: handleCloseOtherTabs,
         onCloseAll: handleCloseAllTabs,
-        onRefresh: handleRefresh,
         onSetFixed: handleSetFixed
       }
     ),
-    /* @__PURE__ */ jsx("div", { className: "tker-layout-content__body", children }, refreshKey)
+    /* @__PURE__ */ jsx("div", { className: "tker-layout-content__body", children })
   ] });
 }
 function openTabInData(tabData, path, config) {
@@ -530,6 +536,7 @@ function LayoutHeader() {
     },
     [getFullPath, navigate, isConcretePage]
   );
+  const emptyOpenKeysRef = useRef(/* @__PURE__ */ new Set());
   const leftContent = isTopMenu ? ["logo", "menu"] : ["logo", "breadcrumb"];
   const logoWidth = isSideMenu ? collapsed ? collapsedWidth : expandedWidth : expandedWidth;
   const LogoAdapter = adapters.logo;
@@ -555,7 +562,7 @@ function LayoutHeader() {
           collapsed: false,
           mode: "top",
           width: logoWidth,
-          openKeys: /* @__PURE__ */ new Set(),
+          openKeys: emptyOpenKeysRef.current,
           onSelect: handleMenuSelect,
           onMenuItemClick: menuItemClick
         }

package/package.json

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