javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-19 19:57:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(datetime): don't update value on confirm call if no date was selected (#25338)

Browse Source
This commit is contained in:
Amanda Johnston
2022-05-24 09:29:31 -05:00
committed by GitHub
parent 0156be61cb
commit 9e5b10a215
2 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/src/components/datetime/datetime.tsx
View File

@ -442,18 +442,26 @@ export class Datetime implements ComponentInterface {
@Method()
async confirm(closeOverlay = false) {
/**
* Prevent convertDataToISO from doing any
* kind of transformation based on timezone
* This cancels out any change it attempts to make
*
* Important: Take the timezone offset based on
* the date that is currently selected, otherwise
* there can be 1 hr difference when dealing w/ DST
* If highlightActiveParts is false, this means the datetime was inited
* without a value, and the user hasn't selected one yet. We shouldn't
* update the value in this case, since otherwise it would be mysteriously
* set to today.
*/
const date = new Date(convertDataToISO(this.activeParts));
this.activeParts.tzOffset = date.getTimezoneOffset() * -1;
if (this.highlightActiveParts) {
/**
* Prevent convertDataToISO from doing any
* kind of transformation based on timezone
* This cancels out any change it attempts to make
*
* Important: Take the timezone offset based on
* the date that is currently selected, otherwise
* there can be 1 hr difference when dealing w/ DST
*/
const date = new Date(convertDataToISO(this.activeParts));
this.activeParts.tzOffset = date.getTimezoneOffset() * -1;
this.value = convertDataToISO(this.activeParts);
this.value = convertDataToISO(this.activeParts);
}
if (closeOverlay) {
this.closeParentOverlay();

17
core/src/components/datetime/test/basic/datetime.e2e.ts
View File

@ -29,3 +29,20 @@ test.describe('datetime: selecting a day', () => {
await testHighlight(page, 'custom-datetime');
});
});
test.describe('datetime: confirm date', () => {
test('should not update value if Done was clicked without selecting a day first', async ({ page }) => {
await page.goto('/src/components/datetime/test/basic');
const datetime = page.locator('#custom-datetime');
const value = await datetime.evaluate((el: HTMLIonDatetimeElement) => el.value);
expect(value).toBeUndefined();
await datetime.evaluate(async (el: HTMLIonDatetimeElement) => {
await el.confirm();
});
const valueAgain = await datetime.evaluate((el: HTMLIonDatetimeElement) => el.value);
expect(valueAgain).toBeUndefined();
});
});