@wordpress/block-editor 12.19.5 → 12.21.0

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

@@ -52,20 +52,109 @@ describe( 'typography utils', () => {
 					size: '28px',
 					fluid: false,
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected: '28px',
 			},
 
+			{
+				message: 'should return value when fluid config is empty`',
+				preset: {
+					size: '28px',
+				},
+				settings: {
+					typography: {
+						fluid: {},
+					},
+				},
+				expected: '28px',
+			},
+
+			{
+				message:
+					'should return  clamp value with `minViewportWidth` override',
+				preset: {
+					size: '28px',
+				},
+				settings: {
+					typography: {
+						fluid: {
+							minViewportWidth: '500px',
+						},
+					},
+				},
+				expected:
+					'clamp(17.905px, 1.119rem + ((1vw - 5px) * 0.918), 28px)',
+			},
+
+			{
+				message:
+					'should return  clamp value with `maxViewportWidth` override',
+				preset: {
+					size: '28px',
+				},
+				settings: {
+					typography: {
+						fluid: {
+							maxViewportWidth: '500px',
+						},
+					},
+				},
+				expected:
+					'clamp(17.905px, 1.119rem + ((1vw - 3.2px) * 5.608), 28px)',
+			},
+
+			{
+				message:
+					'should return clamp value with `layout.wideSize` override',
+				preset: {
+					size: '28px',
+				},
+				settings: {
+					typography: {
+						fluid: true,
+					},
+					layout: {
+						wideSize: '500px',
+					},
+				},
+				expected:
+					'clamp(17.905px, 1.119rem + ((1vw - 3.2px) * 5.608), 28px)',
+			},
+
+			{
+				message:
+					'should return clamp value with `maxViewportWidth` preferred over fallback `layout.wideSize` value',
+				preset: {
+					size: '28px',
+				},
+				settings: {
+					typography: {
+						fluid: {
+							maxViewportWidth: '1000px',
+						},
+					},
+					layout: {
+						wideSize: '500px',
+					},
+				},
+				expected:
+					'clamp(17.905px, 1.119rem + ((1vw - 3.2px) * 1.485), 28px)',
+			},
+
 			{
 				message: 'should return already clamped value',
 				preset: {
 					size: 'clamp(21px, 1.313rem + ((1vw - 7.68px) * 2.524), 42px)',
 					fluid: false,
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(21px, 1.313rem + ((1vw - 7.68px) * 2.524), 42px)',
@@ -77,8 +166,10 @@ describe( 'typography utils', () => {
 					size: '1000%',
 					fluid: false,
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected: '1000%',
 			},
@@ -88,8 +179,10 @@ describe( 'typography utils', () => {
 				preset: {
 					size: '1.75rem',
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(1.119rem, 1.119rem + ((1vw - 0.2rem) * 0.789), 1.75rem)',
@@ -101,9 +194,11 @@ describe( 'typography utils', () => {
 				preset: {
 					size: '1.75rem',
 				},
-				typographySettings: {
-					fluid: {
-						maxViewportWidth: '1200px',
+				settings: {
+					typography: {
+						fluid: {
+							maxViewportWidth: '1200px',
+						},
 					},
 				},
 				expected:
@@ -116,9 +211,11 @@ describe( 'typography utils', () => {
 				preset: {
 					size: '1.75rem',
 				},
-				typographySettings: {
-					fluid: {
-						minViewportWidth: '800px',
+				settings: {
+					typography: {
+						fluid: {
+							minViewportWidth: '800px',
+						},
 					},
 				},
 				expected:
@@ -130,8 +227,10 @@ describe( 'typography utils', () => {
 				preset: {
 					size: '1.75em',
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(1.119em, 1.119rem + ((1vw - 0.2em) * 0.789), 1.75em)',
@@ -142,8 +241,10 @@ describe( 'typography utils', () => {
 				preset: {
 					size: '70.175px',
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(37.897px, 2.369rem + ((1vw - 3.2px) * 2.522), 70.175px)',
@@ -156,8 +257,10 @@ describe( 'typography utils', () => {
 					size: 33,
 					fluid: true,
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(20.515px, 1.282rem + ((1vw - 3.2px) * 0.975), 33px)',
@@ -169,8 +272,10 @@ describe( 'typography utils', () => {
 					size: 70.175,
 					fluid: true,
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(37.897px, 2.369rem + ((1vw - 3.2px) * 2.522), 70.175px)',
@@ -183,8 +288,10 @@ describe( 'typography utils', () => {
 					size: '28px',
 					fluid: [],
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(17.905px, 1.119rem + ((1vw - 3.2px) * 0.789), 28px)',
@@ -196,8 +303,10 @@ describe( 'typography utils', () => {
 					size: '28px',
 					fluid: null,
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(17.905px, 1.119rem + ((1vw - 3.2px) * 0.789), 28px)',
@@ -213,8 +322,10 @@ describe( 'typography utils', () => {
 						max: '125px',
 					},
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(70px, 4.375rem + ((1vw - 3.2px) * 4.297), 125px)',
@@ -230,9 +341,11 @@ describe( 'typography utils', () => {
 						max: '125px',
 					},
 				},
-				typographySettings: {
-					fluid: {
-						maxViewportWidth: '1100px',
+				settings: {
+					typography: {
+						fluid: {
+							maxViewportWidth: '1100px',
+						},
 					},
 				},
 				expected:
@@ -248,8 +361,10 @@ describe( 'typography utils', () => {
 						max: '7.8125rem',
 					},
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(4.375rem, 4.375rem + ((1vw - 0.2rem) * 4.298), 7.8125rem)',
@@ -265,8 +380,10 @@ describe( 'typography utils', () => {
 						max: '32px',
 					},
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected: 'clamp(5rem, 5rem + ((1vw - 0.2rem) * -3.75), 32px)',
 			},
@@ -280,8 +397,10 @@ describe( 'typography utils', () => {
 						max: '50%',
 					},
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected: '10em',
 			},
@@ -292,8 +411,10 @@ describe( 'typography utils', () => {
 				preset: {
 					size: '3px',
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected: '3px',
 			},
@@ -304,8 +425,10 @@ describe( 'typography utils', () => {
 				preset: {
 					size: '14px',
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected: '14px',
 			},
@@ -320,8 +443,10 @@ describe( 'typography utils', () => {
 						max: '50rem',
 					},
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(20px, 1.25rem + ((1vw - 3.2px) * 60.938), 50rem)',
@@ -336,8 +461,10 @@ describe( 'typography utils', () => {
 						min: '2.6rem',
 					},
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(2.6rem, 2.6rem + ((1vw - 0.2rem) * 0.656), 50px)',
@@ -352,8 +479,10 @@ describe( 'typography utils', () => {
 						max: '80px',
 					},
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(17.905px, 1.119rem + ((1vw - 3.2px) * 4.851), 80px)',
@@ -369,8 +498,10 @@ describe( 'typography utils', () => {
 						max: '5rem',
 					},
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(0.5rem, 0.5rem + ((1vw - 0.2rem) * 5.625), 5rem)',
@@ -385,8 +516,10 @@ describe( 'typography utils', () => {
 						min: '12px',
 					},
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(12px, 0.75rem + ((1vw - 3.2px) * 0.625), 20px)',
@@ -401,13 +534,14 @@ describe( 'typography utils', () => {
 						max: '20rem',
 					},
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(0.875rem, 0.875rem + ((1vw - 0.2rem) * 23.906), 20rem)',
 			},
-
 			{
 				message:
 					'should return clamp value when min and max font sizes are equal',
@@ -418,8 +552,10 @@ describe( 'typography utils', () => {
 						max: '30px',
 					},
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected: 'clamp(30px, 1.875rem + ((1vw - 3.2px) * 1), 30px)',
 			},
@@ -430,9 +566,11 @@ describe( 'typography utils', () => {
 				preset: {
 					size: '15px',
 				},
-				typographySettings: {
-					fluid: {
-						minFontSize: '16%',
+				settings: {
+					typography: {
+						fluid: {
+							minFontSize: '16%',
+						},
 					},
 				},
 				expected:
@@ -445,9 +583,11 @@ describe( 'typography utils', () => {
 				preset: {
 					size: '17px',
 				},
-				typographySettings: {
-					fluid: {
-						minFontSize: '16px',
+				settings: {
+					typography: {
+						fluid: {
+							minFontSize: '16px',
+						},
 					},
 				},
 				expected: 'clamp(16px, 1rem + ((1vw - 3.2px) * 0.078), 17px)',
@@ -459,9 +599,11 @@ describe( 'typography utils', () => {
 				preset: {
 					size: '15px',
 				},
-				typographySettings: {
-					fluid: {
-						minFontSize: '16px',
+				settings: {
+					typography: {
+						fluid: {
+							minFontSize: '16px',
+						},
 					},
 				},
 				expected: '15px',
@@ -473,8 +615,10 @@ describe( 'typography utils', () => {
 				preset: {
 					size: '12rem',
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(5.174rem, 5.174rem + ((1vw - 0.2rem) * 8.533), 12rem)',
@@ -486,8 +630,10 @@ describe( 'typography utils', () => {
 				preset: {
 					size: '200px',
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(85.342px, 5.334rem + ((1vw - 3.2px) * 8.958), 200px)',
@@ -502,8 +648,10 @@ describe( 'typography utils', () => {
 						min: '100px',
 					},
 				},
-				typographySettings: {
-					fluid: true,
+				settings: {
+					typography: {
+						fluid: true,
+					},
 				},
 				expected:
 					'clamp(100px, 6.25rem + ((1vw - 3.2px) * 7.813), 200px)',
@@ -514,20 +662,22 @@ describe( 'typography utils', () => {
 				preset: {
 					size: '17px',
 				},
-				typographySettings: {
-					fluid: {
-						minFontSize: '16px',
-						maxViewportWidth: '1200px',
-						minViewportWidth: '640px',
+				settings: {
+					typography: {
+						fluid: {
+							minFontSize: '16px',
+							maxViewportWidth: '1200px',
+							minViewportWidth: '640px',
+						},
 					},
 				},
 				expected: 'clamp(16px, 1rem + ((1vw - 6.4px) * 0.179), 17px)',
 			},
-		].forEach( ( { message, preset, typographySettings, expected } ) => {
+		].forEach( ( { message, preset, settings, expected } ) => {
 			it( `${ message }`, () => {
-				expect(
-					getTypographyFontSizeValue( preset, typographySettings )
-				).toBe( expected );
+				expect( getTypographyFontSizeValue( preset, settings ) ).toBe(
+					expected
+				);
 			} );
 		} );
 	} );
@@ -587,7 +737,7 @@ describe( 'typography utils', () => {
 
 			{
 				message:
-					'should return fluid settings with merged `layout.wideSize`d',
+					'should return fluid settings with merged `layout.wideSize`',
 				settings: {
 					typography: { fluid: { minFontSize: '16px' } },
 					layout: { wideSize: '1000rem' },

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

@@ -169,7 +169,8 @@ describe( 'global styles renderer', () => {
 							},
 						},
 					},
-					selector: '.my-heading1 a, .my-heading2 a',
+					selector:
+						'.my-heading1 a:where(:not(.wp-element-button)), .my-heading2 a:where(:not(.wp-element-button))',
 				},
 				{
 					styles: {
@@ -480,7 +481,7 @@ describe( 'global styles renderer', () => {
 
 			expect( toStyles( tree, blockSelectors ) ).toEqual(
 				'body {margin: 0;}body .is-layout-flow > .alignleft { float: left; margin-inline-start: 0; margin-inline-end: 2em; }body .is-layout-flow > .alignright { float: right; margin-inline-start: 2em; margin-inline-end: 0; }body .is-layout-flow > .aligncenter { margin-left: auto !important; margin-right: auto !important; }body .is-layout-constrained > .alignleft { float: left; margin-inline-start: 0; margin-inline-end: 2em; }body .is-layout-constrained > .alignright { float: right; margin-inline-start: 2em; margin-inline-end: 0; }body .is-layout-constrained > .aligncenter { margin-left: auto !important; margin-right: auto !important; }body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)) { max-width: var(--wp--style--global--content-size); margin-left: auto !important; margin-right: auto !important; }body .is-layout-constrained > .alignwide { max-width: var(--wp--style--global--wide-size); }body .is-layout-flex { display:flex; }body .is-layout-flex { flex-wrap: wrap; align-items: center; }body .is-layout-flex > * { margin: 0; }body .is-layout-grid { display:grid; }body .is-layout-grid > * { margin: 0; }' +
-					'body{background-color: red;margin: 10px;padding: 10px;}a{color: blue;}a:hover{color: orange;}a:focus{color: orange;}h1{font-size: 42px;}.wp-block-group{margin-top: 10px;margin-right: 20px;margin-bottom: 30px;margin-left: 40px;padding-top: 11px;padding-right: 22px;padding-bottom: 33px;padding-left: 44px;}h1,h2,h3,h4,h5,h6{color: orange;}h1 a,h2 a,h3 a,h4 a,h5 a,h6 a{color: hotpink;}h1 a:hover,h2 a:hover,h3 a:hover,h4 a:hover,h5 a:hover,h6 a:hover{color: red;}h1 a:focus,h2 a:focus,h3 a:focus,h4 a:focus,h5 a:focus,h6 a:focus{color: red;}' +
+					'body{background-color: red;margin: 10px;padding: 10px;}a:where(:not(.wp-element-button)){color: blue;}a:where(:not(.wp-element-button)):hover{color: orange;}a:where(:not(.wp-element-button)):focus{color: orange;}h1{font-size: 42px;}.wp-block-group{margin-top: 10px;margin-right: 20px;margin-bottom: 30px;margin-left: 40px;padding-top: 11px;padding-right: 22px;padding-bottom: 33px;padding-left: 44px;}h1,h2,h3,h4,h5,h6{color: orange;}h1 a:where(:not(.wp-element-button)),h2 a:where(:not(.wp-element-button)),h3 a:where(:not(.wp-element-button)),h4 a:where(:not(.wp-element-button)),h5 a:where(:not(.wp-element-button)),h6 a:where(:not(.wp-element-button)){color: hotpink;}h1 a:where(:not(.wp-element-button)):hover,h2 a:where(:not(.wp-element-button)):hover,h3 a:where(:not(.wp-element-button)):hover,h4 a:where(:not(.wp-element-button)):hover,h5 a:where(:not(.wp-element-button)):hover,h6 a:where(:not(.wp-element-button)):hover{color: red;}h1 a:where(:not(.wp-element-button)):focus,h2 a:where(:not(.wp-element-button)):focus,h3 a:where(:not(.wp-element-button)):focus,h4 a:where(:not(.wp-element-button)):focus,h5 a:where(:not(.wp-element-button)):focus,h6 a:where(:not(.wp-element-button)):focus{color: red;}' +
 					'.wp-block-image img, .wp-block-image .wp-crop-area{border-radius: 9999px;}.wp-block-image{color: red;}.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }' +
 					'.has-white-color{color: var(--wp--preset--color--white) !important;}.has-white-background-color{background-color: var(--wp--preset--color--white) !important;}.has-white-border-color{border-color: var(--wp--preset--color--white) !important;}.has-black-color{color: var(--wp--preset--color--black) !important;}.has-black-background-color{background-color: var(--wp--preset--color--black) !important;}.has-black-border-color{border-color: var(--wp--preset--color--black) !important;}h1.has-blue-color,h2.has-blue-color,h3.has-blue-color,h4.has-blue-color,h5.has-blue-color,h6.has-blue-color{color: var(--wp--preset--color--blue) !important;}h1.has-blue-background-color,h2.has-blue-background-color,h3.has-blue-background-color,h4.has-blue-background-color,h5.has-blue-background-color,h6.has-blue-background-color{background-color: var(--wp--preset--color--blue) !important;}h1.has-blue-border-color,h2.has-blue-border-color,h3.has-blue-border-color,h4.has-blue-border-color,h5.has-blue-border-color,h6.has-blue-border-color{border-color: var(--wp--preset--color--blue) !important;}'
 			);

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

@@ -40,15 +40,16 @@ import {
  * Takes into account fluid typography parameters and attempts to return a css formula depending on available, valid values.
  *
  * @param {Preset}                     preset
- * @param {Object}                     typographyOptions
- * @param {boolean|TypographySettings} typographyOptions.fluid Whether fluid typography is enabled, and, optionally, fluid font size options.
+ * @param {Object}                     settings
+ * @param {boolean|TypographySettings} settings.typography.fluid  Whether fluid typography is enabled, and, optionally, fluid font size options.
+ * @param {Object?}                    settings.typography.layout Layout options.
  *
  * @return {string|*} A font-size value or the value of preset.size.
  */
-export function getTypographyFontSizeValue( preset, typographyOptions ) {
+export function getTypographyFontSizeValue( preset, settings ) {
 	const { size: defaultSize } = preset;
 
-	if ( ! isFluidTypographyEnabled( typographyOptions ) ) {
+	if ( ! isFluidTypographyEnabled( settings?.typography ) ) {
 		return defaultSize;
 	}
 	/*
@@ -60,9 +61,11 @@ export function getTypographyFontSizeValue( preset, typographyOptions ) {
 		return defaultSize;
 	}
 
-	const fluidTypographySettings =
-		typeof typographyOptions?.fluid === 'object'
-			? typographyOptions?.fluid
+	let fluidTypographySettings =
+		getFluidTypographyOptionsFromSettings( settings );
+	fluidTypographySettings =
+		typeof fluidTypographySettings?.fluid === 'object'
+			? fluidTypographySettings?.fluid
 			: {};
 
 	const fluidFontSizeValue = getComputedFluidTypographyValue( {