Skip to content
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

Jump to bottom

Fix: Preset variables not being used on the site editor. #33149

Merged
merged 1 commit into from
Jul 5, 2021
Merged

Fix: Preset variables not being used on the site editor. #33149

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
82 changes: 66 additions & 16 deletions packages/edit-site/src/components/editor/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,57 @@ export function useSetting( path, blockName = '' ) {
return result;
}

function findInPresetsBy(
styles,
context,
presetPath,
presetProperty,
presetValueValue
) {
// Block presets take priority above root level presets.
const orderedPresetsByOrigin = [
get( styles, [ 'settings', 'blocks', context, ...presetPath ] ),
get( styles, [ 'settings', ...presetPath ] ),
];
for ( const presetByOrigin of orderedPresetsByOrigin ) {
if ( presetByOrigin ) {
// Preset origins ordered by priority.
const origins = [ 'user', 'theme', 'core' ];
for ( const origin of origins ) {
const presets = presetByOrigin[ origin ];
if ( presets ) {
const presetObject = find(
presets,
( preset ) =>
preset[ presetProperty ] === presetValueValue
);
if ( presetObject ) {
if ( presetProperty === 'slug' ) {
return presetObject;
}
// if there is a highest priority preset with the same slug but different value the preset we found was overwritten and should be ignored.
const highestPresetObjectWithSameSlug = findInPresetsBy(
styles,
context,
presetPath,
'slug',
presetObject.slug
);
if (
highestPresetObjectWithSameSlug[
presetProperty
] === presetObject[ presetProperty ]
) {
return presetObject;
}
return undefined;
}
}
}
}
}
}

export function getPresetVariable( styles, context, propertyName, value ) {
if ( ! value ) {
return value;
Expand All @@ -121,17 +172,16 @@ export function getPresetVariable( styles, context, propertyName, value ) {
// so the value should be returned as it is.
return value;
}
const { valueKey, path, cssVarInfix } = metadata;

const basePath =
ROOT_BLOCK_NAME === context
? [ 'settings' ]
: [ 'settings', 'blocks', context ];
const { valueKey, path: propertyPath, cssVarInfix } = metadata;
const presets = get( styles, [ ...basePath, ...propertyPath ] );
const presetObject = find(
presets,
( preset ) => preset[ valueKey ] === value
const presetObject = findInPresetsBy(
styles,
context,
path,
valueKey,
value
);

if ( ! presetObject ) {
// Value wasn't found in the presets,
// so it must be a custom value.
Expand All @@ -153,14 +203,14 @@ function getValueFromPresetVariable(
return variable;
}

const presets =
get( styles, [ 'settings', 'blocks', blockName, ...metadata.path ] ) ??
get( styles, [ 'settings', ...metadata.path ] );
if ( ! presets ) {
return variable;
}
const presetObject = findInPresetsBy(
styles,
blockName,
metadata.path,
'slug',
slug
);

const presetObject = find( presets, ( preset ) => preset.slug === slug );
if ( presetObject ) {
const { valueKey } = metadata;
const result = presetObject[ valueKey ];
Expand Down