ESC is primary back hotkey, use helper in more places

jzimdars · jzimdars · commit 7644b0e793d4 · 2025-12-01T13:54:08.000-06:00
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -18,7 +18,7 @@ def inline_svg(name)
 
   def back_link_to(label, url, action, **options)
     link_to url, class: "btn btn--back", data: { controller: "hotkey", action: action }, **options do
-      icon_tag("arrow-left") + tag.strong("Back to #{label}", class: "overflow-ellipsis") + tag.kbd("←", class: "txt-x-small hide-on-touch").html_safe
+      icon_tag("arrow-left") + tag.strong("Back to #{label}", class: "overflow-ellipsis") + tag.kbd("ESC", class: "txt-x-small hide-on-touch").html_safe
     end
   end
 end
diff --git a/app/helpers/boards_helper.rb b/app/helpers/boards_helper.rb
@@ -1,6 +1,6 @@
 module BoardsHelper
   def link_back_to_board(board)
-    back_link_to board.name, board, "keydown.left@document->hotkey#click click->turbo-navigation#backIfSamePath"
+    back_link_to board.name, board, "keydown.left@document->hotkey#click keydown.esc@document->hotkey#click click->turbo-navigation#backIfSamePath"
   end
 
   def link_to_edit_board(board)
diff --git a/app/views/account/join_codes/edit.html.erb b/app/views/account/join_codes/edit.html.erb
@@ -2,13 +2,7 @@
 
 <% content_for :header do %>
   <div class="header__actions header__actions--start">
-    <%= link_to account_join_code_path, class: "btn btn--back borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %>
-      <span class="overflow-ellipsis flex align-center">
-        <%= icon_tag "arrow-left" %>
-        <strong>Back to Invite link</strong>
-        <kbd class="txt-x-small margin-inline-start hide-on-touch">&larr;</kbd>
-      </span>
-    <% end %>
+    <%= back_link_to "Invite link", account_join_code_path, "keydown.left@document->hotkey#click keydown.esc@document->hotkey#click" %>
   </div>
 <% end %>
 
diff --git a/app/views/account/join_codes/show.html.erb b/app/views/account/join_codes/show.html.erb
@@ -2,13 +2,7 @@
 
 <% content_for :header do %>
   <div class="header__actions header__actions--start">
-    <%= link_to account_settings_path, class: "btn btn--back borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %>
-      <span class="overflow-ellipsis flex align-center">
-        <%= icon_tag "arrow-left" %>
-        <strong>Back to Account Settings</strong>
-        <kbd class="txt-x-small margin-inline-start hide-on-touch">&larr;</kbd>
-      </span>
-    <% end %>
+    <%= back_link_to "Account Settings", account_settings_path, "keydown.left@document->hotkey#click keydown.esc@document->hotkey#click" %>
   </div>
 <% end %>
 
diff --git a/app/views/events/day_timeline/columns/show.html.erb b/app/views/events/day_timeline/columns/show.html.erb
@@ -2,13 +2,7 @@
 
 <% content_for :header do %>
   <div class="header__actions header__actions--start">
-    <%= link_to events_path, class: "btn btn--back", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %>
-      <span class="overflow-ellipsis flex align-center">
-        <%= icon_tag "arrow-left" %>
-        <strong>Back to Actvity</strong>
-        <kbd class="txt-x-small margin-inline-start hide-on-touch">&larr;</kbd>
-      </span>
-    <% end %>
+    <%= back_link_to "Actvity", root_path, "keydown.left@document->hotkey#click keydown.esc@document->hotkey#click" %>
   </div>
 
   <h1 class="header__title">
diff --git a/app/views/public/boards/columns/closeds/show.html.erb b/app/views/public/boards/columns/closeds/show.html.erb
@@ -2,7 +2,7 @@
 
 <% content_for :header do %>
   <div class="header__actions header__actions--start">
-    <%= back_link_to @board.name, published_board_url(@board), "keydown.left@document->hotkey#click" %>
+    <%= back_link_to @board.name, published_board_url(@board), "keydown.left@document->hotkey#click keydown.esc@document->hotkey#click" %>
   </div>
 
   <h1 class="header__title divider divider--fade full-width">
diff --git a/app/views/public/boards/columns/not_nows/show.html.erb b/app/views/public/boards/columns/not_nows/show.html.erb
@@ -2,7 +2,7 @@
 
 <% content_for :header do %>
   <div class="header__actions header__actions--start">
-    <%= back_link_to @board.name, published_board_url(@board), "keydown.left@document->hotkey#click" %>
+    <%= back_link_to @board.name, published_board_url(@board), "keydown.left@document->hotkey#click keydown.esc@document->hotkey#click" %>
   </div>
 
   <h1 class="header__title divider divider--fade full-width">
diff --git a/app/views/public/boards/columns/show.html.erb b/app/views/public/boards/columns/show.html.erb
@@ -2,7 +2,7 @@
 
 <% content_for :header do %>
   <div class="header__actions header__actions--start">
-    <%= back_link_to @column.board.name, published_board_url(@column.board), "keydown.left@document->hotkey#click" %>
+    <%= back_link_to @column.board.name, published_board_url(@column.board), "keydown.left@document->hotkey#click keydown.esc@document->hotkey#click" %>
   </div>
 
   <h1 class="header__title divider divider--fade full-width">
