diff --git a/packages/@vuepress/theme-default/components/Page.vue b/packages/@vuepress/theme-default/components/Page.vue
index e346021023..328f32c245 100644
--- a/packages/@vuepress/theme-default/components/Page.vue
+++ b/packages/@vuepress/theme-default/components/Page.vue
@@ -182,7 +182,7 @@ function find (page, items, offset) {
const res = []
items.forEach(item => {
if (item.type === 'group') {
- res.push(...item.children || [])
+ res.push(...item.descendants || [])
} else {
res.push(item)
}
diff --git a/packages/@vuepress/theme-default/components/Sidebar.vue b/packages/@vuepress/theme-default/components/Sidebar.vue
index 9ed10ed9b8..a9e5d9293f 100644
--- a/packages/@vuepress/theme-default/components/Sidebar.vue
+++ b/packages/@vuepress/theme-default/components/Sidebar.vue
@@ -8,10 +8,7 @@
v-if="item.type === 'group'"
:item="item"
:first="i === 0"
- :open="i === openGroupIndex"
- :collapsable="item.collapsable || item.collapsible"
- @toggle="toggleGroup(i)"
- />
+ :collapsable="item.collapsable || item.collapsible"/>
@@ -23,58 +20,11 @@
import SidebarGroup from './SidebarGroup.vue'
import SidebarLink from './SidebarLink.vue'
import NavLinks from './NavLinks.vue'
-import { isActive } from '../util'
export default {
components: { SidebarGroup, SidebarLink, NavLinks },
- props: ['items'],
-
- data () {
- return {
- openGroupIndex: 0
- }
- },
-
- created () {
- this.refreshIndex()
- },
-
- watch: {
- '$route' () {
- this.refreshIndex()
- }
- },
-
- methods: {
- refreshIndex () {
- const index = resolveOpenGroupIndex(
- this.$route,
- this.items
- )
- if (index > -1) {
- this.openGroupIndex = index
- }
- },
-
- toggleGroup (index) {
- this.openGroupIndex = index === this.openGroupIndex ? -1 : index
- },
-
- isActive (page) {
- return isActive(this.$route, page.regularPath)
- }
- }
-}
-
-function resolveOpenGroupIndex (route, items) {
- for (let i = 0; i < items.length; i++) {
- const item = items[i]
- if (item.type === 'group' && item.children.some(c => isActive(route, c.path))) {
- return i
- }
- }
- return -1
+ props: ['items']
}
diff --git a/packages/@vuepress/theme-default/components/SidebarGroup.vue b/packages/@vuepress/theme-default/components/SidebarGroup.vue
index 119dfa14c7..7142214426 100644
--- a/packages/@vuepress/theme-default/components/SidebarGroup.vue
+++ b/packages/@vuepress/theme-default/components/SidebarGroup.vue
@@ -6,7 +6,7 @@