Ticket #45365: 45365.2.diff

src/wp-includes/class-wp-editor.php

@@ -1268 +1268 @@
 
                         // Shortcuts help modal
                         'Keyboard Shortcuts' => array( __( 'Keyboard Shortcuts' ), 'accessH' ),
+                        'Classic Block Keyboard Shortcuts' => __( 'Classic Block Keyboard Shortcuts' ),
                         'Default shortcuts,' => __( 'Default shortcuts,' ),
                         'Additional shortcuts,' => __( 'Additional shortcuts,' ),
                         'Focus shortcuts:' => __( 'Focus shortcuts:' ),

src/wp-includes/js/tinymce/plugins/wordpress/plugin.js

@@ -370 +370 @@
                 html += '</div>';
 
                 dialog = editor.windowManager.open( {
-                        title: 'Keyboard Shortcuts',
+                        title: editor.settings.classic_block_editor ? 'Classic Block Keyboard Shortcuts' : 'Keyboard Shortcuts',
                         items: {
                                 type: 'container',
                                 classes: 'wp-help',
@@ -652 +652 @@
                         u: 'InsertUnorderedList',
                         o: 'InsertOrderedList',
                         m: 'WP_Medialib',
-                        z: 'WP_Adv',
                         t: 'WP_More',
                         d: 'Strikethrough',
-                        h: 'WP_Help',
                         p: 'WP_Page',
                         x: 'WP_Code'
                 }, function( command, key ) {
@@ -668 +666 @@
                         }
                 } );
 
+                // Alt+Shift+Z removes a block in the Block Editor, don't add it to the Classic Block.
+                if ( ! editor.settings.classic_block_editor ) {
+                        editor.addShortcut( 'access+z', '', 'WP_Adv' );
+                }
+
+                // Workaround for not triggering the global help modal in the Block Editor by the Classic Block shortcut.
+                editor.on( 'keydown', function( event ) {
+                        if ( event.shiftKey && event.altKey && event.code === 'KeyH' ) {
+                                editor.execCommand( 'WP_Help' );
+                                event.stopPropagation();
+                                event.stopImmediatePropagation();
+                                return false;
+                        }
+
+                        return true;
+                });
+
                 if ( window.getUserSetting( 'editor_plain_text_paste_warning' ) > 1 ) {
                         editor.settings.paste_plaintext_inform = false;
                 }