@wordpress/edit-site 4.14.11 → 4.14.12

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-site",
-	"version": "4.14.11",
+	"version": "4.14.12",
 	"description": "Edit Site Page module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -29,15 +29,15 @@
 		"@babel/runtime": "^7.16.0",
 		"@wordpress/a11y": "^3.17.1",
 		"@wordpress/api-fetch": "^6.14.1",
-		"@wordpress/block-editor": "^10.0.8",
-		"@wordpress/block-library": "^7.14.9",
+		"@wordpress/block-editor": "^10.0.9",
+		"@wordpress/block-library": "^7.14.10",
 		"@wordpress/blocks": "^11.16.4",
 		"@wordpress/components": "^21.0.6",
 		"@wordpress/compose": "^5.15.2",
 		"@wordpress/core-data": "^5.0.4",
 		"@wordpress/data": "^7.1.3",
 		"@wordpress/deprecated": "^3.17.1",
-		"@wordpress/editor": "^12.16.8",
+		"@wordpress/editor": "^12.16.9",
 		"@wordpress/element": "^4.15.1",
 		"@wordpress/hooks": "^3.17.1",
 		"@wordpress/html-entities": "^3.17.1",
@@ -50,7 +50,7 @@
 		"@wordpress/notices": "^3.17.3",
 		"@wordpress/plugins": "^4.15.2",
 		"@wordpress/preferences": "^2.9.6",
-		"@wordpress/reusable-blocks": "^3.15.8",
+		"@wordpress/reusable-blocks": "^3.15.9",
 		"@wordpress/style-engine": "^1.0.3",
 		"@wordpress/url": "^3.18.1",
 		"@wordpress/viewport": "^4.15.3",
@@ -68,5 +68,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "21ef2792a2c3889830aee525f0136657a570c265"
+	"gitHead": "ca07aa8354a1131dbabcc36dfcaf70e0c0891f54"
 }

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

