From 05c0cbb8398c28c4e8cc0e4e1ac597d199b65e33 Mon Sep 17 00:00:00 2001
From: Adrien Maston <adrien@37signals.com>
Date: Mon, 12 Jan 2026 12:52:42 +0100
Subject: [PATCH] Prevent autofocusing the filter input in drop downs

---
 app/assets/stylesheets/popup.css               | 6 +++++-
 app/views/events/index/filter/_board.html.erb  | 4 ++--
 app/views/events/index/filter/_user.html.erb   | 4 ++--
 app/views/filters/settings/_assignees.html.erb | 5 ++---
 app/views/filters/settings/_boards.html.erb    | 5 ++---
 app/views/filters/settings/_closers.html.erb   | 5 ++---
 app/views/filters/settings/_creators.html.erb  | 5 ++---
 app/views/filters/settings/_tags.html.erb      | 5 ++---
 8 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/app/assets/stylesheets/popup.css b/app/assets/stylesheets/popup.css
index 02ae8969e..86da3c55b 100644
--- a/app/assets/stylesheets/popup.css
+++ b/app/assets/stylesheets/popup.css
@@ -48,6 +48,10 @@
   .popup__title {
     font-weight: 800;
     white-space: nowrap;
+
+    &[tabindex="-1"]:focus-visible {
+      outline: unset;
+    }
   }
 
   /* Hide lists when all the items within are hidden */
@@ -155,7 +159,7 @@
     max-inline-size: 100%;
     padding: var(--inline-space-half) var(--popup-item-padding-inline);
     text-align: start;
-    
+
     &:focus-visible {
       z-index: 1;
     }
diff --git a/app/views/events/index/filter/_board.html.erb b/app/views/events/index/filter/_board.html.erb
index 326ce77f9..aa09042f9 100644
--- a/app/views/events/index/filter/_board.html.erb
+++ b/app/views/events/index/filter/_board.html.erb
@@ -16,8 +16,8 @@
   </template>
 
   <%= filter_dialog "Board…" do %>
-    <strong class="popup__title">Board…</strong>
-    <%= text_field_tag nil, nil, id: nil, placeholder: "Filter…", class: "input input--transparent txt-small font-weight-normal", autofocus: true,
+    <%= tag.strong "Board…", class: "popup__title", tabindex: (-1 if platform.mobile?), autofocus: platform.mobile? %>
+    <%= text_field_tag nil, nil, id: nil, placeholder: "Filter…", class: "input input--transparent txt-small font-weight-normal", autofocus: !platform.mobile?,
           type: "search", autocorrect: "off", autocomplete: "off", data: { "1p-ignore": "true", filter_target: "input", action: "input->filter#filter" } %>
 
     <ul class="popup__list" data-filter-target="list" role="listbox">
diff --git a/app/views/events/index/filter/_user.html.erb b/app/views/events/index/filter/_user.html.erb
index e5b37a8a2..d0f4dcaf8 100644
--- a/app/views/events/index/filter/_user.html.erb
+++ b/app/views/events/index/filter/_user.html.erb
@@ -16,8 +16,8 @@
   </template>
 
   <%= filter_dialog "Person…" do %>
-    <strong class="popup__title">Person…</strong>
-    <%= text_field_tag nil, nil, id: nil, placeholder: "Filter…", class: "input input--transparent txt-small font-weight-normal", autofocus: true,
+    <%= tag.strong "Person…", class: "popup__title", tabindex: (-1 if platform.mobile?), autofocus: platform.mobile? %>
+    <%= text_field_tag nil, nil, id: nil, placeholder: "Filter…", class: "input input--transparent txt-small font-weight-normal", autofocus: !platform.mobile?,
           type: "search", autocorrect: "off", autocomplete: "off", data: { "1p-ignore": "true", filter_target: "input", action: "input->filter#filter" } %>
 
     <ul class="popup__list" data-filter-target="list" role="listbox">
diff --git a/app/views/filters/settings/_assignees.html.erb b/app/views/filters/settings/_assignees.html.erb
index 9a2fdd894..31bfdd6b4 100644
--- a/app/views/filters/settings/_assignees.html.erb
+++ b/app/views/filters/settings/_assignees.html.erb
@@ -16,10 +16,9 @@
     </template>
 
     <%= filter_dialog "Assigned to…" do %>
-      <strong class="popup__title">Assigned to…</strong>
-
+      <%= tag.strong "Assigned to…", class: "popup__title", tabindex: (-1 if platform.mobile?), autofocus: platform.mobile? %>
       <% if Current.account.users.active.many? %>
