Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions packages/core/src/components/input/input.util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -207,15 +207,25 @@ export function handleSubmitOnEnterKeydown(
}

event.preventDefault();
const submitButton = form.querySelector<HTMLElement>(
'button[type="submit"], ix-button[type="submit"]'

let submitButton = form.querySelector<HTMLButtonElement>(
'button[type="submit"]'
);

if (submitButton) {
form.requestSubmit(submitButton);
if (!submitButton) {
const ixButton = form.querySelector<HTMLElement>(
'ix-button[type="submit"]'
);
if (ixButton) {
submitButton = ixButton.querySelector<HTMLButtonElement>(
'button[type="submit"]'
);
}
}
Comment thread
1307-Dev marked this conversation as resolved.
Outdated

if (form.length === 1) {
if (submitButton) {
form.requestSubmit(submitButton);
} else if (form.length === 1) {
form.requestSubmit();
}
}
52 changes: 31 additions & 21 deletions packages/core/src/components/input/tests/form-ready.ct.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,27 +83,37 @@ for (const { tag, fill } of inputTags) {
}
);

regressionTest(
`form-ready - multiple ${tag}s submits form on Enter key when submit button is present`,
async ({ mount, page }) => {
await mount(`
<form onsubmit="globalThis.__formSubmitted = true; return false;">
<${tag} name="field-1"></${tag}><${tag} name="field-2"></${tag}><button type="submit">Submit</button>
</form>
`);
await page.evaluate(() => {
globalThis.__formSubmitted = false;
});
const input = page.locator(tag).first().locator('input');
await input.fill(fill);
await input.focus();
await input.press('Enter');
const wasSubmitted = await page.evaluate(
() => globalThis.__formSubmitted
);
expect(wasSubmitted).toBe(true);
}
);
const submitButtons = [
{ name: 'button', markup: '<button type="submit">Submit</button>' },
{
name: 'ix-button',
markup: '<ix-button type="submit">Submit</ix-button>',
},
];

for (const { name, markup } of submitButtons) {
regressionTest.only(
Comment thread
1307-Dev marked this conversation as resolved.
Outdated
`form-ready - multiple ${tag}s submits form on Enter key when ${name} type submit is present`,
async ({ mount, page }) => {
await mount(`
<form onsubmit="globalThis.__formSubmitted = true; return false;">
<${tag} name="field-1"></${tag}><${tag} name="field-2"></${tag}>${markup}
</form>
`);
await page.evaluate(() => {
globalThis.__formSubmitted = false;
});
const input = page.locator(tag).first().locator('input');
await input.fill(fill);
await input.focus();
await input.press('Enter');
const wasSubmitted = await page.evaluate(
() => globalThis.__formSubmitted
);
expect(wasSubmitted).toBe(true);
}
);
}

regressionTest(
`form-ready - ${tag} doesn't submit form on Enter key when suppress submit on enter is true`,
Expand Down
Loading