Skip to content

fix(select): add Enter keypress to dismiss #30622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion core/src/components/select-modal/select-modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export class SelectModal implements ComponentInterface {
labelPlacement="end"
onClick={() => this.closeModal()}
onKeyUp={(ev) => {
if (ev.key === ' ') {
if (ev.key === 'Enter' || ev.key === ' ') {
/**
* Selecting a radio option with keyboard navigation,
* either through the Enter or Space keys, should
Expand Down
18 changes: 18 additions & 0 deletions core/src/components/select-modal/test/basic/select-modal.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,24 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
await expect(selectModalPage.modal).not.toBeVisible();
});

test('pressing Enter on an unselected option should dismiss the modal', async () => {
await selectModalPage.setup(config, options, false);

await selectModalPage.pressEnterOnOption('apple');
await selectModalPage.ionModalDidDismiss.next();
await expect(selectModalPage.modal).not.toBeVisible();
});

test('pressing Enter on a selected option should dismiss the modal', async ({ browserName }) => {
test.skip(browserName === 'firefox', 'Same behavior as ROU-5437');

await selectModalPage.setup(config, checkedOptions, false);

await selectModalPage.pressEnterOnOption('apple');
await selectModalPage.ionModalDidDismiss.next();
await expect(selectModalPage.modal).not.toBeVisible();
});

test('clicking the close button should dismiss the modal', async () => {
await selectModalPage.setup(config, options, false);

Expand Down
5 changes: 5 additions & 0 deletions core/src/components/select-modal/test/fixtures.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@ export class SelectModalPage {
await option.press('Space');
}

async pressEnterOnOption(value: string) {
const option = this.getOption(value);
await option.press('Enter');
}

private getOption(value: string) {
const { multiple, selectModal } = this;
const selector = multiple ? 'ion-checkbox' : 'ion-radio';
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/select-popover/select-popover.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ export class SelectPopover implements ComponentInterface {
disabled={option.disabled}
onClick={() => this.dismissParentPopover()}
onKeyUp={(ev) => {
if (ev.key === ' ') {
if (ev.key === 'Enter' || ev.key === ' ') {
/**
* Selecting a radio option with keyboard navigation,
* either through the Enter or Space keys, should
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,24 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
await selectPopoverPage.ionPopoverDidDismiss.next();
await expect(selectPopoverPage.popover).not.toBeVisible();
});

test('pressing Enter on an unselected option should dismiss the popover', async () => {
await selectPopoverPage.setup(config, options, false);

await selectPopoverPage.pressEnterOnOption('apple');
await selectPopoverPage.ionPopoverDidDismiss.next();
await expect(selectPopoverPage.popover).not.toBeVisible();
});

test('pressing Enter on a selected option should dismiss the popover', async ({ browserName }) => {
test.skip(browserName === 'firefox', 'Same behavior as ROU-5437');

await selectPopoverPage.setup(config, checkedOptions, false);

await selectPopoverPage.pressEnterOnOption('apple');
await selectPopoverPage.ionPopoverDidDismiss.next();
await expect(selectPopoverPage.popover).not.toBeVisible();
});
});
});
});
Expand Down
5 changes: 5 additions & 0 deletions core/src/components/select-popover/test/fixtures.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@ export class SelectPopoverPage {
await option.press('Space');
}

async pressEnterOnOption(value: string) {
const option = this.getOption(value);
await option.press('Enter');
}

private getOption(value: string) {
const { multiple, selectPopover } = this;
const selector = multiple ? 'ion-checkbox' : 'ion-radio';
Expand Down
Loading