-        <%= text_field_tag nil, nil, id: nil, placeholder: "Filter…", class: "input input--transparent txt-small", autofocus: true,
+        <%= text_field_tag nil, nil, id: nil, placeholder: "Filter…", class: "input input--transparent txt-small", autofocus: !platform.mobile?,
               type: "search", autocorrect: "off", autocomplete: "off", data: { "1p-ignore": "true", filter_target: "input", action: "input->filter#filter" } %>
       <% end %>
 
diff --git a/app/views/filters/settings/_boards.html.erb b/app/views/filters/settings/_boards.html.erb
index 56abeeb8c..8bab1c5aa 100644
--- a/app/views/filters/settings/_boards.html.erb
+++ b/app/views/filters/settings/_boards.html.erb
@@ -17,10 +17,9 @@
     </template>
 
     <%= filter_dialog "Board…" do %>
-      <strong class="popup__title">Board…</strong>
-
+      <%= tag.strong "Board…", class: "popup__title", tabindex: (-1 if platform.mobile?), autofocus: platform.mobile? %>
       <% if user_filtering.boards.many? %>
-        <%= text_field_tag nil, nil, id: nil, placeholder: "Filter…", class: "input input--transparent txt-small", autofocus: true,
+        <%= text_field_tag nil, nil, id: nil, placeholder: "Filter…", class: "input input--transparent txt-small", autofocus: !platform.mobile?,
               type: "search", autocorrect: "off", autocomplete: "off", data: { "1p-ignore": "true", filter_target: "input", action: "input->filter#filter" } %>
       <% end %>
 
diff --git a/app/views/filters/settings/_closers.html.erb b/app/views/filters/settings/_closers.html.erb
index a4ca4eb76..03a1130df 100644
--- a/app/views/filters/settings/_closers.html.erb
+++ b/app/views/filters/settings/_closers.html.erb
@@ -17,10 +17,9 @@
     </template>
 
     <%= filter_dialog "Closed by…" do %>
-      <strong class="popup__title">Closed by…</strong>
-
+      <%= tag.strong "Closed by…", class: "popup__title", tabindex: (-1 if platform.mobile?), autofocus: platform.mobile? %>
       <% if user_filtering.users.many? %>
-        <%= text_field_tag nil, nil, id: nil, placeholder: "Filter…", class: "input input--transparent txt-small", autofocus: true,
+        <%= text_field_tag nil, nil, id: nil, placeholder: "Filter…", class: "input input--transparent txt-small", autofocus: !platform.mobile?,
               type: "search", autocorrect: "off", autocomplete: "off", data: { "1p-ignore": "true", filter_target: "input", action: "input->filter#filter" } %>
       <% end %>
 
diff --git a/app/views/filters/settings/_creators.html.erb b/app/views/filters/settings/_creators.html.erb
index 4956c5f92..3bab093b0 100644
--- a/app/views/filters/settings/_creators.html.erb
+++ b/app/views/filters/settings/_creators.html.erb
@@ -17,10 +17,9 @@
     </template>
 
     <%= filter_dialog "Added by…" do %>
-      <strong class="popup__title">Added by…</strong>
-
+      <%= tag.strong "Added by…", class: "popup__title", tabindex: (-1 if platform.mobile?), autofocus: platform.mobile? %>
       <% if user_filtering.users.many? %>
-        <%= text_field_tag nil, nil, id: nil, placeholder: "Filter…", class: "input input--transparent txt-small", autofocus: true,
+        <%= text_field_tag nil, nil, id: nil, placeholder: "Filter…", class: "input input--transparent txt-small", autofocus: !platform.mobile?,
               type: "search", autocorrect: "off", autocomplete: "off", data: { "1p-ignore": "true", filter_target: "input", action: "input->filter#filter" } %>
       <% end %>
 
diff --git a/app/views/filters/settings/_tags.html.erb b/app/views/filters/settings/_tags.html.erb
index beb86b49e..1f81c6124 100644
--- a/app/views/filters/settings/_tags.html.erb
+++ b/app/views/filters/settings/_tags.html.erb
@@ -15,10 +15,9 @@
   </template>
 
   <%= filter_dialog "Tagged…" do %>
-    <strong class="popup__title">Tagged…</strong>
-
+    <%= tag.strong "Tagged…", class: "popup__title", tabindex: (-1 if platform.mobile?), autofocus: platform.mobile? %>
     <% if user_filtering.tags.many? %>
-      <%= text_field_tag nil, nil, id: nil, placeholder: "Filter…", class: "input input--transparent txt-small", autofocus: true,
+      <%= text_field_tag nil, nil, id: nil, placeholder: "Filter…", class: "input input--transparent txt-small", autofocus: !platform.mobile?,
             type: "search", autocorrect: "off", autocomplete: "off", data: { "1p-ignore": "true", filter_target: "input", action: "input->filter#filter" } %>
     <% end %>