@logickernel/bridge 0.11.2 → 0.11.4

package/dist/next/components.cjs

@@ -756,7 +756,23 @@ function getIconComponent(icon) {
 }
 function NavMain({ items }) {
   const pathname = navigation.usePathname();
+  const router = navigation.useRouter();
   const { isMobile, setOpenMobile } = useSidebar();
+  const isAbsoluteUrl = (url) => {
+    return url.startsWith("http://") || url.startsWith("https://");
+  };
+  const isCrossAppPath = (url) => {
+    return url.startsWith("/core") || url.startsWith("/aura");
+  };
+  const handleNavigation = (url, e) => {
+    if (isMobile) {
+      setOpenMobile(false);
+    }
+    if (isCrossAppPath(url) && !isAbsoluteUrl(url)) {
+      e?.preventDefault();
+      router.push(url);
+    }
+  };
   if (typeof window !== "undefined" && process.env.NODE_ENV === "development") {
     console.log("[NavMain] Received items:", {
       itemsCount: items.length,
@@ -834,7 +850,18 @@ function NavMain({ items }) {
         group.label.title
       ] }),
       group.items.length > 0 && /* @__PURE__ */ jsxRuntime.jsx(SidebarMenu, { children: group.items.map((item) => {
-        const isActive = pathname === item.url || item.isActive;
+        let isActive = item.isActive || false;
+        if (!isActive) {
+          if (isAbsoluteUrl(item.url)) {
+            if (typeof window !== "undefined") {
+              isActive = window.location.href === item.url;
+            }
+          } else if (isCrossAppPath(item.url)) {
+            isActive = pathname === item.url;
+          } else {
+            isActive = pathname === item.url;
+          }
+        }
         const hasSubItems = item.items && item.items.length > 0;
         if (hasSubItems) {
           return /* @__PURE__ */ jsxRuntime.jsx(
@@ -856,23 +883,52 @@ function NavMain({ items }) {
                     ]
                   }
                 ) }),
-                /* @__PURE__ */ jsxRuntime.jsx(CollapsibleContent2, { children: /* @__PURE__ */ jsxRuntime.jsx(SidebarMenuSub, { children: item.items?.map((subItem) => /* @__PURE__ */ jsxRuntime.jsx(SidebarMenuSubItem, { children: /* @__PURE__ */ jsxRuntime.jsx(SidebarMenuSubButton, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(
-                  Link__default.default,
-                  {
-                    href: subItem.url,
-                    onClick: () => {
-                      if (isMobile) {
-                        setOpenMobile(false);
+                /* @__PURE__ */ jsxRuntime.jsx(CollapsibleContent2, { children: /* @__PURE__ */ jsxRuntime.jsx(SidebarMenuSub, { children: item.items?.map((subItem) => {
+                  if (isCrossAppPath(subItem.url) && !isAbsoluteUrl(subItem.url)) {
+                    return /* @__PURE__ */ jsxRuntime.jsx(SidebarMenuSubItem, { children: /* @__PURE__ */ jsxRuntime.jsx(SidebarMenuSubButton, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(
+                      "a",
+                      {
+                        href: subItem.url,
+                        onClick: (e) => handleNavigation(subItem.url, e),
+                        children: /* @__PURE__ */ jsxRuntime.jsx("span", { children: subItem.title })
                       }
-                    },
-                    children: /* @__PURE__ */ jsxRuntime.jsx("span", { children: subItem.title })
+                    ) }) }, subItem.title);
                   }
-                ) }) }, subItem.title)) }) })
+                  return /* @__PURE__ */ jsxRuntime.jsx(SidebarMenuSubItem, { children: /* @__PURE__ */ jsxRuntime.jsx(SidebarMenuSubButton, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(
+                    Link__default.default,
+                    {
+                      href: subItem.url,
+                      onClick: () => handleNavigation(subItem.url),
+                      children: /* @__PURE__ */ jsxRuntime.jsx("span", { children: subItem.title })
+                    }
+                  ) }) }, subItem.title);
+                }) }) })
               ] })
             },
             item.title
           );
         }
