Skip to content

Commit 937f1b3

Browse files
committed
fix: now button not selecting in provided timezone (fixes #874)
1 parent b74cfd4 commit 937f1b3

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

src/VueDatePicker/components/DatePicker/date-picker.ts

+7-5
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import { FlowStep } from '@/constants';
3737
import type { ICalendarDate, ICalendarDay, WeekStartNum, IMarker, VueEmit, TimeType } from '@/interfaces';
3838
import type { UnwrapRef } from 'vue';
3939
import type { PickerBasePropsType } from '@/props';
40+
import { dateToTimezoneSafe } from '@/utils/timezone';
4041

4142
export const useDatePicker = (
4243
props: PickerBasePropsType,
@@ -615,14 +616,15 @@ export const useDatePicker = (
615616

616617
// Select current date on now button
617618
const selectCurrentDate = (): void => {
619+
const dateInTz = dateToTimezoneSafe(getDate(), defaultedTz.value);
618620
if (!defaultedRange.value.enabled) {
619-
modelValue.value = getDate();
621+
modelValue.value = dateInTz;
620622
} else if (modelValue.value && Array.isArray(modelValue.value) && modelValue.value[0]) {
621-
modelValue.value = isDateBefore(getDate(), modelValue.value[0])
622-
? [getDate(), modelValue.value[0]]
623-
: [modelValue.value[0], getDate()];
623+
modelValue.value = isDateBefore(dateInTz, modelValue.value[0])
624+
? [dateInTz, modelValue.value[0]]
625+
: [modelValue.value[0], dateInTz];
624626
} else {
625-
modelValue.value = [getDate()];
627+
modelValue.value = [dateInTz];
626628
}
627629

628630
selectOnAutoApply();

0 commit comments

Comments
 (0)