valaxy-theme-press 0.17.0-beta.2 → 0.17.0-beta.4

package/components/PressCategory.vue

@@ -52,7 +52,7 @@ function getTitle(post: Post | any) {
   </li>
 
   <ul v-if="!collapsable">
-    <li v-for="categoryItem, i in category.children" :key="i" class="post-list-item">
+    <li v-for="categoryItem, i in category.children.values()" :key="i" class="post-list-item">
       <template v-if="!isCategoryList(categoryItem)">
         <RouterLink v-if="categoryItem.title" :to="categoryItem.path || ''" class="inline-flex items-center" active-class="active">
           <span m="l-1" text="sm">{{ getTitle(categoryItem) }}</span>

package/components/PressCategoryByName.vue

@@ -0,0 +1,22 @@
+<script lang="ts" setup>
+import type { CategoryList } from 'valaxy'
+import { computed } from 'vue'
+
+const props = defineProps<{
+  categories: CategoryList
+  item: string
+}>()
+
+const category = computed(() => {
+  const c = props.categories.children.get(props.item)
+  return c
+})
+</script>
+
+<template>
+  <PressCategory
+    v-if="category"
+    :category="category"
+    :collapsable="false"
+  />
+</template>

package/components/PressSidebar.vue

@@ -11,8 +11,8 @@ const pages = usePageList()
 const themeConfig = useThemeConfig()
 
 const sidebar = computed(() => themeConfig.value.sidebar)
+const cs = useCategories('', pages.value)
 const categories = computed(() => {
-  const cs = useCategories('', pages.value)
   const cList = cs.value
   removeItemFromCategory(cList, 'Uncategorized')
 
@@ -23,13 +23,10 @@ const categories = computed(() => {
         removeItemFromCategory(cList, item.name)
     })
   }
+
   return cList
 })
 
-function getCategoryByName(name: string) {
-  return categories.value.children.find(c => c.name === name)
-}
-
 const { hasSidebar } = useSidebar()
 </script>
 
@@ -42,10 +39,9 @@ const { hasSidebar } = useSidebar()
     <div text="left" m="2">
       <ul v-for="item in sidebar" :key="item" class="category-list">
         <template v-if="typeof item === 'string'">
-          <PressCategory
-            v-if="getCategoryByName(item)"
-            :category="getCategoryByName(item)"
-            :collapsable="false"
+          <PressCategoryByName
+            :categories="categories"
+            :item="item"
           />
         </template>
         <PressSidebarItem

package/index.ts

@@ -0,0 +1 @@
+export * from './node'

package/node/index.ts

@@ -1,2 +1,12 @@
+import type { UserThemeConfig } from '../types'
+
 export * from '../config'
 export * from '../types/index.d'
+
+/**
+ * valaxy-theme-press
+ * @see https://github.com/YunYouJun/valaxy/tree/main/packages/valaxy-theme-press
+ */
+export function defineThemeConfig(config: UserThemeConfig) {
+  return config
+}

package/package.json

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

package/components/PressCategories.vue

@@ -1,77 +0,0 @@
-<script lang="ts" setup>
-import { useThemeConfig } from 'valaxy'
-import type { Categories } from 'valaxy'
-import { computed, ref } from 'vue'
-import type { PressTheme } from '../types'
-
-const props = withDefaults(defineProps<{
-  categories: Categories
-  /**
-   * 当前层级
-   */
-  level?: number
-  displayCategory?: (category: string) => void
-  collapsable?: boolean
-}>(), {
-  level: 0,
-  collapsable: true,
-})
-
-const collapsable = ref(props.collapsable)
-
-const themeConfig = useThemeConfig<PressTheme.Config>()
-const sidebar = computed(() => themeConfig.value.sidebar)
-
-function getCategoryByName(name: string) {
-  return props.categories.find(c => c.name === name)
-}
-</script>
-
-<template>
-  <ul v-for="item in sidebar" :key="item" class="category-list">
-    <PressCategory
-      v-if="getCategoryByName(item)"
-      :category="getCategoryByName(item)"
-      :level="level + 1"
-      :display-category="displayCategory"
-      :collapsable="collapsable"
-    />
-  </ul>
-</template>
-
-<style lang="scss">
-.category-list {
-  &:first-child {
-    .category-list-item {
-      border-top: 0;
-    }
-  }
-}
-
-.post-list-item {
-  a {
-    color: var(--va-c-text-light);
-    transition: all 0.2s;
-
-    &:hover {
-      color: var(--va-c-primary);
-    }
-
-    &.active {
-      color: var(--va-c-primary);
-    }
-  }
-}
-
-.category-list-item {
-  .folder-action {
-    &:hover {
-      color: var(--va-c-primary);
-    }
-  }
-}
-
-.category-list+.category-list {
-  margin-top: 1rem;
-}
-</style>