@wordpress/block-editor 12.11.1 → 12.12.0

package/src/store/actions.js

@@ -13,6 +13,7 @@ import {
 	switchToBlockType,
 	synchronizeBlocksWithTemplate,
 	getBlockSupport,
+	isUnmodifiedDefaultBlock,
 } from '@wordpress/blocks';
 import { speak } from '@wordpress/a11y';
 import { __, _n, sprintf } from '@wordpress/i18n';
@@ -1013,17 +1014,12 @@ export const mergeBlocks =
 
 		if ( ! blockAType ) return;
 
+		const blockB = select.getBlock( clientIdB );
+
 		if (
 			! blockAType.merge &&
-			! getBlockSupport( blockA.name, '__experimentalOnMerge' )
+			getBlockSupport( blockA.name, '__experimentalOnMerge' )
 		) {
-			dispatch.selectBlock( blockA.clientId );
-			return;
-		}
-
-		const blockB = select.getBlock( clientIdB );
-
-		if ( ! blockAType.merge ) {
 			// If there's no merge function defined, attempt merging inner
 			// blocks.
 			const blocksWithTheSameType = switchToBlockType(
@@ -1090,6 +1086,27 @@ export const mergeBlocks =
 			return;
 		}
 
+		if ( isUnmodifiedDefaultBlock( blockA ) ) {
+			dispatch.removeBlock(
+				clientIdA,
+				select.isBlockSelected( clientIdA )
+			);
+			return;
+		}
+
+		if ( isUnmodifiedDefaultBlock( blockB ) ) {
+			dispatch.removeBlock(
+				clientIdB,
+				select.isBlockSelected( clientIdB )
+			);
+			return;
+		}
+
+		if ( ! blockAType.merge ) {
+			dispatch.selectBlock( blockA.clientId );
+			return;
+		}
+
 		const blockBType = getBlockType( blockB.name );
 		const { clientId, attributeKey, offset } = select.getSelectionStart();
 		const selectedBlockType =

package/src/utils/parse-css-unit-to-px.js

@@ -211,6 +211,26 @@ function convertParsedUnitToPx( parsedUnit, options ) {
 		ex: 7.15625, // X-height of the element's font. Approximate.
 		lh: setOptions.lineHeight,
 	};
+	relativeUnits.svw = relativeUnits.vmin;
+	relativeUnits.lvw = relativeUnits.vmax;
+	relativeUnits.dvw = relativeUnits.vw;
+	relativeUnits.svh = relativeUnits.vmin;
+	relativeUnits.lvh = relativeUnits.vmax;
+	relativeUnits.dvh = relativeUnits.vh;
+	relativeUnits.vi = relativeUnits.vh;
+	relativeUnits.svi = relativeUnits.vmin;
+	relativeUnits.lvi = relativeUnits.vmax;
+	relativeUnits.dvi = relativeUnits.vw;
+	relativeUnits.vb = relativeUnits.vh;
+	relativeUnits.svb = relativeUnits.vmin;
+	relativeUnits.lvb = relativeUnits.vmax;
+	relativeUnits.dvb = relativeUnits.vh;
+	relativeUnits.svmin = relativeUnits.vmin;
+	relativeUnits.lvmin = relativeUnits.vmin;
+	relativeUnits.dvmin = relativeUnits.vmin;
+	relativeUnits.svmax = relativeUnits.vmax;
+	relativeUnits.lvmax = relativeUnits.vmax;
+	relativeUnits.dvmax = relativeUnits.vmax;
 
 	const absoluteUnits = {
 		in: PIXELS_PER_INCH,

package/src/utils/pasting.js

@@ -77,10 +77,7 @@ export function getPasteEventData( { clipboardData } ) {
 
 	const files = getFilesFromDataTransfer( clipboardData );
 
-	if (
-		files.length &&
-		! shouldDismissPastedFiles( files, html, plainText )
-	) {
+	if ( files.length && ! shouldDismissPastedFiles( files, html ) ) {
 		return { files };
 	}
 

package/src/utils/test/pasting.js

@@ -11,20 +11,19 @@ const mocks = {
 
 describe( 'shouldDismissPastedFiles', () => {
 	it( 'should return false when no HTML is present', () => {
-		expect(
-			shouldDismissPastedFiles( [ mocks.pngImageFile ], '', '' )
-		).toBe( false );
+		expect( shouldDismissPastedFiles( [ mocks.pngImageFile ], '' ) ).toBe(
+			false
+		);
 	} );
 	it( 'should return false when file is not an image', () => {
-		expect(
-			shouldDismissPastedFiles( [ mocks.documentFile ], '', '' )
-		).toBe( false );
+		expect( shouldDismissPastedFiles( [ mocks.documentFile ], '' ) ).toBe(
+			false
+		);
 	} );
 	it( 'should return false when multiple images are present', () => {
 		expect(
 			shouldDismissPastedFiles(
 				[ mocks.pngImageFile, mocks.jpgImageFile ],
-				'',
 				''
 			)
 		).toBe( false );
@@ -33,8 +32,7 @@ describe( 'shouldDismissPastedFiles', () => {
 		expect(
 			shouldDismissPastedFiles(
 				[ mocks.pngImageFile ],
-				'<img src="path.png">',
-				''
+				'<img src="path.png">'
 			)
 		).toBe( false );
 	} );
@@ -42,8 +40,7 @@ describe( 'shouldDismissPastedFiles', () => {
 		expect(
 			shouldDismissPastedFiles(
 				[ mocks.pngImageFile ],
-				'<img src="1.png"><br><img src="2.png">',
-				''
+				'<img src="1.png"><br><img src="2.png">'
 			)
 		).toBe( true );
 	} );
@@ -56,8 +53,7 @@ describe( 'shouldDismissPastedFiles', () => {
 		expect(
 			shouldDismissPastedFiles(
 				[ mocks.pngImageFile ],
-				'<img src="https://lh3.googleusercontent.com/ab/SOMESTRING?authuser=0">',
-				'https://lh3.googleusercontent.com/ab/SOMESTRING?authuser=0'
+				'<img src="https://lh3.googleusercontent.com/ab/SOMESTRING?authuser=0">'
 			)
 		).toBe( false );
 	} );
@@ -66,8 +62,7 @@ describe( 'shouldDismissPastedFiles', () => {
 		expect(
 			shouldDismissPastedFiles(
 				[ mocks.pngImageFile ],
-				'<figure><img src="blob:..."></figure>',
-				''
+				'<figure><img src="blob:..."></figure>'
 			)
 		).toBe( false );
 	} );
@@ -76,8 +71,7 @@ describe( 'shouldDismissPastedFiles', () => {
 		expect(
 			shouldDismissPastedFiles(
 				[ mocks.pngImageFile ],
-				'<meta charset="UTF-8"><table>Some table text</table>',
-				'Some table text'
+				'<meta charset="UTF-8"><table>Some table text</table>'
 			)
 		).toBe( true );
 	} );
@@ -86,8 +80,7 @@ describe( 'shouldDismissPastedFiles', () => {
 		expect(
 			shouldDismissPastedFiles(
 				[ mocks.pngImageFile ],
-				'<p>A</p><img src="file:////.../clip_image001.png" alt="..."><p>B</p>',
-				'A\nB'
+				'<p>A</p><img src="file:////.../clip_image001.png" alt="..."><p>B</p>'
 			)
 		).toBe( true );
 	} );

package/build/hooks/metadata-name.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_hooks","require","_metadata","addLabelCallback","settings","__experimentalLabel","supportsBlockNaming","hasBlockMetadataSupport","attributes","context","metadata","name","addFilter"],"sources":["@wordpress/block-editor/src/hooks/metadata-name.js"],"sourcesContent":["/**\n * WordPress dependencies\n */\nimport { addFilter } from '@wordpress/hooks';\n/**\n * Internal dependencies\n */\nimport { hasBlockMetadataSupport } from './metadata';\n\n/**\n * Filters registered block settings, adding an `__experimentalLabel` callback if one does not already exist.\n *\n * @param {Object} settings Original block settings.\n *\n * @return {Object} Filtered block settings.\n */\nexport function addLabelCallback( settings ) {\n\t// If blocks provide their own label callback, do not override it.\n\tif ( settings.__experimentalLabel ) {\n\t\treturn settings;\n\t}\n\n\tconst supportsBlockNaming = hasBlockMetadataSupport(\n\t\tsettings,\n\t\t'name',\n\t\tfalse // default value\n\t);\n\n\t// Check whether block metadata is supported before using it.\n\tif ( supportsBlockNaming ) {\n\t\tsettings.__experimentalLabel = ( attributes, { context } ) => {\n\t\t\tconst { metadata } = attributes;\n\n\t\t\t// In the list view, use the block's name attribute as the label.\n\t\t\tif ( context === 'list-view' && metadata?.name ) {\n\t\t\t\treturn metadata.name;\n\t\t\t}\n\t\t};\n\t}\n\n\treturn settings;\n}\n\naddFilter(\n\t'blocks.registerBlockType',\n\t'core/metadata/addLabelCallback',\n\taddLabelCallback\n);\n"],"mappings":";;;;;;AAGA,IAAAA,MAAA,GAAAC,OAAA;AAIA,IAAAC,SAAA,GAAAD,OAAA;AAPA;AACA;AACA;;AAEA;AACA;AACA;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASE,gBAAgBA,CAAEC,QAAQ,EAAG;EAC5C;EACA,IAAKA,QAAQ,CAACC,mBAAmB,EAAG;IACnC,OAAOD,QAAQ;EAChB;EAEA,MAAME,mBAAmB,GAAG,IAAAC,iCAAuB,EAClDH,QAAQ,EACR,MAAM,EACN,KAAK,CAAC;EACP,CAAC;;EAED;EACA,IAAKE,mBAAmB,EAAG;IAC1BF,QAAQ,CAACC,mBAAmB,GAAG,CAAEG,UAAU,EAAE;MAAEC;IAAQ,CAAC,KAAM;MAC7D,MAAM;QAAEC;MAAS,CAAC,GAAGF,UAAU;;MAE/B;MACA,IAAKC,OAAO,KAAK,WAAW,IAAIC,QAAQ,EAAEC,IAAI,EAAG;QAChD,OAAOD,QAAQ,CAACC,IAAI;MACrB;IACD,CAAC;EACF;EAEA,OAAOP,QAAQ;AAChB;AAEA,IAAAQ,gBAAS,EACR,0BAA0B,EAC1B,gCAAgC,EAChCT,gBACD,CAAC"}

package/build-module/hooks/metadata-name.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["addFilter","hasBlockMetadataSupport","addLabelCallback","settings","__experimentalLabel","supportsBlockNaming","attributes","context","metadata","name"],"sources":["@wordpress/block-editor/src/hooks/metadata-name.js"],"sourcesContent":["/**\n * WordPress dependencies\n */\nimport { addFilter } from '@wordpress/hooks';\n/**\n * Internal dependencies\n */\nimport { hasBlockMetadataSupport } from './metadata';\n\n/**\n * Filters registered block settings, adding an `__experimentalLabel` callback if one does not already exist.\n *\n * @param {Object} settings Original block settings.\n *\n * @return {Object} Filtered block settings.\n */\nexport function addLabelCallback( settings ) {\n\t// If blocks provide their own label callback, do not override it.\n\tif ( settings.__experimentalLabel ) {\n\t\treturn settings;\n\t}\n\n\tconst supportsBlockNaming = hasBlockMetadataSupport(\n\t\tsettings,\n\t\t'name',\n\t\tfalse // default value\n\t);\n\n\t// Check whether block metadata is supported before using it.\n\tif ( supportsBlockNaming ) {\n\t\tsettings.__experimentalLabel = ( attributes, { context } ) => {\n\t\t\tconst { metadata } = attributes;\n\n\t\t\t// In the list view, use the block's name attribute as the label.\n\t\t\tif ( context === 'list-view' && metadata?.name ) {\n\t\t\t\treturn metadata.name;\n\t\t\t}\n\t\t};\n\t}\n\n\treturn settings;\n}\n\naddFilter(\n\t'blocks.registerBlockType',\n\t'core/metadata/addLabelCallback',\n\taddLabelCallback\n);\n"],"mappings":"AAAA;AACA;AACA;AACA,SAASA,SAAS,QAAQ,kBAAkB;AAC5C;AACA;AACA;AACA,SAASC,uBAAuB,QAAQ,YAAY;;AAEpD;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,gBAAgBA,CAAEC,QAAQ,EAAG;EAC5C;EACA,IAAKA,QAAQ,CAACC,mBAAmB,EAAG;IACnC,OAAOD,QAAQ;EAChB;EAEA,MAAME,mBAAmB,GAAGJ,uBAAuB,CAClDE,QAAQ,EACR,MAAM,EACN,KAAK,CAAC;EACP,CAAC;;EAED;EACA,IAAKE,mBAAmB,EAAG;IAC1BF,QAAQ,CAACC,mBAAmB,GAAG,CAAEE,UAAU,EAAE;MAAEC;IAAQ,CAAC,KAAM;MAC7D,MAAM;QAAEC;MAAS,CAAC,GAAGF,UAAU;;MAE/B;MACA,IAAKC,OAAO,KAAK,WAAW,IAAIC,QAAQ,EAAEC,IAAI,EAAG;QAChD,OAAOD,QAAQ,CAACC,IAAI;MACrB;IACD,CAAC;EACF;EAEA,OAAON,QAAQ;AAChB;AAEAH,SAAS,CACR,0BAA0B,EAC1B,gCAAgC,EAChCE,gBACD,CAAC"}