@wordpress/edit-site 3.0.10 → 3.0.14

package/src/components/global-styles/gradients-palette-panel.js

@@ -0,0 +1,99 @@
+/**
+ * External dependencies
+ */
+import { noop } from 'lodash';
+
+/**
+ * WordPress dependencies
+ */
+import {
+	__experimentalVStack as VStack,
+	__experimentalPaletteEdit as PaletteEdit,
+	DuotonePicker,
+	__experimentalHeading as Heading,
+} from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import { useSetting } from './hooks';
+
+export default function GradientPalettePanel( { name } ) {
+	const [ themeGradients, setThemeGradients ] = useSetting(
+		'color.gradients.theme',
+		name
+	);
+	const [ baseThemeGradients ] = useSetting(
+		'color.gradients.theme',
+		name,
+		'base'
+	);
+	const [ defaultGradients, setDefaultGradients ] = useSetting(
+		'color.gradients.default',
+		name
+	);
+	const [ baseDefaultGradients ] = useSetting(
+		'color.gradients.default',
+		name,
+		'base'
+	);
+	const [ customGradients, setCustomGradients ] = useSetting(
+		'color.gradients.custom',
+		name
+	);
+
+	const [ defaultPaletteEnabled ] = useSetting(
+		'color.defaultGradients',
+		name
+	);
+	const [ duotonePalette ] = useSetting( 'color.duotone' ) || [];
+	return (
+		<VStack
+			className="edit-site-global-styles-gradient-palette-panel"
+			spacing={ 10 }
+		>
+			<div>
+				<Heading className="edit-site-global-styles-gradient-palette-panel__duotone-heading">
+					{ __( 'Duotone' ) }
+				</Heading>
+				<DuotonePicker
+					duotonePalette={ duotonePalette }
+					disableCustomDuotone={ true }
+					disableCustomColors={ true }
+					clearable={ false }
+					onChange={ noop }
+				/>
+			</div>
+			{ !! themeGradients && !! themeGradients.length && (
+				<PaletteEdit
+					canReset={ themeGradients !== baseThemeGradients }
+					canOnlyChangeValues
+					gradients={ themeGradients }
+					onChange={ setThemeGradients }
+					paletteLabel={ __( 'Theme' ) }
+				/>
+			) }
+			{ !! defaultGradients &&
+				!! defaultGradients.length &&
+				!! defaultPaletteEnabled && (
+					<PaletteEdit
+						canReset={ defaultGradients !== baseDefaultGradients }
+						canOnlyChangeValues
+						gradients={ defaultGradients }
+						onChange={ setDefaultGradients }
+						paletteLabel={ __( 'Default' ) }
+					/>
+				) }
+			<PaletteEdit
+				gradients={ customGradients }
+				onChange={ setCustomGradients }
+				paletteLabel={ __( 'Custom' ) }
+				emptyMessage={ __(
+					'Custom gradients are empty! Add some gradients to create your own palette.'
+				) }
+				slugPrefix="custom-"
+			/>
+		</VStack>
+	);
+}

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

