fix: check filtered form elements

duckduckgo · Jul 16, 2024 · deb7fb7 · deb7fb7
1 parent 6c543b6
commit deb7fb7
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 15 deletions.
diff --git a/dist/autofill-debug.js b/dist/autofill-debug.js
diff --git a/dist/autofill.js b/dist/autofill.js
diff --git a/src/Form/Form.js b/src/Form/Form.js
@@ -424,10 +424,11 @@ class Form {
                 // For form elements we use .elements to catch fields outside the form itself using the form attribute.
                 // It also catches all elements when the markup is broken.
                 // We use .filter to avoid fieldset, button, textarea etc.
-                // Additionally, we try to find any shadow elements that might be there in the form.
-                const formElements = [...this.form.elements]
+                // If there are not form elements, we try to look for all
+                // enclosed elements within the form.
+                const formElements = [...this.form.elements].filter((el) => el.matches(selector))
                 foundInputs = formElements.length > 0
-                    ? formElements.filter((el) => el.matches(selector))
+                    ? formElements
                     : findEnclosedElements(this.form, selector)
             } else {
                 foundInputs = this.form.querySelectorAll(selector)

diff --git a/swift-package/Resources/assets/autofill-debug.js b/swift-package/Resources/assets/autofill-debug.js
diff --git a/swift-package/Resources/assets/autofill.js b/swift-package/Resources/assets/autofill.js