Skip to content

fix: diff should return NaN for invalid dates (#2793) #2866

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: diff should return NaN for invalid dates (#2793) #2866

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,13 +357,13 @@ class Dayjs {
let result
switch (unit) {
case C.Y:
result = getMonth() / 12
result = (getMonth() / 12) || diff
break
case C.M:
result = getMonth()
result = getMonth() || diff
break
case C.Q:
result = getMonth() / 3
result = (getMonth() / 3) || diff
break
case C.W:
result = (diff - zoneDelta) / C.MILLISECONDS_A_WEEK
Expand Down
12 changes: 12 additions & 0 deletions test/issues/issue2793.diff.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import dayjs from '../../src'

describe('issue 2793 - diff with invalid date should return NaN', () => {
['days', 'week', 'month', 'quarter', 'year', 'hour', 'minute', 'second'].forEach((unit) => {
it(`should return NaN for ${unit}`, () => {
const currentDate = dayjs()
const expiresOn = dayjs(null)
const diffDays = expiresOn.diff(currentDate, unit)
expect(diffDays).toBeNaN()
})
})
})