Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Hide upload button when state is recovered if hideUploadButton is true #4657

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Hide upload button when state is recovered if hideUploadButton is true #4657

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
83 changes: 46 additions & 37 deletions packages/@uppy/status-bar/src/StatusBarUI.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,11 @@ export default function StatusBar (props) {

const width = progressValue ?? 100

const showUploadBtn = !error
&& newFiles
&& !isUploadInProgress
&& !isAllPaused
&& allowNewUpload
&& !hideUploadButton
const showUploadBtn = !hideUploadButton
&& (
(!error && newFiles && !isUploadInProgress && !isAllPaused && allowNewUpload)
|| recoveredState
)

const showCancelBtn = !hideCancelButton
&& uploadState !== STATE_WAITING
Expand All @@ -141,6 +140,14 @@ export default function StatusBar (props) {

const showDoneBtn = doneButtonHandler && uploadState === STATE_COMPLETE

const hasActions = (
showUploadBtn
|| showCancelBtn
|| showPauseResumeBtn
|| showRetryBtn
|| showDoneBtn
)

const progressClassNames = classNames('uppy-StatusBar-progress', {
'is-indeterminate': getIsIndeterminate(),
})
Expand Down Expand Up @@ -204,37 +211,39 @@ export default function StatusBar (props) {
}
})()}

<div className="uppy-StatusBar-actions">
{recoveredState || showUploadBtn ? (
<UploadBtn
newFiles={newFiles}
isUploadStarted={isUploadStarted}
recoveredState={recoveredState}
i18n={i18n}
isSomeGhost={isSomeGhost}
startUpload={startUpload}
uploadState={uploadState}
/>
) : null}

{showRetryBtn ? <RetryBtn i18n={i18n} uppy={uppy} /> : null}

{showPauseResumeBtn ? (
<PauseResumeButton
isAllPaused={isAllPaused}
i18n={i18n}
isAllComplete={isAllComplete}
resumableUploads={resumableUploads}
uppy={uppy}
/>
) : null}

{showCancelBtn ? <CancelBtn i18n={i18n} uppy={uppy} /> : null}

{showDoneBtn ? (
<DoneBtn i18n={i18n} doneButtonHandler={doneButtonHandler} />
) : null}
</div>
{hasActions ? (
<div className="uppy-StatusBar-actions">
{showUploadBtn ? (
<UploadBtn
newFiles={newFiles}
isUploadStarted={isUploadStarted}
recoveredState={recoveredState}
i18n={i18n}
isSomeGhost={isSomeGhost}
startUpload={startUpload}
uploadState={uploadState}
/>
) : null}

{showRetryBtn ? <RetryBtn i18n={i18n} uppy={uppy} /> : null}

{showPauseResumeBtn ? (
<PauseResumeButton
isAllPaused={isAllPaused}
i18n={i18n}
isAllComplete={isAllComplete}
resumableUploads={resumableUploads}
uppy={uppy}
/>
) : null}

{showCancelBtn ? <CancelBtn i18n={i18n} uppy={uppy} /> : null}

{showDoneBtn ? (
<DoneBtn i18n={i18n} doneButtonHandler={doneButtonHandler} />
) : null}
</div>
) : null}
</div>
)
}