From b9c11ad76826c0cde0878a82dd89dc23cb2a819d Mon Sep 17 00:00:00 2001
From: Andy Smith <andy@37signals.com>
Date: Mon, 29 Dec 2025 15:30:55 -0600
Subject: [PATCH] Only enable transitions on user interaction

---
 app/javascript/controllers/collapsible_columns_controller.js | 5 +++--
 app/views/boards/show/_columns.html.erb                      | 2 +-
 app/views/public/boards/show/_columns.html.erb               | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/javascript/controllers/collapsible_columns_controller.js b/app/javascript/controllers/collapsible_columns_controller.js
index 2c97fcd09..fb52385a7 100644
--- a/app/javascript/controllers/collapsible_columns_controller.js
+++ b/app/javascript/controllers/collapsible_columns_controller.js
@@ -25,6 +25,7 @@ export default class extends Controller {
   }
 
   toggle({ target }) {
+    this.#enableTransitions()
     const column = target.closest('[data-collapsible-columns-target="column"]')
     this.#toggleColumn(column);
   }
@@ -35,13 +36,14 @@ export default class extends Controller {
     }
   }
 
-  async restoreState(event) {
+  async restoreState() {
     await nextFrame()
     await this.#restoreColumnsDisablingTransitions()
   }
 
   focusOnColumn({ target }) {
     if (this.#isCollapsed(target)) {
+      this.#enableTransitions()
       this.#collapseAllExcept(target)
       this.#expand(target)
     }
@@ -52,7 +54,6 @@ export default class extends Controller {
     this.#restoreColumns()
 
     await nextFrame()
-    this.#enableTransitions()
   }
 
   #disableTransitions() {
diff --git a/app/views/boards/show/_columns.html.erb b/app/views/boards/show/_columns.html.erb
index bf7a76fcc..b3f77a790 100644
--- a/app/views/boards/show/_columns.html.erb
+++ b/app/views/boards/show/_columns.html.erb
@@ -1,4 +1,4 @@
-<%= tag.div class: "card-columns hide-scrollbar", data: {
+<%= tag.div class: "card-columns no-transitions hide-scrollbar", data: {
       controller: "collapsible-columns drag-and-drop drag-and-strum navigable-list card-hotkeys",
       drag_and_drop_dragged_item_class: "drag-and-drop__dragged-item",
       drag_and_drop_hover_container_class: "drag-and-drop__hover-container",
diff --git a/app/views/public/boards/show/_columns.html.erb b/app/views/public/boards/show/_columns.html.erb
index 59f2b5e39..471816bfe 100644
--- a/app/views/public/boards/show/_columns.html.erb
+++ b/app/views/public/boards/show/_columns.html.erb
@@ -1,5 +1,5 @@
 <%= turbo_frame_tag :cards_container do %>
-  <div class="card-columns hide-scrollbar"
+  <div class="card-columns no-transitions hide-scrollbar"
     data-controller="collapsible-columns"
     data-collapsible-columns-board-value="<%= board.id %>"
     data-collapsible-columns-collapsed-class="is-collapsed"