baaz-custom-components 3.2.18 → 3.2.20

package/dist/index.js

@@ -793,20 +793,20 @@ function getActiveChildGroup(data, base, pathname) {
       const full = buildFullHref(base, routes);
       let hrefPath = extractPathname(full);
       if (hrefPath.endsWith("/-")) hrefPath = hrefPath.slice(0, -2);
-      if (pathname === hrefPath || pathname.startsWith(hrefPath + "/")) {
+      if (pathname.startsWith(hrefPath)) {
         return null;
       }
-    } else if (Array.isArray(routes)) {
+    } else {
       const children = routes;
-      let firstPath = "";
-      if (typeof children[0].routes === "string") {
-        firstPath = children[0].routes;
-      }
-      const full = buildFullHref(base, firstPath);
-      let hrefPath = extractPathname(full);
-      if (hrefPath.endsWith("/-")) hrefPath = hrefPath.slice(0, -2);
-      if (pathname.startsWith(hrefPath)) {
-        if (children.length > 0) {
+      const anyChildMatches = children.some((child) => {
+        if (typeof child.routes !== "string") return false;
+        const full = buildFullHref(base, child.routes);
+        let hrefPath = extractPathname(full);
+        if (hrefPath.endsWith("/-")) hrefPath = hrefPath.slice(0, -2);
+        return pathname.startsWith(hrefPath);
+      });
+      if (anyChildMatches) {
+        if (children.length > 1) {
           return { base, children };
         }
         return null;
@@ -914,7 +914,7 @@ var Notifications = ({
       {
         className: "w-80 h-96 bg-card-foreground",
         align: "start",
-        children: /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(ScrollArea, { className: "w-full h-full", children: (notificationData == null ? void 0 : notificationData.length) == 0 ? /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("h1", { className: "text-center flex items-center justify-center h-80 w-full", children: "No Notifications" }) : notificationData == null ? void 0 : notificationData.map((data, index) => /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)("div", { children: [
+        children: /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(ScrollArea, { className: "w-full h-full", children: (notificationData == null ? void 0 : notificationData.length) == 0 ? /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("h1", { className: "text-center flex items-center  h-80 w-full", children: "No Notifications" }) : notificationData == null ? void 0 : notificationData.map((data, index) => /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)("div", { children: [
           /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)("div", { className: "flex py-4 px-5 gap-6", children: [
             /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("div", { className: "w-3 h-3 mt-2 bg-accent rounded-full flex-shrink-0" }),
             /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)("div", { className: " flex gap-2 flex-col text-sm", children: [
@@ -947,7 +947,7 @@ function SubNav({
     setPath(router.pathname);
   }, [router.pathname]);
   if (!childrenRoutes || childrenRoutes.length === 0) return null;
-  return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)("div", { className: "bg-transparent w-full px-8 py-2", children: childrenRoutes.map((child) => {
+  return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)("div", { className: "bg-transparent w-full px-8 py-2 flex items-center justify-center gap-4", children: childrenRoutes.map((child) => {
     if (typeof child.routes !== "string") return null;
     const href = buildFullHref(base, child.routes);
     const active = isRouteActive(href, path);
@@ -956,7 +956,7 @@ function SubNav({
       {
         onClick: () => router.push(href),
         className: cn(
-          "px-3 py-1 text-sm rounded-md whitespace-nowrap cursor-pointer border-b-2 mx-2",
+          "px-3 py-1 text-sm rounded-md whitespace-nowrap cursor-pointer border-b-2 ",
           active ? "bg-accent text-accent-foreground" : "text-muted-foreground hover:bg-primary"
         ),
         children: child.label

package/dist/index.mjs

@@ -759,20 +759,20 @@ function getActiveChildGroup(data, base, pathname) {
       const full = buildFullHref(base, routes);
       let hrefPath = extractPathname(full);
       if (hrefPath.endsWith("/-")) hrefPath = hrefPath.slice(0, -2);
-      if (pathname === hrefPath || pathname.startsWith(hrefPath + "/")) {
+      if (pathname.startsWith(hrefPath)) {
         return null;
       }
-    } else if (Array.isArray(routes)) {
+    } else {
       const children = routes;
-      let firstPath = "";
-      if (typeof children[0].routes === "string") {
-        firstPath = children[0].routes;
-      }
-      const full = buildFullHref(base, firstPath);
-      let hrefPath = extractPathname(full);
-      if (hrefPath.endsWith("/-")) hrefPath = hrefPath.slice(0, -2);
-      if (pathname.startsWith(hrefPath)) {
-        if (children.length > 0) {
+      const anyChildMatches = children.some((child) => {
+        if (typeof child.routes !== "string") return false;
+        const full = buildFullHref(base, child.routes);
+        let hrefPath = extractPathname(full);
+        if (hrefPath.endsWith("/-")) hrefPath = hrefPath.slice(0, -2);
+        return pathname.startsWith(hrefPath);
+      });
+      if (anyChildMatches) {
+        if (children.length > 1) {
           return { base, children };
         }
         return null;
@@ -880,7 +880,7 @@ var Notifications = ({
       {
         className: "w-80 h-96 bg-card-foreground",
         align: "start",
-        children: /* @__PURE__ */ jsx10(ScrollArea, { className: "w-full h-full", children: (notificationData == null ? void 0 : notificationData.length) == 0 ? /* @__PURE__ */ jsx10("h1", { className: "text-center flex items-center justify-center h-80 w-full", children: "No Notifications" }) : notificationData == null ? void 0 : notificationData.map((data, index) => /* @__PURE__ */ jsxs8("div", { children: [
+        children: /* @__PURE__ */ jsx10(ScrollArea, { className: "w-full h-full", children: (notificationData == null ? void 0 : notificationData.length) == 0 ? /* @__PURE__ */ jsx10("h1", { className: "text-center flex items-center  h-80 w-full", children: "No Notifications" }) : notificationData == null ? void 0 : notificationData.map((data, index) => /* @__PURE__ */ jsxs8("div", { children: [
           /* @__PURE__ */ jsxs8("div", { className: "flex py-4 px-5 gap-6", children: [
             /* @__PURE__ */ jsx10("div", { className: "w-3 h-3 mt-2 bg-accent rounded-full flex-shrink-0" }),
             /* @__PURE__ */ jsxs8("div", { className: " flex gap-2 flex-col text-sm", children: [
@@ -913,7 +913,7 @@ function SubNav({
     setPath(router.pathname);
   }, [router.pathname]);
   if (!childrenRoutes || childrenRoutes.length === 0) return null;
-  return /* @__PURE__ */ jsx11("div", { className: "bg-transparent w-full px-8 py-2", children: childrenRoutes.map((child) => {
+  return /* @__PURE__ */ jsx11("div", { className: "bg-transparent w-full px-8 py-2 flex items-center justify-center gap-4", children: childrenRoutes.map((child) => {
     if (typeof child.routes !== "string") return null;
     const href = buildFullHref(base, child.routes);
     const active = isRouteActive(href, path);
@@ -922,7 +922,7 @@ function SubNav({
       {
         onClick: () => router.push(href),
         className: cn(
-          "px-3 py-1 text-sm rounded-md whitespace-nowrap cursor-pointer border-b-2 mx-2",
+          "px-3 py-1 text-sm rounded-md whitespace-nowrap cursor-pointer border-b-2 ",
           active ? "bg-accent text-accent-foreground" : "text-muted-foreground hover:bg-primary"
         ),
         children: child.label

package/package.json

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