Skip to content

Commit 3b32549

Browse files
Revert "Use set for setTime (#2293)"
This reverts commit 4530a9c.
1 parent 2acee1e commit 3b32549

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

src/date_utils.js

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ import getMonth from "date-fns/getMonth";
2323
import getQuarter from "date-fns/getQuarter";
2424
import getYear from "date-fns/getYear";
2525
import getTime from "date-fns/getTime";
26-
import set from "date-fns/set";
26+
import setSeconds from "date-fns/setSeconds";
27+
import setMinutes from "date-fns/setMinutes";
28+
import setHours from "date-fns/setHours";
2729
import setMonth from "date-fns/setMonth";
2830
import setQuarter from "date-fns/setQuarter";
2931
import setYear from "date-fns/setYear";
@@ -171,7 +173,7 @@ export function safeDateFormat(date, { dateFormat, locale }) {
171173
// ** Date Setters **
172174

173175
export function setTime(date, { hour = 0, minute = 0, second = 0 }) {
174-
return set(date, {hours: hour, minutes: minute, seconds: second});
176+
return setHours(setMinutes(setSeconds(date, second), minute), hour);
175177
}
176178

177179
export { setMinutes, setHours, setMonth, setQuarter, setYear };
@@ -492,9 +494,15 @@ export function isTimeInDisabledRange(time, { minTime, maxTime }) {
492494
throw new Error("Both minTime and maxTime props required");
493495
}
494496
const base = newDate();
495-
const baseTime = set(base, { hours: getHours(time), minutes: getMinutes(time) });
496-
const min = set(base, { hours: getHours(minTime), minutes: getMinutes(minTime) });
497-
const max = set(base, { hours: getHours(maxTime), minutes: getMinutes(maxTime) });
497+
const baseTime = setHours(setMinutes(base, getMinutes(time)), getHours(time));
498+
const min = setHours(
499+
setMinutes(base, getMinutes(minTime)),
500+
getHours(minTime)
501+
);
502+
const max = setHours(
503+
setMinutes(base, getMinutes(maxTime)),
504+
getHours(maxTime)
505+
);
498506

499507
let valid;
500508
try {

0 commit comments

Comments
 (0)