From 0f7734825ddfef8f4a86cad3a0472a899e904e14 Mon Sep 17 00:00:00 2001
From: pengzhanbo <volodymyr@foxmail.com>
Date: Sat, 7 May 2022 14:50:28 +0800
Subject: [PATCH] =?UTF-8?q?refactor(theme):=20=E4=BC=98=E5=8C=96=E6=96=87?=
 =?UTF-8?q?=E7=AB=A0=E5=88=97=E8=A1=A8=E7=BF=BB=E9=A1=B5=E4=BA=A4=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/src/client/components/BackToTop.vue | 19 ++-----------------
 .../src/client/components/BloggerInfo.vue     |  2 --
 .../src/client/components/HomeBigBanner.vue   |  5 +----
 .../src/client/components/Pagination.vue      | 14 ++++++++++++--
 .../theme/src/client/components/PostList.vue  | 14 +++++++-------
 .../theme/src/client/components/icons/icon.ts | 19 +++++++++++++++++++
 6 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/packages/theme/src/client/components/BackToTop.vue b/packages/theme/src/client/components/BackToTop.vue
index 63c7b507..a9c43441 100644
--- a/packages/theme/src/client/components/BackToTop.vue
+++ b/packages/theme/src/client/components/BackToTop.vue
@@ -1,12 +1,9 @@
 <script lang="ts" setup>
-import { usePageFrontmatter } from '@vuepress/client'
 import { debounce } from 'ts-debounce'
-import { computed, onMounted, ref } from 'vue'
+import { onMounted, ref } from 'vue'
 import { getScrollTop, scrollTo } from '../utils'
 import { BackTopIcon } from './icons'
 
-const frontmatter = usePageFrontmatter()
-
 const opacity = ref<number>(0)
 const MAX_TOP = 300
 
@@ -14,20 +11,8 @@ const canShow = debounce((): void => {
   opacity.value = getScrollTop(document) >= MAX_TOP ? 1 : 0
 })
 
