@uppy/status-bar: show upload button when files are recovered #5418
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Diff output filesdiff --git a/packages/@uppy/status-bar/lib/StatusBarUI.js b/packages/@uppy/status-bar/lib/StatusBarUI.js
index e518609..07a54f3 100644
--- a/packages/@uppy/status-bar/lib/StatusBarUI.js
+++ b/packages/@uppy/status-bar/lib/StatusBarUI.js
@@ -97,7 +97,7 @@ export default function StatusBarUI(_ref) {
}
const progressValue = getProgressValue();
const width = progressValue != null ? progressValue : 100;
- const showUploadBtn = !error && newFiles && !isUploadInProgress && !isAllPaused && allowNewUpload
+ const showUploadBtn = !error && newFiles && (!isUploadInProgress && !isAllPaused || recoveredState) && allowNewUpload
&& !hideUploadButton;
const showCancelBtn = !hideCancelButton && uploadState !== STATE_WAITING && uploadState !== STATE_COMPLETE;
const showPauseResumeBtn = resumableUploads && !hidePauseResumeButton && uploadState === STATE_UPLOADING; |
aduh95
reviewed
Aug 20, 2024
| @@ -140,8 +140,7 @@ export default function StatusBarUI<M extends Meta, B extends Body>({ | |||
| const showUploadBtn = | |||
| !error && | |||
| newFiles && | |||
| !isUploadInProgress && | |||
| !isAllPaused && | |||
| ((!isUploadInProgress && !isAllPaused) || recoveredState) && | |||
There was a problem hiding this comment.
nit: it might be easier to follow the logic by rewriting it to:
Suggested change
| ((!isUploadInProgress && !isAllPaused) || recoveredState) && | |
| (recoveredState || !(isUploadInProgress || isAllPaused)) && |
There was a problem hiding this comment.
Somehow I read the first one quicker
There was a problem hiding this comment.
wdyt of
const showUploadBtn =
!hideUploadButton &&
!error &&
newFiles &&
allowNewUpload &&
(
recoveredState ||
(!isUploadInProgress && !isAllPaused)
)There was a problem hiding this comment.
That's basically the same but different formatting? It's up to prettier to decide that.
There was a problem hiding this comment.
The order is different, and IMO easier to follow
Merged
github-actions bot
added a commit
that referenced
this pull request
Aug 21, 2024
| Package | Version | Package | Version | | ----------------- | ------- | ----------------- | ------- | | @uppy/core | 4.1.2 | @uppy/transloadit | 4.1.0 | | @uppy/status-bar | 4.0.3 | uppy | 4.2.0 | | @uppy/svelte | 4.0.1 | | | - @uppy/status-bar: show upload button when files are recovered (Merlijn Vos / #5418) - meta: Bump docker/build-push-action from 6.6.1 to 6.7.0 (dependabot[bot] / #5413) - docs: remove stale reference to plugins page (Merlijn Vos / #5414) - @uppy/transloadit: add execution_progress to AssemblyResponse type (Merlijn Vos / #5420) - @uppy/svelte: fix exports condition (Merlijn Vos / #5416) - @uppy/transloadit: fix check if all files have been removed (Merlijn Vos / #5419) - examples: remove `useUppy` from React Native example (Mikael Finstad / #5405)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #5412
Possibly related: #5350
These conditions aren't pretty. But until Uppy becomes a finite state machine, it is what it is.