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

@uppy/status-bar: show upload button when files are recovered #5418

Merged
merged 1 commit into from
Aug 20, 2024
Merged

@uppy/status-bar: show upload button when files are recovered #5418

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions packages/@uppy/status-bar/src/StatusBarUI.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,7 @@ export default function StatusBarUI<M extends Meta, B extends Body>({
const showUploadBtn =
!error &&
newFiles &&
!isUploadInProgress &&
!isAllPaused &&
((!isUploadInProgress && !isAllPaused) || recoveredState) &&
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: it might be easier to follow the logic by rewriting it to:

Suggested change
((!isUploadInProgress && !isAllPaused) || recoveredState) &&
(recoveredState || !(isUploadInProgress || isAllPaused)) &&

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Somehow I read the first one quicker

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wdyt of

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

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's basically the same but different formatting? It's up to prettier to decide that.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The order is different, and IMO easier to follow

allowNewUpload &&
!hideUploadButton

Expand Down
Loading