Mobile - Preformatted block - Fix showing the default background color (

#36883) * Mobile - Preformatted block - Fix showing the default background color * Mobile - Preformatted block - Remove unnecessary optional chaining check * Mobile - Update CHANGELOG
WordPress · Nov 29, 2021 · 65487d2 · 65487d2
1 parent baaa22d
commit 65487d2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/packages/block-library/src/preformatted/edit.native.js b/packages/block-library/src/preformatted/edit.native.js
@@ -28,10 +28,12 @@ export function PreformattedEdit( props ) {
 		...( style?.fontSize && { fontSize: style.fontSize } ),
 		...( style?.color && { color: style.color } ),
 	};
+	const hasBaseColors =
+		style?.baseColors && Object.entries( style.baseColors ).length !== 0;
 	const containerStyles = [
 		wpBlockPreformatted,
 		style?.backgroundColor && { backgroundColor: style.backgroundColor },
-		style?.baseColors &&
+		hasBaseColors &&
 			! style?.backgroundColor &&
 			styles[ 'wp-block-preformatted__no-background' ],
 	];

diff --git a/packages/react-native-editor/CHANGELOG.md b/packages/react-native-editor/CHANGELOG.md
@@ -11,6 +11,7 @@ For each user feature we should also add a importance categorization label  to i
 
 ## Unreleased
 -   [**] [iOS] Fix scroll update when typing in RichText component [#36914]
+-   [*] [Preformatted block] Fix an issue where the background color is not showing up for standard themes. [#36883]
 
 ## 1.67.0
 -   [**] Adds Clipboard Link Suggestion to Image block and Button block [#35972]