Revert "Revert "Stop showing limited global styles notice in editor d…

…istracti…" This reverts commit ecdb13d.
Automattic · Jan 16, 2025 · 4eba920 · 4eba920
1 parent be0d34b
commit 4eba920
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/...ackages/jetpack-mu-wpcom/changelog/revert-40907-fix-global-styles-notice-distraction-free b/...ackages/jetpack-mu-wpcom/changelog/revert-40907-fix-global-styles-notice-distraction-free
diff --git a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-global-styles/notices.js b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-global-styles/notices.js
@@ -1,5 +1,6 @@
 /* global wpcomGlobalStyles */
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import { store as blockEditorStore } from '@wordpress/block-editor';
 import { ExternalLink, Notice } from '@wordpress/components';
 import { useDispatch, useSelect } from '@wordpress/data';
 import {
@@ -238,19 +239,31 @@ function GlobalStylesEditNotice() {
 		upgradePlan,
 	] );
 
+	const isDistractionFree = useSelect(
+		select => select( blockEditorStore ).getSettings().isDistractionFree,
+		[]
+	);
+
 	useEffect( () => {
 		if ( ! isSiteEditor && ! isPostEditor ) {
 			return;
 		}
 
-		if ( globalStylesInUse ) {
+		if ( globalStylesInUse && ! isDistractionFree ) {
 			showNotice();
 		} else {
 			removeNotice( NOTICE_ID );
 		}
 
 		return () => removeNotice( NOTICE_ID );
-	}, [ globalStylesInUse, isSiteEditor, isPostEditor, removeNotice, showNotice ] );
+	}, [
+		globalStylesInUse,
+		isDistractionFree,
+		isSiteEditor,
+		isPostEditor,
+		removeNotice,
+		showNotice,
+	] );
 
 	return null;
 }