+        if (isCrossAppPath(item.url) && !isAbsoluteUrl(item.url)) {
+          return /* @__PURE__ */ jsxRuntime.jsx(SidebarMenuItem, { children: /* @__PURE__ */ jsxRuntime.jsx(
+            SidebarMenuButton,
+            {
+              asChild: true,
+              tooltip: item.title,
+              isActive,
+              children: /* @__PURE__ */ jsxRuntime.jsxs(
+                "a",
+                {
+                  href: item.url,
+                  onClick: (e) => handleNavigation(item.url, e),
+                  children: [
+                    item.icon && /* @__PURE__ */ jsxRuntime.jsx(item.icon, {}),
+                    /* @__PURE__ */ jsxRuntime.jsx("span", { children: item.title })
+                  ]
+                }
+              )
+            }
+          ) }, item.title);
+        }
         return /* @__PURE__ */ jsxRuntime.jsx(SidebarMenuItem, { children: /* @__PURE__ */ jsxRuntime.jsx(
           SidebarMenuButton,
           {
@@ -883,11 +939,7 @@ function NavMain({ items }) {
               Link__default.default,
               {
                 href: item.url,
-                onClick: () => {
-                  if (isMobile) {
-                    setOpenMobile(false);
-                  }
-                },
+                onClick: () => handleNavigation(item.url),
                 children: [
                   item.icon && /* @__PURE__ */ jsxRuntime.jsx(item.icon, {}),
                   /* @__PURE__ */ jsxRuntime.jsx("span", { children: item.title })
@@ -1125,22 +1177,23 @@ function TeamSwitcher({
   const isMobile = sidebar?.isMobile ?? false;
   const pathname = navigation.usePathname();
   const router = navigation.useRouter();
-  const pathSegments = pathname.split("/");
-  const isAppOrgRoute = pathname.startsWith("/app/") && pathSegments.length > 2 && pathSegments[2] !== "user";
-  const pathOrgId = isAppOrgRoute ? pathSegments[2] : null;
+  const pathSegments = pathname.split("/").filter(Boolean);
+  const skipSegments = ["user", "api", "auth", "dashboard", "settings", "app"];
+  const potentialOrgId = pathSegments.length >= 1 ? pathSegments[0] : null;
+  const pathOrgId = potentialOrgId && !skipSegments.includes(potentialOrgId) && (potentialOrgId.includes("-") || potentialOrgId.length >= 8) ? potentialOrgId : null;
   const currentOrgId = organizationId || (pathOrgId && teams.some((team) => team.id === pathOrgId) ? pathOrgId : null);
   const handleTeamChange = (teamId) => {
     if (isMobile && sidebar?.setOpenMobile) {
       sidebar.setOpenMobile(false);
     }
-    router.push(`/app/${teamId}/home`);
+    router.push(`/${teamId}/home`);
     router.refresh();
   };
   const handleManageOrganizations = () => {
     if (isMobile && sidebar?.setOpenMobile) {
       sidebar.setOpenMobile(false);
     }
-    router.push("/app/user/organizations");
+    router.push("/user/organizations");
   };
   const teamsWithLogo = teams.map((org) => {
     const logoIcon = org.logo ? getIconComponent(org.logo) : LucideIcons.GalleryVerticalEnd;
@@ -1318,12 +1371,7 @@ function AppSidebar({
   const currentPathname = navigation.usePathname();
   const pathSegments = currentPathname.split("/").filter(Boolean);
   let pathOrgId = null;
-  if (pathSegments.length >= 2 && pathSegments[0] === "app") {
-    const potentialOrgId = pathSegments[1];
-    if (potentialOrgId && potentialOrgId !== "user") {
-      pathOrgId = potentialOrgId;
-    }
-  } else if (pathSegments.length >= 1) {
+  if (pathSegments.length >= 1) {
     const potentialOrgId = pathSegments[0];
     const skipSegments = ["user", "api", "auth", "dashboard", "settings", "app"];
     if (potentialOrgId && !skipSegments.includes(potentialOrgId)) {