Fix the removePropertyFromObject function throws an error if the obje…

…ct is null (#60831) Co-authored-by: arthur791004 <[email protected]> Co-authored-by: fabiankaegy <[email protected]>
WordPress · Apr 17, 2024 · f5ee54f · f5ee54f
1 parent a6e8b68
commit f5ee54f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/...-site/src/hooks/use-theme-style-variations/test/use-theme-style-variations-by-property.js b/...-site/src/hooks/use-theme-style-variations/test/use-theme-style-variations-by-property.js
@@ -1079,6 +1079,10 @@ describe( 'removePropertyFromObject', () => {
 		expect( removePropertyFromObject( object, 'color' ) ).toEqual( object );
 	} );
 
+	it( 'should return with null', () => {
+		expect( removePropertyFromObject( null, 'color' ) ).toEqual( null );
+	} );
+
 	it( 'should remove the specified property from the object', () => {
 		expect(
 			removePropertyFromObject(

diff --git a/.../edit-site/src/hooks/use-theme-style-variations/use-theme-style-variations-by-property.js b/.../edit-site/src/hooks/use-theme-style-variations/use-theme-style-variations-by-property.js
@@ -28,7 +28,11 @@ export function removePropertyFromObject( object, property ) {
 		return object;
 	}
 
-	if ( typeof object !== 'object' || ! Object.keys( object ).length ) {
+	if (
+		typeof object !== 'object' ||
+		! object ||
+		! Object.keys( object ).length
+	) {
 		return object;
 	}