Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 15 additions & 11 deletions src/plugin/utc/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,21 +87,25 @@ export default (option, Dayjs, dayjs) => {
}
}
const offset = Math.abs(input) <= 16 ? input * 60 : input
let ins = this

if (offset === 0) {
return this.utc(keepLocalTime)
}

let ins = this.clone()

if (keepLocalTime) {
ins.$offset = offset
ins.$u = input === 0
ins.$u = false
return ins
}
if (input !== 0) {
const localTimezoneOffset = this.$u
? this.toDate().getTimezoneOffset() : -1 * this.utcOffset()
ins = this.local().add(offset + localTimezoneOffset, MIN)
ins.$offset = offset
ins.$x.$localOffset = localTimezoneOffset
} else {
ins = this.utc()
}

const localTimezoneOffset = this.$u
? this.toDate().getTimezoneOffset() : -1 * this.utcOffset()
ins = this.local().add(offset + localTimezoneOffset, MIN)
ins.$offset = offset
ins.$x.$localOffset = localTimezoneOffset

return ins
}

Expand Down
18 changes: 18 additions & 0 deletions test/plugin/utc-utcOffset.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -149,3 +149,21 @@ test('utc startOf', () => {
expect(d2d)
.toBe(1500465600000)
})

test('cloning dates modified with utcOffset', () => {
const djs = dayjs('2023-10-29T00:00:00+03:00')

const tests = [
djs,
djs.utcOffset(-240),
djs.utcOffset(-240, true),
djs.utcOffset(120),
djs.utcOffset(120, true),
djs.utcOffset(0),
djs.utcOffset(0, true)
]

tests.forEach((d) => {
expect(dayjs(d).format()).toEqual(d.format())
})
})