From 7063e5e3ac77b387add2f693710cb5ffd0b06719 Mon Sep 17 00:00:00 2001 From: Matias Benedetto Date: Thu, 15 Feb 2024 15:59:04 -0300 Subject: [PATCH] Fix logic error in #58951 (#59101) * fix empty font sizes * fix logic error Co-authored-by: matiasbenedetto Co-authored-by: scruffian --- .../block-editor/src/components/global-styles/border-panel.js | 4 +--- .../src/components/global-styles/typography-panel.js | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/block-editor/src/components/global-styles/border-panel.js b/packages/block-editor/src/components/global-styles/border-panel.js index 960c19289157a3..f8144f1545aebe 100644 --- a/packages/block-editor/src/components/global-styles/border-panel.js +++ b/packages/block-editor/src/components/global-styles/border-panel.js @@ -155,9 +155,7 @@ export default function BorderPanel( { // Shadow const shadow = decodeValue( inheritedValue?.shadow ); const shadowPresets = settings?.shadow?.presets ?? {}; - const overriddenShadowPresets = shadowPresets - ? overrideOrigins( shadowPresets ) - : []; + const overriddenShadowPresets = overrideOrigins( shadowPresets ) ?? []; const setShadow = ( newValue ) => { const slug = overriddenShadowPresets?.find( ( { shadow: shadowName } ) => shadowName === newValue diff --git a/packages/block-editor/src/components/global-styles/typography-panel.js b/packages/block-editor/src/components/global-styles/typography-panel.js index 6b09b146f9ea17..7fab783c4d0e7b 100644 --- a/packages/block-editor/src/components/global-styles/typography-panel.js +++ b/packages/block-editor/src/components/global-styles/typography-panel.js @@ -106,7 +106,7 @@ function useHasTextColumnsControl( settings ) { function getUniqueFontSizesBySlug( settings ) { const fontSizes = settings?.typography?.fontSizes ?? {}; - const overriddenFontSizes = fontSizes ? overrideOrigins( fontSizes ) : []; + const overriddenFontSizes = overrideOrigins( fontSizes ) ?? []; const uniqueSizes = []; for ( const currentSize of overriddenFontSizes ) { if ( ! uniqueSizes.some( ( { slug } ) => slug === currentSize.slug ) ) {