Skip to content

Global Styles: Add theme origin to getStyle #31267

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
oandregal merged 2 commits into from
Apr 29, 2021
Merged

Global Styles: Add theme origin to getStyle #31267

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6116dd7
Add theme origin to getStyle
aaronrobertshaw Apr 27, 2021
4032f66
Improve clarity of getStyle
aaronrobertshaw Apr 29, 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
26 changes: 22 additions & 4 deletions packages/edit-site/src/components/editor/global-styles-provider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ export default function GlobalStylesProvider( { children, baseStyles } ) {

const contexts = useMemo( () => getContexts( blockTypes ), [ blockTypes ] );

const { __experimentalGlobalStylesBaseStyles: themeStyles } = settings;
const { userStyles, mergedStyles } = useMemo( () => {
let newUserStyles;
try {
Expand Down Expand Up @@ -191,11 +192,28 @@ export default function GlobalStylesProvider( { children, baseStyles } ) {
setContent( JSON.stringify( newContent ) );
},
getStyle: ( context, propertyName, origin = 'merged' ) => {
const styleOrigin =
'user' === origin ? userStyles : mergedStyles;
if ( origin === 'theme' ) {
const value = get(
themeStyles?.styles?.[ context ],
STYLE_PROPERTY[ propertyName ].value
);
return getValueFromVariable( themeStyles, context, value );
}

if ( origin === 'user' ) {
const value = get(
userStyles?.styles?.[ context ],
STYLE_PROPERTY[ propertyName ].value
);

// 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(
styleOrigin?.styles?.[ context ],
mergedStyles?.styles?.[ context ],
STYLE_PROPERTY[ propertyName ].value
);
return getValueFromVariable( mergedStyles, context, value );
Expand All @@ -220,7 +238,7 @@ export default function GlobalStylesProvider( { children, baseStyles } ) {
setContent( JSON.stringify( newContent ) );
},
} ),
[ content, mergedStyles ]
[ content, mergedStyles, themeStyles ]
);

useEffect( () => {
Expand Down