@wordpress/block-editor 15.6.1-next.36001005c.0 → 15.6.2

package/src/components/global-styles/hooks.js

@@ -10,21 +10,81 @@ import { useContext, useCallback, useMemo } from '@wordpress/element';
 import { useSelect } from '@wordpress/data';
 import { store as blocksStore } from '@wordpress/blocks';
 import { _x } from '@wordpress/i18n';
-import {
-	getSetting,
-	getStyle,
-	getPresetVariableFromValue,
-} from '@wordpress/global-styles-engine';
 
 /**
  * Internal dependencies
  */
-import { setImmutably } from '../../utils/object';
+import { getValueFromVariable, getPresetVariableFromValue } from './utils';
+import { getValueFromObjectPath, setImmutably } from '../../utils/object';
 import { GlobalStylesContext } from './context';
 import { unlock } from '../../lock-unlock';
 
 const EMPTY_CONFIG = { settings: {}, styles: {} };
 
+const VALID_SETTINGS = [
+	'appearanceTools',
+	'useRootPaddingAwareAlignments',
+	'background.backgroundImage',
+	'background.backgroundRepeat',
+	'background.backgroundSize',
+	'background.backgroundPosition',
+	'border.color',
+	'border.radius',
+	'border.style',
+	'border.width',
+	'border.radiusSizes',
+	'shadow.presets',
+	'shadow.defaultPresets',
+	'color.background',
+	'color.button',
+	'color.caption',
+	'color.custom',
+	'color.customDuotone',
+	'color.customGradient',
+	'color.defaultDuotone',
+	'color.defaultGradients',
+	'color.defaultPalette',
+	'color.duotone',
+	'color.gradients',
+	'color.heading',
+	'color.link',
+	'color.palette',
+	'color.text',
+	'custom',
+	'dimensions.aspectRatio',
+	'dimensions.minHeight',
+	'layout.contentSize',
+	'layout.definitions',
+	'layout.wideSize',
+	'lightbox.enabled',
+	'lightbox.allowEditing',
+	'position.fixed',
+	'position.sticky',
+	'spacing.customSpacingSize',
+	'spacing.defaultSpacingSizes',
+	'spacing.spacingSizes',
+	'spacing.spacingScale',
+	'spacing.blockGap',
+	'spacing.margin',
+	'spacing.padding',
+	'spacing.units',
+	'typography.fluid',
+	'typography.customFontSize',
+	'typography.defaultFontSizes',
+	'typography.dropCap',
+	'typography.fontFamilies',
+	'typography.fontSizes',
+	'typography.fontStyle',
+	'typography.fontWeight',
+	'typography.letterSpacing',
+	'typography.lineHeight',
+	'typography.textAlign',
+	'typography.textColumns',
+	'typography.textDecoration',
+	'typography.textTransform',
+	'typography.writingMode',
+];
+
 export const useGlobalStylesReset = () => {
 	const { user, setUserConfig } = useContext( GlobalStylesContext );
 	const config = {
@@ -43,6 +103,7 @@ export function useGlobalSetting( propertyPath, blockName, source = 'all' ) {
 	const appendedBlockPath = blockName ? '.blocks.' + blockName : '';
 	const appendedPropertyPath = propertyPath ? '.' + propertyPath : '';
 	const contextualPath = `settings${ appendedBlockPath }${ appendedPropertyPath }`;
+	const globalPath = `settings${ appendedPropertyPath }`;
 	const sourceKey = source === 'all' ? 'merged' : source;
 
 	const settingValue = useMemo( () => {
@@ -51,9 +112,34 @@ export function useGlobalSetting( propertyPath, blockName, source = 'all' ) {
 			throw 'Unsupported source';
 		}
 
-		// Use engine's getSetting instead of duplicating logic
-		return getSetting( configToUse, propertyPath, blockName );
-	}, [ configs, sourceKey, propertyPath, blockName ] );
+		if ( propertyPath ) {
+			return (
+				getValueFromObjectPath( configToUse, contextualPath ) ??
+				getValueFromObjectPath( configToUse, globalPath )
+			);
+		}
+
+		let result = {};
+		VALID_SETTINGS.forEach( ( setting ) => {
+			const value =
+				getValueFromObjectPath(
+					configToUse,
+					`settings${ appendedBlockPath }.${ setting }`
+				) ??
+				getValueFromObjectPath( configToUse, `settings.${ setting }` );
+			if ( value !== undefined ) {
+				result = setImmutably( result, setting.split( '.' ), value );
+			}
+		} );
+		return result;
+	}, [
+		configs,
+		sourceKey,
+		propertyPath,
+		contextualPath,
+		globalPath,
+		appendedBlockPath,
+	] );
 
 	const setSetting = ( newValue ) => {
 		setUserConfig( ( currentConfig ) =>
@@ -97,32 +183,25 @@ export function useGlobalStyle(
 		);
 	};
 
-	let result;
-	// Use engine's getStyle instead of duplicating logic
+	let rawResult, result;
 	switch ( source ) {
 		case 'all':
-			result = getStyle(
-				mergedConfig,
-				path,
-				blockName,
-				shouldDecodeEncode
-			);
+			rawResult = getValueFromObjectPath( mergedConfig, finalPath );
+			result = shouldDecodeEncode
+				? getValueFromVariable( mergedConfig, blockName, rawResult )
+				: rawResult;
 			break;
 		case 'user':
-			result = getStyle(
-				userConfig,
-				path,
-				blockName,
-				shouldDecodeEncode
-			);
+			rawResult = getValueFromObjectPath( userConfig, finalPath );
+			result = shouldDecodeEncode
+				? getValueFromVariable( mergedConfig, blockName, rawResult )
+				: rawResult;
 			break;
 		case 'base':
-			result = getStyle(
-				baseConfig,
-				path,
-				blockName,
-				shouldDecodeEncode
-			);
+			rawResult = getValueFromObjectPath( baseConfig, finalPath );
+			result = shouldDecodeEncode
+				? getValueFromVariable( baseConfig, blockName, rawResult )
+				: rawResult;
 			break;
 		default:
 			throw 'Unsupported source';

package/src/components/global-styles/index.js

@@ -4,6 +4,14 @@ export {
 	useGlobalStyle,
 	useSettingsForBlockElement,
 } from './hooks';
+export { getBlockCSSSelector } from './get-block-css-selector';
+export {
+	getLayoutStyles,
+	getBlockSelectors,
+	toStyles,
+	useGlobalStylesOutput,
+	useGlobalStylesOutputWithConfig,
+} from './use-global-styles-output';
 export { GlobalStylesContext } from './context';
 export {
 	default as TypographyPanel,