-const top = computed(() => {
-  if (__VUEPRESS_SSR__) return 0
-  if (
-    frontmatter.value.home &&
-    (frontmatter.value.banner || frontmatter.value.mobileBanner)
-  ) {
-    return document.documentElement.clientHeight - 58
-  } else {
-    return 0
-  }
-})
-
 const scrollToTop = (): void => {
-  scrollTo(document, top.value)
+  scrollTo(document, 0)
 }
 
 onMounted(() => {
diff --git a/packages/theme/src/client/components/BloggerInfo.vue b/packages/theme/src/client/components/BloggerInfo.vue
index b7b7135c..ff47a57a 100644
--- a/packages/theme/src/client/components/BloggerInfo.vue
+++ b/packages/theme/src/client/components/BloggerInfo.vue
@@ -69,8 +69,6 @@ const useSocialList = (): SocialRef => {
 const socialList = useSocialList()
 
 const postStat = usePostStat()
-
-console.log(postStat)
 </script>
 <template>
   <DropdownTransition>
diff --git a/packages/theme/src/client/components/HomeBigBanner.vue b/packages/theme/src/client/components/HomeBigBanner.vue
index b643f7eb..f55397bc 100644
--- a/packages/theme/src/client/components/HomeBigBanner.vue
+++ b/packages/theme/src/client/components/HomeBigBanner.vue
@@ -2,10 +2,7 @@
 import { usePageFrontmatter, withBase } from '@vuepress/client'
 import { isLinkHttp } from '@vuepress/shared'
 import { computed, onMounted, ref } from 'vue'
-import type {
-  PlumeThemeHomeFrontmatter,
-  PlumeThemeLocaleOptions,
-} from '../../shared'
+import type { PlumeThemeHomeFrontmatter } from '../../shared'
 import { useThemeLocaleData } from '../composables'
 import { scrollTo } from '../utils'
 import { ArrowBottomIcon } from './icons'
diff --git a/packages/theme/src/client/components/Pagination.vue b/packages/theme/src/client/components/Pagination.vue
index 9ed79ac6..6069d8de 100644
--- a/packages/theme/src/client/components/Pagination.vue
+++ b/packages/theme/src/client/components/Pagination.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup>
 import { useOffsetPagination } from '@vueuse/core'
 import { computed, ref, toRefs } from 'vue'
+import { ArrowDoubleLeftIcon, ArrowDoubleRightIcon } from './icons'
 
 const emit = defineEmits(['togglePage'])
 const props = defineProps({
@@ -75,7 +76,7 @@ function handleJump(): void {
         :disabled="isFirstPage"
         @click="prev"
       >
-        prev
+        <ArrowDoubleLeftIcon />
       </button>
       <template v-for="count in pageList" :key="count">
         <button
@@ -94,7 +95,7 @@ function handleJump(): void {
         :disabled="isLastPage"
         @click="next"
       >
-        next
+        <ArrowDoubleRightIcon />
       </button>
     </div>
     <div class="pagination-form can-hide">
@@ -151,6 +152,15 @@ function handleJump(): void {
         color: var(--c-text);
       }
     }
+
+    &.btn-prev,
+    &.btn-next {
+      .icon {
+        width: 14px;
+        height: 14px;
+        vertical-align: text-top;
+      }
+    }
   }
 
   .pagination-form {
diff --git a/packages/theme/src/client/components/PostList.vue b/packages/theme/src/client/components/PostList.vue
index 8e1d7140..4d1ffc27 100644
--- a/packages/theme/src/client/components/PostList.vue
+++ b/packages/theme/src/client/components/PostList.vue
@@ -33,23 +33,23 @@ watch(
 )
 
 const route = useRoute()
-
+let offsetHeight = 0
 onBeforeRouteUpdate((to) => {
   if (__VUEPRESS_SSR__) return
   setPostListPage((to.query.p as unknown as number) || 1)
   const { home, banner, mobileBanner } = frontmatter.value
   let top = 0
   if (home && (banner || mobileBanner)) {
-    rect =
-      rect || document.querySelector('.navbar-wrapper')?.getBoundingClientRect()
-    top = document.documentElement.clientHeight - (rect?.height || 0)
+    offsetHeight =
+      offsetHeight ||
+      document.querySelector<HTMLElement>('.navbar-wrapper')?.offsetHeight ||
+      0
+    top = document.documentElement.clientHeight - offsetHeight
   }
-  scrollTo(document, top)
+  setTimeout(() => scrollTo(document, top), 0)
 })
 
 setPostListPage((route.query.p as unknown as number) || 1)
-
-let rect: any
 const togglePage = (currentPage: number): void => {
   router.push({
     path: route.path,
diff --git a/packages/theme/src/client/components/icons/icon.ts b/packages/theme/src/client/components/icons/icon.ts
index 38ed4af0..9cf540dd 100644
--- a/packages/theme/src/client/components/icons/icon.ts
+++ b/packages/theme/src/client/components/icons/icon.ts
@@ -88,3 +88,22 @@ export const PostIcon: FunctionalComponent = () =>
     })
   )
 PostIcon.displayName = 'PostIcon'
+
+export const ArrowDoubleRightIcon: FunctionalComponent = () =>
+  h(IconBase, { name: 'arrow-double-right', viewBox: '0 0 1024 1024' }, () =>
+    h('path', {
+      d: 'M160.117 212.026v-82.233a8 8 0 0 1 13.33-5.966l407.697 364.298c0.9 0.804 1.753 1.658 2.556 2.558 11.764 13.186 10.62 33.419-2.556 45.192L173.448 900.173a8 8 0 0 1-13.33-5.966v-82.233a16 16 0 0 1 5.338-11.93L487.814 512 165.456 223.957a16 16 0 0 1-5.339-11.931z m272.057 0v-82.233a8 8 0 0 1 13.33-5.966l407.697 364.298c0.9 0.804 1.753 1.658 2.556 2.558 11.764 13.186 10.62 33.419-2.556 45.192L445.505 900.173a8 8 0 0 1-13.33-5.966v-82.233a16 16 0 0 1 5.339-11.93L759.87 512 437.514 223.957a16 16 0 0 1-5.34-11.931z',
+    })
+  )
+ArrowDoubleRightIcon.displayName = 'ArrowDoubleRightIcon'
+
+export const ArrowDoubleLeftIcon: FunctionalComponent = () =>
+  h(IconBase, { name: 'arrow-double-left', viewBox: '0 0 1024 1024' }, () => [
+    h('path', {
+      d: 'M495.976 476.195c19.777 17.656 21.494 48 3.837 67.774a48.003 48.003 0 0 1-3.837 3.836L536.082 512l-40.106-35.805zM864 212.083v-82.217a8 8 0 0 0-13.328-5.967L442.69 488.13c-0.9 0.804-1.754 1.657-2.558 2.557-11.772 13.184-10.626 33.412 2.558 45.183l407.983 364.231A8 8 0 0 0 864 894.134v-82.217a16 16 0 0 0-5.344-11.936L536.082 512l322.574-287.981A16 16 0 0 0 864 212.083zM495.976 476.195c19.777 17.656 21.494 48 3.837 67.774a48.003 48.003 0 0 1-3.837 3.836L536.082 512l-40.106-35.805zM864 212.083v-82.217a8 8 0 0 0-13.328-5.967L442.69 488.13c-0.9 0.804-1.754 1.657-2.558 2.557-11.772 13.184-10.626 33.412 2.558 45.183l407.983 364.231A8 8 0 0 0 864 894.134v-82.217a16 16 0 0 0-5.344-11.936L536.082 512l322.574-287.981A16 16 0 0 0 864 212.083z',
+    }),
+    h('path', {
+      d: 'M223.976 476.195c19.777 17.656 21.494 48 3.837 67.774a48.003 48.003 0 0 1-3.837 3.836L264.082 512l-40.106-35.805zM592 212.083v-82.217a8 8 0 0 0-13.328-5.967L170.69 488.13c-0.9 0.804-1.754 1.657-2.558 2.557-11.772 13.184-10.626 33.412 2.558 45.183l407.983 364.231A8 8 0 0 0 592 894.134v-82.217a16 16 0 0 0-5.344-11.936L264.082 512l322.574-287.981A16 16 0 0 0 592 212.083zM223.976 476.195c19.777 17.656 21.494 48 3.837 67.774a48.003 48.003 0 0 1-3.837 3.836L264.082 512l-40.106-35.805zM592 212.083v-82.217a8 8 0 0 0-13.328-5.967L170.69 488.13c-0.9 0.804-1.754 1.657-2.558 2.557-11.772 13.184-10.626 33.412 2.558 45.183l407.983 364.231A8 8 0 0 0 592 894.134v-82.217a16 16 0 0 0-5.344-11.936L264.082 512l322.574-287.981A16 16 0 0 0 592 212.083z',
+    }),
+  ])
+ArrowDoubleLeftIcon.displayName = 'ArrowDoubleLeftIcon'