From 35b1941a0b74438b92b6aa86636978ad4abf5b93 Mon Sep 17 00:00:00 2001 From: Alexey Pyltsyn Date: Wed, 2 Jun 2021 13:20:32 +0300 Subject: [PATCH] fix(v2): unbreak adding of custom HTML metadatas (#4871) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(v2): unbreak adding of custom HTML metadatas * Correct solution * Update website/docusaurus.config.js Co-authored-by: Sébastien Lorber --- .../docusaurus-theme-classic/src/theme/LayoutHead/index.tsx | 6 +++++- packages/docusaurus-theme-classic/src/theme/Seo/index.tsx | 1 - .../docusaurus-theme-common/src/utils/useThemeConfig.ts | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/docusaurus-theme-classic/src/theme/LayoutHead/index.tsx b/packages/docusaurus-theme-classic/src/theme/LayoutHead/index.tsx index 38288d1e39..d3a05c7f4d 100644 --- a/packages/docusaurus-theme-classic/src/theme/LayoutHead/index.tsx +++ b/packages/docusaurus-theme-classic/src/theme/LayoutHead/index.tsx @@ -85,7 +85,7 @@ export default function LayoutHead(props: Props): JSX.Element { const { siteConfig: { favicon, - themeConfig: {metadatas}, + themeConfig: {metadatas, image: defaultImage}, }, i18n: {currentLocale, localeConfigs}, } = useDocusaurusContext(); @@ -105,6 +105,10 @@ export default function LayoutHead(props: Props): JSX.Element { {favicon && } {pageTitle} + {image || + (defaultImage && ( + + ))} diff --git a/packages/docusaurus-theme-classic/src/theme/Seo/index.tsx b/packages/docusaurus-theme-classic/src/theme/Seo/index.tsx index 49e7a494b1..88fa6beb3f 100644 --- a/packages/docusaurus-theme-classic/src/theme/Seo/index.tsx +++ b/packages/docusaurus-theme-classic/src/theme/Seo/index.tsx @@ -41,7 +41,6 @@ export default function Seo({ {pageImage && } {pageImage && } - {pageImage && } ); } diff --git a/packages/docusaurus-theme-common/src/utils/useThemeConfig.ts b/packages/docusaurus-theme-common/src/utils/useThemeConfig.ts index 677b3cf01f..375879d67e 100644 --- a/packages/docusaurus-theme-common/src/utils/useThemeConfig.ts +++ b/packages/docusaurus-theme-common/src/utils/useThemeConfig.ts @@ -102,6 +102,7 @@ export type ThemeConfig = { footer?: Footer; hideableSidebar: boolean; image: string; + metadatas: Array>; }; export function useThemeConfig(): ThemeConfig {