@logickernel/bridge 0.11.8 → 0.11.10

package/dist/next/components.cjs

@@ -757,27 +757,43 @@ function getIconComponent(icon) {
 function NavMain({ items }) {
   const pathname = navigation.usePathname();
   const { isMobile, setOpenMobile } = useSidebar();
-  const getCurrentContext = () => {
-    const segments = pathname.split("/").filter(Boolean);
+  const getContextFromPath = (path) => {
+    const segments = path.split("/").filter(Boolean);
     if (segments.length === 0) return null;
     return `/${segments[0]}`;
   };
+  const getCurrentContext = () => {
+    if (typeof window !== "undefined") {
+      const fullPath = window.location.pathname;
+      return getContextFromPath(fullPath);
+    }
+    return getContextFromPath(pathname);
+  };
   const shouldUseLink = (url) => {
     const currentContext = getCurrentContext();
+    const urlContext = getContextFromPath(url);
     if (typeof window !== "undefined" && process.env.NODE_ENV === "development") {
-      const willUseLink = currentContext ? url.startsWith(currentContext) : false;
+      const willUseLink = currentContext && urlContext && currentContext === urlContext;
       console.log("[NavMain] shouldUseLink check:", {
         url,
         currentPathname: pathname,
+        windowPathname: typeof window !== "undefined" ? window.location.pathname : "N/A",
         currentContext,
-        urlStartsWithContext: currentContext ? url.startsWith(currentContext) : false,
+        urlContext,
+        contextsMatch: currentContext === urlContext,
         willUseLink
       });
     }
-    if (!currentContext) return false;
-    if (url.startsWith(currentContext)) return true;
+    if (currentContext && urlContext && currentContext === urlContext) {
+      return true;
+    }
     return false;
   };
+  const stripContextFromUrl = (url) => {
+    const urlContext = getContextFromPath(url);
+    if (!urlContext) return url;
+    return url.substring(urlContext.length) || "/";
+  };
   const handleClick = (e) => {
     if (isMobile) {
       setOpenMobile(false);
@@ -895,17 +911,19 @@ function NavMain({ items }) {
                 ) }),
                 /* @__PURE__ */ jsxRuntime.jsx(CollapsibleContent2, { children: /* @__PURE__ */ jsxRuntime.jsx(SidebarMenuSub, { children: item.items?.map((subItem) => {
                   const useLink2 = shouldUseLink(subItem.url);
+                  const linkHref2 = useLink2 ? stripContextFromUrl(subItem.url) : subItem.url;
                   if (typeof window !== "undefined" && process.env.NODE_ENV === "development") {
                     console.log("[NavMain] SubItem navigation:", {
                       title: subItem.title,
-                      url: subItem.url,
+                      originalUrl: subItem.url,
+                      linkHref: linkHref2,
                       currentContext: getCurrentContext(),
                       useLink: useLink2,
                       willReload: !useLink2
                     });
                   }
                   if (useLink2) {
-                    return /* @__PURE__ */ jsxRuntime.jsx(SidebarMenuSubItem, { children: /* @__PURE__ */ jsxRuntime.jsx(SidebarMenuSubButton, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(Link__default.default, { href: subItem.url, onClick: handleClick, className: "text-blue-500", children: /* @__PURE__ */ jsxRuntime.jsx("span", { children: subItem.title }) }) }) }, subItem.title);
+                    return /* @__PURE__ */ jsxRuntime.jsx(SidebarMenuSubItem, { children: /* @__PURE__ */ jsxRuntime.jsx(SidebarMenuSubButton, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(Link__default.default, { href: linkHref2, onClick: handleClick, className: "text-blue-500", children: /* @__PURE__ */ jsxRuntime.jsx("span", { children: subItem.title }) }) }) }, subItem.title);
                   }
                   return /* @__PURE__ */ jsxRuntime.jsx(SidebarMenuSubItem, { children: /* @__PURE__ */ jsxRuntime.jsx(SidebarMenuSubButton, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx("a", { href: subItem.url, className: "text-red-500", onClick: handleClick, children: /* @__PURE__ */ jsxRuntime.jsx("span", { children: subItem.title }) }) }) }, subItem.title);
                 }) }) })
@@ -915,10 +933,12 @@ function NavMain({ items }) {
           );
         }
         const useLink = shouldUseLink(item.url);
+        const linkHref = useLink ? stripContextFromUrl(item.url) : item.url;
         if (typeof window !== "undefined" && process.env.NODE_ENV === "development") {
           console.log("[NavMain] Item navigation:", {
             title: item.title,
-            url: item.url,
+            originalUrl: item.url,
+            linkHref,
             currentContext: getCurrentContext(),
             currentPathname: pathname,
             useLink,
@@ -932,7 +952,7 @@ function NavMain({ items }) {
               asChild: true,
               tooltip: item.title,
               isActive,
-              children: /* @__PURE__ */ jsxRuntime.jsxs(Link__default.default, { href: item.url, onClick: handleClick, className: "text-blue-500", children: [
+              children: /* @__PURE__ */ jsxRuntime.jsxs(Link__default.default, { href: linkHref, onClick: handleClick, className: "text-blue-500", children: [
                 item.icon && /* @__PURE__ */ jsxRuntime.jsx(item.icon, {}),
                 /* @__PURE__ */ jsxRuntime.jsx("span", { children: item.title })
               ] })