fix only apply default rendering mode on load

WordPress · Nov 15, 2024 · a742e4a · a742e4a
1 parent b94e309
commit a742e4a
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/packages/editor/src/components/provider/index.js b/packages/editor/src/components/provider/index.js
@@ -168,13 +168,15 @@ export const ExperimentalEditorProvider = withRegistryProvider(
 			selection,
 			isReady,
 			mode,
+			defaultMode,
 			postTypeEntities,
 			hasLoadedPostObject,
 		} = useSelect(
 			( select ) => {
 				const {
 					getEditorSettings,
 					getEditorSelection,
+					getRenderingMode,
 					__unstableIsEditorReady,
 				} = select( editorStore );
 				const { getEntitiesConfig } = select( coreStore );
@@ -191,7 +193,9 @@ export const ExperimentalEditorProvider = withRegistryProvider(
 					hasLoadedPostObject: _hasLoadedPostObject,
 					editorSettings: getEditorSettings(),
 					isReady: __unstableIsEditorReady(),
-					mode: postTypeObject?.default_rendering_mode ?? 'post-only',
+					mode: getRenderingMode(),
+					defaultMode:
+						postTypeObject?.default_rendering_mode ?? 'post-only',
 					selection: getEditorSelection(),
 					postTypeEntities:
 						post.type === 'wp_template'
@@ -322,8 +326,8 @@ export const ExperimentalEditorProvider = withRegistryProvider(
 
 		// Sets the right rendering mode when loading the editor.
 		useEffect( () => {
-			setRenderingMode( mode );
-		}, [ mode, setRenderingMode ] );
+			setRenderingMode( defaultMode );
+		}, [ defaultMode, setRenderingMode ] );
 
 		useHideBlocksFromInserter( post.type, mode );