valaxy-theme-press 0.23.5 → 0.24.0

package/components/PressArticle.vue

@@ -1,10 +1,9 @@
 <script setup lang="ts">
-import { useFrontmatter, useSiteStore } from 'valaxy'
+import { tObject, useFrontmatter, useSiteStore } from 'valaxy'
 import { computed } from 'vue'
 
 import { useI18n } from 'vue-i18n'
 import { useRoute } from 'vue-router'
-import { getLocaleTitle } from '../utils'
 
 const frontmatter = useFrontmatter()
 
@@ -19,7 +18,7 @@ const nextPost = computed(() => site.postList[findCurrentIndex() - 1])
 const prevPost = computed(() => site.postList[findCurrentIndex() + 1])
 
 const { locale } = useI18n()
-const localeTitle = computed(() => getLocaleTitle(locale.value, frontmatter.value))
+const $title = computed(() => tObject(frontmatter.value.title || '', locale.value))
 </script>
 
 <template>
@@ -36,7 +35,7 @@ const localeTitle = computed(() => getLocaleTitle(locale.value, frontmatter.valu
           md:text-5xl md:leading-14
         "
       >
-        {{ localeTitle }}
+        {{ $title }}
       </h1>
     </header>
 

package/components/PressCategory.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import type { Category, Post } from 'valaxy'
-import { isCategoryList } from 'valaxy'
+import { isCategoryList, tObject } from 'valaxy'
 import { ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
@@ -23,8 +23,7 @@ const { t, locale } = useI18n()
 
 function getTitle(post: Post | any) {
   const lang = locale.value
-  const localeTitle = post[`title_${lang}`] || post[`title_${lang.split('-')[0]}`]
-  return localeTitle || post.title
+  return tObject(post.title || '', lang)
 }
 </script>
 

package/components/ValaxyMain.vue

@@ -1,11 +1,10 @@
 <script lang="ts" setup>
 import type { PageData, Post } from 'valaxy'
-import { onClickHref, onContentUpdated, scrollTo, useFrontmatter, useLayout, useSidebar, useSiteConfig } from 'valaxy'
+import { onClickHref, onContentUpdated, scrollTo, tObject, useFrontmatter, useLayout, useSidebar, useSiteConfig } from 'valaxy'
 import { computed, nextTick } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useRoute, useRouter } from 'vue-router'
 import { targetPadding } from '../client'
-import { getLocaleTitle } from '../utils'
 
 defineProps<{
   frontmatter: Post
@@ -20,7 +19,7 @@ const isHome = useLayout('home')
 const layout = useLayout()
 
 const { locale } = useI18n()
-const localeTitle = computed(() => getLocaleTitle(locale.value, frontmatter.value))
+const $title = computed(() => tObject(frontmatter.value.title || '', locale.value))
 
 const route = useRoute()
 const router = useRouter()
@@ -64,9 +63,9 @@ onContentUpdated(() => {
               <slot name="main-content-before" />
 
               <ValaxyMd class="mx-auto w-full max-w-4xl" :frontmatter="frontmatter">
-                <h1 v-if="hasSidebar && !isHome && frontmatter.title" :id="frontmatter.title" tabindex="-1">
-                  {{ localeTitle }}
-                  <a class="header-anchor" :href="`#${frontmatter.title}`" aria-hidden="true" />
+                <h1 v-if="hasSidebar && !isHome && $title" :id="$title" tabindex="-1">
+                  {{ $title }}
+                  <a class="header-anchor" :href="`#${$title}`" aria-hidden="true" />
                 </h1>
                 <slot name="main-content-md" />
                 <slot />

package/composables/useEditLink.ts

@@ -8,8 +8,7 @@ export function useEditLink() {
 
   return computed(() => {
     const { text, pattern } = themeConfig.value.editLink || {}
-    const url = pattern.replace(/:path/g, page.value.relativePath)
-
+    const url = pattern.replace(/:path/g, page.value?.relativePath || '')
     return { url, text }
   })
 }

package/package.json

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

package/utils/index.ts

@@ -1,8 +0,0 @@
-/**
- * get locale title
- * @param locale
- * @param frontmatter
- */
-export function getLocaleTitle(locale: string, frontmatter: any) {
-  return frontmatter[`title${locale === 'en' ? '' : `_${locale}`}`] || frontmatter.title
-}