Skip to content

fix(ui5-dynamic-date-range): correct off-by-one-day date shift in negative UTC offsets #14017

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

Open
unazko wants to merge 5 commits into
base: main
Choose a base branch
from
+34 −16
Open

fix(ui5-dynamic-date-range): correct off-by-one-day date shift in negative UTC offsets #14017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6289772
fix(ui5-dynamic-date-range): correct off-by-one-day date shift in neg…
unazko Sep 2, 2026
100dcde
Merge branch 'main' into dynamic_date_range_timezone
unazko Sep 2, 2026
a42a148
fix(ui5-dynamic-date-range)fix(ui5-dynamic-date-range): fix lint errors
unazko Sep 2, 2026
029e977
fix(ui5-dynamic-date-range): correct off-by-one-day date shift in neg…
unazko Sep 4, 2026
1faa4bc
Merge branch 'main' into dynamic_date_range_timezone
unazko Sep 4, 2026
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
14 changes: 14 additions & 0 deletions packages/main/cypress/specs/DynamicDateRange.cy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import Label from "../../src/Label.js";
import SingleDate from '../../src/dynamic-date-range-options/SingleDate.js';
import DateRange from '../../src/dynamic-date-range-options/DateRange.js';
import Today from '../../src/dynamic-date-range-options/Today.js';
import { calendarTimestampToLocalDate } from '../../src/dynamic-date-range-options/toDates.js';
import LastOptions from '../../src/dynamic-date-range-options/LastOptions.js';
import NextOptions from '../../src/dynamic-date-range-options/NextOptions.js';
import DateTimeRange from '../../src/dynamic-date-range-options/DateTimeRange.js';
Expand Down Expand Up @@ -888,4 +889,17 @@ describe("DynamicDateRange DateTimeRange Option", () => {
.should("contain.value", "Mar 5, 2025")
.and("contain.value", "Mar 6, 2025");
});
});

describe("calendarTimestampToLocalDate", () => {
it("local date components match the UTC date of the calendar timestamp", () => {
// 1747267200 = 2025-05-15 00:00:00 UTC — same timestamp the calendar fires for May 15
const ts = 1747267200;
const result = calendarTimestampToLocalDate(ts);
const ref = new Date(ts * 1000);

expect(result.getFullYear()).to.equal(ref.getUTCFullYear());
expect(result.getMonth()).to.equal(ref.getUTCMonth());
expect(result.getDate()).to.equal(ref.getUTCDate());
});
});
8 changes: 4 additions & 4 deletions packages/main/src/dynamic-date-range-options/DateRange.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import DateRangeTemplate from "./DateRangeTemplate.js";
import type { DynamicDateRangeValue, IDynamicDateRangeOption } from "../DynamicDateRange.js";
import DateFormat from "@ui5/webcomponents-localization/dist/DateFormat.js";
import UI5Date from "@ui5/webcomponents-localization/dist/dates/UI5Date.js";
import type UI5Date from "@ui5/webcomponents-localization/dist/dates/UI5Date.js";
import type { JsxTemplate } from "@ui5/webcomponents-base/dist/index.js";
import {
DYNAMIC_DATE_RANGE_DATERANGE_TEXT,
} from "../generated/i18n/i18n-defaults.js";
import { dateRangeOptionToDates } from "./toDates.js";
import { dateRangeOptionToDates, calendarTimestampToLocalDate } from "./toDates.js";
import DynamicDateRange from "../DynamicDateRange.js";