@@ -49,7 +49,7 @@ export function useSetting( path, blockName, source = 'all' ) {
 		setUserConfig( ( currentConfig ) => {
 			const newUserConfig = cloneDeep( currentConfig );
 			const pathToSet = PATHS_WITH_MERGE[ path ]
-				? fullPath + '.user'
+				? fullPath + '.custom'
 				: fullPath;
 			set( newUserConfig, pathToSet, newValue );
 
@@ -65,7 +65,7 @@ export function useSetting( path, blockName, source = 'all' ) {
 		const getSettingValue = ( configToUse ) => {
 			const result = get( configToUse, currentPath );
 			if ( PATHS_WITH_MERGE[ path ] ) {
-				return result?.user ?? result?.theme ?? result?.default;
+				return result?.custom ?? result?.theme ?? result?.default;
 			}
 			return result;
 		};
@@ -218,7 +218,7 @@ export function getSupportedGlobalStylesPanels( name ) {
 }
 
 export function useColorsPerOrigin( name ) {
-	const [ customColors ] = useSetting( 'color.palette.user', name );
+	const [ customColors ] = useSetting( 'color.palette.custom', name );
 	const [ themeColors ] = useSetting( 'color.palette.theme', name );
 	const [ defaultColors ] = useSetting( 'color.palette.default', name );
 	const [ shouldDisplayDefaultColors ] = useSetting( 'color.defaultPalette' );
@@ -261,7 +261,7 @@ export function useColorsPerOrigin( name ) {
 }
 
 export function useGradientsPerOrigin( name ) {
-	const [ customGradients ] = useSetting( 'color.gradients.user', name );
+	const [ customGradients ] = useSetting( 'color.gradients.custom', name );
 	const [ themeGradients ] = useSetting( 'color.gradients.theme', name );
 	const [ defaultGradients ] = useSetting( 'color.gradients.default', name );
 	const [ shouldDisplayDefaultGradients ] = useSetting(

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

@@ -11,6 +11,7 @@ import {
 	ColorIndicator,
 } from '@wordpress/components';
 import { __, _n, sprintf } from '@wordpress/i18n';
+import { useMemo } from '@wordpress/element';
 
 /**
  * Internal dependencies
@@ -22,18 +23,43 @@ import { useSetting } from './hooks';
 const EMPTY_COLORS = [];
 
 function Palette( { name } ) {
-	const [ colorsSetting ] = useSetting( 'color.palette.user', name );
-	const colors = colorsSetting || EMPTY_COLORS;
+	const [ customColors ] = useSetting( 'color.palette.custom' );
+	const [ themeColors ] = useSetting( 'color.palette.theme' );
+	const [ defaultColors ] = useSetting( 'color.palette.default' );
+
+	const [ defaultPaletteEnabled ] = useSetting(
+		'color.defaultPalette',
+		name
+	);
+	const colors = useMemo(
+		() => [
+			...( customColors || EMPTY_COLORS ),
+			...( themeColors || EMPTY_COLORS ),
+			...( defaultColors && defaultPaletteEnabled
+				? defaultColors
+				: EMPTY_COLORS ),
+		],
+		[ customColors, themeColors, defaultColors, defaultPaletteEnabled ]
+	);
+
 	const screenPath = ! name
 		? '/colors/palette'
 		: '/blocks/' + name + '/colors/palette';
+	const paletteButtonText =
+		colors.length > 0
+			? sprintf(
+					// Translators: %d: Number of palette colors.
+					_n( '%d color', '%d colors', colors.length ),
+					colors.length
+			  )
+			: __( 'Add custom colors' );
 
 	return (
 		<VStack spacing={ 3 }>
 			<Subtitle>{ __( 'Palette' ) }</Subtitle>
 			<ItemGroup isBordered isSeparated>
 				<NavigationButton path={ screenPath }>
-					<HStack>
+					<HStack isReversed={ colors.length === 0 }>
 						<FlexBlock>
 							<ZStack isLayered={ false } offset={ -8 }>
 								{ colors.slice( 0, 5 ).map( ( { color } ) => (
@@ -44,13 +70,7 @@ function Palette( { name } ) {
 								) ) }
 							</ZStack>
 						</FlexBlock>
-						<FlexItem>
-							{ sprintf(
-								// Translators: %d: Number of palette colors.
-								_n( '%d color', '%d colors', colors.length ),
-								colors.length
-							) }
-						</FlexItem>
+						<FlexItem>{ paletteButtonText }</FlexItem>
 					</HStack>
 				</NavigationButton>
 			</ItemGroup>

package/src/components/global-styles/screen-background-color.js

@@ -104,6 +104,8 @@ function ScreenBackgroundColor( { name } ) {
 				disableCustomGradients={ ! areCustomGradientsEnabled }
 				__experimentalHasMultipleOrigins
 				showTitle={ false }
+				enableAlpha
+				__experimentalIsRenderedInSidebar
 			/>
 		</>
 	);

package/src/components/global-styles/screen-color-palette.js

@@ -2,26 +2,53 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
+import {
+	__experimentalToggleGroupControl as ToggleGroupControl,
+	__experimentalToggleGroupControlOption as ToggleGroupControlOption,
+} from '@wordpress/components';
+import { useState } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
 import ColorPalettePanel from './color-palette-panel';
+import GradientPalettePanel from './gradients-palette-panel';
 import ScreenHeader from './header';
 
 function ScreenColorPalette( { name } ) {
+	const [ currentTab, setCurrentTab ] = useState( 'solid' );
 	const parentMenu = name === undefined ? '' : '/blocks/' + name;
 
 	return (
 		<>
 			<ScreenHeader
 				back={ parentMenu + '/colors' }
-				title={ __( 'Color Palette' ) }
+				title={ __( 'Palette' ) }
 				description={ __(
-					'Color palettes are used to provide default color options for blocks and various design tools. Here you can edit the colors with their labels.'
+					'Palettes are used to provide default color options for blocks and various design tools. Here you can edit the colors with their labels.'
 				) }
 			/>
-			<ColorPalettePanel name={ name } />
+			<ToggleGroupControl
+				className="edit-site-screen-color-palette-toggle"
+				value={ currentTab }
+				onChange={ setCurrentTab }
+				label={ __( 'Select palette type' ) }
+				hideLabelFromVision
+				isBlock
+			>
+				<ToggleGroupControlOption
+					value="solid"
+					label={ __( 'Solid' ) }
+				/>
+				<ToggleGroupControlOption
+					value="gradient"
+					label={ __( 'Gradient' ) }
+				/>
+			</ToggleGroupControl>
+			{ currentTab === 'solid' && <ColorPalettePanel name={ name } /> }
+			{ currentTab === 'gradient' && (
+				<GradientPalettePanel name={ name } />
+			) }
 		</>
 	);
 }

package/src/components/global-styles/screen-link-color.js

@@ -70,6 +70,8 @@ function ScreenLinkColor( { name } ) {
 				disableCustomColors={ ! areCustomSolidsEnabled }
 				__experimentalHasMultipleOrigins
 				showTitle={ false }
+				enableAlpha
+				__experimentalIsRenderedInSidebar
 			/>
 		</>
 	);

package/src/components/global-styles/screen-text-color.js

@@ -62,6 +62,8 @@ function ScreenTextColor( { name } ) {
 				disableCustomColors={ ! areCustomSolidsEnabled }
 				__experimentalHasMultipleOrigins
 				showTitle={ false }
+				enableAlpha
+				__experimentalIsRenderedInSidebar
 			/>
 		</>
 	);

package/src/components/global-styles/screen-typography-element.js

@@ -0,0 +1,39 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import TypographyPanel from './typography-panel';
+import ScreenHeader from './header';
+
+const elements = {
+	text: {
+		description: __( 'Manage the fonts used on the site.' ),
+		title: __( 'Text' ),
+	},
+	link: {
+		description: __( 'Manage the fonts and typography used on the links.' ),
+		title: __( 'Links' ),
+	},
+};
+
+function ScreenTypographyElement( { name, element } ) {
+	const parentMenu =
+		name === undefined ? '/typography' : '/blocks/' + name + '/typography';
+
+	return (
+		<>
+			<ScreenHeader
+				back={ parentMenu }
+				title={ elements[ element ].title }
+				description={ elements[ element ].description }
+			/>
+			<TypographyPanel name={ name } element={ element } />
+		</>
+	);
+}
+
+export default ScreenTypographyElement;

package/src/components/global-styles/screen-typography.js

@@ -2,12 +2,69 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
+import {
+	__experimentalItemGroup as ItemGroup,
+	__experimentalVStack as VStack,
+	__experimentalHStack as HStack,
+	FlexItem,
+} from '@wordpress/components';
 
 /**
  * Internal dependencies
  */
-import TypographyPanel from './typography-panel';
 import ScreenHeader from './header';
+import NavigationButton from './navigation-button';
+import { useStyle } from './hooks';
+import Subtitle from './subtitle';
+import TypographyPanel from './typography-panel';
+
+function Item( { name, parentMenu, element, label } ) {
+	const hasSupport = ! name;
+	const prefix =
+		element === 'text' || ! element ? '' : `elements.${ element }.`;
+	const extraStyles =
+		element === 'link'
+			? {
+					textDecoration: 'underline',
+			  }
+			: {};
+	const [ fontFamily ] = useStyle( prefix + 'typography.fontFamily', name );
+	const [ fontStyle ] = useStyle( prefix + 'typography.fontStyle', name );
+	const [ fontWeight ] = useStyle( prefix + 'typography.fontWeight', name );
+	const [ letterSpacing ] = useStyle(
+		prefix + 'typography.letterSpacing',
+		name
+	);
+	const [ backgroundColor ] = useStyle( prefix + 'color.background', name );
+	const [ gradientValue ] = useStyle( prefix + 'color.gradient', name );
+	const [ color ] = useStyle( prefix + 'color.text', name );
+
+	if ( ! hasSupport ) {
+		return null;
+	}
+
+	return (
+		<NavigationButton path={ parentMenu + '/typography/' + element }>
+			<HStack justify="flex-start">
+				<FlexItem
+					className="edit-site-global-styles-screen-typography__indicator"
+					style={ {
+						fontFamily: fontFamily ?? 'serif',
+						background: gradientValue ?? backgroundColor,
+						color,
+						fontStyle,
+						fontWeight,
+						letterSpacing,
+						...extraStyles,
+					} }
+				>
+					{ __( 'Aa' ) }
+				</FlexItem>
+				<FlexItem>{ label }</FlexItem>
+			</HStack>
+		</NavigationButton>
+	);
+}
 
 function ScreenTypography( { name } ) {
 	const parentMenu = name === undefined ? '' : '/blocks/' + name;
@@ -18,10 +75,34 @@ function ScreenTypography( { name } ) {
 				back={ parentMenu ? parentMenu : '/' }
 				title={ __( 'Typography' ) }
 				description={ __(
-					'Manage the fonts used on the website and the default aspect of different global elements.'
+					'Manage the typography settings for different elements.'
 				) }
 			/>
-			<TypographyPanel name={ name } />
+
+			{ ! name && (
+				<div className="edit-site-global-styles-screen-typography">
+					<VStack spacing={ 3 }>
+						<Subtitle>{ __( 'Elements' ) }</Subtitle>
+						<ItemGroup isBordered isSeparated>
+							<Item
+								name={ name }
+								parentMenu={ parentMenu }
+								element="text"
+								label={ __( 'Text' ) }
+							/>
+							<Item
+								name={ name }
+								parentMenu={ parentMenu }
+								element="link"
+								label={ __( 'Links' ) }
+							/>
+						</ItemGroup>
+					</VStack>
+				</div>
+			) }
+
+			{ /* no typogrpahy elements support yet for blocks */ }
+			{ !! name && <TypographyPanel name={ name } element="text" /> }
 		</>
 	);
 }

package/src/components/global-styles/style.scss

@@ -15,6 +15,30 @@
 	}
 }
 
+.edit-site-typography-panel__preview {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	min-height: 100px;
+	margin-bottom: $grid-unit-20;
+	background: $gray-100;
+	border-radius: $radius-block-ui;
+}
+
+.edit-site-global-styles-screen-typography {
+	margin: $grid-unit-20;
+}
+
+.edit-site-global-styles-screen-typography__indicator {
+	height: 24px;
+	width: 24px;
+	font-size: 14px;
+	display: flex !important;
+	align-items: center;
+	justify-content: center;
+	border-radius: $radius-block-ui;
+}
+
 .edit-site-global-styles-screen-colors {
 	margin: $grid-unit-20;
 
@@ -22,15 +46,13 @@
 		margin-left: 0;
 		display: block;
 		border-radius: 50%;
-		border: 0;
 		height: 24px;
 		width: 24px;
 		padding: 0;
-		background-image:
-			repeating-linear-gradient(45deg, $gray-200 25%, transparent 25%, transparent 75%, $gray-200 75%, $gray-200),
-			repeating-linear-gradient(45deg, $gray-200 25%, transparent 25%, transparent 75%, $gray-200 75%, $gray-200);
-		background-position: 0 0, 25px 25px;
-		background-size: calc(2 * 5px) calc(2 * 5px);
+		border: $border-width solid $gray-300;
+
+		// Show a diagonal line (crossed out) for empty swatches.
+		background: linear-gradient(-45deg, transparent 48%, $gray-300 48%, $gray-300 52%, transparent 52%);
 	}
 }
 
@@ -44,3 +66,20 @@
 	text-transform: uppercase;
 	font-weight: 500;
 }
+
+.edit-site-screen-color-palette-toggle.edit-site-screen-color-palette-toggle {
+	margin-right: $grid-unit-20;
+	margin-left: $grid-unit-20;
+	width: unset;
+	.components-toggle-group-control {
+		min-height: $grid-unit-40;
+	}
+}
+
+h2.edit-site-global-styles-gradient-palette-panel__duotone-heading.components-heading {
+	text-transform: uppercase;
+	line-height: $grid-unit-30;
+	font-weight: 500;
+	font-size: 11px;
+	margin-bottom: $grid-unit-10;
+}

package/src/components/global-styles/test/use-global-styles-output.js

@@ -206,7 +206,7 @@ describe( 'global styles renderer', () => {
 				settings: {
 					color: {
 						palette: {
-							user: [
+							custom: [
 								{
 									name: 'White',
 									slug: 'white',

package/src/components/global-styles/test/utils.js

@@ -21,7 +21,7 @@ describe( 'editor utils', () => {
 							name: 'Secondary',
 						},
 					],
-					user: [
+					custom: [
 						{
 							slug: 'primary',
 							color: '#007cba',

package/src/components/global-styles/typography-panel.js

@@ -54,8 +54,10 @@ function useHasLetterSpacingControl( name ) {
 	);
 }
 
-export default function TypographyPanel( { name } ) {
+export default function TypographyPanel( { name, element } ) {
 	const supports = getSupportedGlobalStylesPanels( name );
+	const prefix =
+		element === 'text' || ! element ? '' : `elements.${ element }.`;
 	const [ fontSizes ] = useSetting( 'typography.fontSizes', name );
 	const disableCustomFontSizes = ! useSetting(
 		'typography.customFontSize',
@@ -73,30 +75,58 @@ export default function TypographyPanel( { name } ) {
 	const hasLetterSpacingControl = useHasLetterSpacingControl( name );
 
 	const [ fontFamily, setFontFamily ] = useStyle(
-		'typography.fontFamily',
+		prefix + 'typography.fontFamily',
+		name
+	);
+	const [ fontSize, setFontSize ] = useStyle(
+		prefix + 'typography.fontSize',
 		name
 	);
-	const [ fontSize, setFontSize ] = useStyle( 'typography.fontSize', name );
 
 	const [ fontStyle, setFontStyle ] = useStyle(
-		'typography.fontStyle',
+		prefix + 'typography.fontStyle',
 		name
 	);
 	const [ fontWeight, setFontWeight ] = useStyle(
-		'typography.fontWeight',
+		prefix + 'typography.fontWeight',
 		name
 	);
 	const [ lineHeight, setLineHeight ] = useStyle(
-		'typography.lineHeight',
+		prefix + 'typography.lineHeight',
 		name
 	);
 	const [ letterSpacing, setLetterSpacing ] = useStyle(
-		'typography.letterSpacing',
+		prefix + 'typography.letterSpacing',
 		name
 	);
+	const [ backgroundColor ] = useStyle( prefix + 'color.background', name );
+	const [ gradientValue ] = useStyle( prefix + 'color.gradient', name );
+	const [ color ] = useStyle( prefix + 'color.text', name );
+	const extraStyles =
+		element === 'link'
+			? {
+					textDecoration: 'underline',
+			  }
+			: {};
 
 	return (
 		<PanelBody className="edit-site-typography-panel" initialOpen={ true }>
+			<div
+				className="edit-site-typography-panel__preview"
+				style={ {
+					fontFamily: fontFamily ?? 'serif',
+					background: gradientValue ?? backgroundColor,
+					color,
+					fontSize,
+					fontStyle,
+					fontWeight,
+					letterSpacing,
+					...extraStyles,
+				} }
+			>
+				Aa
+			</div>
+
 			{ supports.includes( 'fontFamily' ) && (
 				<FontFamilyControl
 					fontFamilies={ fontFamilies }

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

@@ -14,6 +14,7 @@ import ScreenRoot from './screen-root';
 import ScreenBlockList from './screen-block-list';
 import ScreenBlock from './screen-block';
 import ScreenTypography from './screen-typography';
+import ScreenTypographyElement from './screen-typography-element';
 import ScreenColors from './screen-colors';
 import ScreenColorPalette from './screen-color-palette';
 import ScreenBackgroundColor from './screen-background-color';
@@ -30,6 +31,14 @@ function ContextScreens( { name } ) {
 				<ScreenTypography name={ name } />
 			</NavigatorScreen>
 
+			<NavigatorScreen path={ parentMenu + '/typography/text' }>
+				<ScreenTypographyElement name={ name } element="text" />
+			</NavigatorScreen>
+
+			<NavigatorScreen path={ parentMenu + '/typography/link' }>
+				<ScreenTypographyElement name={ name } element="link" />
+			</NavigatorScreen>
+
 			<NavigatorScreen path={ parentMenu + '/colors' }>
 				<ScreenColors name={ name } />
 			</NavigatorScreen>

package/src/components/global-styles/use-global-styles-output.js

@@ -60,7 +60,7 @@ function getPresetsDeclarations( blockPresets = {} ) {
 		PRESET_METADATA,
 		( declarations, { path, valueKey, cssVarInfix } ) => {
 			const presetByOrigin = get( blockPresets, path, [] );
-			[ 'default', 'theme', 'user' ].forEach( ( origin ) => {
+			[ 'default', 'theme', 'custom' ].forEach( ( origin ) => {
 				if ( presetByOrigin[ origin ] ) {
 					presetByOrigin[ origin ].forEach( ( value ) => {
 						declarations.push(
@@ -94,7 +94,7 @@ function getPresetsClasses( blockSelector, blockPresets = {} ) {
 			}
 
 			const presetByOrigin = get( blockPresets, path, [] );
-			[ 'default', 'theme', 'user' ].forEach( ( origin ) => {
+			[ 'default', 'theme', 'custom' ].forEach( ( origin ) => {
 				if ( presetByOrigin[ origin ] ) {
 					presetByOrigin[ origin ].forEach( ( { slug } ) => {
 						classes.forEach( ( { classSuffix, propertyName } ) => {

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

@@ -90,7 +90,7 @@ function findInPresetsBy(
 	for ( const presetByOrigin of orderedPresetsByOrigin ) {
 		if ( presetByOrigin ) {
 			// Preset origins ordered by priority.
-			const origins = [ 'user', 'theme', 'default' ];
+			const origins = [ 'custom', 'theme', 'default' ];
 			for ( const origin of origins ) {
 				const presets = presetByOrigin[ origin ];
 				if ( presets ) {