Edit Site: Fix useEditedEntityRecord() loading state (#50730)

* Edit Site: Fix useEditedEntityRecord() loading state * Use hasFinishedResolution instead * Also check for post ID
WordPress · May 18, 2023 · 37a691f · 37a691f
1 parent 589fc18
commit 37a691f
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/packages/edit-site/src/components/use-edited-entity-record/index.js b/packages/edit-site/src/components/use-edited-entity-record/index.js
@@ -16,7 +16,8 @@ export default function useEditedEntityRecord( postType, postId ) {
 		( select ) => {
 			const { getEditedPostType, getEditedPostId } =
 				select( editSiteStore );
-			const { getEditedEntityRecord } = select( coreStore );
+			const { getEditedEntityRecord, hasFinishedResolution } =
+				select( coreStore );
 			const { __experimentalGetTemplateInfo: getTemplateInfo } =
 				select( editorStore );
 			const usedPostType = postType ?? getEditedPostType();
@@ -26,7 +27,13 @@ export default function useEditedEntityRecord( postType, postId ) {
 				usedPostType,
 				usedPostId
 			);
-			const _isLoaded = !! usedPostId;
+			const _isLoaded =
+				usedPostId &&
+				hasFinishedResolution( 'getEditedEntityRecord', [
+					'postType',
+					usedPostType,
+					usedPostId,
+				] );
 			const templateInfo = getTemplateInfo( _record );
 
 			return {