Global Styles: Abstract preset variable retrieving and setting #26970
Conversation
This file contains 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
jorgefilipecosta
added
the
Global Styles
|
Size Change: +6 B (0%) Total Size: 1.2 MB
ℹ️ View Unchanged
|
oandregal
reviewed
Nov 16, 2020
| context, | ||
| propertyName, | ||
| origin = 'merged', | ||
| resolveVars = true |
There was a problem hiding this comment.
Why do we need this? I'd think resolving variables is always part of the algorithm this function has to perform (same for setStyleProperty).
There was a problem hiding this comment.
Feedback applied 👍 resolveVars was removed.
oandregal
reviewed
Nov 16, 2020
| @@ -53,33 +60,42 @@ export function useEditorFeature( featurePath, blockName = GLOBAL_CONTEXT ) { | |||
| ); | |||
| } | |||
|
|
|||
| export function getPresetVariable( presetCategory, presets, value ) { | |||
| export function getPresetVariable( styles, blockName, propertyName, value ) { | |||
| if ( ! value ) { | |||
| return; | |||
There was a problem hiding this comment.
Can we make it so this function returns the preset variable or the input value? I've noticed in all the places this is used we need a fallback for when we return undefined, which won't be needed if we return the input value when there's no need for processing it.
There was a problem hiding this comment.
Same for getValueFromVariable.
There was a problem hiding this comment.
Feedback applied 👍
oandregal
reviewed
Nov 16, 2020
packages/edit-site/src/components/editor/global-styles-provider.js
Outdated
Show resolved
Hide resolved
jorgefilipecosta
force-pushed
the
update/abstract-preset-variable-retriving-and-setting
branch
from
561736a to
81ebe91
Compare
|
Hi @nosolosw thank you for the review, all the feedback was applied. |
jorgefilipecosta
force-pushed
the
update/abstract-preset-variable-retriving-and-setting
branch
from
81ebe91 to
3dfc717
Compare
Squashed commits: [dadc751ac5] Global Styles: Abstract preset variable retrieving and setting
jorgefilipecosta
force-pushed
the
update/abstract-preset-variable-retriving-and-setting
branch
from
3dfc717 to
4560791
Compare
|
All the feedback was applied so I merged this PR. If there is any further feedback feel free to leave a comment and I will propose a follow-up PR. |
jorgefilipecosta
deleted the
update/abstract-preset-variable-retriving-and-setting
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR abstracts the retrieving and setting of preset variables inside getStyleProperty and setStyleProperty. With this change, the code inside the Global Style panels does not even need to know about presets, custom vars, etc.
How has this been tested?
I verified the variable styles set in 2021 are correctly reflected on the global styles UI.
I changed some values on the global styles UI to use some of the presets (font sizes, font family, colors, gradients) and verified using the browser dev tools the CSS vars are output in the generated CSS code.