Fix autofocus on dynamically inserted forms, remove this.blur() handlers

form_controller.connect() now blurs the previously focused element and
explicitly focuses the [autofocus] element when a form is inserted into
the DOM (via Turbo Stream). Only runs when an [autofocus] element is
present, so closing forms and other stream updates are unaffected.

Remove all onclick='this.blur()' inline handlers from templates — they
were a workaround for the same autofocus problem, now solved properly
via the Stimulus lifecycle.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

app/javascript/application.js

@@ -2,7 +2,6 @@
 // https://github.com/rails/importmap-rails
 import "@hotwired/turbo-rails"
 import "controllers"
-import { disableElement, enableElement } from "element_helpers"
 
 
 /* Hide page before loaded for testing purposes */
@@ -13,13 +12,23 @@ document.addEventListener('turbo:load', showPage)
 
 
 /* Turbo stream actions */
-Turbo.StreamElement.prototype.disableElement = disableElement
-Turbo.StreamElement.prototype.enableElement = enableElement
+Turbo.StreamElement.prototype.disableElement = function(element) {
+    element.setAttribute("disabled", "disabled")
+    element.setAttribute("aria-disabled", "true")
+    element.setAttribute("tabindex", "-1")
+}
 Turbo.StreamActions.disable = function() {
-  this.targetElements.forEach(disableElement)
+  this.targetElements.forEach((e) => { this.disableElement(e) })
+}
+
+Turbo.StreamElement.prototype.enableElement = function(element) {
+    element.removeAttribute("disabled")
+    element.removeAttribute("aria-disabled")
+    // Assume 'tabindex' is not used explicitly, so removing it is safe
+    element.removeAttribute("tabindex")
 }
 Turbo.StreamActions.enable = function() {
-  this.targetElements.forEach(enableElement)
+  this.targetElements.forEach((e) => { this.enableElement(e) })
 }
 
 /* TODO: change to visibility = collapse to avoid width change? */

app/javascript/controllers/details_controller.js

@@ -1,5 +1,4 @@
 import { Controller } from "@hotwired/stimulus"
