Skip to content

fix: fix the issue of endOf('day') #2839

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix: fix the issue of endOf('day') #2839

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,28 @@ class Dayjs {
(isStartOf ? argumentStart : argumentEnd).slice(slice)
), this)
}
const instanceFactorySetHours = (method, slice) => {
const argumentStart = [0, 0, 0, 0]
const argumentEnd = [23, 59, 59, 999];

const argument = isStartOf ? argumentStart : argumentEnd;

/** Compute the time zone offset in minutes */
const offsetMinute = this.utcOffset() + new Date().getTimezoneOffset();

const offsetDayjs = Utils.w(this.toDate()[method].apply( // eslint-disable-line prefer-spread
this.toDate('s'),
argument.slice(slice)
), this)

const offsetDate = offsetDayjs.toDate()

if (offsetDate.getHours() === argument[0] && offsetDate.getMinutes() === argument[1] && offsetDate.getSeconds() === argument[2]) {
return offsetDayjs
}

return offsetDayjs.add(offsetMinute, "minute");
}
const { $W, $M, $D } = this
const utcPad = `set${this.$u ? 'UTC' : ''}`
switch (unit) {
Expand All @@ -175,7 +197,7 @@ class Dayjs {
}
case C.D:
case C.DATE:
return instanceFactorySet(`${utcPad}Hours`, 0)
return utcPad === 'set' ? instanceFactorySetHours(`${utcPad}Hours`, 0) : instanceFactorySet(`${utcPad}Hours`, 0)
case C.H:
return instanceFactorySet(`${utcPad}Minutes`, 1)
case C.MIN:
Expand Down