fix: don't reset value, if the target input is non-ddg

duckduckgo · Jan 30, 2025 · 336906b · 336906b
1 parent 676d426
commit 336906b
Show file tree

Hide file tree

Showing 9 changed files with 195 additions and 11 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/integration-test/helpers/pages/addressPage.js b/integration-test/helpers/pages/addressPage.js
@@ -0,0 +1,47 @@
+import { expect } from '@playwright/test';
+import { mockedCalls } from '../harness.js';
+
+/**
+ * A wrapper around interactions for `integration-test/pages/address-form.html`
+ *
+ * @param {import("@playwright/test").Page} page
+ */
+export function addressPage(page) {
+    class AddressPage {
+        /**
+         * @return {Promise<void>}
+         */
+        async navigate() {
+            await page.goto('integration-test/pages/address-form.html');
+        }
+
+        /**
+         * Fill in all address form fields
+         */
+        async fillAddressForm(data) {
+            await page.fill('#firstName', data.firstName);
+            await page.fill('#lastName', data.lastName);
+            await page.fill('#address1', data.addressStreet);
+            await page.fill('#address2', data.addressStreet2);
+            await page.fill('#city', data.addressCity);
+            await page.fill('#state', data.addressProvince);
+            await page.fill('#postalCode', data.addressPostalCode);
+            await page.fill('#country', data.addressCountryCode);
+            await page.fill('#phone', data.phone);
+            await page.fill('#notes', data.notes);
+        }
+
+        async submitFormViaTextbox() {
+            const textbox = await page.$('#notes');
+            await textbox?.focus();
+            await page.keyboard.down('Enter');
+        }
+
+        async shouldNotPromptToSave() {
+            const mockCalls = await mockedCalls(page, { names: ['storeFormData'], minCount: 0 });
+            expect(mockCalls.length).toBe(0);
+        }
+    }
+
+    return new AddressPage();
+}
diff --git a/integration-test/pages/address-form.html b/integration-test/pages/address-form.html
@@ -0,0 +1,79 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Address Form Test</title>
+    <link rel="stylesheet" href="style.css">
+</head>
+<body>
+    <div class="container">
+        <form id="addressForm" method="POST" action="#">
+            <h2>Test address form, with an arbitrary text field</h2>
+            <p>This form is used to test the address form, with an arbitrary text field</p>
+
+            <!-- Name Fields -->
+            <div class="form-group">
+                <label for="firstName">First Name</label>
+                <input type="text" id="firstName" name="firstName" autocomplete="given-name" required>
+            </div>
+
+            <div class="form-group">
+                <label for="lastName">Last Name</label>
+                <input type="text" id="lastName" name="lastName" autocomplete="name" required>
+            </div>
+
+            <!-- Address Fields -->
+            <div class="form-group">
+                <label for="address1">Address Line 1</label>
+                <input type="text" id="address1" name="address1" autocomplete="address-line1" required>
+            </div>
+
+            <div class="form-group">
+                <label for="address2">Address Line 2</label>
+                <input type="text" id="address2" name="address2" autocomplete="address-line2">
+            </div>
+
+            <div class="form-group">
+                <label for="city">City</label>
+                <input type="text" id="city" name="city" autocomplete="address-level2" required>
+            </div>
+
+            <div class="form-group">
+                <label for="state">State/Province</label>
+                <input type="text" id="state" name="state" autocomplete="address-level1" required>
+            </div>
+
+            <div class="form-group">
+                <label for="postalCode">Postal Code</label>
+                <input type="text" id="postalCode" name="postalCode" autocomplete="postal-code" required>
+            </div>
+
+            <div class="form-group">
+                <label for="country">Country</label>
+                <input type="text" id="country" name="country" autocomplete="country" required>
+            </div>
+
+            <div class="form-group">
+                <label for="phone">Phone Number</label>
+                <input type="tel" id="phone" name="phone" autocomplete="tel">
+            </div>
+
+            <!-- Additional Random Text Field -->
+            <div class="form-group">
+                <label for="notes">Random Notes</label>
+                <textarea id="notes" name="notes"></textarea>
+            </div>
+
+            <button type="submit">Save Address</button>
+        </form>
+    </div>
+    <script type="module">
+        [...document.forms].forEach((form) => {
+          form.addEventListener("submit", (e) => {
+            e.preventDefault();
+          })
+        })
+      </script>
+</body>
+</html> 
diff --git a/integration-test/pages/index.html b/integration-test/pages/index.html
@@ -9,6 +9,7 @@
 </head>
 <body>
 <ul>
+    <li><a href="address-form.html">address-form.html</a></li>
     <li><a href="email-at-bottom.html">email-at-bottom.html</a></li>
     <li><a href="email-at-top-left.html">email-at-top-left.html</a></li>
     <li><a href="email-autofill.html">email-autofill.html</a></li>

diff --git a/integration-test/tests/save-prompts.macos.spec.js b/integration-test/tests/save-prompts.macos.spec.js
@@ -4,7 +4,7 @@ import { createWebkitMocks, macosContentScopeReplacements } from '../helpers/moc
 import { test as base } from '@playwright/test';
 import { signupPage } from '../helpers/pages/signupPage.js';
 import { loginPage } from '../helpers/pages/loginPage.js';
-
+import { addressPage } from '../helpers/pages/addressPage.js';
 /**
  *  Tests for various auto-fill scenarios on macos
  */
@@ -79,5 +79,32 @@ test.describe('macos', () => {
                 await login.shouldPromptToSave();
             });
         });
+        test.describe('prompting to save an address form with additional inputs', () => {
+            const addressData = {
+                firstName: 'John',
+                lastName: 'Doe',
+                addressStreet: '123 Main St',
+                addressStreet2: 'Apt 4B',
+                addressCity: 'New York',
+                addressCountryCode: 'US',
+                addressProvince: 'NY',
+                addressPostalCode: '10001',
+                phone: '5550123',
+                notes: 'Leave at door',
+            };
+            test('submitting address form with non-ddg inputs should not prompt', async ({ page }) => {
+                // enable in-terminal exceptions
+                await forwardConsoleMessages(page);
+
+                await createWebkitMocks().applyTo(page);
+                await defaultMacosScript(page);
+
+                const address = addressPage(page);
+                await address.navigate();
+                await address.fillAddressForm(addressData);
+                await address.submitFormViaTextbox();
+                await address.shouldNotPromptToSave();
+            });
+        });
     });
 });
diff --git a/src/Form/Form.js b/src/Form/Form.js
@@ -368,10 +368,16 @@ class Form {
 
     initFormListeners() {
         // This ensures we fire the handler again if the form is changed
-        this.addListener(this.form, 'input', () => {
+        this.addListener(this.form, 'input', (e) => {
             if (!this.isAutofilling) {
                 this.submitHandlerExecuted = false;
-                this.resetShouldPromptToStoreData();
+                /** @type {import('./matching.js').SupportedTypes} **/
+                const inputType = e.target.getAttribute(ATTR_INPUT_TYPE);
+                if (inputType && inputType !== 'unknown') {
+                    this.resetShouldPromptToStoreData();
+                } else {
+                    this.shouldPromptToStoreData = false;
+                }
             }
         });
 

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