From 0519e94878e21a6685d268c2303ea1f796b60b3d Mon Sep 17 00:00:00 2001 From: userquin Date: Sun, 22 Oct 2023 20:08:34 +0200 Subject: [PATCH] chore: change print option, all defaults to true --- .../theme-default/composables/screen-only.ts | 15 ++++++++------- src/node/config.ts | 15 ++++----------- types/default-theme.d.ts | 12 +++++------- 3 files changed, 17 insertions(+), 25 deletions(-) diff --git a/src/client/theme-default/composables/screen-only.ts b/src/client/theme-default/composables/screen-only.ts index fbd39ef3..4eea1f84 100644 --- a/src/client/theme-default/composables/screen-only.ts +++ b/src/client/theme-default/composables/screen-only.ts @@ -6,12 +6,13 @@ export function useScreenOnly(entry: keyof DefaultTheme.PrintOptions) { const { theme, frontmatter } = useData() // we have aside and outline in frontmatter, we will check for both for outline - return computed(() => - entry === 'outline' - ? frontmatter.value.aside === false || frontmatter.value.outline === false - : frontmatter.value[entry] === false || - theme.value.print === false || - (typeof theme.value.print === 'object' && - theme.value.print[entry] === false) + return computed( + () => + (entry === 'outline' + ? frontmatter.value.aside === false || + frontmatter.value.outline === false + : frontmatter.value[entry] === false) || + theme.value.print === false || + theme.value.print![entry] === false ) } diff --git a/src/node/config.ts b/src/node/config.ts index 139a427f..1ca1127f 100644 --- a/src/node/config.ts +++ b/src/node/config.ts @@ -225,18 +225,11 @@ export async function resolveSiteData( const themeConfig = userConfig.themeConfig || {} - if (typeof themeConfig.print === 'boolean') { - themeConfig.print = { - outline: themeConfig.print, - navbar: themeConfig.print, - sidebar: themeConfig.print, - footer: themeConfig.print - } - } else { + if (typeof themeConfig.print !== 'boolean') { themeConfig.print ??= {} - themeConfig.print.outline ??= false - themeConfig.print.navbar ??= false - themeConfig.print.sidebar ??= false + themeConfig.print.outline ??= true + themeConfig.print.navbar ??= true + themeConfig.print.sidebar ??= true themeConfig.print.footer ??= true } diff --git a/types/default-theme.d.ts b/types/default-theme.d.ts index bae68e59..04aaf038 100644 --- a/types/default-theme.d.ts +++ b/types/default-theme.d.ts @@ -151,13 +151,11 @@ export namespace DefaultTheme { * * To exclude `outline`, `navbar`, `sidebar` and `footer` from being printed, configure `print: false`. * - * To print all of them, configure `print: true`. - * * Frontmatter configuration will override the global configuration, for example, a page containing `navbar: false`, the navbar will not be printed. * - * @default { outline: false, navbar: false, sidebar: false, footer: true } + * @default { outline: true, navbar: true, sidebar: true, footer: true } */ - print?: boolean | PrintOptions + print?: false | PrintOptions } // nav ----------------------------------------------------------------------- @@ -494,19 +492,19 @@ export namespace DefaultTheme { /** * Should the outline be printed? * - * @default false + * @default true */ outline?: boolean /** * Should the navbar be printed? * - * @default false + * @default true */ navbar?: boolean /** * Should the sidebar be printed? * - * @default false + * @default true */ sidebar?: boolean /**