@kirchdev/duxt 0.3.1 → 0.3.2-dev-main.36-6234a47

package/app/components/DuxtVersion.vue

@@ -154,6 +154,7 @@ function pathIn(version: { to?: string }) {
          scrolls at about ten entries instead of filling the screen. -->
     <UiDropdownMenuContent
       align="start"
+      :portal="props.variant !== 'block'"
       class="max-h-[min(20rem,var(--reka-dropdown-menu-content-available-height))]"
       :class="
         props.variant === 'block'

package/app/components/ui/dropdown-menu/DropdownMenuContent.vue

@@ -17,20 +17,27 @@ defineOptions({
 });
 
 const props = withDefaults(
-  defineProps<DropdownMenuContentProps & { class?: HTMLAttributes['class'] }>(),
+  defineProps<
+    DropdownMenuContentProps & {
+      class?: HTMLAttributes['class'];
+      /** Keep the content inside a containing modal when it must receive taps. */
+      portal?: boolean;
+    }
+  >(),
   {
-    sideOffset: 4
+    sideOffset: 4,
+    portal: true
   }
 );
 const emits = defineEmits<DropdownMenuContentEmits>();
 
-const delegatedProps = reactiveOmit(props, 'class');
+const delegatedProps = reactiveOmit(props, 'class', 'portal');
 
 const forwarded = useForwardPropsEmits(delegatedProps, emits);
 </script>
 
 <template>
-  <DropdownMenuPortal>
+  <DropdownMenuPortal :disabled="!props.portal">
     <DropdownMenuContent
       data-slot="dropdown-menu-content"
       v-bind="{ ...$attrs, ...forwarded }"

package/app/utils/version-choices.ts

@@ -11,6 +11,36 @@
  * rest of it is: every version bug this layer has had came from prefix work
  * done inline in a component, where it could only be checked by clicking.
  */
+import { compareVersionTags } from '../../sources-resolve';
+
+/**
+ * What a reader needs to see first: work that may change, the edition they
+ * normally read, then retired documentation. Version number only breaks ties
+ * inside one lifecycle group — a branch such as `main` therefore stays above
+ * the default release without pretending to be a semver tag.
+ */
+function lifecycleOrder(source: DuxtResolvedSource): number {
+  if (source.status === 'upcoming') return 0;
+  if (source.isDefault) return 1;
+  if (source.status === 'current' || source.status === 'maintained') return 2;
+  if (source.status === 'deprecated') return 3;
+  return 4;
+}
+
+function compareEditions(a: DuxtResolvedSource, b: DuxtResolvedSource): number {
+  const lifecycle = lifecycleOrder(a) - lifecycleOrder(b);
+  if (lifecycle) return lifecycle;
+
+  const aVersion = a.version!;
+  const bVersion = b.version!;
+  const semver = /^v?\d+\.\d+\.\d+(?:-.+)?$/;
+
+  // The shared comparator knows full tags. Demo editions such as `v3.x` are
+  // deliberately not tags, but still sort newest-first inside their group.
+  return semver.test(aVersion) && semver.test(bVersion)
+    ? compareVersionTags(aVersion, bVersion)
+    : bVersion.localeCompare(aVersion);
+}
 
 /**
  * Are these two collections versions of the SAME thing?
@@ -62,6 +92,7 @@ export function versionChoices(
       editions.add(edition);
       return true;
     })
+    .sort(compareEditions)
     .map((source) => ({
       label: source.version!,
       to: source.prefix || '/',

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://www.schemastore.org/package.json",
   "name": "@kirchdev/duxt",
-  "version": "0.3.1",
+  "version": "0.3.2-dev-main.36-6234a47",
   "description": "Nuxt documentation layer on Content v3 — multi-repo, versioned docs from one compact source list.",
   "keywords": [
     "content-v3",