try adding currentTheme to the editor settings

WordPress · Sep 20, 2024 · 8ced871 · 8ced871
1 parent c262896
commit 8ced871
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/packages/block-editor/src/components/use-editor-fonts-resolver/index.js b/packages/block-editor/src/components/use-editor-fonts-resolver/index.js
@@ -16,9 +16,8 @@ function useEditorFontsResolver() {
 	const { currentTheme = {}, fontFamilies = [] } = useSelect( ( select ) => {
 		return {
 			currentTheme:
-				// Disable Reason: Using 'core' as string to avoid circular dependency importing from @wordpress/core-data.
-				// eslint-disable-next-line @wordpress/data-no-store-string-literals
-				select( 'core' )?.getCurrentTheme(),
+				select( editorStore ).getSettings()?.__experimentalFeatures
+					?.currentTheme,
 			fontFamilies:
 				select( editorStore ).getSettings()?.__experimentalFeatures
 					?.typography?.fontFamilies,

diff --git a/packages/edit-site/src/components/global-styles-renderer/index.js b/packages/edit-site/src/components/global-styles-renderer/index.js
@@ -4,6 +4,7 @@
 import { useEffect } from '@wordpress/element';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
+import { store as coreDataStore } from '@wordpress/core-data';
 
 /**
  * Internal dependencies
@@ -15,12 +16,18 @@ import { TEMPLATE_POST_TYPE } from '../../utils/constants';
 const { useGlobalStylesOutput } = unlock( blockEditorPrivateApis );
 
 function useGlobalStylesRenderer() {
-	const postType = useSelect( ( select ) => {
-		return select( editSiteStore ).getEditedPostType();
+	const { postType, currentTheme } = useSelect( ( select ) => {
+		return {
+			postType: select( editSiteStore ).getEditedPostType(),
+			currentTheme: select( coreDataStore ).getCurrentTheme(),
+		};
 	} );
 	const [ styles, settings ] = useGlobalStylesOutput(
 		postType !== TEMPLATE_POST_TYPE
 	);
+
+	settings.currentTheme = currentTheme;
+
 	const { getSettings } = useSelect( editSiteStore );
 	const { updateSettings } = useDispatch( editSiteStore );