fix(useTimeAgo): rounding unit fallback

vueuse · Dec 20, 2022 · f40a021 · f40a021
1 parent 9293c1b
commit f40a021
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/packages/core/useTimeAgo/index.test.ts b/packages/core/useTimeAgo/index.test.ts
@@ -249,6 +249,15 @@ describe('useTimeAgo', () => {
     expect(useTimeAgo(changeTime, { rounding: 3 }).value).toBe('in 5.49 days')
   })
 
+  test('rounding unit fallback', () => {
+    changeValue.value = getNeededTimeChange('month', 11.5)
+    expect(useTimeAgo(changeTime).value).toBe('next year')
+    expect(useTimeAgo(changeTime, { rounding: 'ceil' }).value).toBe('next year')
+    expect(useTimeAgo(changeTime, { rounding: 'floor' }).value).toBe('in 11 months')
+    expect(useTimeAgo(changeTime, { rounding: 1 }).value).toBe('in 0.9 year')
+    expect(useTimeAgo(changeTime, { rounding: 3 }).value).toBe('in 0.945 year')
+  })
+
   test('custom units', () => {
     changeValue.value = getNeededTimeChange('day', 14)
     expect(useTimeAgo(changeTime).value).toBe('in 2 weeks')

diff --git a/packages/core/useTimeAgo/index.ts b/packages/core/useTimeAgo/index.ts
@@ -168,8 +168,12 @@ export function foramtTimeAgo<UnitNames extends string = UseTimeAgoUnitNamesDefa
   const diff = +now - +from
   const absDiff = Math.abs(diff)
 
+  function getValue(diff: number, unit: UseTimeAgoUnit) {
+    return roundFn(Math.abs(diff) / unit.value)
+  }
+
   function format(diff: number, unit: UseTimeAgoUnit) {
-    const val = roundFn(Math.abs(diff) / unit.value)
+    const val = getValue(diff, unit)
     const past = diff > 0
 
     const str = applyFormat(unit.name as UnitNames, val, past)
@@ -196,7 +200,10 @@ export function foramtTimeAgo<UnitNames extends string = UseTimeAgoUnitNamesDefa
       return fullDateFormatter(new Date(from))
   }
 
-  for (const unit of units) {
+  for (const [idx, unit] of units.entries()) {
+    const val = getValue(diff, unit)
+    if (val <= 0 && units[idx - 1])
+      return format(diff, units[idx - 1])
     if (absDiff < unit.max)
       return format(diff, unit)
   }