Fix array access, add length check and additional test

WordPress · Oct 19, 2022 · 4e3c1f9 · 4e3c1f9
1 parent a691f88
commit 4e3c1f9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/packages/block-editor/src/hooks/style.js b/packages/block-editor/src/hooks/style.js
@@ -245,8 +245,8 @@ export function omitStyle( style, paths, preserveReference = false ) {
 		if ( path.length > 1 ) {
 			const [ firstSubpath, ...restPath ] = path;
 			omitStyle( newStyle[ firstSubpath ], [ restPath ], true );
-		} else {
-			delete newStyle[ path ];
+		} else if ( path.length === 1 ) {
+			delete newStyle[ path[ 0 ] ];
 		}
 	} );
 

diff --git a/packages/block-editor/src/hooks/test/style.js b/packages/block-editor/src/hooks/test/style.js
@@ -399,4 +399,11 @@ describe( 'omitStyle', () => {
 			omitStyle( style3, [ [ 'border', 'radius', 'bottomLeft' ] ] )
 		).toEqual( style3 );
 	} );
+
+	it( 'should ignore an empty array path', () => {
+		const style = { typography: {}, '': 'test' };
+
+		expect( omitStyle( style, [] ) ).toEqual( style );
+		expect( omitStyle( style, [ [] ] ) ).toEqual( style );
+	} );
 } );