Allow duotone presets to be stored in the "duotone" block attribute#48381
Closed
ajlende wants to merge 12 commits into
Closed
Allow duotone presets to be stored in the "duotone" block attribute#48381ajlende wants to merge 12 commits into
ajlende wants to merge 12 commits into
Conversation
|
Flaky tests detected in 360af4d. 🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/4261031277
|
|
Size Change: +404 B (0%) Total Size: 1.33 MB
ℹ️ View Unchanged
|
ajlende
commented
Feb 24, 2023
Comment on lines
+314
to
+316
| if ( isset( $preset['colors'] ) && 'unset' === $preset['colors'] ) { | ||
| return 'none'; | ||
| } |
Contributor
Author
There was a problem hiding this comment.
gutenberg_get_duotone_filter_property is used externally by WP_Theme_JSON, so we want to keep the original behavior.
Contributor
There was a problem hiding this comment.
Oh man. Its so horrible having to remember that everything is public in PHP. Thank you for catching this.
| $scoped[] = $scope . ' ' . trim( $sel ); | ||
| } | ||
| $selector = implode( ', ', $scoped ); | ||
| $selector = WP_Theme_JSON_Gutenberg::scope_selector( '.' . $filter_id, $duotone_support ); |
Contributor
Author
There was a problem hiding this comment.
I forget—when doing backports, renaming things like WP_Theme_JSON_Gutenberg to WP_Theme_JSON is part of the normal process, right? Or will this need special attention?
Contributor
There was a problem hiding this comment.
I think this is fine, we just need to to rename it when we do the backport.
getdave
reviewed
Feb 24, 2023
Comment on lines
+314
to
+316
| if ( isset( $preset['colors'] ) && 'unset' === $preset['colors'] ) { | ||
| return 'none'; | ||
| } |
Contributor
There was a problem hiding this comment.
Oh man. Its so horrible having to remember that everything is public in PHP. Thank you for catching this.
| $filter_key = $is_duotone_colors_array ? implode( '-', $duotone_attr ) : $duotone_attr; | ||
| $filter_preset = array( | ||
| $filter_key = is_array( $duotone_attr ) ? implode( '-', $duotone_attr ) : $duotone_attr; | ||
| $filter_data = array( |
Contributor
There was a problem hiding this comment.
filter_data is much better name now - thank you.
| $scoped[] = $scope . ' ' . trim( $sel ); | ||
| } | ||
| $selector = implode( ', ', $scoped ); | ||
| $selector = WP_Theme_JSON_Gutenberg::scope_selector( '.' . $filter_id, $duotone_support ); |
Contributor
There was a problem hiding this comment.
Nice! That bit of code was on my refactor this. Glad you found it.
getdave
reviewed
Feb 24, 2023
Comment on lines
+126
to
+128
| const duotonePresetOrColors = duotonePreset | ||
| ? getColorsFromDuotonePreset( duotonePreset, duotonePalette ) | ||
| : duotoneColors; |
Contributor
There was a problem hiding this comment.
TODO
Bug: the "unset" value is stored in the style attribute so we need a custom condition here to handle when duotone is hard value "unset" otherwise this code will retriebe the colors from the default duotone palette.
Contributor
|
I'm now working on the JS side. Nearly done. |
Contributor
|
We'll need to pull in changes from #48401 once it's merged. |
Contributor
Author
|
Closing in favor of #48426 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What?
Why?
Fixes #48371
How?
Testing Instructions
Testing Instructions for Keyboard
Screenshots or screencast
Co-authored-by: Dave Smith 444434+getdave@users.noreply.github.com