baaz-custom-components 3.2.4 → 3.2.6

package/dist/index.js

@@ -434,7 +434,7 @@ function SrpDropDown({
   hubIdEnable
 }) {
   const defaultValue = userData.currentHubId.toString();
-  return /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(Select, { onValueChange: onChange, defaultValue, disabled: hubIdEnable, children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(Select, { onValueChange: onChange, defaultValue, disabled: !hubIdEnable, children: [
     /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(SelectTrigger, { className: "w-[100px] cursor-pointer", children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(SelectValue, { placeholder: "Hub Id" }) }),
     /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(SelectContent, { children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(ScrollArea, { className: "h-40 w-full", children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(SelectGroup, { className: "cursor-pointer", children: hubIds == null ? void 0 : hubIds.map((hubId, index) => /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)("div", { children: [
       /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(
@@ -724,19 +724,56 @@ function extractPathname(urlOrPath) {
   }
   return urlOrPath;
 }
+function extractOrigin(urlOrPath) {
+  try {
+    if (urlOrPath.startsWith("http://") || urlOrPath.startsWith("https://")) {
+      return new URL(urlOrPath).origin;
+    }
+  } catch (_) {
+  }
+  return void 0;
+}
+function getCurrentOrigin() {
+  if (typeof window !== "undefined" && window.location) {
+    return window.location.origin;
+  }
+  return void 0;
+}
+function buildFullHref(base, route) {
+  return base + normalizePath(route);
+}
+function isRouteActive(fullHref, currentPathname) {
+  const hrefPath = extractPathname(fullHref);
+  if (hrefPath !== currentPathname) return false;
+  const hrefOrigin = extractOrigin(fullHref);
+  const currentOrigin = getCurrentOrigin();
+  if (!hrefOrigin || !currentOrigin) return true;
+  return hrefOrigin === currentOrigin;
+}
 function treeContainsPath({
   data,
   base,
-  pathname
+  pathname,
+  currentOrigin
 }) {
+  const originToMatch = currentOrigin != null ? currentOrigin : getCurrentOrigin();
   for (const value of data) {
     if (typeof value.routes === "string") {
-      const full = base + normalizePath(value.routes);
+      const full = buildFullHref(base, value.routes);
       const onlyPath = extractPathname(full);
+      if (originToMatch) {
+        const fullOrigin = extractOrigin(full);
+        if (fullOrigin && fullOrigin !== originToMatch) continue;
+      }
       if (onlyPath === pathname) return true;
       continue;
     }
-    if (treeContainsPath({ data: value.routes, base, pathname })) {
+    if (treeContainsPath({
+      data: value.routes,
+      base,
+      pathname,
+      currentOrigin: originToMatch
+    })) {
       return true;
     }
   }
@@ -755,8 +792,8 @@ function MenuItems({
 }) {
   return /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_jsx_runtime9.Fragment, { children: data.map((value) => {
     if (isLeaf(value.routes)) {
-      const fullPath = base + normalizePath(value.routes);
-      const active = extractPathname(fullPath) === router.pathname;
+      const fullPath = buildFullHref(base, value.routes);
+      const active = isRouteActive(fullPath, router.pathname);
       return /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
         MenubarItem,
         {
@@ -1555,8 +1592,8 @@ function renderMenu(data, base, router) {
   return data.map((value) => {
     const { scope, label, routes } = value;
     if (typeof routes === "string") {
-      const fullPath = `${base}${routes.startsWith("/") ? value : `/${value}`}`;
-      const active = extractPathname(fullPath) === router.pathname;
+      const fullPath = buildFullHref(base, routes);
+      const active = isRouteActive(fullPath, router.pathname);
       return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(SidebarMenuSubItem, { children: /* @__PURE__ */ (0, import_jsx_runtime16.jsxs)(
         SidebarMenuSubButton,
         {

package/dist/index.mjs

@@ -400,7 +400,7 @@ function SrpDropDown({
   hubIdEnable
 }) {
   const defaultValue = userData.currentHubId.toString();
-  return /* @__PURE__ */ jsxs4(Select, { onValueChange: onChange, defaultValue, disabled: hubIdEnable, children: [
+  return /* @__PURE__ */ jsxs4(Select, { onValueChange: onChange, defaultValue, disabled: !hubIdEnable, children: [
     /* @__PURE__ */ jsx6(SelectTrigger, { className: "w-[100px] cursor-pointer", children: /* @__PURE__ */ jsx6(SelectValue, { placeholder: "Hub Id" }) }),
     /* @__PURE__ */ jsx6(SelectContent, { children: /* @__PURE__ */ jsx6(ScrollArea, { className: "h-40 w-full", children: /* @__PURE__ */ jsx6(SelectGroup, { className: "cursor-pointer", children: hubIds == null ? void 0 : hubIds.map((hubId, index) => /* @__PURE__ */ jsxs4("div", { children: [
       /* @__PURE__ */ jsx6(
@@ -690,19 +690,56 @@ function extractPathname(urlOrPath) {
   }
   return urlOrPath;
 }
+function extractOrigin(urlOrPath) {
+  try {
+    if (urlOrPath.startsWith("http://") || urlOrPath.startsWith("https://")) {
+      return new URL(urlOrPath).origin;
+    }
+  } catch (_) {
+  }
+  return void 0;
+}
+function getCurrentOrigin() {
+  if (typeof window !== "undefined" && window.location) {
+    return window.location.origin;
+  }
+  return void 0;
+}
+function buildFullHref(base, route) {
+  return base + normalizePath(route);
+}
+function isRouteActive(fullHref, currentPathname) {
+  const hrefPath = extractPathname(fullHref);
+  if (hrefPath !== currentPathname) return false;
+  const hrefOrigin = extractOrigin(fullHref);
+  const currentOrigin = getCurrentOrigin();
+  if (!hrefOrigin || !currentOrigin) return true;
+  return hrefOrigin === currentOrigin;
+}
 function treeContainsPath({
   data,
   base,
-  pathname
+  pathname,
+  currentOrigin
 }) {
+  const originToMatch = currentOrigin != null ? currentOrigin : getCurrentOrigin();
   for (const value of data) {
     if (typeof value.routes === "string") {
-      const full = base + normalizePath(value.routes);
+      const full = buildFullHref(base, value.routes);
       const onlyPath = extractPathname(full);
+      if (originToMatch) {
+        const fullOrigin = extractOrigin(full);
+        if (fullOrigin && fullOrigin !== originToMatch) continue;
+      }
       if (onlyPath === pathname) return true;
       continue;
     }
-    if (treeContainsPath({ data: value.routes, base, pathname })) {
+    if (treeContainsPath({
+      data: value.routes,
+      base,
+      pathname,
+      currentOrigin: originToMatch
+    })) {
       return true;
     }
   }
@@ -721,8 +758,8 @@ function MenuItems({
 }) {
   return /* @__PURE__ */ jsx9(Fragment, { children: data.map((value) => {
     if (isLeaf(value.routes)) {
-      const fullPath = base + normalizePath(value.routes);
-      const active = extractPathname(fullPath) === router.pathname;
+      const fullPath = buildFullHref(base, value.routes);
+      const active = isRouteActive(fullPath, router.pathname);
       return /* @__PURE__ */ jsx9(
         MenubarItem,
         {
@@ -1521,8 +1558,8 @@ function renderMenu(data, base, router) {
   return data.map((value) => {
     const { scope, label, routes } = value;
     if (typeof routes === "string") {
-      const fullPath = `${base}${routes.startsWith("/") ? value : `/${value}`}`;
-      const active = extractPathname(fullPath) === router.pathname;
+      const fullPath = buildFullHref(base, routes);
+      const active = isRouteActive(fullPath, router.pathname);
       return /* @__PURE__ */ jsx16(SidebarMenuSubItem, { children: /* @__PURE__ */ jsxs13(
         SidebarMenuSubButton,
         {

package/package.json

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