fixed parsing date with time zone in dayjs.tz()

iamkun · Nov 23, 2024 · bfc7e1f · bfc7e1f
1 parent 72f2aa3
commit bfc7e1f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/plugin/timezone/index.js b/src/plugin/timezone/index.js
@@ -90,6 +90,11 @@ export default (o, c, d) => {
     return [localTS - (Math.min(o2, o3) * 60 * 1000), Math.max(o2, o3)]
   }
 
+  const hasTimeZone = (dateTimeString) => {
+    const timeZoneRegex = /\+\d{4}|\-\d{4}|[\+\-]\d{2}:\d{2}|UTC|GMT$|Z$/i;
+    return timeZoneRegex.test(dateTimeString);
+  };
+
   const proto = c.prototype
 
   proto.tz = function (timezone = defaultTimezone, keepLocalTime) {
@@ -136,8 +141,8 @@ export default (o, c, d) => {
     const parseFormat = arg2 && arg1
     const timezone = arg2 || arg1 || defaultTimezone
     const previousOffset = tzOffset(+d(), timezone)
-    if (typeof input !== 'string') {
-      // timestamp number || js Date || Day.js
+    if ((typeof input !== 'string') || hasTimeZone(input)) {
+      // timestamp number || js Date || Day.js || date with time zone
       return d(input).tz(timezone)
     }
     const localTs = d.utc(input, parseFormat).valueOf()

diff --git a/test/plugin/timezone.test.js b/test/plugin/timezone.test.js
@@ -42,6 +42,15 @@ describe('Parse', () => {
     expect(newYork.valueOf()).toBe(MnewYork.valueOf())
   })
 
+  it('parse target time string with timezone info', () => {
+    const newYork = dayjs.tz('2024-09-30 12:43:00 -0400', NY)
+    const DnewYork = dayjs('2024-09-30 12:43:00 -0400').tz(NY)
+    const MnewYork = moment('2024-09-30 12:43:00 -0400').tz(NY)
+    expect(newYork.format()).toBe('2024-09-30T12:43:00-04:00')
+    expect(newYork.format()).toBe(DnewYork.format())
+    expect(newYork.format()).toBe(MnewYork.format())
+  })
+
   it('parse timestamp, js Date, Day.js object', () => {
     const d = new Date('2020-08-07T12:00-07:00')
     const result = '2020-08-07T12:00:00-07:00'