Only return merged global styles data

WordPress · May 10, 2024 · 2ef52a7 · 2ef52a7
1 parent 2fff473
commit 2ef52a7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/packages/editor/src/components/provider/use-block-editor-settings.js b/packages/editor/src/components/provider/use-block-editor-settings.js
@@ -174,7 +174,7 @@ function useBlockEditorSettings( settings, postType, postId, renderingMode ) {
 		[ postType, postId, isLargeViewport, renderingMode ]
 	);
 
-	const globalStylesData = useGlobalStylesData();
+	const { styles: globalStylesData } = useGlobalStylesData();
 
 	const settingsBlockPatterns =
 		settings.__experimentalAdditionalBlockPatterns ?? // WP 6.0

diff --git a/packages/editor/src/components/use-global-styles-data/index.js b/packages/editor/src/components/use-global-styles-data/index.js
@@ -72,8 +72,6 @@ export function useGlobalStylesData() {
 
 	return {
 		isReady: isBaseStylesReady && isUserStylesReady,
-		base: baseStyles ?? DEFAULT_STYLES,
-		user: userStyles ?? DEFAULT_STYLES,
-		merged: mergedStyles,
+		styles: mergedStyles,
 	};
 }