-import { disableElement, enableElement } from "element_helpers"
 
 export default class extends Controller {
   static targets = ["countLabel", "submitButton", "list"]
@@ -19,10 +18,10 @@ export default class extends Controller {
     const count = this.element.querySelectorAll('input:checked:not([disabled])').length
     if (count > 0) {
       this.countLabelTarget.textContent = count + ' selected'
-      enableElement(this.submitButtonTarget)
+      Turbo.StreamElement.prototype.enableElement(this.submitButtonTarget)
     } else {
       this.countLabelTarget.textContent = this.countLabelTarget.dataset.prompt
-      disableElement(this.submitButtonTarget)
+      Turbo.StreamElement.prototype.disableElement(this.submitButtonTarget)
     }
   }
 

app/javascript/controllers/form_controller.js

@@ -1,6 +1,14 @@
 import { Controller } from "@hotwired/stimulus"
 
 export default class extends Controller {
+  connect() {
+    const autofocusEl = this.element.querySelector('[autofocus]')
+    if (autofocusEl) {
+      document.activeElement?.blur()
+      autofocusEl.focus()
+    }
+  }
+
   processKey(event) {
     switch (event.key) {
       case "Escape":

app/javascript/controllers/readout_unit_controller.js

@@ -1,14 +1,13 @@
 import { Controller } from "@hotwired/stimulus"
-import { disableElement, enableElement } from "element_helpers"
 
 export default class extends Controller {
   static targets = ["select", "button"]
 
   unitChanged() {
     if (this.selectTarget.value && this.selectTarget.value !== this.selectTarget.dataset.defaultUnitId) {
-      enableElement(this.buttonTarget)
+      Turbo.StreamElement.prototype.enableElement(this.buttonTarget)
     } else {
-      disableElement(this.buttonTarget)
+      Turbo.StreamElement.prototype.disableElement(this.buttonTarget)
     }
   }
 

app/javascript/element_helpers.js

@@ -1,11 +0,0 @@
-export function disableElement(element) {
-  element.setAttribute("disabled", "disabled")
-  element.setAttribute("aria-disabled", "true")
-  element.setAttribute("tabindex", "-1")
-}
-
-export function enableElement(element) {
-  element.removeAttribute("disabled")
-  element.removeAttribute("aria-disabled")
-  element.removeAttribute("tabindex")
-}

app/views/measurements/_readout.html.erb

@@ -4,7 +4,7 @@
   <td>
     <% if current_user.at_least(:active) %>
       <%= link_to readout.quantity, edit_measurement_path(readout),
-        class: 'link', onclick: 'this.blur();', data: {turbo_stream: true} %>
+        class: 'link', data: {turbo_stream: true} %>
     <% else %>
       <%= readout.quantity %>
     <% end %>

app/views/measurements/_wide_table.html.erb

@@ -20,7 +20,7 @@
                 <% if current_user.at_least(:active) %>
                   <%= link_to format("%.10g", readout.value),
                     edit_measurement_path(readout, view: :wide),
-                    class: 'link', onclick: 'this.blur();',
+                    class: 'link',
                     data: {turbo_stream: true} %>
                 <% else %>
                   <%= format("%.10g", readout.value) %>

app/views/measurements/index.html.erb

@@ -2,7 +2,7 @@
 <div class="rightside-area buttongrid" data-controller="measurements-view">
   <% if current_user.at_least(:active) %>
     <%= image_link_to t('.new_measurement'), 'plus-outline', new_measurement_path,
-      id: :new_measurement_link, onclick: 'this.blur();',
+      id: :new_measurement_link,
       data: {turbo_stream: true} %>
   <% end %>
   <%= image_button_tag '', 'view-rows', name: nil, type: 'button',

app/views/quantities/_quantity.html.erb

@@ -8,7 +8,7 @@
 
   <td style="--depth:<%= quantity.depth %>">
     <%= link_to quantity, edit_quantity_path(quantity), class: 'link',
-      onclick: 'this.blur();', data: {turbo_stream: true} %>
+      data: {turbo_stream: true} %>
   </td>
   <td><%= quantity.description %></td>
   <td><%= quantity.default_unit&.symbol %></td>
@@ -16,7 +16,7 @@
   <% if current_user.at_least(:active) %>
     <td class="flex">
       <%= image_link_to t('.new_subquantity'), 'plus-outline', new_quantity_path(quantity),
-        id: dom_id(quantity, :new, :link), onclick: 'this.blur();', data: {turbo_stream: true} %>
+        id: dom_id(quantity, :new, :link), data: {turbo_stream: true} %>
 
       <%= image_button_to_if quantity.destroyable?, t('.destroy'), 'delete-outline',
         quantity_path(quantity), method: :delete %>

app/views/quantities/index.html.erb

@@ -1,7 +1,7 @@
 <div class="rightside-area buttongrid">
   <% if current_user.at_least(:active) %>
     <%= image_link_to t('.new_quantity'), 'plus-outline', new_quantity_path,
-      id: dom_id(Quantity, :new, :link), onclick: 'this.blur();',
+      id: dom_id(Quantity, :new, :link),
       data: {turbo_stream: true} %>
   <% end %>
   <%#= image_link_to t('.import_quantities'), 'download-outline', default_quantities_path,

app/views/units/_unit.html.erb

@@ -7,7 +7,7 @@
                   drag_drop_id_param_value: 'unit[base_id]'} do %>
 
   <td style="--depth:<%= unit.base_id? ? 1 : 0 %>">
-    <%= link_to unit, edit_unit_path(unit), class: 'link', onclick: 'this.blur();',
+    <%= link_to unit, edit_unit_path(unit), class: 'link',
       data: {turbo_stream: true} %>
   </td>
   <td><%= unit.description %></td>
@@ -17,7 +17,7 @@
     <td class="flex">
       <% unless unit.base_id? %>
         <%= image_link_to t('.new_subunit'), 'plus-outline', new_unit_path(unit),
-          id: dom_id(unit, :new, :link), onclick: 'this.blur();', data: {turbo_stream: true} %>
+          id: dom_id(unit, :new, :link), data: {turbo_stream: true} %>
       <% end %>
 
       <%= image_button_to_if unit.movable?, t('.destroy'), 'delete-outline', unit_path(unit),

app/views/units/index.html.erb

@@ -1,7 +1,7 @@
 <div class="rightside-area buttongrid">
   <% if current_user.at_least(:active) %>
     <%= image_link_to t('.new_unit'), 'plus-outline', new_unit_path,
-      id: dom_id(Unit, :new, :link), onclick: 'this.blur();', data: {turbo_stream: true} %>
+      id: dom_id(Unit, :new, :link), data: {turbo_stream: true} %>
   <% end %>
   <%= image_link_to t('.import_units'), 'download-outline', default_units_path,
     class: 'tools-area' %>

config/importmap.rb

@@ -1,7 +1,6 @@
 # Pin npm packages by running ./bin/importmap
 
 pin "application", preload: true
-pin "element_helpers"
 pin "@hotwired/turbo-rails", to: "turbo.min.js", preload: true
 pin "@hotwired/stimulus", to: "stimulus.min.js", preload: true
 pin "@hotwired/stimulus-loading", to: "stimulus-loading.js", preload: true