Skip to content

Commit

Permalink
Revert #55219 fix/block-settings-origins (#58951)
Browse files Browse the repository at this point in the history 
Co-authored-by: ajlende <ajlende@git.wordpress.org>
Co-authored-by: youknowriad <youknowriad@git.wordpress.org>
Co-authored-by: t-hamano <wildworks@git.wordpress.org>
Co-authored-by: MaggieCabrera <onemaggie@git.wordpress.org>
Co-authored-by: getdave <get_dave@git.wordpress.org>
Co-authored-by: scruffian <scruffian@git.wordpress.org>
Co-authored-by: andrewserong <andrewserong@git.wordpress.org>
Co-authored-by: matiasbenedetto <mmaattiiaass@git.wordpress.org>
Co-authored-by: carolinan <poena@git.wordpress.org>
Co-authored-by: justintadlock <greenshady@git.wordpress.org>
Co-authored-by: annezazu <annezazu@git.wordpress.org>
Co-authored-by: widoz <wido@git.wordpress.org>
Co-authored-by: colorful-tones <colorful-tones@git.wordpress.org>
Co-authored-by: iamtakashi <iamtakashi@git.wordpress.org>
Co-authored-by: juanfra <juanfra@git.wordpress.org>
Co-authored-by: hanneslsm <hanneslsm@git.wordpress.org>
Co-authored-by: richtabor <richtabor@git.wordpress.org>
  • Loading branch information
