@cal.macconnachie/web-components 1.2.0 → 1.2.2

package/dist/index.js

@@ -726,18 +726,18 @@ const Oo = ({
       return c.json();
     },
     refresh: async () => {
-      const c = await fetch(`${e}${t.refresh}`, {
+      const c = `${e}${t.refresh}`.replace(/\/api\/api\//, "/api/"), h = await fetch(c, {
         method: "POST",
         headers: {
           "Content-Type": "application/json"
         },
         credentials: "include"
       });
-      if (!c.ok) {
-        const h = await c.json();
-        throw new Error(h.message || h.error || "Failed to refresh token");
+      if (!h.ok) {
+        const m = await h.json();
+        throw new Error(m.message || m.error || "Failed to refresh token");
       }
-      return c.json();
+      return h.json();
     },
     checkSession: async () => {
       const c = await fetch(`${e}${t.checkSession}`, {
@@ -1459,7 +1459,7 @@ let E = class extends U {
   getApiService() {
     return this.apiService || (this.mockMode ? this.apiService = this.createMockApiService() : this.apiService = Oo({
       baseUrl: "/api/"
-    })), this.apiService;
+    })), this.error = "", this.apiService;
   }
   createMockApiService() {
     return {
@@ -5845,13 +5845,15 @@ let Z = class extends U {
   queryAndRegisterTabs() {
     const e = this.querySelectorAll("base-tab"), t = [];
     e.forEach((r) => {
-      const o = {
+      if (r.parentElement?.closest("base-tabs") !== this)
+        return;
+      const i = {
         id: r.id,
         label: r.getAttribute("label") || "",
         badge: r.hasAttribute("badge") ? Number(r.getAttribute("badge")) : void 0,
         icon: r.getAttribute("icon") || void 0
       };
-      o.id && !this.tabs.find((i) => i.id === o.id) && t.push(o);
+      i.id && !this.tabs.find((s) => s.id === i.id) && t.push(i);
     }), t.length > 0 && (this.tabs = [...this.tabs, ...t]);
   }
   willUpdate(e) {
@@ -5868,20 +5870,24 @@ let Z = class extends U {
     super.updated(e), e.has("activeTab") && this.updateChildTabs();
   }
   handleTabRegister(e) {
+    if (e.target.parentElement?.closest("base-tabs") !== this)
+      return;
     e.stopPropagation();
-    const t = e.detail;
-    this.tabs.find((r) => r.id === t.id) || (this.tabs = [...this.tabs, t]);
+    const o = e.detail;
+    this.tabs.find((i) => i.id === o.id) || (this.tabs = [...this.tabs, o]);
   }
   handleTabBadgeUpdate(e) {
+    if (e.target.parentElement?.closest("base-tabs") !== this)
+      return;
     e.stopPropagation();
-    const { id: t, badge: r } = e.detail, o = this.tabs.findIndex((i) => i.id === t);
-    o !== -1 && (this.tabs = this.tabs.map(
-      (i, s) => s === o ? { ...i, badge: r } : i
+    const { id: o, badge: i } = e.detail, s = this.tabs.findIndex((a) => a.id === o);
+    s !== -1 && (this.tabs = this.tabs.map(
+      (a, n) => n === s ? { ...a, badge: i } : a
     ));
   }
   updateChildTabs() {
     this.querySelectorAll("base-tab").forEach((t) => {
-      t.active = t.id === this.activeTab;
+      t.parentElement?.closest("base-tabs") === this && (t.active = t.id === this.activeTab);
     });
   }
   handleHashChange() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cal.macconnachie/web-components",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "Web components hosted on a CDN",
   "keywords": [
     "web-components",