Skip to content

Commit 1a57da8

Browse files
author
reco_luan
committed
fix(theme-reco): fix animation
1 parent 804fedc commit 1a57da8

File tree

7 files changed

+24
-13
lines changed

7 files changed

+24
-13
lines changed

packages/vuepress-theme-reco/components/Common.vue

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,8 @@ import Sidebar from '@theme/components/Sidebar'
7777
import PersonalInfo from '@theme/components/PersonalInfo'
7878
import Password from '@theme/components/Password'
7979
import { setTimeout } from 'timers'
80-
import moduleTransitonMixin from '@theme/mixins/moduleTransiton'
8180
8281
export default {
83-
mixins: [moduleTransitonMixin],
84-
8582
components: { Sidebar, Navbar, Password, PersonalInfo },
8683
8784
props: {
@@ -92,6 +89,10 @@ export default {
9289
sidebarItems: {
9390
type: Array,
9491
default: () => []
92+
},
93+
recoShowModule: {
94+
type: Boolean,
95+
default: false
9596
}
9697
},
9798

packages/vuepress-theme-reco/components/Home.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,13 @@
4545
<script>
4646
import NavLink from '@theme/components/NavLink'
4747
import { ModuleTransition } from '@vuepress-reco/core/lib/components'
48-
import moduleTransitonMixin from '@theme/mixins/moduleTransiton'
4948
5049
export default {
51-
mixins: [moduleTransitonMixin],
5250
components: { NavLink, ModuleTransition },
5351
computed: {
52+
recoShowModule () {
53+
return this.$parent.recoShowModule
54+
},
5455
5556
actionLink () {
5657
return {

packages/vuepress-theme-reco/components/HomeBlog.vue

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,9 @@ import pagination from '@theme/mixins/pagination'
7474
import { ModuleTransition, RecoIcon } from '@vuepress-reco/core/lib/components'
7575
import PersonalInfo from '@theme/components/PersonalInfo'
7676
import { getOneColor } from '@theme/helpers/other'
77-
import moduleTransitonMixin from '@theme/mixins/moduleTransiton'
7877
7978
export default {
80-
mixins: [pagination, moduleTransitonMixin],
79+
mixins: [pagination],
8180
components: { NoteAbstract, TagList, FriendLink, ModuleTransition, PersonalInfo, RecoIcon },
8281
data () {
8382
return {
@@ -87,6 +86,9 @@ export default {
8786
}
8887
},
8988
computed: {
89+
recoShowModule () {
90+
return this.$parent.recoShowModule
91+
},
9092
homeBlogCfg () {
9193
return this.$recoLocales.homeBlog
9294
},

packages/vuepress-theme-reco/components/Page.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,9 @@
8282
import PageInfo from '@theme/components/PageInfo'
8383
import { resolvePage, outboundRE, endingSlashRE } from '@theme/helpers/utils'
8484
import { ModuleTransition } from '@vuepress-reco/core/lib/components'
85-
import moduleTransitonMixin from '@theme/mixins/moduleTransiton'
8685
import SubSidebar from '@theme/components/SubSidebar'
8786
8887
export default {
89-
mixins: [moduleTransitonMixin],
9088
components: { PageInfo, ModuleTransition, SubSidebar },
9189
9290
props: ['sidebarItems'],
@@ -98,6 +96,9 @@ export default {
9896
},
9997
10098
computed: {
99+
recoShowModule () {
100+
return this.$parent.recoShowModule
101+
},
101102
// 是否显示评论
102103
shouldShowComments () {
103104
const { isShowComments } = this.$frontmatter

packages/vuepress-theme-reco/components/Password.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,8 @@
4444
<script>
4545
import md5 from 'md5'
4646
import { ModuleTransition, RecoIcon } from '@vuepress-reco/core/lib/components'
47-
import moduleTransitonMixin from '@theme/mixins/moduleTransiton'
4847
4948
export default {
50-
mixins: [moduleTransitonMixin],
5149
components: { ModuleTransition, RecoIcon },
5250
props: {
5351
isPage: {
@@ -63,6 +61,9 @@ export default {
6361
}
6462
},
6563
computed: {
64+
recoShowModule () {
65+
return this.$parent.recoShowModule
66+
},
6667
year () {
6768
return new Date().getFullYear()
6869
}

packages/vuepress-theme-reco/layouts/Layout.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<Common :sidebarItems="sidebarItems">
2+
<Common :sidebarItems="sidebarItems" :recoShowModule="recoShowModule">
33
<component v-if="$frontmatter.home" :is="homeCom"/>
44
<Page v-else :sidebar-items="sidebarItems"/>
55
<Footer v-if="$frontmatter.home" class="footer" />
@@ -13,8 +13,10 @@ import Page from '@theme/components/Page'
1313
import Footer from '@theme/components/Footer'
1414
import Common from '@theme/components/Common'
1515
import { resolveSidebarItems } from '@theme/helpers/utils'
16+
import moduleTransitonMixin from '@theme/mixins/moduleTransiton'
1617
1718
export default {
19+
mixins: [moduleTransitonMixin],
1820
components: { HomeBlog, Home, Page, Common, Footer },
1921
computed: {
2022
sidebarItems () {

packages/vuepress-theme-reco/mixins/moduleTransiton.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,11 @@ export default {
88
this.recoShowModule = true
99
},
1010
watch: {
11-
'$route' () {
11+
'$route' (newV, oldV) {
12+
if (newV.path === oldV.path) return
13+
1214
this.recoShowModule = false
15+
1316
setTimeout(() => {
1417
this.recoShowModule = true
1518
}, 200)

0 commit comments

Comments
 (0)