baaz-custom-components 3.2.13 → 3.2.14

package/dist/index.js

@@ -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
@@ -982,7 +976,7 @@ function DesktopNavbar({
   }, [navbarData, pathname]);
   const subNavData = (0, import_react2.useMemo)(() => {
     if (!activeEntry) return null;
-    return getDeepestActiveChildren(
+    return getActiveRouteSiblings(
       activeEntry.routes,
       activeEntry.url,
       pathname

package/dist/index.mjs

@@ -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
@@ -948,7 +942,7 @@ function DesktopNavbar({
   }, [navbarData, pathname]);
   const subNavData = useMemo(() => {
     if (!activeEntry) return null;
-    return getDeepestActiveChildren(
+    return getActiveRouteSiblings(
       activeEntry.routes,
       activeEntry.url,
       pathname

package/package.json

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