Skip to content

Block Supports: Add border color, style and width support #30124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aaronrobertshaw merged 13 commits into from
Apr 19, 2021
Merged

Block Supports: Add border color, style and width support #30124

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
50504fd
Add border color, style and width support
aaronrobertshaw Mar 17, 2021
45e0be3
Pass colors and gradients to border color control
aaronrobertshaw Mar 24, 2021
82b7ab1
Return new object instead of mutating passed settings
aaronrobertshaw Mar 24, 2021
c5a2d64
Refactor individual feature support checks
aaronrobertshaw Mar 24, 2021
5f8006f
Add support for skipping serialization of border color
aaronrobertshaw Mar 25, 2021
97de73f
Add comment about enforcing undefined for color slug
aaronrobertshaw Mar 25, 2021
6c6290e
Add comment explaining EMPTY_ARRAY avoiding rerenders
aaronrobertshaw Mar 25, 2021
9add20e
Add clarifying comment around clearing `className`
aaronrobertshaw Mar 25, 2021
9bb2c82
Add border block support to global styles sidebar
aaronrobertshaw Mar 31, 2021
699895b
Add filter to force inline border color style in editor
aaronrobertshaw Apr 12, 2021
d87a299
Use gutenberg_block_has_support and unnest support checks
aaronrobertshaw Apr 14, 2021
f1f3c4b
Refactor to handle disabled/support checks in root border hook
aaronrobertshaw Apr 14, 2021
c96ec94
Fix border support check
aaronrobertshaw Apr 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Return new object instead of mutating passed settings
  • Loading branch information
@aaronrobertshaw
aaronrobertshaw committed Apr 12, 2021
commit 82b7ab116452adeccd154fa510041e6683629c82
19 changes: 12 additions & 7 deletions packages/block-editor/src/hooks/border-color.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,20 +112,25 @@ export function useIsBorderColorDisabled( { name: blockName } = {} ) {
* @return {Object} Updated block settings.
*/
function addAttributes( settings ) {
if ( ! hasBlockSupport( settings, BORDER_COLOR_SUPPORT_KEY ) ) {
if ( ! hasBorderColorSupport( settings ) ) {
return settings;
}

// Allow blocks to specify default value if needed.
if ( ! settings.attributes.borderColor ) {
Object.assign( settings.attributes, {
if ( settings.attributes.borderColor ) {
return settings;
}

// Add new borderColor attribute to block settings.
return {
...settings,
attributes: {
...settings.attributes,
borderColor: {
type: 'string',
},
} );
}

return settings;
},
};
}

/**
Expand Down