Editor: Avoid a 'flash' when rendering in 'template-locked' mode (Wor…

…dPress#69173) * Editor: Avoid a 'flash' when rendering in 'template-locked' mode * Relocate some checks Co-authored-by: Mamaduka <[email protected]> Co-authored-by: fabiankaegy <[email protected]> Co-authored-by: Mayank-Tripathi32 <[email protected]>
Kallyan01 · Feb 24, 2025 · 6d99851 · 6d99851
1 parent 9c72f9f
commit 6d99851
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/packages/editor/src/components/provider/index.js b/packages/editor/src/components/provider/index.js
@@ -203,14 +203,17 @@ export const ExperimentalEditorProvider = withRegistryProvider(
 					: undefined;
 				const hasDefaultMode = RENDERING_MODES.includes( _defaultMode );
 
+				// Wait for template resolution when rendering in a `template-locked` mode.
+				const hasResolvedMode =
+					hasLoadedPostObject && _defaultMode === 'template-locked'
+						? hasTemplate
+						: true;
+
 				return {
 					editorSettings: getEditorSettings(),
-					isReady: __unstableIsEditorReady() && hasLoadedPostObject,
+					isReady: __unstableIsEditorReady() && hasResolvedMode,
 					mode: getRenderingMode(),
-					defaultMode:
-						hasTemplate && hasDefaultMode
-							? _defaultMode
-							: 'post-only',
+					defaultMode: hasDefaultMode ? _defaultMode : 'post-only',
 					selection: getEditorSelection(),
 					postTypeEntities:
 						post.type === 'wp_template'