Prevent encoding colors for sides that aren't set

Also prevents attempting to encode flat color for border object that is undefined.
WordPress · Apr 6, 2023 · 6aadf4c · 6aadf4c
1 parent 854ab4b
commit 6aadf4c
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/packages/block-editor/src/components/global-styles/border-panel.js b/packages/block-editor/src/components/global-styles/border-panel.js
@@ -190,12 +190,14 @@ export default function BorderPanel( {
 
 		if ( hasSplitBorders( updatedBorder ) ) {
 			[ 'top', 'right', 'bottom', 'left' ].forEach( ( side ) => {
-				updatedBorder[ side ] = {
-					...updatedBorder[ side ],
-					color: encodeColorValue( updatedBorder[ side ]?.color ),
-				};
+				if ( updatedBorder[ side ] ) {
+					updatedBorder[ side ] = {
+						...updatedBorder[ side ],
+						color: encodeColorValue( updatedBorder[ side ]?.color ),
+					};
+				}
 			} );
-		} else {
+		} else if ( updatedBorder ) {
 			updatedBorder.color = encodeColorValue( updatedBorder.color );
 		}