valaxy-theme-yun 0.13.0 → 0.13.2

package/components/ValaxyMain.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { PageData, Post } from 'valaxy'
-import { usePostTitle, useRuntimeConfig, useSiteConfig } from 'valaxy'
-import { StyleValue, computed, defineAsyncComponent } from 'vue'
+import { usePostTitle, useSiteConfig } from 'valaxy'
+import { StyleValue, computed } from 'vue'
 import { usePostProperty } from '../composables'
 
 const props = defineProps<{
@@ -9,23 +9,12 @@ const props = defineProps<{
   data?: PageData
 }>()
 
-const runtimeConfig = useRuntimeConfig()
 const siteConfig = useSiteConfig()
 
 const { styles, icon, color } = usePostProperty(props.frontmatter.type)
 const title = usePostTitle(computed(() => props.frontmatter))
 
 const aside = computed(() => props.frontmatter.aside !== false)
-
-// not import from 'valaxy-addon-waline' to judge
-const YunWaline = runtimeConfig.value.addons['valaxy-addon-waline']
-  ? defineAsyncComponent(() => import('./YunWaline.vue'))
-  : () => null
-
-// todo: refactor
-const YunTwikoo = runtimeConfig.value.addons['valaxy-addon-twikoo']
-  ? defineAsyncComponent(() => import('./YunTwikoo.vue'))
-  : () => null
 </script>
 
 <template>
@@ -60,10 +49,7 @@ const YunTwikoo = runtimeConfig.value.addons['valaxy-addon-twikoo']
           <slot name="main-nav-after" />
 
           <slot v-if="siteConfig.comment.enable && frontmatter.comment !== false" name="comment">
-            <YunCard w="full" p="4" class="comment sm:p-6 lg:px-12 xl:px-16" :class="frontmatter.nav === false ? 'mt-4' : 0">
-              <YunWaline />
-              <YunTwikoo />
-            </YunCard>
+            <YunComment :class="frontmatter.nav === false ? 'mt-4' : 0" />
           </slot>
 
           <slot name="main-footer-before" />

package/components/YunComment.vue

@@ -0,0 +1,25 @@
+<script lang="ts" setup>
+import { useRuntimeConfig } from 'valaxy'
+import { defineAsyncComponent } from 'vue'
+
+const runtimeConfig = useRuntimeConfig()
+
+// not import from 'valaxy-addon-waline' to judge
+const YunWaline = runtimeConfig.value.addons['valaxy-addon-waline']
+  ? defineAsyncComponent(() => import('./YunWaline.vue'))
+  : () => null
+
+// todo: refactor
+const YunTwikoo = runtimeConfig.value.addons['valaxy-addon-twikoo']
+  ? defineAsyncComponent(() => import('./YunTwikoo.vue'))
+  : () => null
+</script>
+
+<template>
+  <YunCard w="full" p="4" class="comment sm:p-6 lg:px-12 xl:px-16">
+    <ClientOnly>
+      <YunWaline />
+      <YunTwikoo />
+    </ClientOnly>
+  </YunCard>
+</template>

package/components/YunSearchTrigger.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { computed } from '@vue/reactivity'
 import { useSiteConfig } from 'valaxy'
-import { onMounted, onUnmounted, ref, watch } from 'vue'
+import { ref, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useMagicKeys } from '@vueuse/core'
 
@@ -20,49 +20,19 @@ function load() {
 
 const isAlgolia = computed(() => siteConfig.value.search.type === 'algolia')
 
-onMounted(() => {
-  if (!isAlgolia.value)
-    return
-
-  const handleSearchHotKey = (e: KeyboardEvent) => {
-    if (e.key === 'k' && (e.ctrlKey || e.metaKey)) {
-      e.preventDefault()
-      load()
-      // eslint-disable-next-line @typescript-eslint/no-use-before-define
-      remove()
-    }
-  }
-
-  const remove = () => {
-    window.removeEventListener('keydown', handleSearchHotKey)
-  }
-
-  window.addEventListener('keydown', handleSearchHotKey)
-
-  onUnmounted(remove)
-})
-
 const open = ref(false)
 
-const trigger = () => {
-  // todo, refactor shortcut
-  const e = new Event('keydown') as any
-
-  e.key = 'k'
-  e.metaKey = true
-}
-
 const togglePopup = () => {
   open.value = !open.value
-
-  trigger()
 }
 
 const { Meta_K } = useMagicKeys()
 
 watch(Meta_K, (val) => {
-  if (val)
+  if (val) {
     togglePopup()
+    load()
+  }
 })
 </script>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "valaxy-theme-yun",
-  "version": "0.13.0",
+  "version": "0.13.2",
   "author": {
     "email": "me@yunyoujun.cn",
     "name": "YunYouJun",
@@ -22,6 +22,6 @@
     "valaxy-addon-waline": "0.0.9"
   },
   "devDependencies": {
-    "valaxy": "0.13.0"
+    "valaxy": "0.13.2"
   }
 }