@uppy/StatusBar - made sure lingering dot is not displayed, changed className

This commit is contained in:
Evgenia Karunus 2019-07-07 19:36:45 +02:00
parent bbf0b33bcb
commit a1bf8cbb52
2 changed files with 20 additions and 8 deletions

View file

@ -232,24 +232,36 @@ const ProgressBarProcessing = (props) => {
</div>
}
const renderDot = () =>
' \u00B7 '
const ProgressDetails = (props) => {
const ifShowFilesUploadedOfTotal = props.numUploads > 1
return <div class="uppy-StatusBar-statusSecondary">
{
props.numUploads > 1 &&
ifShowFilesUploadedOfTotal &&
props.i18n('filesUploadedOfTotal', {
complete: props.complete,
smart_count: props.numUploads
}) + ' \u00B7 '
})
}
<span class="uppy-StatusBar--onlyForDesktop">
<span class="uppy-StatusBar-additionalInfo">
{/* When should we render this dot?
1. .-additionalInfo is shown (happens only on desktops)
2. AND 'filesUploadedOfTotal' was shown
*/}
{ifShowFilesUploadedOfTotal && renderDot()}
{
props.i18n('dataUploadedOfTotal', {
complete: prettyBytes(props.totalUploadedSize),
total: prettyBytes(props.totalSize)
}) + ' \u00B7 '
})
}
</span>
<span class="uppy-StatusBar--onlyForDesktop">
{renderDot()}
{
props.i18n('xTimeLeft', {
time: prettyETA(props.totalETA)

View file

@ -112,8 +112,8 @@
padding-right: 0.3em;
}
// Don't display elements with class .--onlyForDesktop if we're not at least on .md
.uppy-Root:not(.uppy-size--md) .uppy-StatusBar--onlyForDesktop {
// Don't display elements with class .-additionalInfo if we're not at least on .md
.uppy-Root:not(.uppy-size--md) .uppy-StatusBar-additionalInfo {
display: none;
}