File tree 1 file changed +6
-4
lines changed
src/VueDatePicker/components/TimePicker
1 file changed +6
-4
lines changed Original file line number Diff line number Diff line change 279
279
return Boolean (disabledTimes [type ]?.includes (value ));
280
280
};
281
281
282
+ const getAmPmDiff = (val : number , type : TimeType ): number => {
283
+ if (type !== ' hours' ) return val ;
284
+ return amPm .value === ' AM' ? val : val + 12 ;
285
+ };
286
+
282
287
const getGridItems = (type : TimeType ): OverlayGridItem [][] => {
283
288
const timeRange = props .is24 ? 24 : 12 ;
284
289
const max = type === ' hours' ? timeRange : 60 ;
288
293
const generatedArray: IDefaultSelect [] = [];
289
294
290
295
for (let i = min ; i < max ; i += increment ) {
291
- generatedArray .push ({ value: i , text: i < 10 ? ` 0${i } ` : ` ${i } ` });
296
+ generatedArray .push ({ value: props . is24 ? i : getAmPmDiff ( i , type ) , text: i < 10 ? ` 0${i } ` : ` ${i } ` });
292
297
}
293
298
294
299
if (type === ' hours' && ! props .is24 ) {
410
415
411
416
const handleTimeFromOverlay = (type : TimeType , value : number ): void => {
412
417
toggleOverlay (type );
413
- if (type === ' hours' && ! props .is24 ) {
414
- return emit (` update:${type } ` , amPm .value === ' PM' ? value + 12 : value );
415
- }
416
418
return emit (` update:${type } ` , value );
417
419
};
418
420
You can’t perform that action at this time.
0 commit comments