/**
Expand Down Expand Up @@ -85,11 +85,11 @@ class DateRange implements IDynamicDateRangeOption {
currentValue.operator = this.operator;

if (e.detail.selectedDates[0]) {
currentValue.values[0] = UI5Date.getInstance(e.detail.selectedDates[0] * 1000);
currentValue.values[0] = calendarTimestampToLocalDate(e.detail.selectedDates[0] as number);
}

if (e.detail.selectedDates[1]) {
currentValue.values[1] = UI5Date.getInstance(e.detail.selectedDates[1] * 1000);
currentValue.values[1] = calendarTimestampToLocalDate(e.detail.selectedDates[1] as number);
}

// Handle backwards date ranges by automatically flipping them
Expand Down
9 changes: 4 additions & 5 deletions packages/main/src/dynamic-date-range-options/FromDateTime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import FromDateTimeTemplate from "./FromDateTimeTemplate.js";
import type { DynamicDateRangeValue, IDynamicDateRangeOption } from "../DynamicDateRange.js";
import DateFormat from "@ui5/webcomponents-localization/dist/DateFormat.js";
import UI5Date from "@ui5/webcomponents-localization/dist/dates/UI5Date.js";
import type { JsxTemplate } from "@ui5/webcomponents-base/dist/index.js";
import {
DATETIME_PICKER_DATE_BUTTON,
DATETIME_PICKER_TIME_BUTTON,
DYNAMIC_DATE_RANGE_FROM_INPUT_TEXT,
DYNAMIC_DATE_RANGE_FROM_TEXT,
} from "../generated/i18n/i18n-defaults.js";
import { dateTimeOptionToDates } from "./toDates.js";
import { dateTimeOptionToDates, calendarTimestampToLocalDate } from "./toDates.js";
import DynamicDateRange from "../DynamicDateRange.js";

/**
Expand All @@ -28,7 +27,7 @@ class FromDateTime implements IDynamicDateRangeOption {
constructor() {
this.template = FromDateTimeTemplate;
this._showTimeView = false;
this._currentDateValue = UI5Date.getInstance();
this._currentDateValue = new Date();
}

parse(value: string): DynamicDateRangeValue {
Expand Down Expand Up @@ -155,8 +154,8 @@ class FromDateTime implements IDynamicDateRangeOption {

if (target.hasAttribute("ui5-calendar")) {
if (e.detail.selectedDates[0]) {
const tempDate = UI5Date.getInstance(e.detail.selectedDates[0] * 1000);
this._currentDateValue.setFullYear(tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate());
const localDate = calendarTimestampToLocalDate(e.detail.selectedDates[0] as number);
this._currentDateValue.setFullYear(localDate.getFullYear(), localDate.getMonth(), localDate.getDate());
currentValue.values = [this._currentDateValue];
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/main/src/dynamic-date-range-options/SingleDate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import type { JsxTemplate } from "@ui5/webcomponents-base/dist/index.js";
import {
DYNAMIC_DATE_RANGE_DATE_TEXT,
} from "../generated/i18n/i18n-defaults.js";
import { dateOptionToDates } from "./toDates.js";
import { dateOptionToDates, calendarTimestampToLocalDate } from "./toDates.js";
import DynamicDateRange from "../DynamicDateRange.js";

/**
Expand Down Expand Up @@ -76,7 +76,7 @@ class SingleDate implements IDynamicDateRangeOption {
currentValue.operator = this.operator;

if (e.detail.selectedDates[0]) {
currentValue.values[0] = new Date(e.detail.selectedDates[0] * 1000);
currentValue.values[0] = calendarTimestampToLocalDate(e.detail.selectedDates[0] as number);
}

return currentValue;
Expand Down
9 changes: 4 additions & 5 deletions packages/main/src/dynamic-date-range-options/ToDateTime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import FromDateTimeTemplate from "./FromDateTimeTemplate.js";
import type { DynamicDateRangeValue, IDynamicDateRangeOption } from "../DynamicDateRange.js";
import DateFormat from "@ui5/webcomponents-localization/dist/DateFormat.js";
import UI5Date from "@ui5/webcomponents-localization/dist/dates/UI5Date.js";
import type { JsxTemplate } from "@ui5/webcomponents-base/dist/index.js";
import {
DATETIME_PICKER_DATE_BUTTON,
DATETIME_PICKER_TIME_BUTTON,
DYNAMIC_DATE_RANGE_TO_INPUT_TEXT,
DYNAMIC_DATE_RANGE_TO_TEXT,
} from "../generated/i18n/i18n-defaults.js";
import { dateTimeOptionToDates } from "./toDates.js";
import { dateTimeOptionToDates, calendarTimestampToLocalDate } from "./toDates.js";
import DynamicDateRange from "../DynamicDateRange.js";

/**
Expand All @@ -28,7 +27,7 @@ class ToDateTime implements IDynamicDateRangeOption {
constructor() {
this.template = FromDateTimeTemplate;
this._showTimeView = false;
this._currentDateValue = UI5Date.getInstance();
this._currentDateValue = new Date();
}

parse(value: string): DynamicDateRangeValue {
Expand Down Expand Up @@ -156,8 +155,8 @@ class ToDateTime implements IDynamicDateRangeOption {

if (target.hasAttribute("ui5-calendar")) {
if (e.detail.selectedDates[0]) {
const tempDate = UI5Date.getInstance(e.detail.selectedDates[0] * 1000);
this._currentDateValue.setFullYear(tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate());
const localDate = calendarTimestampToLocalDate(e.detail.selectedDates[0] as number);
this._currentDateValue.setFullYear(localDate.getFullYear(), localDate.getMonth(), localDate.getDate());
currentValue.values = [this._currentDateValue];
}
}
Expand Down
6 changes: 6 additions & 0 deletions packages/main/src/dynamic-date-range-options/toDates.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import type { DynamicDateRangeValue, IDynamicDateRangeOption } from "../DynamicDateRange.js";
import UI5Date from "@ui5/webcomponents-localization/dist/dates/UI5Date.js";
import CalendarDate from "@ui5/webcomponents-localization/dist/dates/CalendarDate.js";

const calendarTimestampToLocalDate = (timestampSeconds: number): Date => {
return CalendarDate.fromTimestamp(timestampSeconds * 1000).toLocalJSDate();
};

const dateOptionToDates = (value: DynamicDateRangeValue): Array<Date> => {
if (!value || !value.values || value.values.length !== 1) {
Expand Down Expand Up @@ -211,6 +216,7 @@ const dateTimeOptionToDates = (value: DynamicDateRangeValue): Array<Date> => {
};

export {
calendarTimestampToLocalDate,
dateOptionToDates,
dateRangeOptionToDates,
dateTimeRangeOptionToDates,
Expand Down
Loading