@@ -37,6 +37,7 @@ import { FlowStep } from '@/constants';
37
37
import type { ICalendarDate , ICalendarDay , WeekStartNum , IMarker , VueEmit , TimeType } from '@/interfaces' ;
38
38
import type { UnwrapRef } from 'vue' ;
39
39
import type { PickerBasePropsType } from '@/props' ;
40
+ import { dateToTimezoneSafe } from '@/utils/timezone' ;
40
41
41
42
export const useDatePicker = (
42
43
props : PickerBasePropsType ,
@@ -615,14 +616,15 @@ export const useDatePicker = (
615
616
616
617
// Select current date on now button
617
618
const selectCurrentDate = ( ) : void => {
619
+ const dateInTz = dateToTimezoneSafe ( getDate ( ) , defaultedTz . value ) ;
618
620
if ( ! defaultedRange . value . enabled ) {
619
- modelValue . value = getDate ( ) ;
621
+ modelValue . value = dateInTz ;
620
622
} 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 ] ;
624
626
} else {
625
- modelValue . value = [ getDate ( ) ] ;
627
+ modelValue . value = [ dateInTz ] ;
626
628
}
627
629
628
630
selectOnAutoApply ( ) ;
0 commit comments