listpage-next 0.0.39 → 0.0.41

package/dist/components/Menu/hooks/useMenuNavigation.d.ts

@@ -1,2 +1,2 @@
 import { MenuItem } from '../types';
-export declare function useActiveMenuKey(items: MenuItem[]): [string | null, (key: string) => void];
+export declare function useActiveMenuKey(items: MenuItem[], baseUrl?: string): [string | null, (key: string) => void];

package/dist/components/Menu/hooks/useMenuNavigation.js

@@ -1,6 +1,6 @@
 import { useCallback, useMemo } from "react";
 import { useLocation, useNavigate } from "react-router-dom";
-function useActiveMenuKey(items) {
+function useActiveMenuKey(items, baseUrl = '') {
     const location = useLocation();
     const navigate = useNavigate();
     const setActiveKey = useCallback((key)=>{
@@ -29,17 +29,33 @@ function useActiveMenuKey(items) {
         navigate
     ]);
     const activeKey = useMemo(()=>{
-        const paths = getPaths(location.pathname);
+        const filteredPaths = removeBaseUrl(location.pathname, baseUrl);
+        const paths = getPaths(filteredPaths);
         return matchRoutes(items, paths);
     }, [
         location.pathname,
-        items
+        items,
+        baseUrl
     ]);
     return [
         activeKey,
         setActiveKey
     ];
 }
+const removeBaseUrl = (pathname, baseUrl)=>{
+    if ('' === baseUrl) return pathname;
+    let normalizedBaseUrl = baseUrl;
+    if (!baseUrl.startsWith('/')) normalizedBaseUrl = '/' + baseUrl;
+    let normalizedPathname = pathname;
+    if (!pathname.startsWith('/')) normalizedPathname = '/' + pathname;
+    if (normalizedPathname.startsWith(normalizedBaseUrl)) {
+        if (normalizedPathname === normalizedBaseUrl || '/' === normalizedPathname.charAt(normalizedBaseUrl.length)) {
+            const result = normalizedPathname.substring(normalizedBaseUrl.length);
+            return '' === result ? '/' : result.startsWith('/') ? result : '/' + result;
+        }
+    }
+    return pathname;
+};
 const matchRoutes = (routes, paths)=>{
     for (const route of routes){
         const routePaths = getPaths(route.path || route.key);

package/dist/components/Menu/index.js

@@ -3,8 +3,8 @@ import { useMemo } from "react";
 import { Menu } from "antd";
 import { useActiveMenuKey } from "./hooks/useMenuNavigation.js";
 const Menu_Menu = (props)=>{
-    const { menus, theme, style } = props;
-    const [activeKey, setActiveKey] = useActiveMenuKey(menus);
+    const { menus, theme, style, baseUrl } = props;
+    const [activeKey, setActiveKey] = useActiveMenuKey(menus, baseUrl);
     const menuItems = useMemo(()=>menus.map((item)=>({
                 key: item.key,
                 label: item.label,

package/dist/components/Menu/types.d.ts

@@ -11,4 +11,5 @@ export interface MenuProps {
     menus: MenuItem[];
     theme?: 'light' | 'dark';
     style?: CSSProperties;
+    baseUrl?: string;
 }

package/dist/components/Page/components/PageContainer/index.js

@@ -1,6 +1,6 @@
 import { jsx, jsxs } from "react/jsx-runtime";
-import styled_components from "styled-components";
 import "react";
+import styled_components from "styled-components";
 import { Layout } from "antd";
 import { useControllableValue } from "ahooks";
 import { PageContextProvider } from "../../context/page.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "listpage-next",
-  "version": "0.0.39",
+  "version": "0.0.41",
   "description": "A React component library for creating filter forms with Ant Design",
   "type": "module",
   "main": "./dist/index.js",