Fix for themes with no editor styles

WordPress · Oct 18, 2021 · b5b101d · b5b101d
1 parent 9953bfc
commit b5b101d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/global-styles.php b/lib/global-styles.php
@@ -131,10 +131,14 @@ function_exists( 'gutenberg_is_edit_site_page' ) &&
 	}
 
 	if ( 'other' === $context ) {
-		$block_styles  = array( 'css' => gutenberg_experimental_global_styles_get_stylesheet( $consolidated, 'block_styles' ) );
+		$block_styles  = array(
+			'css'    => gutenberg_experimental_global_styles_get_stylesheet( $consolidated, 'block_styles' ),
+			'toSkip' => true,
+		);
 		$css_variables = array(
 			'css'                     => gutenberg_experimental_global_styles_get_stylesheet( $consolidated, 'css_variables' ),
 			'__experimentalNoWrapper' => true,
+			'toSkip'                  => true,
 		);
 
 		// Make sure the styles array exists.

diff --git a/packages/edit-post/src/editor.js b/packages/edit-post/src/editor.js
@@ -161,7 +161,10 @@ function Editor( {
 	] );
 
 	const styles = useMemo( () => {
-		return hasThemeStyles && settings.styles?.length
+		// settings.styles can have styles that core adds.
+		// We don't want these to count as "theme styles".
+		const filteredStyles = settings.styles?.length ? settings.styles.filter( style => ! style.toSkip ) : [];
+		return hasThemeStyles && filteredStyles.length
 			? settings.styles
 			: settings.defaultEditorStyles;
 	}, [ settings, hasThemeStyles ] );