use exact unit for duration
This commit is contained in:
1 parent
650cfe00ce
commit
0f474d82d6
1 file changed
+16
-10
@@ -120,30 +120,36 @@ const DURATION_UNITS: Array<{ unit: DurationUnit; milliseconds: number }> = [
|
|||||||
{ unit: "second", milliseconds: MS_PER_SECOND },
|
{ unit: "second", milliseconds: MS_PER_SECOND },
|
||||||
];
|
];
|
||||||
|
|
||||||
|
const FALLBACK_DURATION_UNIT = DURATION_UNITS[DURATION_UNITS.length - 1];
|
||||||
|
|
||||||
const getDurationUnit = (ms: number) =>
|
const getDurationUnit = (ms: number) =>
|
||||||
DURATION_UNITS.find(({ milliseconds }) => Math.abs(ms) >= milliseconds) ??
|
DURATION_UNITS.find(({ milliseconds }) => Math.abs(ms) >= milliseconds) ??
|
||||||
DURATION_UNITS[DURATION_UNITS.length - 1];
|
FALLBACK_DURATION_UNIT;
|
||||||
|
|
||||||
|
const getExactDurationUnit = (ms: number) =>
|
||||||
|
DURATION_UNITS.find(({ milliseconds }) => ms !== 0 && ms % milliseconds === 0) ??
|
||||||
|
FALLBACK_DURATION_UNIT;
|
||||||
|
|
||||||
export const formatDuration = (
|
export const formatDuration = (
|
||||||
ms: number,
|
ms: number,
|
||||||
{ long = false, relative = false, hasSpace = true, locale }: FormatDurationOptions = {}
|
{ long = false, relative = false, hasSpace = true, locale }: FormatDurationOptions = {}
|
||||||
): string => {
|
): string => {
|
||||||
if (long || relative) {
|
if (relative) {
|
||||||
const { unit, milliseconds } = getDurationUnit(ms);
|
const { unit, milliseconds } = getDurationUnit(ms);
|
||||||
const value = Math.sign(ms) * Math.floor(Math.abs(ms) / milliseconds);
|
const value = Math.sign(ms) * Math.floor(Math.abs(ms) / milliseconds);
|
||||||
|
return new Intl.RelativeTimeFormat(locale, {
|
||||||
|
numeric: "always",
|
||||||
|
style: long ? "long" : "narrow",
|
||||||
|
}).format(-value, unit);
|
||||||
|
}
|
||||||
|
|
||||||
if (relative) {
|
if (long) {
|
||||||
return new Intl.RelativeTimeFormat(locale, {
|
const { unit, milliseconds } = getExactDurationUnit(ms);
|
||||||
numeric: "always",
|
|
||||||
style: long ? "long" : "narrow",
|
|
||||||
}).format(-value, unit);
|
|
||||||
}
|
|
||||||
|
|
||||||
return new Intl.NumberFormat(locale, {
|
return new Intl.NumberFormat(locale, {
|
||||||
style: "unit",
|
style: "unit",
|
||||||
unit,
|
unit,
|
||||||
unitDisplay: "long",
|
unitDisplay: "long",
|
||||||
}).format(value);
|
}).format(ms / milliseconds);
|
||||||
}
|
}
|
||||||
|
|
||||||
const formatted = prettyMilliseconds(ms, {
|
const formatted = prettyMilliseconds(ms, {
|
||||||
|
|||||||
Reference in new issue
Block a user