@ajlende @youknowriad
@t-hamano @getdave @scruffian @andrewserong @carolinan @justintadlock @annezazu @colorful-tones @juanfra @richtabor
18 people authored Feb 14, 2024
1 parent ec329cd commit 857356c
Show file tree
Hide file tree
Showing 6 changed files with 60 additions and 27 deletions.
10 changes: 5 additions & 5 deletions packages/block-editor/src/components/global-styles/border-panel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { __ } from '@wordpress/i18n';
import BorderRadiusControl from '../border-radius-control';
import { useColorsPerOrigin } from './hooks';
import { getValueFromVariable, TOOLSPANEL_DROPDOWNMENU_PROPS } from './utils';
import { mergeOrigins } from '../../store/get-block-settings';
import { overrideOrigins } from '../../store/get-block-settings';
import { setImmutably } from '../../utils/object';
import { getBorderPanelLabel } from '../../hooks/border';
import { ShadowPopover } from './shadow-panel-components';
Expand Down Expand Up @@ -154,12 +154,12 @@ export default function BorderPanel( {

// Shadow
const shadow = decodeValue( inheritedValue?.shadow );
const shadowPresets = settings?.shadow?.presets;
const mergedShadowPresets = shadowPresets
? mergeOrigins( shadowPresets )
const shadowPresets = settings?.shadow?.presets ?? {};
const overriddenShadowPresets = shadowPresets
? overrideOrigins( shadowPresets )
: [];
const setShadow = ( newValue ) => {
const slug = mergedShadowPresets?.find(
const slug = overriddenShadowPresets?.find(
( { shadow: shadowName } ) => shadowName === newValue
)?.slug;

Expand Down
18 changes: 11 additions & 7 deletions packages/block-editor/src/components/global-styles/typography-panel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ import { useCallback } from '@wordpress/element';
/**
* Internal dependencies
*/
import { mergeOrigins, hasMergedOrigins } from '../../store/get-block-settings';
import {
mergeOrigins,
overrideOrigins,
hasOriginValue,
} from '../../store/get-block-settings';
import FontFamilyControl from '../font-family';
import FontAppearanceControl from '../font-appearance-control';
import LineHeightControl from '../line-height-control';
Expand Down Expand Up @@ -53,13 +57,13 @@ export function useHasTypographyPanel( settings ) {

function useHasFontSizeControl( settings ) {
return (
hasMergedOrigins( settings?.typography?.fontSizes ) ||
hasOriginValue( settings?.typography?.fontSizes ) ||
settings?.typography?.customFontSize
);
}

function useHasFontFamilyControl( settings ) {
return hasMergedOrigins( settings?.typography?.fontFamilies );
return hasOriginValue( settings?.typography?.fontFamilies );
}

function useHasLineHeightControl( settings ) {
Expand Down Expand Up @@ -101,10 +105,10 @@ function useHasTextColumnsControl( settings ) {
}

function getUniqueFontSizesBySlug( settings ) {
const fontSizes = settings?.typography?.fontSizes;
const mergedFontSizes = fontSizes ? mergeOrigins( fontSizes ) : [];
const fontSizes = settings?.typography?.fontSizes ?? {};
const overriddenFontSizes = fontSizes ? overrideOrigins( fontSizes ) : [];
const uniqueSizes = [];
for ( const currentSize of mergedFontSizes ) {
for ( const currentSize of overriddenFontSizes ) {
if ( ! uniqueSizes.some( ( { slug } ) => slug === currentSize.slug ) ) {
uniqueSizes.push( currentSize );
}
Expand Down Expand Up @@ -162,7 +166,7 @@ export default function TypographyPanel( {

// Font Family
const hasFontFamilyEnabled = useHasFontFamilyControl( settings );
const fontFamilies = settings?.typography?.fontFamilies;
const fontFamilies = settings?.typography?.fontFamilies ?? {};
const mergedFontFamilies = fontFamilies ? mergeOrigins( fontFamilies ) : [];
const fontFamily = decodeValue( inheritedValue?.typography?.fontFamily );
const setFontFamily = ( newValue ) => {
Expand Down
32 changes: 24 additions & 8 deletions packages/block-editor/src/hooks/utils.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,12 @@ export function useBlockSettings( name, parentLayout ) {
const [
backgroundImage,
backgroundSize,
fontFamilies,
fontSizes,
customFontFamilies,
defaultFontFamilies,
themeFontFamilies,
customFontSizes,
defaultFontSizes,
themeFontSizes,
customFontSize,
fontStyle,
fontWeight,
Expand Down Expand Up @@ -223,8 +227,12 @@ export function useBlockSettings( name, parentLayout ) {
] = useSettings(
'background.backgroundImage',
'background.backgroundSize',
'typography.fontFamilies',
'typography.fontSizes',
'typography.fontFamilies.custom',
'typography.fontFamilies.default',
'typography.fontFamilies.theme',
'typography.fontSizes.custom',
'typography.fontSizes.default',
'typography.fontSizes.theme',
'typography.customFontSize',
'typography.fontStyle',
'typography.fontWeight',
Expand Down Expand Up @@ -305,10 +313,14 @@ export function useBlockSettings( name, parentLayout ) {
},
typography: {
fontFamilies: {
custom: fontFamilies,
custom: customFontFamilies,
default: defaultFontFamilies,
theme: themeFontFamilies,
},
fontSizes: {
custom: fontSizes,
custom: customFontSizes,
default: defaultFontSizes,
theme: themeFontSizes,
},
customFontSize,
fontStyle,
Expand Down Expand Up @@ -346,8 +358,12 @@ export function useBlockSettings( name, parentLayout ) {
}, [
backgroundImage,
backgroundSize,
fontFamilies,
fontSizes,
customFontFamilies,
defaultFontFamilies,
themeFontFamilies,
customFontSizes,
defaultFontSizes,
themeFontSizes,
customFontSize,
fontStyle,
fontWeight,
Expand Down
19 changes: 15 additions & 4 deletions packages/block-editor/src/store/get-block-settings.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* WordPress dependencies
*/
import {
__EXPERIMENTAL_PATHS_WITH_MERGE as PATHS_WITH_MERGE,
__EXPERIMENTAL_PATHS_WITH_OVERRIDE as PATHS_WITH_OVERRIDE,
hasBlockSupport,
} from '@wordpress/blocks';
import { applyFilters } from '@wordpress/hooks';
Expand Down Expand Up @@ -111,6 +111,17 @@ export function mergeOrigins( value ) {
}
const mergeCache = new WeakMap();

/**
* For settings like `color.palette`, which have a value that is an object
* with `default`, `theme`, `custom`, with field values that are arrays of
* items, returns the one with the highest priority among these three arrays.
* @param {Object} value Object to extract from
* @return {Array} Array of items extracted from the three origins
*/
export function overrideOrigins( value ) {
return value.custom ?? value.theme ?? value.default;
}

/**
* For settings like `color.palette`, which have a value that is an object
* with `default`, `theme`, `custom`, with field values that are arrays of
Expand All @@ -119,7 +130,7 @@ const mergeCache = new WeakMap();
* @param {Object} value Object to check
* @return {boolean} Whether the object has values in any of the three origins
*/
export function hasMergedOrigins( value ) {
export function hasOriginValue( value ) {
return [ 'default', 'theme', 'custom' ].some(
( key ) => value?.[ key ]?.length
);
Expand Down Expand Up @@ -203,8 +214,8 @@ export function getBlockSettings( state, clientId, ...paths ) {

// Return if the setting was found in either the block instance or the store.
if ( result !== undefined ) {
if ( PATHS_WITH_MERGE[ normalizedPath ] ) {
return mergeOrigins( result );
if ( PATHS_WITH_OVERRIDE[ normalizedPath ] ) {
return overrideOrigins( result );
}
return result;
}
Expand Down
6 changes: 4 additions & 2 deletions packages/blocks/src/api/constants.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,11 +271,13 @@ export const __EXPERIMENTAL_ELEMENTS = {
cite: 'cite',
};

export const __EXPERIMENTAL_PATHS_WITH_MERGE = {
// These paths may have three origins, custom, theme, and default,
// and are expected to override other origins with custom, theme,
// and default priority.
export const __EXPERIMENTAL_PATHS_WITH_OVERRIDE = {
'color.duotone': true,
'color.gradients': true,
'color.palette': true,
'typography.fontFamilies': true,
'typography.fontSizes': true,
'spacing.spacingSizes': true,
};
2 changes: 1 addition & 1 deletion packages/blocks/src/api/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,5 +162,5 @@ export { default as node } from './node';
export {
__EXPERIMENTAL_STYLE_PROPERTY,
__EXPERIMENTAL_ELEMENTS,
__EXPERIMENTAL_PATHS_WITH_MERGE,
__EXPERIMENTAL_PATHS_WITH_OVERRIDE,
} from './constants';

1 comment on commit 857356c

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Flaky tests detected in 857356c.
Some tests passed with failed attempts. The failures may not be related to this commit but are still reported for visibility. See the documentation for more information.

🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/7900679212
📝 Reported issues:

Please sign in to comment.