Merge pull request rails#48290 from marckohlbrugge/patch-1

Support nested elements inside <button>
andrewn617 · Nov 20, 2023 · 0ad26f7 · 0ad26f7
2 parents e1a0f6f + a1504f4
commit 0ad26f7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/activestorage/app/assets/javascripts/activestorage.esm.js b/activestorage/app/assets/javascripts/activestorage.esm.js
diff --git a/activestorage/app/assets/javascripts/activestorage.js b/activestorage/app/assets/javascripts/activestorage.js
diff --git a/activestorage/app/javascript/activestorage/ujs.js b/activestorage/app/javascript/activestorage/ujs.js
@@ -15,9 +15,9 @@ export function start() {
 }
 
 function didClick(event) {
-  const { target } = event
-  if ((target.tagName == "INPUT" || target.tagName == "BUTTON") && target.type == "submit" && target.form) {
-    submitButtonsByForm.set(target.form, target)
+  const submitButton = event.target.closest(":is(button, input)[type='submit']")
+  if (submitButton && submitButton.form) {
+    submitButtonsByForm.set(submitButton.form, submitButton)
   }
 }