Global Styles: Add theme origin to getStyle #31267
Merged
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
This aims to allow retrieval of a style value set by the theme itself. For example, when resetting a global style control.
aaronrobertshaw
added
Global Styles
7 tasks
|
Size Change: -82.4 kB (-6%) ✅ Total Size: 1.31 MB
ℹ️ View Unchanged
|
oandregal
reviewed
Apr 28, 2021
| return getValueFromVariable( mergedStyles, context, value ); | ||
|
|
||
| const styles = 'theme' === origin ? themeStyles : mergedStyles; | ||
| return getValueFromVariable( styles, context, value ); |
There was a problem hiding this comment.
I understand why we use both styleOrigin and styles. However, it's complex and I'm wondering how we can rewrite it so it's more straightforward for the reader. How about?
getStyle: ( context, propertyName, origin = 'merged' ) => {
if ( origin === 'theme' ) {
const value = get( themeStyles, path );
return getValueFromVariable( themeStyles, context, value );
}
if ( origin === 'user' ) {
const value = get( userStyles, path );
// We still need to use merged styles here because
// the presets used to resolve user variable may be defined
// a layer down (core, theme, or user).
return getValueFromVariable( mergedStyles, context, value );
}
const value = get( mergedStyles, path );
return getValueFromVariable( mergedStyles, context, value );
},There was a problem hiding this comment.
Good idea 👍
I've updated getStyle to the suggested structure. Thanks.
oandregal
approved these changes
Apr 29, 2021
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.
Description
Adds a
themeorigin to thegetStylefunction used to retrieve style values for Global Styles controls.The aim is to allow retrieval of a value set by the theme itself so Global Style controls can be reset to that theme value rather than simply unset completely.
How has this been tested?
Test Setup
edit-site/src/components/sidebar/spacing-panel.jsto set theresetValuesprop on the padding'sBoxControlTest Instructions
Screenshots
Types of changes
New feature.
Checklist:
*.native.jsfiles for terms that need renaming or removal).