Skip to content

Commit

Permalink
Fix endless webcam re-render with Golden Retriever (#4111)
Browse files Browse the repository at this point in the history
Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
  • Loading branch information
Murderlon and aduh95 committed Sep 19, 2022
1 parent 04d7d39 commit 7c7943d
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions packages/@uppy/golden-retriever/src/index.js
Expand Up @@ -113,7 +113,9 @@ export default class GoldenRetriever extends BasePlugin {

// If all files have been removed by the user, clear recovery state
if (Object.keys(filesToSave).length === 0) {
this.uppy.setState({ recoveredState: null })
if (this.uppy.getState().recoveredState !== null) {
this.uppy.setState({ recoveredState: null })
}
MetaDataStore.cleanup(this.uppy.opts.id)
return
}
Expand Down Expand Up @@ -350,7 +352,6 @@ export default class GoldenRetriever extends BasePlugin {
})
} else {
this.uppy.log('[GoldenRetriever] No files need to be loaded, only restoring processing state...')
this.onBlobsLoaded([])
}
}

Expand All @@ -361,6 +362,9 @@ export default class GoldenRetriever extends BasePlugin {
this.uppy.on('file-added', this.addBlobToStores)
this.uppy.on('file-editor:complete', this.replaceBlobInStores)
this.uppy.on('file-removed', this.removeBlobFromStores)
// TODO: the `state-update` is bad practise. It fires on any state change in Uppy
// or any state change in any of the plugins. We should to able to only listen
// for the state changes we need, somehow.
this.uppy.on('state-update', this.saveFilesStateToLocalStorage)
this.uppy.on('restore-confirmed', this.handleRestoreConfirmed)
this.uppy.on('restore-canceled', this.abortRestore)
Expand Down

0 comments on commit 7c7943d

Please sign in to comment.