From e357cdea8fc5dc8bb0e1720b07e475333b958a1e Mon Sep 17 00:00:00 2001 From: Derek Liang Date: Fri, 1 Nov 2024 23:59:51 +0000 Subject: [PATCH 1/2] fix- daterange picker, default range in quick Select ranges --- src/datepicker/themes/bs/bs-custom-dates-view.component.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/datepicker/themes/bs/bs-custom-dates-view.component.ts b/src/datepicker/themes/bs/bs-custom-dates-view.component.ts index 533bb4a55b..fc98b0ef55 100644 --- a/src/datepicker/themes/bs/bs-custom-dates-view.component.ts +++ b/src/datepicker/themes/bs/bs-custom-dates-view.component.ts @@ -34,6 +34,12 @@ export class BsCustomDatesViewComponent { } compareRanges(range?: BsCustomDates) { + const currentRange = range?.value; + if (Array.isArray(currentRange) && Array.isArray(this.selectedRange)) { + return new Date(currentRange[0]).setHours(0, 0, 0, 0) === new Date(this.selectedRange[0]).setHours(0, 0, 0, 0) + && new Date(currentRange[1]).setHours(0, 0, 0, 0) === new Date(this.selectedRange[1]).setHours(0, 0, 0, 0); + } + return JSON.stringify(range?.value) === JSON.stringify(this.selectedRange); } } From 31831536808768b9df8853614cd2d2b51b2219b5 Mon Sep 17 00:00:00 2001 From: Derek Liang Date: Sat, 2 Nov 2024 00:22:08 +0000 Subject: [PATCH 2/2] refactor --- .../themes/bs/bs-custom-dates-view.component.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/datepicker/themes/bs/bs-custom-dates-view.component.ts b/src/datepicker/themes/bs/bs-custom-dates-view.component.ts index fc98b0ef55..7e6e73d0b1 100644 --- a/src/datepicker/themes/bs/bs-custom-dates-view.component.ts +++ b/src/datepicker/themes/bs/bs-custom-dates-view.component.ts @@ -35,11 +35,12 @@ export class BsCustomDatesViewComponent { compareRanges(range?: BsCustomDates) { const currentRange = range?.value; - if (Array.isArray(currentRange) && Array.isArray(this.selectedRange)) { - return new Date(currentRange[0]).setHours(0, 0, 0, 0) === new Date(this.selectedRange[0]).setHours(0, 0, 0, 0) - && new Date(currentRange[1]).setHours(0, 0, 0, 0) === new Date(this.selectedRange[1]).setHours(0, 0, 0, 0); + const selectedRange = this.selectedRange; + if (Array.isArray(currentRange) && Array.isArray(selectedRange)) { + return new Date(currentRange[0]).setHours(0, 0, 0, 0) === new Date(selectedRange[0]).setHours(0, 0, 0, 0) + && new Date(currentRange[1]).setHours(0, 0, 0, 0) === new Date(selectedRange[1]).setHours(0, 0, 0, 0); } - return JSON.stringify(range?.value) === JSON.stringify(this.selectedRange); + return JSON.stringify(currentRange) === JSON.stringify(selectedRange); } }