valaxy-theme-press 0.22.4 → 0.22.5-beta.4

package/components/PressMenuLink.vue

@@ -0,0 +1,50 @@
+<script lang="ts" setup>
+import type { NavItemLink } from '../types'
+import { useI18n } from 'vue-i18n'
+
+defineProps<{
+  item: NavItemLink
+}>()
+
+const { t } = useI18n()
+</script>
+
+<template>
+  <div class="menu-link">
+    <AppLink
+      v-if="'link' in item"
+      class="menu-item"
+      p="x-3"
+      :to="item.link"
+    >
+      {{ item.text.includes(".") ? t(item.text) : item.text }}
+    </AppLink>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.menu-link{
+    .menu-item {
+    display: flex;
+    width: 100%;
+    border-radius: 6px;
+    color: var(--pr-nav-text);
+    line-height: 32px;
+    font-size: 14px;
+    font-weight: 500;
+    white-space: nowrap;
+    transition:
+      background-color 0.25s,
+      color 0.25s;
+
+    &:hover {
+      background-color: #f1f1f1;
+      color: var(--va-c-brand);
+
+      .dark & {
+        background-color: #2f2f2f;
+      }
+    }
+  }
+}
+</style>

package/components/PressNavItemGroup.vue

@@ -1,10 +1,12 @@
 <script lang="ts" setup>
-import type { NavItemGroup } from '../types'
+import type { NavItemWithChildren } from '../types'
 import { ref } from 'vue'
 import { useI18n } from 'vue-i18n'
+import PressMenuLink from './PressMenuLink.vue'
+import PressNavItemGroupChild from './PressNavItemGroupChild.vue'
 
 defineProps<{
-  item: NavItemGroup
+  item: NavItemWithChildren
 }>()
 
 const open = ref(false)
@@ -27,33 +29,38 @@ const { t } = useI18n()
       h="full"
       @click="open = !open"
     >
-      <span class="text">
-        {{ item.text.includes('.') ? t(item.text) : item.text }}
+      <span v-if="item.text" class="text">
+        {{ item.text.includes(".") ? t(item.text) : item.text }}
       </span>
       <div i-ri-arrow-drop-down-line />
     </button>
 
     <div class="menu grow" flex="~ col" items="start">
-      <AppLink v-for="itemLink in item.items" :key="itemLink.text" class="menu-item" p="x-3" :to="itemLink.link">
-        {{ itemLink.text.includes('.') ? t(itemLink.text) : itemLink.text }}
-      </AppLink>
+      <template v-for="itemLink in item.items" :key="JSON.stringify(itemLink)">
+        <PressMenuLink v-if="'link' in itemLink" :item="itemLink" />
+        <PressNavItemGroupChild
+          v-else
+          :text="itemLink.text"
+          :items="itemLink.items"
+        />
+      </template>
     </div>
   </div>
 </template>
 
 <style lang="scss" scoped>
-.group .button{
+.group .button {
   color: var(--pr-nav-text);
   font-weight: 500;
   font-size: 14px;
 }
 
-.group[aria-expanded="true"] .button{
-  color: rgba(60, 60, 60, 0.70);
+.group[aria-expanded="true"] .button {
+  color: rgb(60 60 60 / 0.70);
   transition: color 0.25s;
 
-  .dark &{
-    color: rgba(235, 235, 235, 0.6)
+  .dark & {
+    color: rgb(235 235 235 / 0.6)
   }
 }
 
@@ -64,39 +71,21 @@ const { t } = useI18n()
   min-width: 128px;
   opacity: 0;
   visibility: hidden;
-  transition: opacity 0.25s, visibility 0.25s, transform 0.25s;
+  transition:
+    opacity 0.25s,
+    visibility 0.25s,
+    transform 0.25s;
   transform: translateX(-50%) translateY(calc(var(--pr-nav-height) / 2));
   border-radius: 12px;
   padding: 12px;
-  border: 1px solid rgba(60, 60, 60, 0.12);
+  border: 1px solid rgb(60 60 60 / 0.12);
   background-color: #fff;
-  box-shadow: 0 12px 32px rgba(0, 0, 0, 0.1), 0 2px 6px rgba(0, 0, 0, 0.08);
+  box-shadow: 0 12px 32px rgb(0 0 0 / 0.1), 0 2px 6px rgb(0 0 0 / 0.08);
 
-  .dark &{
+  .dark & {
     background-color: #242424;
   }
 
-  &-item{
-    display: flex;
-    width: 100%;
-    border-radius: 6px;
-    color: var(--pr-nav-text);
-    line-height: 32px;
-    font-size: 14px;
-    font-weight: 500;
-    white-space: nowrap;
-    transition: background-color .25s,color .25s;
-
-    &:hover{
-      background-color: #f1f1f1;
-      color: var(--va-c-brand);
-
-      .dark &{
-        background-color: #2f2f2f;
-      }
-    }
-
-  }
 }
 
 .group[aria-expanded="true"] > .menu {

package/components/PressNavItemGroupChild.vue

@@ -0,0 +1,45 @@
+<script lang="ts" setup>
+import type { NavItemLink } from '../types'
+import PressMenuLink from './PressMenuLink.vue'
+
+defineProps<{
+  text?: string
+  items: NavItemLink[]
+}>()
+</script>
+
+<template>
+  <div class="menu-group-item">
+    <p v-if="text" class="title">
+      {{ text }}
+    </p>
+    <template v-for="item in items" :key="item.link">
+      <PressMenuLink v-if="'link' in item" :item="item" />
+    </template>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.menu-group-item {
+  display: block;
+  margin: 12px -12px 0;
+  border-top: 1px solid rgb(60 60 60 / 0.12);
+  padding: 12px 12px 0;
+
+  .title {
+    padding: 0 12px;
+    line-height: 28px;
+    font-size: 14px;
+    font-weight: 600;
+    color: rgb(60 60 60 / 0.33);
+    white-space: nowrap;
+    transition: color 0.25s;
+  }
+
+  &:first-child {
+    margin-top: 0;
+    border-top: 0;
+    padding-top: 0;
+  }
+}
+</style>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "valaxy-theme-press",
-  "version": "0.22.4",
+  "version": "0.22.5-beta.4",
   "description": "Docs Theme for Valaxy",
   "author": {
     "email": "me@yunyoujun.cn",
@@ -26,6 +26,6 @@
     "@docsearch/js": "^3.8.2"
   },
   "devDependencies": {
-    "valaxy": "0.22.4"
+    "valaxy": "0.22.5-beta.4"
   }
 }

package/types/index.d.ts

@@ -103,12 +103,18 @@ export interface NavItemLink {
   active?: string
 }
 
-export interface NavItemGroup {
-  text: string
+export interface NavItemChildren {
+  text?: string
   items: NavItemLink[]
 }
 
-export type NavItem = NavItemLink | NavItemGroup
+export interface NavItemWithChildren {
+  text?: string
+  items?: (NavItemChildren | NavItemLink)[]
+  active?: string
+}
+
+export type NavItem = NavItemLink | NavItemWithChildren
 
 /**
  * Theme Config