Depend only on record ID

WordPress · May 24, 2021 · 373677b · 373677b
1 parent 5653001
commit 373677b
Showing 1 changed file with 35 additions and 4 deletions.
diff --git a/packages/core-data/src/selectors.js b/packages/core-data/src/selectors.js
@@ -224,7 +224,22 @@ export const getRawEntityRecord = createSelector(
 			}, {} )
 		);
 	},
-	( state, kind, name ) => [ get( state.entities.data, [ kind, name ] ) ]
+	( state, kind, name, recordId ) => [
+		get( state.entities.data, [
+			kind,
+			name,
+			'queriedData',
+			'items',
+			recordId,
+		] ),
+		get( state.entities.data, [
+			kind,
+			name,
+			'queriedData',
+			'itemIsComplete',
+			recordId,
+		] ),
+	]
 );
 
 /**
@@ -361,9 +376,9 @@ export const getEntityRecordNonTransientEdits = createSelector(
 			return acc;
 		}, {} );
 	},
-	( state, kind, name ) => [
+	( state, kind, name, recordId ) => [
 		state.entities.config,
-		[ get( state.entities.data, [ kind, name ] ) ],
+		get( state.entities.data, [ kind, name, 'edits', recordId ] ),
 	]
 );
 
@@ -402,7 +417,23 @@ export const getEditedEntityRecord = createSelector(
 		...getRawEntityRecord( state, kind, name, recordId ),
 		...getEntityRecordEdits( state, kind, name, recordId ),
 	} ),
-	( state, kind, name ) => [ get( state.entities.data, [ kind, name ] ) ]
+	( state, kind, name, recordId ) => [
+		get( state.entities.data, [
+			kind,
+			name,
+			'queriedData',
+			'items',
+			recordId,
+		] ),
+		get( state.entities.data, [
+			kind,
+			name,
+			'queriedData',
+			'itemIsComplete',
+			recordId,
+		] ),
+		get( state.entities.data, [ kind, name, 'edits', recordId ] ),
+	]
 );
 
 /**