Skip to content

Commit

Permalink
Borders: Prevent console error when clearing custom border color (#52963
Browse files Browse the repository at this point in the history
)
  • Loading branch information
aaronrobertshaw authored Jul 27, 2023
1 parent 4404be9 commit d1a8081
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion packages/block-editor/src/hooks/border.js
Original file line number Diff line number Diff line change
Expand Up @@ -377,13 +377,14 @@ export const withBorderColorPaletteStyles = createHigherOrderComponent(
borderBottomColor: borderBottomColor || borderColorValue,
borderLeftColor: borderLeftColor || borderColorValue,
};
const cleanedExtraStyles = cleanEmptyObject( extraStyles ) || {};

let wrapperProps = props.wrapperProps;
wrapperProps = {
...props.wrapperProps,
style: {
...props.wrapperProps?.style,
...extraStyles,
...cleanedExtraStyles,
},
};

Expand Down

1 comment on commit d1a8081

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Flaky tests detected in d1a8081.
Some tests passed with failed attempts. The failures may not be related to this commit but are still reported for visibility. See the documentation for more information.

🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/5674991956
📝 Reported issues:

Please sign in to comment.