diff --git a/app/views/public/boards/columns/streams/show.html.erb b/app/views/public/boards/columns/streams/show.html.erb
@@ -2,7 +2,7 @@
 
 <% content_for :header do %>
   <div class="header__actions header__actions--start">
-    <%= back_link_to @board.name, published_board_url(@board), "keydown.left@document->hotkey#click" %>
+    <%= back_link_to @board.name, published_board_url(@board), "keydown.left@document->hotkey#click keydown.esc@document->hotkey#click" %>
   </div>
 
   <h1 class="header__title divider divider--fade full-width">
diff --git a/app/views/public/cards/show.html.erb b/app/views/public/cards/show.html.erb
@@ -14,7 +14,7 @@
 
 <% content_for :header do %>
   <div class="header__actions header__actions--start">
-    <%= back_link_to @card.board.name, published_board_url(@card.board), "keydown.left@document->hotkey#click", style: "view-transistion-name: card-board-title;" %>
+    <%= back_link_to @card.board.name, published_board_url(@card.board), "keydown.left@document->hotkey#click keydown.esc@document->hotkey#click", style: "view-transistion-name: card-board-title;" %>
   </div>
 <% end %>
 
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
@@ -2,13 +2,7 @@
 
 <% content_for :header do %>
   <div class="header__actions header__actions--start">
-    <%= link_to user_path(@user), class: "btn btn--back borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %>
-      <span class="overflow-ellipsis flex align-center">
-        <%= icon_tag "arrow-left" %>
-        <strong>Back to profile</strong>
-        <kbd class="txt-x-small margin-inline-start hide-on-touch">&larr;</kbd>
-      </span>
-    <% end %>
+    <%= back_link_to "profile", user_path(@user), "keydown.left@document->hotkey#click keydown.esc@document->hotkey#click" %>
   </div>
 <% end %>
 
diff --git a/app/views/users/email_addresses/create.html.erb b/app/views/users/email_addresses/create.html.erb
@@ -2,12 +2,7 @@
 
 <% content_for :header do %>
   <div class="header__actions header__actions--start">
-    <%= link_to edit_user_path(@user, script_name: @user.account.slug), class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %>
-      <span class="overflow-ellipsis flex align-center">
-        <strong>Back to My profile</strong>
-        <kbd class="txt-x-small margin-inline-start hide-on-touch">&larr;</kbd>
-      </span>
-    <% end %>
+    <%= back_link_to "My profile", edit_user_path(@user, script_name: @user.account.slug), "keydown.left@document->hotkey#click keydown.esc@document->hotkey#click" %>
   </div>
 <% end %>
 
diff --git a/app/views/users/email_addresses/new.html.erb b/app/views/users/email_addresses/new.html.erb
@@ -2,13 +2,7 @@
 
 <% content_for :header do %>
   <div class="header__actions header__actions--start">
-    <%= link_to edit_user_path(@user, script_name: @user.account.slug), class: "btn btn--back borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %>
-      <span class="overflow-ellipsis flex align-center">
-        <%= icon_tag "arrow-left" %>
-        <strong>Back to My profile</strong>
-        <kbd class="txt-x-small margin-inline-start hide-on-touch">&larr;</kbd>
-      </span>
-    <% end %>
+    <%= back_link_to "My profile", edit_user_path(@user, script_name: @user.account.slug), "keydown.left@document->hotkey#click keydown.esc@document->hotkey#click" %>
   </div>
 <% end %>
 
diff --git a/app/views/webhooks/edit.html.erb b/app/views/webhooks/edit.html.erb
@@ -2,7 +2,7 @@
 
 <% content_for :header do %>
   <div class="header__actions header__actions--start">
-    <%= back_link_to @page_title, @webhook, "keydown.left@document->hotkey#click" %>
+    <%= back_link_to @page_title, @webhook, "keydown.left@document->hotkey#click keydown.esc@document->hotkey#click" %>
   </div>
 <% end %>
 
diff --git a/app/views/webhooks/new.html.erb b/app/views/webhooks/new.html.erb
@@ -2,7 +2,7 @@
 
 <% content_for :header do %>
   <div class="header__actions header__actions--start">
-    <%= back_link_to "Webhooks", board_webhooks_path, "keydown.left@document->hotkey#click" %>
+    <%= back_link_to "Webhooks", board_webhooks_path, "keydown.left@document->hotkey#click keydown.esc@document->hotkey#click" %>
   </div>
 
   <h1 class="header__title"><%= @page_title %></h1>
diff --git a/app/views/webhooks/show.html.erb b/app/views/webhooks/show.html.erb
@@ -3,7 +3,7 @@
 <% content_for :header do %>
   <div class="header__actions header__actions--start">
     <div class="header__actions header__actions--start">
-      <%= back_link_to "Webhooks", board_webhooks_path, "keydown.left@document->hotkey#click" %>
+      <%= back_link_to "Webhooks", board_webhooks_path, "keydown.left@document->hotkey#click keydown.esc@document->hotkey#click" %>
     </div>
   </div>
 
