Skip to content

date-range selectedRange highlighted date fix #1141

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 6 commits into from
Oct 7, 2025
Merged

date-range selectedRange highlighted date fix #1141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9121105
daterange-component selectedrange highlighted date fix
sreyaswimlane Sep 15, 2025
f0712ab
changelog added
sreyaswimlane Sep 15, 2025
4104374
Merge remote-tracking branch 'origin/master' into date-range-componen…
sreyaswimlane Sep 24, 2025
ae8a813
fix clicking on cancel is converting the selected
alok-sahu31 Oct 6, 2025
88bc8e3
fix lint issue
alok-sahu31 Oct 6, 2025
4d6636d
fix test
alok-sahu31 Oct 6, 2025
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
3 changes: 3 additions & 0 deletions projects/swimlane/ngx-ui/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## HEAD (unreleased)

- Fix (`ngx-date-range-picker`): Preset values now retain their relative expressions when cancel is clicked, instead of being converted to timestamps
- Fix (`ngx-date-range-picker`): Fix highlight the date for given `selectedRange` values.

## 50.1.3 (2025-09-23)

- Fix (`ngx-multi-dimension-selection`): Show children of items matching search term
Expand Down
7 changes: 6 additions & 1 deletion ...wimlane/ngx-ui/src/lib/components/date-range-calendar/date-range-picker.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,12 @@ describe('DateRangePickerComponent', () => {
it('should reset to last confirmed range onCancel when present', () => {
const confirmedStart = new Date('2023-01-01');
const confirmedEnd = new Date('2023-01-10');
component.lastConfirmedRange = { startDate: confirmedStart, endDate: confirmedEnd };
component.lastConfirmedRange = {
startDate: confirmedStart,
endDate: confirmedEnd,
startRaw: '2023-01-01',
endRaw: '2023-01-10'
};
spyOn(component.cancel, 'emit');
component.onCancel();
expect(component.form.startDate).toEqual(confirmedStart);
Expand Down
20 changes: 14 additions & 6 deletions ...cts/swimlane/ngx-ui/src/lib/components/date-range-calendar/date-range-picker.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export class DateRangePickerComponent implements OnInit, OnChanges {
@ViewChild('wrapperRef', { static: false }) wrapperRef!: DropdownComponent;

private readonly dateFormat: string = 'yyyy-MM-dd HH:mm:ss';
lastConfirmedRange: { startDate: Date; endDate: Date } = null;
lastConfirmedRange: { startDate: Date; endDate: Date; startRaw: string; endRaw: string } = null;

form: DateRangeForm = { startRaw: '', endRaw: '', startDate: null, endDate: null };

Expand Down Expand Up @@ -154,12 +154,15 @@ export class DateRangePickerComponent implements OnInit, OnChanges {
: this.selectedRange.end;
this.lastConfirmedRange = {
startDate,
endDate
endDate,
startRaw: this.selectedRange.start,
endRaw: this.selectedRange.end
};
this.form.startRaw = this.selectedRange.start;
this.form.endRaw = this.selectedRange.end;
this.form.startDate = startDate;
this.form.endDate = endDate;
this.rangeModel = { startDate, endDate };
this.setTooltipDate(startDate, endDate);
}
}
Expand Down Expand Up @@ -284,7 +287,9 @@ export class DateRangePickerComponent implements OnInit, OnChanges {
if (this.form.startDate && this.form.endDate) {
this.lastConfirmedRange = {
startDate: this.form.startDate,
endDate: this.form.endDate
endDate: this.form.endDate,
startRaw: this.form.startRaw,
endRaw: this.form.endRaw
};
this.updateSelectedLabel();
this.apply.emit({
Expand All @@ -304,10 +309,13 @@ export class DateRangePickerComponent implements OnInit, OnChanges {
this.form = {
startDate: this.lastConfirmedRange.startDate,
endDate: this.lastConfirmedRange.endDate,
startRaw: format(this.lastConfirmedRange.startDate, this.dateFormat),
endRaw: format(this.lastConfirmedRange.endDate, this.dateFormat)
startRaw: this.lastConfirmedRange.startRaw,
endRaw: this.lastConfirmedRange.endRaw
};
this.rangeModel = {
startDate: this.lastConfirmedRange.startDate,
endDate: this.lastConfirmedRange.endDate
};
this.rangeModel = { ...this.lastConfirmedRange };
} else {
// First-time cancel before any apply: reset form
this.form = {
Expand Down