Skip to content

Commit 160cf16

Browse files
authored
GoldenRetriever + hideUploadButton=true (#5350)
* `<StatusBarUI/>` - rewrite without affecting logic * `<StatusBarUI/>` - rewrite without affecting logic * `<StatusBarUI/>` - make `hideUploadButton` option work for recovered files too
1 parent f3be9f0 commit 160cf16

File tree

1 file changed

+57
-61
lines changed

1 file changed

+57
-61
lines changed

packages/@uppy/status-bar/src/StatusBarUI.tsx

+57-61
Original file line numberDiff line numberDiff line change
@@ -133,25 +133,8 @@ export default function StatusBarUI<M extends Meta, B extends Body>({
133133
}
134134
}
135135

136-
function getIsHidden(): boolean | undefined {
137-
if (recoveredState) {
138-
return false
139-
}
140-
141-
switch (uploadState) {
142-
case STATE_WAITING:
143-
return hideUploadButton || newFiles === 0
144-
case STATE_COMPLETE:
145-
return hideAfterFinish
146-
default:
147-
return false
148-
}
149-
}
150-
151136
const progressValue = getProgressValue()
152137

153-
const isHidden = getIsHidden()
154-
155138
const width = progressValue ?? 100
156139

157140
const showUploadBtn =
@@ -186,6 +169,61 @@ export default function StatusBarUI<M extends Meta, B extends Body>({
186169
{ 'has-ghosts': isSomeGhost },
187170
)
188171

172+
const progressBarStateEl = (() => {
173+
switch (uploadState) {
174+
case STATE_PREPROCESSING:
175+
case STATE_POSTPROCESSING:
176+
return (
177+
<ProgressBarProcessing
178+
progress={calculateProcessingProgress(files)}
179+
/>
180+
)
181+
case STATE_COMPLETE:
182+
return <ProgressBarComplete i18n={i18n} />
183+
case STATE_ERROR:
184+
return (
185+
<ProgressBarError
186+
error={error}
187+
i18n={i18n}
188+
numUploads={numUploads}
189+
complete={complete}
190+
/>
191+
)
192+
case STATE_UPLOADING:
193+
return (
194+
<ProgressBarUploading
195+
i18n={i18n}
196+
supportsUploadProgress={supportsUploadProgress}
197+
totalProgress={totalProgress}
198+
showProgressDetails={showProgressDetails}
199+
isUploadStarted={isUploadStarted}
200+
isAllComplete={isAllComplete}
201+
isAllPaused={isAllPaused}
202+
newFiles={newFiles}
203+
numUploads={numUploads}
204+
complete={complete}
205+
totalUploadedSize={totalUploadedSize}
206+
totalSize={totalSize}
207+
totalETA={totalETA}
208+
startUpload={startUpload}
209+
/>
210+
)
211+
default:
212+
return null
213+
}
214+
})()
215+
216+
const atLeastOneAction =
217+
showUploadBtn ||
218+
showRetryBtn ||
219+
showPauseResumeBtn ||
220+
showCancelBtn ||
221+
showDoneBtn
222+
const thereIsNothingInside = !atLeastOneAction && !progressBarStateEl
223+
224+
const isHidden =
225+
thereIsNothingInside || (uploadState === STATE_COMPLETE && hideAfterFinish)
226+
189227
return (
190228
<div className={statusBarClassNames} aria-hidden={isHidden}>
191229
<div
@@ -199,52 +237,10 @@ export default function StatusBarUI<M extends Meta, B extends Body>({
199237
aria-valuenow={progressValue!}
200238
/>
201239

202-
{(() => {
203-
switch (uploadState) {
204-
case STATE_PREPROCESSING:
205-
case STATE_POSTPROCESSING:
206-
return (
207-
<ProgressBarProcessing
208-
progress={calculateProcessingProgress(files)}
209-
/>
210-
)
211-
case STATE_COMPLETE:
212-
return <ProgressBarComplete i18n={i18n} />
213-
case STATE_ERROR:
214-
return (
215-
<ProgressBarError
216-
error={error}
217-
i18n={i18n}
218-
numUploads={numUploads}
219-
complete={complete}
220-
/>
221-
)
222-
case STATE_UPLOADING:
223-
return (
224-
<ProgressBarUploading
225-
i18n={i18n}
226-
supportsUploadProgress={supportsUploadProgress}
227-
totalProgress={totalProgress}
228-
showProgressDetails={showProgressDetails}
229-
isUploadStarted={isUploadStarted}
230-
isAllComplete={isAllComplete}
231-
isAllPaused={isAllPaused}
232-
newFiles={newFiles}
233-
numUploads={numUploads}
234-
complete={complete}
235-
totalUploadedSize={totalUploadedSize}
236-
totalSize={totalSize}
237-
totalETA={totalETA}
238-
startUpload={startUpload}
239-
/>
240-
)
241-
default:
242-
return null
243-
}
244-
})()}
240+
{progressBarStateEl}
245241

246242
<div className="uppy-StatusBar-actions">
247-
{recoveredState || showUploadBtn ?
243+
{showUploadBtn ?
248244
<UploadBtn
249245
newFiles={newFiles}
250246
isUploadStarted={isUploadStarted}

0 commit comments

Comments
 (0)