fix(useDateFormat): handle zero properly (#3272)

Co-authored-by: Anthony Fu <anthonyfu117@hotmail.com>
vueuse · Jul 30, 2023 · d642866 · d642866
1 parent b5e52f5
commit d642866
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/packages/shared/useDateFormat/index.test.ts b/packages/shared/useDateFormat/index.test.ts
@@ -104,4 +104,9 @@ describe('useDateFormat', () => {
       expect(useDateFormat(new Date(dateStr), formatStr, { customMeridiem }).value).toBe(expected)
     })
   })
+
+  it('formatDate', () => {
+    expect(formatDate(new Date('Sun Jul 30 2023 21:15:42 GMT+0800'), 'd'))
+      .toMatchInlineSnapshot('"0"')
+  })
 })
diff --git a/packages/shared/useDateFormat/index.ts b/packages/shared/useDateFormat/index.ts
@@ -66,7 +66,7 @@ export function formatDate(date: Date, formatStr: string, options: UseDateFormat
     a: () => meridiem(hours, minutes, true),
     aa: () => meridiem(hours, minutes, true, true),
   }
-  return formatStr.replace(REGEX_FORMAT, (match, $1) => $1 || matches[match]?.() || match)
+  return formatStr.replace(REGEX_FORMAT, (match, $1) => $1 ?? matches[match]?.() ?? match)
 }
 
 export function normalizeDate(date: DateLike) {