KeyboardShortcuts: Update delete shortcut to use primaryShift + Delete

packages/block-editor/src/components/keyboard-shortcuts/index.js

@@ -29,9 +29,15 @@ function KeyboardShortcutsRegister() {
 			category: 'block',
 			description: __( 'Remove the selected block(s).' ),
 			keyCombination: {
-				modifier: 'platformAlt',
+				modifier: 'primaryShift',
 				character: 'backspace',
 			},
+			aliases: [
+				{
+					modifier: 'primaryShift',
+					character: 'delete',
+				},
+			],
 		} );
 
 		registerShortcut( {

packages/e2e-test-utils-playwright/src/page-utils/keycodes.ts

@@ -23,11 +23,6 @@ export const COMMAND = 'meta';
  */
 export const SHIFT = 'shift';
 
-/**
- * Keycode for DELETE key.
- */
-export const BACKSPACE = 'backspace';
-
 /**
  * Object that contains functions that return the available modifier
  * depending on platform.
@@ -44,12 +39,10 @@ export const modifiers: Record<
 	secondary: ( _isApple ) =>
 		_isApple() ? [ SHIFT, ALT, COMMAND ] : [ CTRL, SHIFT, ALT ],
 	access: ( _isApple ) => ( _isApple() ? [ CTRL, ALT ] : [ SHIFT, ALT ] ),
-	platformAlt: ( _isApple ) => ( _isApple() ? [ CTRL ] : [ ALT ] ),
 	ctrl: () => [ CTRL ],
 	alt: () => [ ALT ],
 	ctrlShift: () => [ CTRL, SHIFT ],
 	shift: () => [ SHIFT ],
 	shiftAlt: () => [ SHIFT, ALT ],
-	backspace: () => [ BACKSPACE ],
 	undefined: () => [],
 };

packages/keycodes/src/index.js

@@ -21,7 +21,7 @@ import { isAppleOS } from './platform';
 
 /** @typedef {typeof ALT | CTRL | COMMAND | SHIFT } WPModifierPart */
 
-/** @typedef {'primary' | 'primaryShift' | 'primaryAlt' | 'platformAlt' | 'secondary' | 'access' | 'ctrl' | 'alt' | 'ctrlShift' | 'shift' | 'shiftAlt' | 'undefined'} WPKeycodeModifier */
+/** @typedef {'primary' | 'primaryShift' | 'primaryAlt' | 'secondary' | 'access' | 'ctrl' | 'alt' | 'ctrlShift' | 'shift' | 'shiftAlt' | 'undefined'} WPKeycodeModifier */
 
 /**
  * An object of handler functions for each of the possible modifier
@@ -188,7 +188,6 @@ export const modifiers = {
 	secondary: ( _isApple ) =>
 		_isApple() ? [ SHIFT, ALT, COMMAND ] : [ CTRL, SHIFT, ALT ],
 	access: ( _isApple ) => ( _isApple() ? [ CTRL, ALT ] : [ SHIFT, ALT ] ),
-	platformAlt: ( _isApple ) => ( _isApple() ? [ CTRL ] : [ ALT ] ),
 	ctrl: () => [ CTRL ],
 	alt: () => [ ALT ],
 	ctrlShift: () => [ CTRL, SHIFT ],

test/e2e/specs/editor/blocks/navigation.spec.js

@@ -276,7 +276,7 @@ test.describe( 'Navigation block', () => {
 			await pageUtils.pressKeys( 'ArrowDown' );
 
 			// remove the child link
-			await pageUtils.pressKeys( 'platformAlt+backspace' );
+			await pageUtils.pressKeys( 'primaryShift+Delete' );
 
 			const submenuBlock2 = editor.canvas.getByRole( 'document', {
 				name: 'Block: Submenu',
@@ -494,7 +494,7 @@ test.describe( 'Navigation block', () => {
 		await pageUtils.pressKeys( 'ArrowDown', { times: 4 } );
 		await navigation.checkLabelFocus( 'wordpress.org' );
 		// Delete the nav link
-		await pageUtils.pressKeys( 'platformAlt+backspace' );
+		await pageUtils.pressKeys( 'primaryShift+Delete' );
 		// Focus moved to sibling
 		await navigation.checkLabelFocus( 'Dog' );
 		// Add a link back so we can delete the first submenu link and see if focus returns to the parent submenu item
@@ -507,15 +507,15 @@ test.describe( 'Navigation block', () => {
 		await pageUtils.pressKeys( 'ArrowUp', { times: 2 } );
 		await navigation.checkLabelFocus( 'Dog' );
 		// Delete the nav link
-		await pageUtils.pressKeys( 'platformAlt+backspace' );
+		await pageUtils.pressKeys( 'primaryShift+Delete' );
 		await pageUtils.pressKeys( 'ArrowDown' );
 		// Focus moved to parent submenu item
 		await navigation.checkLabelFocus( 'example.com' );
 		// Deleting this should move focus to the sibling item
-		await pageUtils.pressKeys( 'platformAlt+backspace' );
+		await pageUtils.pressKeys( 'primaryShift+Delete' );
 		await navigation.checkLabelFocus( 'Cat' );
 		// Deleting with no more siblings should focus the navigation block again
-		await pageUtils.pressKeys( 'platformAlt+backspace' );
+		await pageUtils.pressKeys( 'primaryShift+Delete' );
 		await expect( navBlock ).toBeFocused();
 		// Wait until the nav block inserter is visible before we continue.
 		await expect( navBlockInserter ).toBeVisible();

test/e2e/specs/editor/various/block-deletion.spec.js

@@ -134,7 +134,7 @@ test.describe( 'Block deletion', () => {
 		).toBeFocused();
 
 		// Remove the current paragraph via dedicated keyboard shortcut.
-		await pageUtils.pressKeys( 'platformAlt+backspace' );
+		await pageUtils.pressKeys( 'primaryShift+Delete' );
 
 		// Ensure the last block was removed.
 		await expect.poll( editor.getBlocks ).toMatchObject( [

test/e2e/specs/editor/various/block-locking.spec.js

@@ -133,7 +133,7 @@ test.describe( 'Block Locking', () => {
 		).toBeVisible();
 
 		await paragraph.click();
-		await pageUtils.pressKeys( 'platformAlt+backspace' );
+		await pageUtils.pressKeys( 'primaryShift+Delete' );
 
 		await expect.poll( editor.getBlocks ).toMatchObject( [
 			{

test/e2e/specs/editor/various/list-view.spec.js

@@ -809,8 +809,8 @@ test.describe( 'List View', () => {
 
 		// Delete remaining blocks.
 		// Keyboard shortcut should also work.
-		await pageUtils.pressKeys( 'platformAlt+backspace' );
-		await pageUtils.pressKeys( 'platformAlt+backspace' );
+		await pageUtils.pressKeys( 'primaryShift+Delete' );
+		await pageUtils.pressKeys( 'primaryShift+Delete' );
 		await expect
 			.poll(
 				listViewUtils.getBlocksWithA11yAttributes,
@@ -842,7 +842,7 @@ test.describe( 'List View', () => {
 				{ name: 'core/heading', selected: false },
 			] );
 
-		await pageUtils.pressKeys( 'platformAlt+backspace' );
+		await pageUtils.pressKeys( 'primaryShift+Delete' );
 		await expect
 			.poll(
 				listViewUtils.getBlocksWithA11yAttributes,
@@ -865,11 +865,7 @@ test.describe( 'List View', () => {
 			.getByRole( 'gridcell', { name: 'File' } )
 			.getByRole( 'link' )
 			.focus();
-		for ( const keys of [
-			'Delete',
-			'Backspace',
-			'platformAlt+backspace',
-		] ) {
+		for ( const keys of [ 'Delete', 'Backspace', 'primaryShift+Delete' ] ) {
 			await pageUtils.pressKeys( keys );
 			await expect
 				.poll(
@@ -1137,7 +1133,7 @@ test.describe( 'List View', () => {
 			optionsForFileMenu,
 			'Pressing Space should also open the menu dropdown'
 		).toBeVisible();
-		await pageUtils.pressKeys( 'platformAlt+backspace' ); // Keyboard shortcut for Delete.
+		await pageUtils.pressKeys( 'primaryShift+Delete' ); // Keyboard shortcut for Delete.
 		await expect
 			.poll(
 				listViewUtils.getBlocksWithA11yAttributes,
@@ -1157,7 +1153,7 @@ test.describe( 'List View', () => {
 			optionsForFileMenu.getByRole( 'menuitem', { name: 'Delete' } ),
 			'The delete menu item should be hidden for locked blocks'
 		).toBeHidden();
-		await pageUtils.pressKeys( 'platformAlt+backspace' );
+		await pageUtils.pressKeys( 'primaryShift+Delete' );
 		await expect
 			.poll(
 				listViewUtils.getBlocksWithA11yAttributes,

test/e2e/specs/site-editor/template-part.spec.js

@@ -375,7 +375,7 @@ test.describe( 'Template Part', () => {
 		await editor.selectBlocks( siteTitle );
 
 		// Remove the default site title block.
-		await pageUtils.pressKeys( 'platformAlt+backspace' );
+		await pageUtils.pressKeys( 'primaryShift+Delete' );
 
 		// Insert a group block with a Site Title block inside.
 		await editor.insertBlock( {

test/e2e/specs/widgets/editing-widgets.spec.js

@@ -573,7 +573,7 @@ test.describe( 'Widgets screen', () => {
 			.getByRole( 'document', { name: 'Block: Paragraph' } )
 			.filter( { hasText: 'Second Paragraph' } )
 			.focus();
-		await pageUtils.pressKeys( 'platformAlt+backspace' );
+		await pageUtils.pressKeys( 'primaryShift+Delete' );
 		await widgetsScreen.saveWidgets();
 
 		await expect.poll( widgetsScreen.getWidgetAreaBlocks ).toMatchObject( {