Access isPreviewMode directly from getSettings instead of through pri…

…vate symbol within RichText block
WordPress · Oct 15, 2024 · c30246d · c30246d
1 parent b667808
commit c30246d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/packages/block-editor/src/components/block-edit/context.js b/packages/block-editor/src/components/block-edit/context.js
@@ -7,7 +7,6 @@ export const mayDisplayControlsKey = Symbol( 'mayDisplayControls' );
 export const mayDisplayParentControlsKey = Symbol( 'mayDisplayParentControls' );
 export const blockEditingModeKey = Symbol( 'blockEditingMode' );
 export const blockBindingsKey = Symbol( 'blockBindings' );
-export const isPreviewModeKey = Symbol( 'isPreviewMode' );
 
 export const DEFAULT_BLOCK_EDIT_CONTEXT = {
 	name: '',

diff --git a/packages/block-editor/src/components/block-edit/index.js b/packages/block-editor/src/components/block-edit/index.js
@@ -15,7 +15,6 @@ import {
 	mayDisplayParentControlsKey,
 	blockEditingModeKey,
 	blockBindingsKey,
-	isPreviewModeKey,
 } from './context';
 import { MultipleUsageWarning } from './multiple-usage-warning';
 import { PrivateBlockContext } from '../block-list/private-block-context';
@@ -71,7 +70,6 @@ export default function BlockEdit( {
 					[ mayDisplayParentControlsKey ]: mayDisplayParentControls,
 					[ blockEditingModeKey ]: blockEditingMode,
 					[ blockBindingsKey ]: bindings,
-					[ isPreviewModeKey ]: isPreviewMode,
 				} ),
 				[
 					name,
@@ -84,7 +82,6 @@ export default function BlockEdit( {
 					mayDisplayParentControls,
 					blockEditingMode,
 					bindings,
-					isPreviewMode,
 				]
 			) }
 		>

diff --git a/packages/block-editor/src/components/rich-text/index.js b/packages/block-editor/src/components/rich-text/index.js
@@ -29,7 +29,7 @@ import { __, sprintf } from '@wordpress/i18n';
  */
 import { useBlockEditorAutocompleteProps } from '../autocomplete';
 import { useBlockEditContext } from '../block-edit';
-import { blockBindingsKey, isPreviewModeKey } from '../block-edit/context';
+import { blockBindingsKey } from '../block-edit/context';
 import FormatToolbarContainer from './format-toolbar-container';
 import { store as blockEditorStore } from '../../store';
 import { useMarkPersistent } from './use-mark-persistent';
@@ -503,8 +503,13 @@ PrivateRichText.isEmpty = ( value ) => {
  * @see https://github.com/WordPress/gutenberg/blob/HEAD/packages/block-editor/src/components/rich-text/README.md
  */
 const PublicForwardedRichTextContainer = forwardRef( ( props, ref ) => {
-	const context = useBlockEditContext();
-	const isPreviewMode = context[ isPreviewModeKey ];
+	const { isPreviewMode } = useSelect( ( select ) => {
+		const { getSettings } = select( blockEditorStore );
+
+		return {
+			isPreviewMode: getSettings().isPreviewMode,
+		};
+	} );
 
 	if ( isPreviewMode ) {
 		// Remove all non-content props.