@@ -5,352 +5,206 @@ import { getTypographyFontSizeValue } from '../typography-utils';
 
 describe( 'typography utils', () => {
 	describe( 'getTypographyFontSizeValue', () => {
-		[
-			{
-				message: 'Default return non-fluid value.',
-				preset: {
-					size: '28px',
-				},
-				typographySettings: undefined,
-				expected: '28px',
-			},
-
-			{
-				message: 'Default return value where font size is 0.',
-				preset: {
-					size: 0,
-				},
-				typographySettings: undefined,
-				expected: 0,
-			},
-
-			{
-				message: "Default return value where font size is '0'.",
-				preset: {
-					size: '0',
-				},
-				typographySettings: undefined,
-				expected: '0',
-			},
-
-			{
-				message:
-					'Default return non-fluid value where `size` is undefined.',
-				preset: {
-					size: undefined,
-				},
-				typographySettings: undefined,
-				expected: undefined,
-			},
-
-			{
-				message: 'return non-fluid value when fluid is `false`.',
-				preset: {
-					size: '28px',
-					fluid: false,
-				},
-				typographySettings: {
-					fluid: true,
-				},
-				expected: '28px',
-			},
-
-			{
-				message:
-					'Should coerce integer to `px` and return fluid value.',
-				preset: {
-					size: 33,
-					fluid: true,
-				},
-				typographySettings: {
-					fluid: true,
-				},
-				expected:
-					'clamp(24.75px, 1.547rem + ((1vw - 7.68px) * 2.975), 49.5px)',
-			},
-
-			{
-				message: 'coerce float to `px` and return fluid value.',
-				preset: {
-					size: 100.23,
-					fluid: true,
-				},
-				typographySettings: {
-					fluid: true,
-				},
-				expected:
-					'clamp(75.173px, 4.698rem + ((1vw - 7.68px) * 9.035), 150.345px)',
-			},
-
-			{
-				message: 'return incoming value when already clamped.',
-				preset: {
-					size: 'clamp(21px, 1.313rem + ((1vw - 7.68px) * 2.524), 42px)',
-					fluid: false,
-				},
-				typographySettings: {
-					fluid: true,
-				},
-				expected:
-					'clamp(21px, 1.313rem + ((1vw - 7.68px) * 2.524), 42px)',
-			},
-
-			{
-				message: 'return incoming value with unsupported unit.',
-				preset: {
-					size: '1000%',
-					fluid: false,
-				},
-				typographySettings: {
-					fluid: true,
-				},
-				expected: '1000%',
-			},
-
-			{
-				message: 'return fluid value.',
-				preset: {
-					size: '1.75rem',
-				},
-				typographySettings: {
-					fluid: true,
-				},
-				expected:
-					'clamp(1.313rem, 1.313rem + ((1vw - 0.48rem) * 2.523), 2.625rem)',
-			},
-
-			{
-				message: 'return fluid value for floats with units.',
-				preset: {
-					size: '100.175px',
-				},
-				typographySettings: {
-					fluid: true,
-				},
-				expected:
-					'clamp(75.131px, 4.696rem + ((1vw - 7.68px) * 9.03), 150.263px)',
-			},
-
-			{
-				message:
-					'Should return default fluid values with empty fluid array.',
-				preset: {
-					size: '28px',
-					fluid: [],
-				},
-				typographySettings: {
-					fluid: true,
-				},
-				expected:
-					'clamp(21px, 1.313rem + ((1vw - 7.68px) * 2.524), 42px)',
-			},
-
-			{
-				message: 'return default fluid values with null value.',
-				preset: {
-					size: '28px',
-					fluid: null,
-				},
-				typographySettings: {
-					fluid: true,
-				},
-				expected:
-					'clamp(21px, 1.313rem + ((1vw - 7.68px) * 2.524), 42px)',
-			},
-
-			{
-				message:
-					'return clamped value if min font size is greater than max.',
-				preset: {
-					size: '3rem',
-					fluid: {
-						min: '5rem',
-						max: '32px',
+		it( 'should return the expected values', () => {
+			[
+				// Default return non-fluid value.
+				{
+					preset: {
+						size: '28px',
 					},
+					typographySettings: undefined,
+					expected: '28px',
 				},
-				typographySettings: {
-					fluid: true,
-				},
-				expected:
-					'clamp(5rem, 5rem + ((1vw - 0.48rem) * -5.769), 32px)',
-			},
-
-			{
-				message: 'return size with invalid fluid units.',
-				preset: {
-					size: '10em',
-					fluid: {
-						min: '20vw',
-						max: '50%',
+				// Default return value where font size is 0.
+				{
+					preset: {
+						size: 0,
 					},
+					typographySettings: undefined,
+					expected: 0,
 				},
-				typographySettings: {
-					fluid: true,
-				},
-				expected: '10em',
-			},
-
-			{
-				message:
-					'return clamped using font size where no min is given and size is less than default min size.',
-				preset: {
-					size: '3px',
-				},
-				typographySettings: {
-					fluid: true,
+				// Default return value where font size is '0'.
+				{
+					preset: {
+						size: '0',
+					},
+					typographySettings: undefined,
+					expected: '0',
 				},
-				expected:
-					'clamp(3px, 0.188rem + ((1vw - 7.68px) * 0.18), 4.5px)',
-			},
 
-			{
-				message:
-					'return fluid clamp value with different min max units.',
-				preset: {
-					size: '28px',
-					fluid: {
-						min: '20px',
-						max: '50rem',
+				// Default return non-fluid value where `size` is undefined.
+				{
+					preset: {
+						size: undefined,
 					},
-				},
-				typographySettings: {
-					fluid: true,
-				},
-				expected:
-					'clamp(20px, 1.25rem + ((1vw - 7.68px) * 93.75), 50rem)',
-			},
-			//
-			{
-				message:
-					' Should return clamp value with default fluid max value.',
-				preset: {
-					size: '28px',
-					fluid: {
-						min: '2.6rem',
+					typographySettings: undefined,
+					expected: undefined,
+				},
+				// Should return non-fluid value when fluid is `false`.
+				{
+					preset: {
+						size: '28px',
+						fluid: false,
 					},
-				},
-				typographySettings: {
-					fluid: true,
-				},
-				expected:
-					'clamp(2.6rem, 2.6rem + ((1vw - 0.48rem) * 0.048), 42px)',
-			},
-
-			{
-				message:
-					'Should return clamp value with default fluid min value.',
-				preset: {
-					size: '28px',
-					fluid: {
-						max: '80px',
+					typographySettings: {
+						fluid: true,
 					},
+					expected: '28px',
 				},
-				typographySettings: {
-					fluid: true,
-				},
-				expected:
-					'clamp(21px, 1.313rem + ((1vw - 7.68px) * 7.091), 80px)',
-			},
-
-			{
-				message: 'adjust computed min in px to min limit.',
-				preset: {
-					size: '14px',
-				},
-				typographySettings: {
-					fluid: true,
-				},
-				expected:
-					'clamp(14px, 0.875rem + ((1vw - 7.68px) * 0.841), 21px)',
-			},
-
-			{
-				message: 'adjust computed min in rem to min limit.',
-				preset: {
-					size: '1.1rem',
-				},
-				typographySettings: {
-					fluid: true,
-				},
-				expected:
-					'clamp(0.875rem, 0.875rem + ((1vw - 0.48rem) * 1.49), 1.65rem)',
-			},
-
-			{
-				message: 'adjust computed min in em to min limit.',
-				preset: {
-					size: '1.1em',
-				},
-				typographySettings: {
-					fluid: true,
-				},
-				expected:
-					'clamp(0.875em, 0.875rem + ((1vw - 0.48em) * 1.49), 1.65em)',
-			},
-
-			{
-				message: 'adjust fluid min value in px to min limit',
-				preset: {
-					size: '20px',
-					fluid: {
-						min: '12px',
+				// Should coerce integer to `px` and return fluid value.
+				{
+					preset: {
+						size: 33,
+						fluid: true,
 					},
+					typographySettings: {
+						fluid: true,
+					},
+					expected:
+						'clamp(24.75px, 1.546875rem + ((1vw - 7.68px) * 2.975), 49.5px)',
 				},
-				typographySettings: {
-					fluid: true,
-				},
-				expected:
-					'clamp(14px, 0.875rem + ((1vw - 7.68px) * 1.923), 30px)',
-			},
 
-			{
-				message: 'adjust fluid min value in rem to min limit.',
-				preset: {
-					size: '1.5rem',
-					fluid: {
-						min: '0.5rem',
+				// Should coerce float to `px` and return fluid value.
+				{
+					preset: {
+						size: 100.23,
+						fluid: true,
 					},
+					typographySettings: {
+						fluid: true,
+					},
+					expected:
+						'clamp(75.1725px, 4.69828125rem + ((1vw - 7.68px) * 9.035), 150.345px)',
+				},
+				// Should return incoming value when already clamped.
+				{
+					preset: {
+						size: 'clamp(21px, 1.3125rem + ((1vw - 7.68px) * 2.524), 42px)',
+						fluid: false,
+					},
+					typographySettings: {
+						fluid: true,
+					},
+					expected:
+						'clamp(21px, 1.3125rem + ((1vw - 7.68px) * 2.524), 42px)',
+				},
+				// Should return incoming value with unsupported unit.
+				{
+					preset: {
+						size: '1000%',
+						fluid: false,
+					},
+					typographySettings: {
+						fluid: true,
+					},
+					expected: '1000%',
 				},
-				typographySettings: {
-					fluid: true,
-				},
-				expected:
-					'clamp(0.875rem, 0.875rem + ((1vw - 0.48rem) * 2.644), 2.25rem)',
-			},
-
-			{
-				message: 'adjust fluid min value but honor max value.',
-				preset: {
-					size: '1.5rem',
-					fluid: {
-						min: '0.5rem',
-						max: '5rem',
+				// Should return fluid value.
+				{
+					preset: {
+						size: '1.75rem',
 					},
+					typographySettings: {
+						fluid: true,
+					},
+					expected:
+						'clamp(1.3125rem, 1.3125rem + ((1vw - 0.48rem) * 2.524), 2.625rem)',
 				},
-				typographySettings: {
-					fluid: true,
+				// Should return fluid value for floats with units.
+				{
+					preset: {
+						size: '100.175px',
+					},
+					typographySettings: {
+						fluid: true,
+					},
+					expected:
+						'clamp(75.13125px, 4.695703125rem + ((1vw - 7.68px) * 9.03), 150.2625px)',
+				},
+				// Should return default fluid values with empty fluid array.
+				{
+					preset: {
+						size: '28px',
+						fluid: [],
+					},
+					typographySettings: {
+						fluid: true,
+					},
+					expected:
+						'clamp(21px, 1.3125rem + ((1vw - 7.68px) * 2.524), 42px)',
 				},
-				expected:
-					'clamp(0.875rem, 0.875rem + ((1vw - 0.48rem) * 7.933), 5rem)',
-			},
 
-			{
-				message:
-					'return a fluid font size a min and max font sizes are equal.',
-				preset: {
-					size: '4rem',
-					fluid: {
-						min: '30px',
-						max: '30px',
+				// Should return default fluid values with null values.
+				{
+					preset: {
+						size: '28px',
+						fluid: null,
 					},
+					typographySettings: {
+						fluid: true,
+					},
+					expected:
+						'clamp(21px, 1.3125rem + ((1vw - 7.68px) * 2.524), 42px)',
+				},
+
+				// Should return size with invalid fluid units.
+				{
+					preset: {
+						size: '10em',
+						fluid: {
+							min: '20vw',
+							max: '50%',
+						},
+					},
+					typographySettings: {
+						fluid: true,
+					},
+					expected: '10em',
+				},
+				// Should return fluid clamp value.
+				{
+					preset: {
+						size: '28px',
+						fluid: {
+							min: '20px',
+							max: '50rem',
+						},
+					},
+					typographySettings: {
+						fluid: true,
+					},
+					expected:
+						'clamp(20px, 1.25rem + ((1vw - 7.68px) * 93.75), 50rem)',
+				},
+				// Should return clamp value with default fluid max value.
+				{
+					preset: {
+						size: '28px',
+						fluid: {
+							min: '2.6rem',
+						},
+					},
+					typographySettings: {
+						fluid: true,
+					},
+					expected:
+						'clamp(2.6rem, 2.6rem + ((1vw - 0.48rem) * 0.048), 42px)',
+				},
+				// Should return clamp value with default fluid min value.
+				{
+					preset: {
+						size: '28px',
+						fluid: {
+							max: '80px',
+						},
+					},
+					typographySettings: {
+						fluid: true,
+					},
+					expected:
+						'clamp(21px, 1.3125rem + ((1vw - 7.68px) * 7.091), 80px)',
 				},
-				typographySettings: {
-					fluid: true,
-				},
-				expected: 'clamp(30px, 1.875rem + ((1vw - 7.68px) * 1), 30px)',
-			},
-		].forEach( ( { message, preset, typographySettings, expected } ) => {
-			it( `should ${ message }`, () => {
+			].forEach( ( { preset, typographySettings, expected } ) => {
 				expect(
 					getTypographyFontSizeValue( preset, typographySettings )
 				).toBe( expected );

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

@@ -782,7 +782,7 @@ describe( 'global styles renderer', () => {
 				'padding-bottom: 33px',
 				'padding-left: 33px',
 				'font-family: sans-serif',
-				'font-size: clamp(14px, 0.875rem + ((1vw - 7.68px) * 0.841), 21px)',
+				'font-size: clamp(10.5px, 0.65625rem + ((1vw - 7.68px) * 1.262), 21px)',
 			] );
 		} );