From 37dc14c0c6c683b5166643ed53068b0be3234562 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 3 Jun 2025 16:35:55 -0500
Subject: [PATCH] `x` interferes with string entry, try `SHIFT+ENTER` to toggle
 checkboxes

---
 app/javascript/controllers/navigable_list_controller.js | 9 +++++----
 app/views/cards/index/_header.html.erb                  | 2 +-
 app/views/events/_filter.html.erb                       | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/javascript/controllers/navigable_list_controller.js b/app/javascript/controllers/navigable_list_controller.js
index 49050e3ab..eb416c159 100644
--- a/app/javascript/controllers/navigable_list_controller.js
+++ b/app/javascript/controllers/navigable_list_controller.js
@@ -125,10 +125,11 @@ export default class extends Controller {
       this.#handleArrowKey(event, this.#selectPrevious.bind(this))
     },
     Enter(event) {
-      this.#clickCurrentItem(event)
+      if (event.shiftKey) {
+        this.#toggleCurrentItem(event)
+      } else {
+        this.#clickCurrentItem(event)
+      }
     },
-    x(event) {
-      this.#toggleCurrentItem(event)
-    }
   }
 }
diff --git a/app/views/cards/index/_header.html.erb b/app/views/cards/index/_header.html.erb
index 7498d9095..8120d3ea4 100644
--- a/app/views/cards/index/_header.html.erb
+++ b/app/views/cards/index/_header.html.erb
@@ -31,7 +31,7 @@
           <%= render "cards/index/collections_filter", filter: filter %>
         </menu>
         <p class="txt-small txt-align-center margin-block-half full-width">
-          Press <kbd class="kbd"><%= hotkey_label(["ctrl", "J"]) -%></kbd> anytime to open this, <kbd class="kbd">esc</kbd> to close, <kbd class="kbd">↑</kbd><kbd class="kbd">↓</kbd> to move, <kbd class="kbd">enter</kbd> to navigate, <kbd class="kbd">x</kbd> to select.
+          Press <kbd class="kbd"><%= hotkey_label(["ctrl", "J"]) -%></kbd> anytime to open this, <kbd class="kbd">esc</kbd> to close, <kbd class="kbd">↑</kbd><kbd class="kbd">↓</kbd> to move, <kbd class="kbd">enter</kbd> to navigate, <kbd class="kbd">SHIFT+ENTER</kbd> to select.
         </p>
       <% end %>
     </div>
diff --git a/app/views/events/_filter.html.erb b/app/views/events/_filter.html.erb
index 22add94b5..7486754a4 100644
--- a/app/views/events/_filter.html.erb
+++ b/app/views/events/_filter.html.erb
@@ -36,7 +36,7 @@
 		<% end %>
 
 		<p class="txt-small txt-align-center margin-block-half full-width">
-			Press <kbd class="kbd"><%= hotkey_label(["ctrl", "J"]) -%></kbd> anytime to open this, <kbd class="kbd">esc</kbd> to close, <kbd class="kbd">↑</kbd><kbd class="kbd">↓</kbd> to move, <kbd class="kbd">enter</kbd> to navigate, <kbd class="kbd">x</kbd> to select.
+			Press <kbd class="kbd"><%= hotkey_label(["ctrl", "J"]) -%></kbd> anytime to open this, <kbd class="kbd">esc</kbd> to close, <kbd class="kbd">↑</kbd><kbd class="kbd">↓</kbd> to move, <kbd class="kbd">enter</kbd> to navigate, <kbd class="kbd">SHIFT+ENTER</kbd> to select.
 		</p>
 	<% end %>
 </div>