Ticket #60369: 60369-2.patch

src/js/media/views/attachment.js

@@ -199 +199 @@
                         method = 'toggle';
                 }
 
+                // Avoid toggles when the command or control key is pressed with the enter key to prevent deselecting the last selected attachment.
+                if ( ( event.metaKey || event.ctrlKey ) && ( 13 === event.keyCode || 10 === event.keyCode ) ) {
+                        return;
+                }
+
                 this.toggleSelection({
                         method: method
                 });

src/js/media/views/modal.js

@@ -181 +181 @@
         },
 
         /**
+         * Handles the selection of attachments when the command or control key is pressed with the enter key.
+         *
+         * @since 6.6
+         *
+         * @param {Object} event The keydown event object.
+         */
+        selectHandler: function( event ) {
+                var selection = this.controller.state().get( 'selection' );
+
+                if ( ! selection.length > 0 ) {
+                        return;
+                }
+
+                if ( 'insert' === this.controller.options.state ) {
+                        this.controller.trigger( 'insert', selection );
+                } else {
+                        this.controller.trigger( 'select', selection );
+                        event.preventDefault();
+                        this.escape();  
+                }
+        },
+
+        /**
          * @param {Array|Object} content Views to register to '.media-modal-content'
          * @return {wp.media.view.Modal} Returns itself to allow chaining.
          */
@@ -214 +237 @@
                         this.escape();
                         event.stopImmediatePropagation();
                 }
+
+                // Select the attachment when command or control and enter are pressed.
+                if ( ( 13 === event.which || 10 === event.which ) && ( event.metaKey || event.ctrlKey ) ) {
+                        this.selectHandler( event );
+                        event.stopImmediatePropagation();
+                }
+
         }
 });