Skip to content

Commit

Permalink
fix(useTimeAgo): Support custom UnitNames type for units field (#3684)
Browse files Browse the repository at this point in the history
Co-authored-by: Doctorwu <44631608+Doctor-wu@users.noreply.github.com>
  • Loading branch information
nickmessing and Doctor-wu committed Jan 9, 2024
1 parent c197e8b commit 1d6bed9
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions packages/core/useTimeAgo/index.ts
Expand Up @@ -54,7 +54,7 @@ export interface FormatTimeAgoOptions<UnitNames extends string = UseTimeAgoUnitN
/**
* Custom units
*/
units?: UseTimeAgoUnit<UseTimeAgoUnitNamesDefault>[]
units?: UseTimeAgoUnit<UnitNames>[]
}

export interface UseTimeAgoOptions<Controls extends boolean, UnitNames extends string = UseTimeAgoUnitNamesDefault> extends FormatTimeAgoOptions<UnitNames> {
Expand Down Expand Up @@ -157,7 +157,7 @@ export function formatTimeAgo<UnitNames extends string = UseTimeAgoUnitNamesDefa
max,
messages = DEFAULT_MESSAGES as UseTimeAgoMessages<UnitNames>,
fullDateFormatter = DEFAULT_FORMATTER,
units = DEFAULT_UNITS,
units = DEFAULT_UNITS as UseTimeAgoUnit<UnitNames>[],
showSecond = false,
rounding = 'round',
} = options
Expand All @@ -169,11 +169,11 @@ export function formatTimeAgo<UnitNames extends string = UseTimeAgoUnitNamesDefa
const diff = +now - +from
const absDiff = Math.abs(diff)

function getValue(diff: number, unit: UseTimeAgoUnit) {
function getValue(diff: number, unit: UseTimeAgoUnit<UnitNames>) {
return roundFn(Math.abs(diff) / unit.value)
}

function format(diff: number, unit: UseTimeAgoUnit) {
function format(diff: number, unit: UseTimeAgoUnit<UnitNames>) {
const val = getValue(diff, unit)
const past = diff > 0

Expand Down

0 comments on commit 1d6bed9

Please sign in to comment.