From b0eef052336547d810139a09cdd2399a421e6bd0 Mon Sep 17 00:00:00 2001 From: Ben Dwyer Date: Thu, 13 Jun 2024 16:03:57 +0100 Subject: [PATCH] Only show typesets if there are fonts --- .../edit-site/src/components/global-styles/typeset-button.js | 3 ++- packages/edit-site/src/components/global-styles/typeset.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/edit-site/src/components/global-styles/typeset-button.js b/packages/edit-site/src/components/global-styles/typeset-button.js index 8795e02ffc067b..4c08f08a411d8e 100644 --- a/packages/edit-site/src/components/global-styles/typeset-button.js +++ b/packages/edit-site/src/components/global-styles/typeset-button.js @@ -30,7 +30,8 @@ function TypesetButton() { const { user: userConfig } = useContext( GlobalStylesContext ); const config = mergeBaseAndUserConfigs( base, userConfig ); const allFontFamilies = getFontFamilies( config ); - const hasFonts = 0 < allFontFamilies.length; + const hasFonts = + allFontFamilies.filter( ( font ) => font !== null ).length > 0; return ( hasFonts && ( diff --git a/packages/edit-site/src/components/global-styles/typeset.js b/packages/edit-site/src/components/global-styles/typeset.js index c1541687ae9081..f4cadf03b96ce6 100644 --- a/packages/edit-site/src/components/global-styles/typeset.js +++ b/packages/edit-site/src/components/global-styles/typeset.js @@ -32,7 +32,8 @@ function Typesets() { const { user: userConfig } = useContext( GlobalStylesContext ); const config = mergeBaseAndUserConfigs( base, userConfig ); const allFontFamilies = getFontFamilies( config ); - const hasFonts = 0 < allFontFamilies.length; + const hasFonts = + allFontFamilies.filter( ( font ) => font !== null ).length > 0; return ( hasFonts && (