Mirrors/uppy
1
0
Fork 0
mirror of https://github.com/transloadit/uppy.git synced 2026-07-23 10:18:40 +00:00
Code Issues Projects Releases Wiki Activity

refactor StatusBar status containers

Browse source
This commit is contained in:
Artur Paikin 2018-07-27 22:41:02 -04:00
parent e8129e8911
commit 88cfe9d5aa
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
packages/@uppy/status-bar/src/StatusBar.js
View file

@ -177,11 +177,11 @@ const ProgressBarProcessing = (props) => {
}
const progressDetails = (props) => {
return <span class="uppy-StatusBar-statusSecondary">
return <div class="uppy-StatusBar-statusSecondary">
{ props.inProgress > 1 && props.i18n('filesUploadedOfTotal', { complete: props.complete, smart_count: props.inProgress }) + ' \u00B7 ' }
{ props.i18n('dataUploadedOfTotal', { complete: props.totalUploadedSize, total: props.totalSize }) + ' \u00B7 ' }
{ props.i18n('xTimeLeft', { time: props.totalETA }) }
</span>
</div>
}
const ThrottledProgressDetails = throttle(progressDetails, 500, { leading: true, trailing: true })
@ -197,8 +197,7 @@ const ProgressBarUploading = (props) => {
<div class="uppy-StatusBar-content" aria-label={title} title={title}>
{ !props.hidePauseResumeCancelButtons && <PauseResumeButtons {...props} /> }
<div class="uppy-StatusBar-status">
<span class="uppy-StatusBar-statusPrimary">{title}: {props.totalProgress}%</span>
<br />
<div class="uppy-StatusBar-statusPrimary">{title}: {props.totalProgress}%</div>
{ !props.isAllPaused && <ThrottledProgressDetails {...props} /> }
</div>
</div>