Lodash: Remove _.pickBy() from editor hooks (#46982)

WordPress · Jan 10, 2023 · f0834e5 · f0834e5 · github-actions · Jan 10, 2023
1 parent 1c1cd7b
commit f0834e5
Showing 1 changed file with 16 additions and 13 deletions.
diff --git a/packages/editor/src/hooks/custom-sources-backwards-compatibility.js b/packages/editor/src/hooks/custom-sources-backwards-compatibility.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { pickBy, mapValues, isEmpty } from 'lodash';
+import { mapValues, isEmpty } from 'lodash';
 
 /**
  * WordPress dependencies
@@ -70,18 +70,17 @@ const createWithMetaAttributeSource = ( metaAttributes ) =>
 						attributes={ mergedAttributes }
 						setAttributes={ ( nextAttributes ) => {
 							const nextMeta = Object.fromEntries(
-								Object.entries(
-									// Filter to intersection of keys between the updated
-									// attributes and those with an associated meta key.
-									pickBy(
-										nextAttributes,
-										( value, key ) => metaAttributes[ key ]
+								Object.entries( nextAttributes ?? {} )
+									.filter(
+										// Filter to intersection of keys between the updated
+										// attributes and those with an associated meta key.
+										( [ key ] ) => key in metaAttributes
 									)
-								).map( ( [ attributeKey, value ] ) => [
-									// Rename the keys to the expected meta key name.
-									metaAttributes[ attributeKey ],
-									value,
-								] )
+									.map( ( [ attributeKey, value ] ) => [
+										// Rename the keys to the expected meta key name.
+										metaAttributes[ attributeKey ],
+										value,
+									] )
 							);
 
 							if ( ! isEmpty( nextMeta ) ) {
@@ -108,7 +107,11 @@ const createWithMetaAttributeSource = ( metaAttributes ) =>
 function shimAttributeSource( settings ) {
 	/** @type {WPMetaAttributeMapping} */
 	const metaAttributes = mapValues(
-		pickBy( settings.attributes, { source: 'meta' } ),
+		Object.fromEntries(
+			Object.entries( settings.attributes ?? {} ).filter(
+				( [ , { source } ] ) => source === 'meta'
+			)
+		),
 		'meta'
 	);
 	if ( ! isEmpty( metaAttributes ) ) {