Relocate some checks

WordPress · Feb 17, 2025 · e9bced2 · e9bced2
1 parent 3dab7f3
commit e9bced2
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/packages/editor/src/components/provider/index.js b/packages/editor/src/components/provider/index.js
@@ -204,15 +204,14 @@ export const ExperimentalEditorProvider = withRegistryProvider(
 				const hasDefaultMode = RENDERING_MODES.includes( _defaultMode );
 
 				// Wait for template resolution when rendering in a `template-locked` mode.
-				const canRenderDefaultMode =
-					_defaultMode === 'template-locked' ? hasTemplate : true;
+				const hasResolvedMode =
+					hasLoadedPostObject && _defaultMode === 'template-locked'
+						? hasTemplate
+						: true;
 
 				return {
 					editorSettings: getEditorSettings(),
-					isReady:
-						__unstableIsEditorReady() &&
-						hasLoadedPostObject &&
-						canRenderDefaultMode,
+					isReady: __unstableIsEditorReady() && hasResolvedMode,
 					mode: getRenderingMode(),
 					defaultMode: hasDefaultMode ? _defaultMode : 'post-only',
 					selection: getEditorSelection(),