Hide upload button when state is recovered if hideUploadButton is true

transloadit · Sep 12, 2023 · 6f3ff0c · 6f3ff0c
1 parent 3104f94
commit 6f3ff0c
Showing 1 changed file with 46 additions and 37 deletions.
diff --git a/packages/@uppy/status-bar/src/StatusBarUI.jsx b/packages/@uppy/status-bar/src/StatusBarUI.jsx
@@ -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
@@ -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(),
   })
@@ -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>
   )
 }