listpage-next 0.0.225 → 0.0.227

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

@@ -0,0 +1,2 @@
+import { MenuProps } from './types';
+export declare const Menu: (props: MenuProps) => import("react/jsx-runtime").JSX.Element;

package/dist/components/Menu/Menu.js

@@ -0,0 +1,28 @@
+import { jsx } from "react/jsx-runtime";
+import { Menu } from "antd";
+import { styled } from "styled-components";
+import { useControllableValue } from "ahooks";
+const Menu_Menu = (props)=>{
+    const { onSelect, ...restMenuProps } = props;
+    const [activeKey, setActiveKey] = useControllableValue(props, {
+        defaultValuePropName: 'defaultActiveKey'
+    });
+    return /*#__PURE__*/ jsx(MenuStyled, {
+        mode: "inline",
+        selectedKeys: activeKey ? [
+            activeKey
+        ] : [],
+        onSelect: (info)=>{
+            setActiveKey(info.key);
+            const path = info.keyPath.reverse().join('/');
+            onSelect?.(path);
+        },
+        ...restMenuProps
+    });
+};
+const MenuStyled = styled(Menu)`
+  .ant-menu {
+    border-inline-end: none !important;
+  }
+`;
+export { Menu_Menu as Menu };

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

@@ -1,3 +1,3 @@
-import { MenuProps } from './types';
-export declare const Menu: (props: MenuProps) => import("react/jsx-runtime").JSX.Element;
-export type { MenuProps, MenuItem } from './types';
+export { Menu } from './Menu';
+export type { MenuItem, MenuProps } from './types';
+export { detectActiveMenu } from './utils';

package/dist/components/Menu/index.js

@@ -1,43 +1,3 @@
-import { jsx } from "react/jsx-runtime";
-import { useMemo } from "react";
-import { Menu } from "antd";
-import { styled } from "styled-components";
-import { useControllableValue } from "ahooks";
-const Menu_Menu = (props)=>{
-    const { menus, theme, style, onSelect } = props;
-    const [activeKey, setActiveKey] = useControllableValue(props, {
-        defaultValuePropName: 'defaultActiveKey'
-    });
-    const menuItems = useMemo(()=>menus.map((item)=>({
-                key: item.key,
-                label: item.label,
-                icon: item.icon,
-                children: item.children?.map((child)=>({
-                        key: child.key,
-                        label: child.label,
-                        icon: child.icon
-                    }))
-            })), [
-        menus
-    ]);
-    return /*#__PURE__*/ jsx(MenuStyled, {
-        mode: "inline",
-        theme: theme,
-        style: style,
-        items: menuItems,
-        selectedKeys: activeKey ? [
-            activeKey
-        ] : [],
-        onSelect: (info)=>{
-            setActiveKey(info.key);
-            const path = info.keyPath.reverse().join('/');
-            onSelect?.(path);
-        }
-    });
-};
-const MenuStyled = styled(Menu)`
-  .ant-menu {
-    border-inline-end: none !important;
-  }
-`;
-export { Menu_Menu as Menu };
+import { Menu } from "./Menu.js";
+import { detectActiveMenu } from "./utils.js";
+export { Menu, detectActiveMenu };

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

@@ -1,16 +1,6 @@
-import { CSSProperties } from 'react';
-export interface MenuItem {
-    key: string;
-    label: React.ReactNode;
-    icon?: React.ReactNode;
-    children?: MenuItem[];
-    disabled?: boolean;
-    path?: string;
-}
-export interface MenuProps {
-    menus: MenuItem[];
-    theme?: 'light' | 'dark';
-    style?: CSSProperties;
+import { ItemType } from 'antd/es/menu/interface';
+import { MenuProps as AntdMenuProps } from 'antd';
+export type MenuItem = ItemType;
+export interface MenuProps extends Omit<AntdMenuProps, 'onSelect'> {
     onSelect?: (path: string) => void;
-    defaultActiveKey?: string;
 }

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

@@ -0,0 +1,2 @@
+import { MenuItem } from './types';
+export declare function detectActiveMenu(pathname: string, menus: MenuItem[]): string | undefined;

package/dist/components/Menu/utils.js

@@ -0,0 +1,9 @@
+function detectActiveMenu(pathname, menus) {
+    debugger;
+    const activeMenu = menus.filter((item)=>item && pathname.startsWith(item.key)).sort((a, b)=>b.key.length - a.key.length)?.[0];
+    if (!activeMenu) return;
+    if (!activeMenu.children?.length) return activeMenu.key;
+    pathname = pathname.slice(activeMenu.key.length + 1);
+    return detectActiveMenu(pathname, activeMenu.children);
+}
+export { detectActiveMenu };

package/dist/features/ChatClient/ui/ConversationDropdownMenu/index.js

@@ -54,8 +54,8 @@ const ConversationDropdownMenu = (props)=>{
 };
 const DefaultPanelContainer = styled_components.div`
   padding: 12px 24px;
-  background: '#eee';
-  color: '#000';
+  background: #fff;
+  color: rgba(0,0,0,0.88);
   border-radius: 8px;
   min-height: 100px;
   min-width: 200px;

package/package.json

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

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

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

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

@@ -1,70 +0,0 @@
-import { useCallback, useMemo } from "react";
-import { useLocation, useNavigate } from "react-router-dom";
-function useActiveMenuKey(items, baseUrl = '') {
-    const location = useLocation();
-    const navigate = useNavigate();
-    const setActiveKey = useCallback((key)=>{
-        function findKeyPath(items, paths = []) {
-            for (const item of items){
-                if (item.key === key) return [
-                    ...paths,
-                    item.path || item.key
-                ];
-                if (item.children) {
-                    const subPaths = findKeyPath(item.children, []);
-                    if (subPaths.length) return [
-                        ...paths,
-                        item.path || item.key,
-                        ...subPaths
-                    ];
-                }
-            }
-            return [];
-        }
-        const paths = findKeyPath(items, []);
-        const urlPath = paths.map((p)=>getPaths(p)).flat().join('/');
-        navigate(urlPath);
-    }, [
-        items,
-        navigate
-    ]);
-    const activeKey = useMemo(()=>{
-        const filteredPaths = removeBaseUrl(location.pathname, baseUrl);
-        const paths = getPaths(filteredPaths);
-        return matchRoutes(items, paths);
-    }, [
-        location.pathname,
-        items,
-        baseUrl
-    ]);
-    return [
-        activeKey,
-        setActiveKey
-    ];
-}
-const removeBaseUrl = (pathname, baseUrl)=>{
-    if (!baseUrl) return pathname;
-    if (pathname.startsWith(baseUrl)) return pathname.slice(baseUrl.length);
-    return pathname;
-};
-const matchRoutes = (routes, paths)=>{
-    for (const route of routes){
-        const routePaths = getPaths(route.path || route.key);
-        const isMatch = isPathMatch(paths, routePaths);
-        if (isMatch) {
-            if (route.children) return matchRoutes(route.children, paths.slice(routePaths.length));
-            return route.key;
-        }
-    }
-    return null;
-};
-const isPathMatch = (urlPaths, routePaths)=>{
-    for(let i = 0; i < routePaths.length; i++){
-        const matchAny = '*' === routePaths[i];
-        const matchUrl = routePaths[i] === urlPaths[i];
-        if (!matchAny && !matchUrl) return false;
-    }
-    return true;
-};
-const getPaths = (path = '')=>path.split('/').filter(Boolean);
-export { useActiveMenuKey };