fix(theme-default): fix sidebar config override

meteorlxy · meteorlxy · commit 2c2c2801be71 · 2021-01-16T23:00:10.000+08:00
diff --git a/packages/@vuepress/theme-default/src/composables/useSidebarItems.ts b/packages/@vuepress/theme-default/src/composables/useSidebarItems.ts
@@ -50,7 +50,7 @@ export const resolveSidebarItems = (): SidebarItemsRef => {
 
   // get sidebar config from frontmatter > themeConfig
   const sidebarConfig = computed(
-    () => frontmatter.value.sidebar || themeLocale.value.sidebar
+    () => frontmatter.value.sidebar ?? themeLocale.value.sidebar ?? 'auto'
   )
 
   // resolve sidebar items according to the config

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ export const resolveSidebarItems = (): SidebarItemsRef => {`
`50`	`50`
`51`	`51`	`// get sidebar config from frontmatter > themeConfig`
`52`	`52`	`const sidebarConfig = computed(`
`53`		`- () => frontmatter.value.sidebar \|\| themeLocale.value.sidebar`
	`53`	`+ () => frontmatter.value.sidebar ?? themeLocale.value.sidebar ?? 'auto'`
`54`	`54`	`)`
`55`	`55`
`56`	`56`	`// resolve sidebar items according to the config`