@@ -23,7 +23,10 @@ export const convertToDateObject = (date, selectionType) => {
23
23
return convertIsoWeekToDate ( date )
24
24
}
25
25
26
- return new Date ( Date . parse ( date ) )
26
+ const _date = new Date ( Date . parse ( date ) )
27
+ const userTimezoneOffset = _date . getTimezoneOffset ( ) * 60_000
28
+
29
+ return new Date ( _date . getTime ( ) + userTimezoneOffset )
27
30
}
28
31
29
32
export const convertToLocalDate = ( d , locale , options = { } ) =>
@@ -41,15 +44,15 @@ export const createGroupsInArray = (arr, numberOfGroups) => {
41
44
42
45
export const getCalendarDate = ( calendarDate , order , view ) => {
43
46
if ( order !== 0 && view === 'days' ) {
44
- return new Date ( Date . UTC ( calendarDate . getFullYear ( ) , calendarDate . getMonth ( ) + order , 1 ) )
47
+ return new Date ( calendarDate . getFullYear ( ) , calendarDate . getMonth ( ) + order , 1 )
45
48
}
46
49
47
50
if ( order !== 0 && view === 'months' ) {
48
- return new Date ( Date . UTC ( calendarDate . getFullYear ( ) + order , calendarDate . getMonth ( ) , 1 ) )
51
+ return new Date ( calendarDate . getFullYear ( ) + order , calendarDate . getMonth ( ) , 1 )
49
52
}
50
53
51
54
if ( order !== 0 && view === 'years' ) {
52
- return new Date ( Date . UTC ( calendarDate . getFullYear ( ) + ( 12 * order ) , calendarDate . getMonth ( ) , 1 ) )
55
+ return new Date ( calendarDate . getFullYear ( ) + ( 12 * order ) , calendarDate . getMonth ( ) , 1 )
53
56
}
54
57
55
58
return calendarDate
@@ -201,10 +204,7 @@ export const getWeekNumber = date => {
201
204
1 +
202
205
Math . round (
203
206
// eslint-disable-next-line no-mixed-operators
204
- ( ( date . getTime ( ) - week1 . getTime ( ) ) / 86400000 -
205
- 3 +
206
- ( ( week1 . getDay ( ) + 6 ) % 7 ) ) /
207
- 7
207
+ ( ( date . getTime ( ) - week1 . getTime ( ) ) / 86_400_000 - 3 + ( ( week1 . getDay ( ) + 6 ) % 7 ) ) / 7
208
208
)
209
209
)
210
210
}
@@ -284,7 +284,11 @@ export const isDateDisabled = (date, min, max, dates) => {
284
284
}
285
285
286
286
export const isDateInRange = ( date , start , end ) => {
287
- return start && end && start <= date && date <= end
287
+ const _date = removeTimeFromDate ( date )
288
+ const _start = start ? removeTimeFromDate ( start ) : null
289
+ const _end = end ? removeTimeFromDate ( end ) : null
290
+
291
+ return _start && _end && _start <= _date && _date <= _end
288
292
}
289
293
290
294
export const isDateSelected = ( date , start , end ) => {
@@ -338,3 +342,6 @@ export const isValidDate = date => {
338
342
const d = new Date ( date )
339
343
return d instanceof Date && d . getTime ( )
340
344
}
345
+
346
+ export const removeTimeFromDate = date =>
347
+ new Date ( date . getFullYear ( ) , date . getMonth ( ) , date . getDate ( ) )
0 commit comments