neptune/ghost-portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix elapsed formatting (correct units) (#5063)

Browse Source
This commit is contained in:
Jaco 2021-04-14 10:14:39 +03:00 committed by GitHub
parent 22b68ac9ab
commit cd4ca8bca2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -1,5 +1,12 @@
# CHANGELOG
## master
Changes:
- Fix Elapsed formatting (previously would only show s units)
## 0.87.1 Apr 12, 2021
Contributed:

25
packages/react-query/src/Elapsed.tsx
View File

@ -42,7 +42,7 @@ function formatValue (value: number, type = 's', withDecimal = false): React.Rea
return withDecimal
? <>{before}.<div className='digit'>{post}</div> {type}</>
: <>{before} s</>;
: <>{before} {type}</>;
}
function getDisplayValue (now = 0, value: BN | Date | number = 0): React.ReactNode {
@ -51,23 +51,18 @@ function getDisplayValue (now = 0, value: BN | Date | number = 0): React.ReactNo
? (value as Date).getTime()
: bnToBn(value as number).toNumber()
) || 0;
let display = formatValue(0, 's', true);
if (now && tsValue) {
const elapsed = Math.max(Math.abs(now - tsValue), 0) / 1000;
if (elapsed < 15) {
display = formatValue(elapsed, 's', true);
} else if (elapsed < 60) {
display = formatValue(elapsed);
} else if (elapsed < 3600) {
display = formatValue(elapsed, 'min');
} else {
display = formatValue(elapsed / 3600, 'hr');
}
if (!now || !tsValue) {
return formatValue(0, 's', true);
}
return display;
const elapsed = Math.max(Math.abs(now - tsValue), 0) / 1000;
return (elapsed < 60)
? formatValue(elapsed, 's', elapsed < 15)
: (elapsed < 3600)
? formatValue(elapsed, 'min')
: formatValue(elapsed / 3600, 'hr');
}
tick();