[Fix #10] target vs currentTarget (#12)

Co-authored-by: Jeremy Walton <[email protected]>
RoleModel · Sep 27, 2023 · 66dc7e9 · 66dc7e9
1 parent 53501ed
commit 66dc7e9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rolemodel/turbo-confirm",
   "type": "module",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Drop-in upgrade for Rails' data-turbo-confirm feature to support custom HTML dialogs.",
   "main": "src/index.js",
   "directories": {

diff --git a/src/lib/ConfirmationController.js b/src/lib/ConfirmationController.js
@@ -114,14 +114,12 @@ export default class ConfirmationController {
     }, this.#config.animationDuration)
   }
 
-  #clickTarget({currentTarget}) {
-    // Turbo listens for link clicks on the document.
-    if (currentTarget === document) {
-      // in this case, activeElement is the link that was clicked
-      return currentTarget.activeElement.closest(`[data-turbo-confirm]`)
-    } else {
-      return currentTarget.closest(`[data-turbo-confirm]`)
-    }
+  #clickTarget({target}) {
+    // in the case of a turbo link intercept, the target is the document.
+    // Form submissions still have the original submitter as the target.
+    const element = target.activeElement ?? target
+
+    return element.closest('[data-turbo-confirm]')
   }
 
   #setupListeners() {