From 19d16e6949588aebdcaecd3be25939d7a951ff91 Mon Sep 17 00:00:00 2001
From: Jay Ohms <jay@37signals.com>
Date: Thu, 8 Jan 2026 13:46:31 -0500
Subject: [PATCH] Cleanup bridge components

---
 .../controllers/bridge/buttons_controller.js      | 15 ++++++++++-----
 .../controllers/bridge/form_controller.js         |  8 +++++---
 .../bridge/overflow_menu_controller.js            | 15 ++++++++++-----
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/app/javascript/controllers/bridge/buttons_controller.js b/app/javascript/controllers/bridge/buttons_controller.js
index a13620728..ecad31564 100644
--- a/app/javascript/controllers/bridge/buttons_controller.js
+++ b/app/javascript/controllers/bridge/buttons_controller.js
@@ -7,13 +7,18 @@ export default class extends BridgeComponent {
 
   connect() {
     super.connect()
-    if (!this.hasButtonTarget) return
-    this.notifyBridgeOfConnect()
+
+    if (this.hasButtonTarget) {
+      this.notifyBridgeOfConnect()
+    }
   }
 
   disconnect() {
     super.disconnect()
-    this.notifyBridgeOfDisconnect()
+
+    if (this.hasButtonTarget) {
+      this.notifyBridgeOfDisconnect()
+    }
   }
 
   notifyBridgeOfConnect() {
@@ -23,7 +28,7 @@ export default class extends BridgeComponent {
     })
 
     this.send("connect", { buttons }, message => {
-      this.activateButton(message)
+      this.clickButton(message)
     })
   }
 
@@ -31,7 +36,7 @@ export default class extends BridgeComponent {
     this.send("disconnect")
   }
 
-  activateButton(message) {
+  clickButton(message) {
     const selectedIndex = message.data.selectedIndex
     this.buttonTargets[selectedIndex].click()
   }
diff --git a/app/javascript/controllers/bridge/form_controller.js b/app/javascript/controllers/bridge/form_controller.js
index 49394e79a..3051087e2 100644
--- a/app/javascript/controllers/bridge/form_controller.js
+++ b/app/javascript/controllers/bridge/form_controller.js
@@ -8,9 +8,11 @@ export default class extends BridgeComponent {
 
   connect() {
     super.connect()
-    if (!this.hasSubmitTarget) return
-    this.notifyBridgeOfConnect()
-    this.observeSubmitTarget()
+
+    if (this.hasSubmitTarget) {
+      this.notifyBridgeOfConnect()
+      this.observeSubmitTarget()
+    }
   }
 
   disconnect() {
diff --git a/app/javascript/controllers/bridge/overflow_menu_controller.js b/app/javascript/controllers/bridge/overflow_menu_controller.js
index 642221fd4..d0edc912f 100644
--- a/app/javascript/controllers/bridge/overflow_menu_controller.js
+++ b/app/javascript/controllers/bridge/overflow_menu_controller.js
@@ -7,13 +7,18 @@ export default class extends BridgeComponent {
 
   connect() {
     super.connect()
-    if (!this.hasItemTarget) return
-    this.notifyBridgeOfConnect()
+
+    if (this.hasItemTarget) {
+      this.notifyBridgeOfConnect()
+    }
   }
 
   disconnect() {
     super.disconnect()
-    this.notifyBridgeOfDisconnect()
+
+    if (this.hasItemTarget) {
+      this.notifyBridgeOfDisconnect()
+    }
   }
 
   notifyBridgeOfConnect() {
@@ -23,7 +28,7 @@ export default class extends BridgeComponent {
     })
 
     this.send("connect", { items }, message => {
-      this.activateItem(message)
+      this.clickItem(message)
     })
   }
 
@@ -31,7 +36,7 @@ export default class extends BridgeComponent {
     this.send("disconnect")
   }
 
-  activateItem(message) {
+  clickItem(message) {
     const selectedIndex = message.data.selectedIndex
     this.itemTargets[selectedIndex].click()
   }