Skip to content

fix(datetime): closing time picker no longer changes month #25478

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.

Sign up for GitHub

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

Merged
merged 7 commits into from
Jun 17, 2022
Merged

fix(datetime): closing time picker no longer changes month #25478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
77c8d0f
fix(datetime): closing time popover no longer changes month
liamdebeasi Jun 15, 2022
84a2f0c
test(datetime): add failing test
liamdebeasi Jun 15, 2022
53c1bea
fix(datetime): closing time picker no longer changes month
liamdebeasi Jun 15, 2022
0f1ed72
chore(): remove only
liamdebeasi Jun 15, 2022
f7a82d6
chore(): prettier
liamdebeasi Jun 15, 2022
2818073
Merge branch 'main' into FW-1710
liamdebeasi Jun 15, 2022
b16560e
Merge branch 'main' into FW-1710
liamdebeasi Jun 17, 2022
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
29 changes: 29 additions & 0 deletions core/src/components/datetime/test/basic/datetime.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,35 @@ import { expect } from '@playwright/test';
import type { E2EPage } from '@utils/test/playwright';
import { test } from '@utils/test/playwright';

test.describe('datetime: closing time popover', () => {
test('it should not change months', async ({ page }) => {
test.info().annotations.push({
type: 'issue',
description: 'https://github.com/ionic-team/ionic-framework/issues/25438',
});

await page.setContent(`
<ion-datetime></ion-datetime>
`);

const ionPopoverDidPresent = await page.spyOnEvent('ionPopoverDidPresent');
const ionPopoverDidDismiss = await page.spyOnEvent('ionPopoverDidDismiss');
const timeButton = page.locator('.time-body');
const calendarMonthYear = page.locator('ion-datetime .calendar-month-year');
const currentMonthAndYear = await calendarMonthYear.evaluate((el: HTMLElement) => el.innerText);

await timeButton.click();
await ionPopoverDidPresent.next();

await page.keyboard.press('Escape');

await ionPopoverDidDismiss.next();
await page.waitForChanges();

expect(calendarMonthYear).toHaveText(currentMonthAndYear);
});
});

test.describe('datetime: selecting a day', () => {
const testHighlight = async (page: E2EPage, datetimeID: string) => {
const today = new Date();
Expand Down
7 changes: 3 additions & 4 deletions core/src/utils/overlays.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,14 @@ export const createOverlay = <T extends HTMLIonOverlayElement>(

const focusableQueryString =
'[tabindex]:not([tabindex^="-"]), input:not([type=hidden]):not([tabindex^="-"]), textarea:not([tabindex^="-"]), button:not([tabindex^="-"]), select:not([tabindex^="-"]), .ion-focusable:not([tabindex^="-"])';
const innerFocusableQueryString = 'input:not([type=hidden]), textarea, button, select';

export const focusFirstDescendant = (ref: Element, overlay: HTMLIonOverlayElement) => {
let firstInput = ref.querySelector(focusableQueryString) as HTMLElement | null;

const shadowRoot = firstInput?.shadowRoot;
if (shadowRoot) {
// If there are no inner focusable elements, just focus the host element.
firstInput = shadowRoot.querySelector(innerFocusableQueryString) || firstInput;
firstInput = shadowRoot.querySelector(focusableQueryString) || firstInput;
}

if (firstInput) {
Expand All @@ -112,7 +111,7 @@ const focusLastDescendant = (ref: Element, overlay: HTMLIonOverlayElement) => {
const shadowRoot = lastInput?.shadowRoot;
if (shadowRoot) {
// If there are no inner focusable elements, just focus the host element.
lastInput = shadowRoot.querySelector(innerFocusableQueryString) || lastInput;
lastInput = shadowRoot.querySelector(focusableQueryString) || lastInput;
}

if (lastInput) {
Expand Down Expand Up @@ -460,7 +459,7 @@ const focusPreviousElementOnDismiss = async (overlayEl: any) => {
const shadowRoot = previousElement?.shadowRoot;
if (shadowRoot) {
// If there are no inner focusable elements, just focus the host element.
previousElement = shadowRoot.querySelector(innerFocusableQueryString) || previousElement;
previousElement = shadowRoot.querySelector(focusableQueryString) || previousElement;
}

await overlayEl.onDidDismiss();
Expand Down