Skip to content

Global Styles: Fix push-to-global-styles clearing of attributes, border fallbacks, link hover colors, and behaviors #51621

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 7 commits into from
Aug 11, 2023
Merged

Global Styles: Fix push-to-global-styles clearing of attributes, border fallbacks, link hover colors, and behaviors #51621

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2bef26a
Global Styles: Add default border style when applying block styles gl…
aaronrobertshaw Jun 18, 2023
724c49c
Fix application and clearing of presets
aaronrobertshaw Jun 18, 2023
26d8df2
Apply default border style for preset border color
aaronrobertshaw Jun 19, 2023
c3066c4
Fix pushing of split border styles
aaronrobertshaw Jun 19, 2023
9376d76
Fix application of block border styles over existing global styles
aaronrobertshaw Jun 19, 2023
aebc285
Fix pushing of blockGap styles
aaronrobertshaw Jul 27, 2023
1fcce00
Fix pushing link colors and behaviors
aaronrobertshaw Aug 8, 2023
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
Fix pushing link colors and behaviors
  • Loading branch information
@aaronrobertshaw @glendaviesnz
aaronrobertshaw authored and glendaviesnz committed Aug 10, 2023
commit 1fcce005c53792fc121e84aa039d34cba2dcdc1c
27 changes: 27 additions & 0 deletions packages/edit-site/src/hooks/push-changes-to-global-styles/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,30 @@ function useChangesToPush( name, attributes, userConfig ) {
? `var:preset|${ STYLE_PATH_TO_CSS_VAR_INFIX[ presetAttributeKey ] }|${ presetAttributeValue }`
: getValueFromObjectPath( attributes.style, path );

// Links only have a single support entry but have two element
// style properties, color and hover color. The following check
// will add the hover color to the changes if required.
if ( key === 'linkColor' ) {
const linkChanges = value ? [ { path, value } ] : [];
const hoverPath = [
'elements',
'link',
':hover',
'color',
'text',
];
const hoverValue = getValueFromObjectPath(
attributes.style,
hoverPath
);

if ( hoverValue ) {
linkChanges.push( { path: hoverPath, value: hoverValue } );
}

return linkChanges;
}

// The shorthand border styles can't be mapped directly as global
// styles requires longhand config.
if ( flatBorderProperties.includes( key ) && value ) {
Expand Down Expand Up @@ -284,6 +308,7 @@ function PushChangesToGlobalStylesControl( {
if ( changes.length === 0 && ! userHasEditedBehaviors ) {
return;
}

if ( changes.length > 0 ) {
const { style: blockStyles } = attributes;

Expand Down Expand Up @@ -339,8 +364,10 @@ function PushChangesToGlobalStylesControl( {
}
);
}

if ( userHasEditedBehaviors ) {
__unstableMarkNextChangeAsNotPersistent();
setAttributes( { behaviors: undefined } );
Copy link
Contributor Author

@aaronrobertshaw aaronrobertshaw Aug 8, 2023

Choose a reason for hiding this comment

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

A good potential follow-up here might be to consolidate the updating of attributes and snackbar notices for both styles and behaviours. To keep the scope of this PR manageable for testing I've opted against this larger refactor.

setBehavior( attributes.behaviors );
createSuccessNotice(
sprintf(
Expand Down