@pnkx-lib/ui 1.9.94 → 1.9.96

package/es/chunks/{index-Ze5DnHAV.js → index-BMH0bSgU.js}

@@ -12172,13 +12172,11 @@ const Sidebar = ({ children, menu, userInfo }) => {
     router(path);
   };
   const handleOpenSubmenu = (item, hasChildren) => {
-    console.log("click", hasChildren);
-    const cleanPath = (...segments) => segments.map((s) => s.replace(/^\/+|\/+$/g, "")).filter(Boolean).join("/");
     if (hasChildren) {
-      const fullPath = `/${cleanPath(pathUrl, item.path)}`;
-      router(fullPath);
+      setOpenSubmenu((prev) => prev === item.name ? null : item.name);
+      return;
     }
-    setOpenSubmenu((prev) => prev === item.name ? null : item.name);
+    router(item.path);
   };
   useEffect(() => {
     const filteredMenu = menu.filter((item) => item.isShow).flatMap((menu2) => {
@@ -12188,11 +12186,11 @@ const Sidebar = ({ children, menu, userInfo }) => {
     });
     setNewMenu(filteredMenu);
   }, [searchSidebar]);
-  const handleClick = (sub, path) => {
-    if (!sub?.path || !activeMainMenu) return;
-    const segments = [activeMainMenu, sub.path, path || ""].map((s) => s.replace(/^\/|\/$/g, "")).filter(Boolean);
-    const pathRouter = "/" + segments.join("/");
-    router(pathRouter);
+  const handleClick = (subPath, itemPath) => {
+    const cleanedSubPath = subPath.replace(/\/$/, "");
+    const cleanedItemPath = itemPath.replace(/^\//, "");
+    const fullPath = `${cleanedSubPath}/${cleanedItemPath}`;
+    router(fullPath);
   };
   return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex relative h-screen", children: [
     /* @__PURE__ */ jsxRuntimeExports.jsxs(
@@ -12230,7 +12228,7 @@ const Sidebar = ({ children, menu, userInfo }) => {
             /* @__PURE__ */ jsxRuntimeExports.jsx("ul", { role: "list", className: twMerge("-mx-2 space-y-1 relative"), children: newMenu.flatMap(
               (item) => {
                 const isActive = [activeMainMenu, pathUrl].includes(item.path);
-                const isActiveUrl = item.path === activeMainMenu || item.path === pathUrl;
+                const isActiveUrl = activeMainMenu.startsWith(item.path) || pathUrl.startsWith(item.path);
                 return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { children: /* @__PURE__ */ jsxRuntimeExports.jsxs(
                   "li",
                   {
@@ -12387,14 +12385,16 @@ const Sidebar = ({ children, menu, userInfo }) => {
                   ),
                   children: activeSubmenu?.map(
                     (sub) => {
+                      const isActiveSumenu = pathUrl.startsWith(sub.path);
                       return /* @__PURE__ */ jsxRuntimeExports.jsxs("li", { children: [
                         /* @__PURE__ */ jsxRuntimeExports.jsxs(
                           "a",
                           {
                             onClick: () => {
-                              handleOpenSubmenu(sub, sub?.children?.length === 0);
+                              handleOpenSubmenu(sub, sub?.children?.length > 0);
                             },
                             className: twMerge(
+                              isActiveSumenu ? "bg-[#EEEEF0]" : "",
                               "group flex gap-x-3 rounded-md p-2 text-gray-700 hover:bg-[#EEEEF0] mr-8 text-sm leading-6 transition-all duration-300 font-semibold items-center"
                             ),
                             children: [
@@ -12422,12 +12422,16 @@ const Sidebar = ({ children, menu, userInfo }) => {
                             ),
                             children: sub?.children?.map(
                               (item) => {
+                                const itemFullPath = `${sub.path.replace(
+                                  /\/$/,
+                                  ""
+                                )}/${item.path.replace(/^\//, "")}`;
                                 return /* @__PURE__ */ jsxRuntimeExports.jsxs(
                                   "li",
                                   {
-                                    onClick: () => handleClick(sub, item.path),
+                                    onClick: () => handleClick(sub.path, item.path),
                                     className: twMerge(
-                                      pathUrl.startsWith(item.path) ? "bg-[#EEEEF0] text-black" : "",
+                                      pathUrl.startsWith(itemFullPath) ? "bg-[#EEEEF0] text-black" : "",
                                       "text-xs hover:bg-[#EEEEF0] mr-8 transition-all duration-300 mt-2 rounded-md py-2 flex items-center gap-2 p-2"
                                     ),
                                     children: [
@@ -12435,7 +12439,7 @@ const Sidebar = ({ children, menu, userInfo }) => {
                                       item.name
                                     ]
                                   },
-                                  item.path
+                                  `${sub.path}-${item.path}`
                                 );
                               }
                             )

package/es/index.js

@@ -1,4 +1,4 @@
-export { Z as ActionRowTable, A as Alert, E as Anchor, G as Appfix, I as AutoComplete, e as Badge, g as Breadcrumb, U as BulkAction, B as Button, C as CascaderField, Y as CategoryStatus, f as Col, V as ConfirmModal, d as Container, o as Divider, q as Drawer, D as Dropdown, N as Empty, X as ErrorBoundary, F as Flex, H as Heading, O as Image, L as Layout, j as Menu, M as Modal, a0 as PAGE_NUMBER, a1 as PAGE_SIZE, k as Pagination, J as PnkxCollapse, K as PnkxColorPicker, r as Popconfirm, P as Popover, Q as QRCode, u as Rate, s as Result, R as Row, a2 as SORT_BY, a3 as SORT_DESC, _ as START_PAGE, $ as START_PAGE_SIZE, c as SearchFiltersForm, v as Segmented, m as Sidebar, S as Skeleton, h as Space, p as Spin, i as Splitter, w as Statistic, l as Steps, T as Table, b as Tabs, n as Tag, x as Timeline, a as Tooltip, y as Tour, z as Tree, a4 as TypeActionRowTable, W as Watermark, t as typeColorMap } from './chunks/index-Ze5DnHAV.js';
+export { Z as ActionRowTable, A as Alert, E as Anchor, G as Appfix, I as AutoComplete, e as Badge, g as Breadcrumb, U as BulkAction, B as Button, C as CascaderField, Y as CategoryStatus, f as Col, V as ConfirmModal, d as Container, o as Divider, q as Drawer, D as Dropdown, N as Empty, X as ErrorBoundary, F as Flex, H as Heading, O as Image, L as Layout, j as Menu, M as Modal, a0 as PAGE_NUMBER, a1 as PAGE_SIZE, k as Pagination, J as PnkxCollapse, K as PnkxColorPicker, r as Popconfirm, P as Popover, Q as QRCode, u as Rate, s as Result, R as Row, a2 as SORT_BY, a3 as SORT_DESC, _ as START_PAGE, $ as START_PAGE_SIZE, c as SearchFiltersForm, v as Segmented, m as Sidebar, S as Skeleton, h as Space, p as Spin, i as Splitter, w as Statistic, l as Steps, T as Table, b as Tabs, n as Tag, x as Timeline, a as Tooltip, y as Tour, z as Tree, a4 as TypeActionRowTable, W as Watermark, t as typeColorMap } from './chunks/index-BMH0bSgU.js';
 export { C as CheckboxField, D as DatePickerField, E as ErrorMessage, I as Input, L as Label, P as PnkxField, R as RangePickerField, a as TINY_API, b as TinyMCE, T as Typography } from './chunks/AntdIcon-sydRpDMU.js';
 import 'react-router';
 export { R as RadioGroup, S as Select, a as Switch, U as UploadField } from './chunks/Switch-Ch-t7bqG.js';

package/es/ui/index.js

@@ -1,3 +1,3 @@
-export { Z as ActionRowTable, A as Alert, E as Anchor, G as Appfix, I as AutoComplete, e as Badge, g as Breadcrumb, U as BulkAction, B as Button, C as CascaderField, Y as CategoryStatus, f as Col, V as ConfirmModal, d as Container, o as Divider, q as Drawer, D as Dropdown, N as Empty, X as ErrorBoundary, F as Flex, H as Heading, O as Image, L as Layout, j as Menu, M as Modal, a0 as PAGE_NUMBER, a1 as PAGE_SIZE, k as Pagination, J as PnkxCollapse, K as PnkxColorPicker, r as Popconfirm, P as Popover, Q as QRCode, u as Rate, s as Result, R as Row, a2 as SORT_BY, a3 as SORT_DESC, _ as START_PAGE, $ as START_PAGE_SIZE, c as SearchFiltersForm, v as Segmented, m as Sidebar, S as Skeleton, h as Space, p as Spin, i as Splitter, w as Statistic, l as Steps, T as Table, b as Tabs, n as Tag, x as Timeline, a as Tooltip, y as Tour, z as Tree, a4 as TypeActionRowTable, W as Watermark, t as typeColorMap } from '../chunks/index-Ze5DnHAV.js';
+export { Z as ActionRowTable, A as Alert, E as Anchor, G as Appfix, I as AutoComplete, e as Badge, g as Breadcrumb, U as BulkAction, B as Button, C as CascaderField, Y as CategoryStatus, f as Col, V as ConfirmModal, d as Container, o as Divider, q as Drawer, D as Dropdown, N as Empty, X as ErrorBoundary, F as Flex, H as Heading, O as Image, L as Layout, j as Menu, M as Modal, a0 as PAGE_NUMBER, a1 as PAGE_SIZE, k as Pagination, J as PnkxCollapse, K as PnkxColorPicker, r as Popconfirm, P as Popover, Q as QRCode, u as Rate, s as Result, R as Row, a2 as SORT_BY, a3 as SORT_DESC, _ as START_PAGE, $ as START_PAGE_SIZE, c as SearchFiltersForm, v as Segmented, m as Sidebar, S as Skeleton, h as Space, p as Spin, i as Splitter, w as Statistic, l as Steps, T as Table, b as Tabs, n as Tag, x as Timeline, a as Tooltip, y as Tour, z as Tree, a4 as TypeActionRowTable, W as Watermark, t as typeColorMap } from '../chunks/index-BMH0bSgU.js';
 export { E as ErrorMessage, L as Label, a as TINY_API, T as Typography } from '../chunks/AntdIcon-sydRpDMU.js';
 import 'react-router';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pnkx-lib/ui",
   "private": false,
-  "version": "1.9.94",
+  "version": "1.9.96",
   "type": "module",
   "main": "./es/index.js",
   "module": "./es/index.js",

package/types/index.d.ts

@@ -753,7 +753,6 @@ export declare interface TableCommonProps<T> extends Omit<TableProps<T>, "column
     renderHeadingSearch: () => ReactNode;
     rightHeadingContent: ReactNode;
     menu: Array<MenuType>;
-    renderGroupHeadingButton: ReactNode;
     groupHeadingButtonItems?: GroupHeadingButtonItem[];
     showIndexColumn?: boolean;
     setFilters: (nextFilter: InitialFiltersSearch<TFilters>) => void;

package/types/ui.d.ts

@@ -601,7 +601,6 @@ export declare interface TableCommonProps<T> extends Omit<TableProps<T>, "column
     renderHeadingSearch: () => ReactNode;
     rightHeadingContent: ReactNode;
     menu: Array<MenuType>;
-    renderGroupHeadingButton: ReactNode;
     groupHeadingButtonItems?: GroupHeadingButtonItem[];
     showIndexColumn?: boolean;
     setFilters: (nextFilter: InitialFiltersSearch<TFilters>) => void;