Revert "Use optional chaining instead of lodash get"

This reverts commit 6f0a317.
WordPress · Jun 8, 2021 · 2e0af2f · 2e0af2f
1 parent 77c8ae9
commit 2e0af2f
Showing 1 changed file with 30 additions and 10 deletions.
diff --git a/packages/core-data/src/selectors.js b/packages/core-data/src/selectors.js
@@ -226,10 +226,20 @@ export const getRawEntityRecord = createSelector(
 		);
 	},
 	( state, kind, name, recordId ) => [
-		state.entities.data[ kind ]?.[ name ]?.queriedData?.items?.[ recordId ],
-		state.entities.data[ kind ]?.[ name ]?.queriedData?.itemIsComplete?.[
-			recordId
-		],
+		get( state.entities.data, [
+			kind,
+			name,
+			'queriedData',
+			'items',
+			recordId,
+		] ),
+		get( state.entities.data, [
+			kind,
+			name,
+			'queriedData',
+			'itemIsComplete',
+			recordId,
+		] ),
 	]
 );
 
@@ -369,7 +379,7 @@ export const getEntityRecordNonTransientEdits = createSelector(
 	},
 	( state, kind, name, recordId ) => [
 		state.entities.config,
-		state.entities.data[ kind ]?.[ name ]?.edits?.[ recordId ],
+		get( state.entities.data, [ kind, name, 'edits', recordId ] ),
 	]
 );
 
@@ -409,11 +419,21 @@ export const getEditedEntityRecord = createSelector(
 		...getEntityRecordEdits( state, kind, name, recordId ),
 	} ),
 	( state, kind, name, recordId ) => [
-		state.entities.data[ kind ]?.[ name ]?.queriedData?.items?.[ recordId ],
-		state.entities.data[ kind ]?.[ name ]?.queriedData?.itemIsComplete?.[
-			recordId
-		],
-		state.entities.data[ kind ]?.[ name ]?.edits?.[ 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 ] ),
 	]
 );