@shwfed/nuxt 0.1.56 → 0.1.58

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@shwfed/nuxt",
   "configKey": "shwfed",
-  "version": "0.1.56",
+  "version": "0.1.58",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/runtime/components/app.vue

@@ -1,6 +1,6 @@
 <script setup>
-import { useHead, useNuxtApp, useRouter, useRuntimeConfig } from "#app";
-import { computed, ref } from "vue";
+import { useHead, useNuxtApp, useRoute, useRouter, useRuntimeConfig } from "#app";
+import { computed, onMounted, ref } from "vue";
 import { CommandDialog, CommandInput, CommandList, CommandGroup, CommandEmpty, CommandItem } from "./ui/command";
 import { TooltipProvider } from "./ui/tooltip";
 import { Toaster } from "vue-sonner";
@@ -14,7 +14,12 @@ import { Sidebar, SidebarContent, SidebarGroup, SidebarGroupLabel, SidebarMenu,
 import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "./ui/collapsible";
 import Logo from "./logo.vue";
 const { $dsl } = useNuxtApp();
-const config = useRuntimeConfig().public.shwfed;
+const {
+  public: {
+    shwfed: config
+  },
+  app
+} = useRuntimeConfig();
 const props = defineProps({
   navigation: { type: Array, required: false },
   commands: { type: Array, required: false },
@@ -39,6 +44,7 @@ whenever(() => meta_k?.value, () => {
   isCommandOpen.value = !isCommandOpen.value;
 });
 const router = useRouter();
+const route = useRoute();
 setGlobalDslContext(await props.dsl?.pipe(Effect.scoped).pipe(Effect.runPromise) ?? {});
 function toNavigationKey(groupId, itemId) {
   return groupId ? `${groupId}::${itemId}` : `::${itemId}`;
@@ -62,6 +68,25 @@ function findNavigationByKey(navList, key) {
   }
   return void 0;
 }
+function normalizePathForMatch(p) {
+  const trimmed = p.replace(/\/$/, "");
+  return trimmed === "" ? "/" : trimmed;
+}
+function findNavigationKeyByPath(navList, path) {
+  const normalized = normalizePathForMatch(path);
+  for (const el of navList) {
+    if (el.type === "item") {
+      if (el.external === true) continue;
+      if (normalizePathForMatch(el.target) === normalized) return toNavigationKey("", el.id);
+    } else {
+      for (const child of el.children) {
+        if (child.external === true) continue;
+        if (normalizePathForMatch(child.target) === normalized) return toNavigationKey(el.id, child.id);
+      }
+    }
+  }
+  return void 0;
+}
 const palette = computed(() => {
   const items = [];
   for (const navigation2 of props.navigation ?? []) {
@@ -288,6 +313,25 @@ const tabs = useSessionStorage("navigation-tabs", /* @__PURE__ */ new Set(), {
 const activeTab = useSessionStorage("navigation-active-tab", void 0, {
   writeDefaults: false
 });
+onMounted(() => {
+  const baseRaw = app.baseURL ?? "/";
+  const base = baseRaw === "" || baseRaw === "/" ? "/" : baseRaw.replace(/\/*$/, "") + "/";
+  const pathOnly = route.fullPath.replace(/\?.*$/, "").replace(/#.*$/, "");
+  let pathToMatch;
+  if (base === "/") {
+    pathToMatch = pathOnly;
+  } else if (pathOnly.startsWith(base) || pathOnly === base.slice(0, -1)) {
+    const remainder = pathOnly === base.slice(0, -1) ? "/" : pathOnly.slice(base.length) || "/";
+    pathToMatch = remainder.startsWith("/") ? remainder : `/${remainder}`;
+  } else {
+    pathToMatch = route.path;
+  }
+  const key = findNavigationKeyByPath(navigation.value, pathToMatch);
+  if (key !== void 0) {
+    tabs.value.add(key);
+    activeTab.value = key;
+  }
+});
 useHead({
   title: () => activeTab.value ? findNavigationByKey(navigation.value, activeTab.value)?.title ?? config.title : config.title
 });
@@ -649,6 +693,7 @@ useHead({
             >
               {{ findNavigationByKey(navigation, tab)?.title ?? tab ?? "Unknown" }}
               <button
+                v-if="tabs.size > 1"
                 type="button"
                 class="opacity-80 group-hover/tab:opacity-100 transition-opacity cursor-pointer text-zinc-500 hover:text-(--primary) duration-180"
                 @click.stop="() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shwfed/nuxt",
-  "version": "0.1.56",
+  "version": "0.1.58",
   "description": "",
   "license": "MIT",
   "type": "module",