baaz-custom-components 3.2.13 → 3.2.15

package/dist/index.js

@@ -82,10 +82,10 @@ function useIsMobile() {
 }
 
 // src/components/custom/navbar/navbar.tsx
-var import_react3 = require("react");
+var import_react4 = require("react");
 
 // src/components/custom/navbar/desktopNavbar.tsx
-var import_react2 = require("react");
+var import_react3 = require("react");
 
 // src/components/ui/dropdown-menu.tsx
 var DropdownMenuPrimitive = __toESM(require("@radix-ui/react-dropdown-menu"));
@@ -786,31 +786,25 @@ function treeContainsPath({
   }
   return false;
 }
-function getDeepestActiveChildren(data, base, pathname) {
-  let result = null;
-  function dfs(routes, parentBase) {
-    for (const node of routes) {
-      if (typeof node.routes === "string") {
-        const full = buildFullHref(parentBase, node.routes);
-        let hrefPath = extractPathname(full);
-        if (hrefPath.endsWith("/-")) hrefPath = hrefPath.slice(0, -2);
-        if (pathname === hrefPath || pathname.startsWith(hrefPath + "/")) {
-        }
-      } else {
-        const firstChild = node.routes[0];
-        const maybePath = typeof firstChild.routes === "string" ? firstChild.routes : "";
-        const full = buildFullHref(parentBase, maybePath);
-        let hrefPath = extractPathname(full);
-        if (hrefPath.endsWith("/-")) hrefPath = hrefPath.slice(0, -2);
-        if (pathname.startsWith(hrefPath)) {
-          result = { base: parentBase, children: node.routes };
-          dfs(node.routes, parentBase);
-        }
+function getActiveRouteSiblings(data, base, pathname) {
+  for (const node of data) {
+    if (typeof node.routes === "string") {
+      const full = buildFullHref(base, node.routes);
+      let hrefPath = extractPathname(full);
+      if (hrefPath.endsWith("/-")) hrefPath = hrefPath.slice(0, -2);
+      if (pathname === hrefPath || pathname.startsWith(hrefPath + "/")) {
+        return { base, children: data };
       }
+    } else {
+      const childMatch = getActiveRouteSiblings(
+        node.routes,
+        base,
+        pathname
+      );
+      if (childMatch) return childMatch;
     }
   }
-  dfs(data, base);
-  return result;
+  return null;
 }
 
 // src/components/custom/navbar/customMenu.tsx
@@ -930,18 +924,22 @@ var Notifications = ({
 var notifications_default = Notifications;
 
 // src/components/custom/navbar/sub-nav.tsx
+var import_react2 = require("react");
 var import_jsx_runtime11 = require("react/jsx-runtime");
 function SubNav({
   base,
   childrenRoutes,
   router
 }) {
-  const pathname = typeof window !== "undefined" ? window.location.pathname : "";
+  const [path, setPath] = (0, import_react2.useState)(router.pathname);
+  (0, import_react2.useEffect)(() => {
+    setPath(router.pathname);
+  }, [router.pathname]);
   if (!childrenRoutes || childrenRoutes.length === 0) return null;
   return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)("div", { className: "bg-transparent border rounded-md px-2 py-1 shadow-lg flex gap-2", children: childrenRoutes.map((child) => {
     if (typeof child.routes !== "string") return null;
     const href = buildFullHref(base, child.routes);
-    const active = isRouteActive(href, pathname);
+    const active = isRouteActive(href, path);
     return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(
       "button",
       {
@@ -971,7 +969,7 @@ function DesktopNavbar({
   hubIdChangeHandler
 }) {
   const pathname = router.pathname;
-  const activeEntry = (0, import_react2.useMemo)(() => {
+  const activeEntry = (0, import_react3.useMemo)(() => {
     return navbarData == null ? void 0 : navbarData.find(
       (entry) => treeContainsPath({
         data: entry.routes,
@@ -980,9 +978,9 @@ function DesktopNavbar({
       })
     );
   }, [navbarData, pathname]);
-  const subNavData = (0, import_react2.useMemo)(() => {
+  const subNavData = (0, import_react3.useMemo)(() => {
     if (!activeEntry) return null;
-    return getDeepestActiveChildren(
+    return getActiveRouteSiblings(
       activeEntry.routes,
       activeEntry.url,
       pathname
@@ -1793,8 +1791,8 @@ function Navbar({
   notificationHandler
 }) {
   const isMobile = useIsMobile();
-  const [mounted, setMounted] = (0, import_react3.useState)(false);
-  (0, import_react3.useEffect)(() => {
+  const [mounted, setMounted] = (0, import_react4.useState)(false);
+  (0, import_react4.useEffect)(() => {
     setMounted(true);
   }, []);
   if (!mounted) return null;

package/dist/index.mjs

@@ -48,7 +48,7 @@ function useIsMobile() {
 }
 
 // src/components/custom/navbar/navbar.tsx
-import { useEffect as useEffect3, useState as useState4 } from "react";
+import { useEffect as useEffect4, useState as useState5 } from "react";
 
 // src/components/custom/navbar/desktopNavbar.tsx
 import { useMemo } from "react";
@@ -752,31 +752,25 @@ function treeContainsPath({
   }
   return false;
 }
-function getDeepestActiveChildren(data, base, pathname) {
-  let result = null;
-  function dfs(routes, parentBase) {
-    for (const node of routes) {
-      if (typeof node.routes === "string") {
-        const full = buildFullHref(parentBase, node.routes);
-        let hrefPath = extractPathname(full);
-        if (hrefPath.endsWith("/-")) hrefPath = hrefPath.slice(0, -2);
-        if (pathname === hrefPath || pathname.startsWith(hrefPath + "/")) {
-        }
-      } else {
-        const firstChild = node.routes[0];
-        const maybePath = typeof firstChild.routes === "string" ? firstChild.routes : "";
-        const full = buildFullHref(parentBase, maybePath);
-        let hrefPath = extractPathname(full);
-        if (hrefPath.endsWith("/-")) hrefPath = hrefPath.slice(0, -2);
-        if (pathname.startsWith(hrefPath)) {
-          result = { base: parentBase, children: node.routes };
-          dfs(node.routes, parentBase);
-        }
+function getActiveRouteSiblings(data, base, pathname) {
+  for (const node of data) {
+    if (typeof node.routes === "string") {
+      const full = buildFullHref(base, node.routes);
+      let hrefPath = extractPathname(full);
+      if (hrefPath.endsWith("/-")) hrefPath = hrefPath.slice(0, -2);
+      if (pathname === hrefPath || pathname.startsWith(hrefPath + "/")) {
+        return { base, children: data };
       }
+    } else {
+      const childMatch = getActiveRouteSiblings(
+        node.routes,
+        base,
+        pathname
+      );
+      if (childMatch) return childMatch;
     }
   }
-  dfs(data, base);
-  return result;
+  return null;
 }
 
 // src/components/custom/navbar/customMenu.tsx
@@ -896,18 +890,22 @@ var Notifications = ({
 var notifications_default = Notifications;
 
 // src/components/custom/navbar/sub-nav.tsx
+import { useEffect as useEffect2, useState as useState3 } from "react";
 import { jsx as jsx11 } from "react/jsx-runtime";
 function SubNav({
   base,
   childrenRoutes,
   router
 }) {
-  const pathname = typeof window !== "undefined" ? window.location.pathname : "";
+  const [path, setPath] = useState3(router.pathname);
+  useEffect2(() => {
+    setPath(router.pathname);
+  }, [router.pathname]);
   if (!childrenRoutes || childrenRoutes.length === 0) return null;
   return /* @__PURE__ */ jsx11("div", { className: "bg-transparent border rounded-md px-2 py-1 shadow-lg flex gap-2", children: childrenRoutes.map((child) => {
     if (typeof child.routes !== "string") return null;
     const href = buildFullHref(base, child.routes);
-    const active = isRouteActive(href, pathname);
+    const active = isRouteActive(href, path);
     return /* @__PURE__ */ jsx11(
       "button",
       {
@@ -948,7 +946,7 @@ function DesktopNavbar({
   }, [navbarData, pathname]);
   const subNavData = useMemo(() => {
     if (!activeEntry) return null;
-    return getDeepestActiveChildren(
+    return getActiveRouteSiblings(
       activeEntry.routes,
       activeEntry.url,
       pathname
@@ -1759,8 +1757,8 @@ function Navbar({
   notificationHandler
 }) {
   const isMobile = useIsMobile();
-  const [mounted, setMounted] = useState4(false);
-  useEffect3(() => {
+  const [mounted, setMounted] = useState5(false);
+  useEffect4(() => {
     setMounted(true);
   }, []);
   if (!mounted) return null;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "baaz-custom-components",
-    "version": "3.2.13",
+    "version": "3.2.15",
     "private": false,
     "sideEffects": false,
     "main": "dist/index.js",