@mercurjs/admin 2.0.0-canary.52 → 2.0.0-canary.53

package/dist/index.js

@@ -1620,12 +1620,6 @@ var NavItem = ({
   useEffect7(() => {
     setOpen(getIsOpen(to, items, pathname));
   }, [pathname, to, items]);
-  const isNestedActive = useCallback5(
-    (nestedTo) => {
-      return pathname === nestedTo || pathname.startsWith(nestedTo + "/");
-    },
-    [pathname]
-  );
   const navLinkClassNames = useCallback5(
     ({
       to: to2,
@@ -1634,13 +1628,14 @@ var NavItem = ({
       isSetting: isSetting2 = false
     }) => {
       if (["core", "setting"].includes(type)) {
-        if (isNested) {
-          isActive = isNestedActive(to2);
-        } else if (items?.length) {
-          const nestedMatch = items.some((item) => isNestedActive(item.to));
-          isActive = pathname.startsWith(to2) && !nestedMatch;
-        } else {
-          isActive = pathname.startsWith(to2);
+        isActive = pathname.startsWith(to2);
+        if (isActive && !isNested && items?.length) {
+          const nestedIsActive = items.some(
+            (item) => pathname.startsWith(item.to)
+          );
+          if (nestedIsActive) {
+            isActive = false;
+          }
         }
       }
       return clx2(BASE_NAV_LINK_CLASSES, {
@@ -1649,7 +1644,7 @@ var NavItem = ({
         [SETTING_NAV_LINK_CLASSES]: isSetting2
       });
     },
-    [type, pathname, items, isNestedActive]
+    [type, pathname, items]
   );
   const isSetting = type === "setting";
   return /* @__PURE__ */ jsxs3(
@@ -2730,7 +2725,7 @@ var MainSidebar = () => {
   const customRoutesWithNested = customMenuItems.sort((a, b) => (a.rank ?? 0) - (b.rank ?? 0)).map((item) => ({
     label: item.label,
     to: item.path,
-    icon: item.icon ? void 0 : void 0,
+    icon: item.icon ? /* @__PURE__ */ jsx12(item.icon, {}) : void 0,
     translationNs: item.translationNs,
     items: addNestedItems(item.path)
   }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mercurjs/admin",
-  "version": "2.0.0-canary.52",
+  "version": "2.0.0-canary.53",
   "repository": {
     "type": "git",
     "url": "https://github.com/mercurjs/mercur",