Fix uppy.close() crashes when remote-sources or image-editor is ins…

…talled (#3914)
transloadit · Jul 27, 2022 · f1a7e0c · f1a7e0c
1 parent 7f5059b
commit f1a7e0c
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 5 deletions.
diff --git a/e2e/clients/dashboard-ui/app.js b/e2e/clients/dashboard-ui/app.js
@@ -1,13 +1,36 @@
 import Uppy from '@uppy/core'
 import Dashboard from '@uppy/dashboard'
+import RemoteSources from '@uppy/remote-sources'
+import Webcam from '@uppy/webcam'
+import ScreenCapture from '@uppy/screen-capture'
+import GoldenRetriever from '@uppy/golden-retriever'
 import ImageEditor from '@uppy/image-editor'
+import DropTarget from '@uppy/drop-target'
+import Audio from '@uppy/audio'
+import Compressor from '@uppy/compressor'
 
 import '@uppy/core/dist/style.css'
 import '@uppy/dashboard/dist/style.css'
 
+const COMPANION_URL = 'http://companion.uppy.io'
+
 const uppy = new Uppy()
   .use(Dashboard, { target: '#app', inline: true })
+  .use(RemoteSources, { companionUrl: COMPANION_URL })
+  .use(Webcam, {
+    target: Dashboard,
+    showVideoSourceDropdown: true,
+    showRecordingLength: true,
+  })
+  .use(Audio, {
+    target: Dashboard,
+    showRecordingLength: true,
+  })
+  .use(ScreenCapture, { target: Dashboard })
   .use(ImageEditor, { target: Dashboard })
+  .use(DropTarget, { target: document.body })
+  .use(Compressor)
+  .use(GoldenRetriever, { serviceWorker: true })
 
 // Keep this here to access uppy in tests
 window.uppy = uppy
diff --git a/e2e/cypress/integration/dashboard-ui.spec.ts b/e2e/cypress/integration/dashboard-ui.spec.ts
@@ -4,6 +4,14 @@ describe('dashboard-ui', () => {
     cy.get('.uppy-Dashboard-input:first').as('file-input')
   })
 
+  it('should not throw when calling uppy.close()', () => {
+    cy.get('@file-input').selectFile(['cypress/fixtures/images/cat.jpg', 'cypress/fixtures/images/traffic.jpg'], { force:true })
+
+    cy.window().then(({ uppy }) => {
+      expect(uppy.close()).to.not.throw
+    })
+  })
+
   it('should render thumbnails', () => {
     cy.get('@file-input').selectFile(['cypress/fixtures/images/cat.jpg', 'cypress/fixtures/images/traffic.jpg'], { force:true })
     cy.get('.uppy-Dashboard-Item-previewImg')

diff --git a/packages/@uppy/dashboard/src/components/FileCard/index.jsx b/packages/@uppy/dashboard/src/components/FileCard/index.jsx
@@ -59,8 +59,7 @@ class FileCard extends Component {
   }
 
   handleCancel = () => {
-    const { currentImage } = this.getPluginState()
-    const file = this.props.uppy.getFile(currentImage.id)
+    const file = this.props.files[this.props.fileCardFor]
     this.props.uppy.emit('file-editor:cancel', file)
     this.props.toggleFileCard(false)
   }

diff --git a/packages/@uppy/image-editor/src/ImageEditor.jsx b/packages/@uppy/image-editor/src/ImageEditor.jsx
@@ -122,9 +122,11 @@ export default class ImageEditor extends UIPlugin {
 
   uninstall () {
     const { currentImage } = this.getPluginState()
-    const file = this.uppy.getFile(currentImage.id)
-    this.uppy.emit('file-editor:cancel', file)
 
+    if (currentImage) {
+      const file = this.uppy.getFile(currentImage.id)
+      this.uppy.emit('file-editor:cancel', file)
+    }
     this.unmount()
   }
 

diff --git a/packages/@uppy/remote-sources/src/index.js b/packages/@uppy/remote-sources/src/index.js
@@ -70,7 +70,9 @@ export default class RemoteSources extends BasePlugin {
         throw new Error(`Invalid plugin: "${pluginId}" is not one of: ${formatter.format(pluginNames)}.`)
       }
       this.uppy.use(plugin, optsForRemoteSourcePlugin)
-      this.#installedPlugins.add(plugin)
+      // `plugin` is a class, but we want to track the instance object
+      // so we have to do `getPlugin` here.
+      this.#installedPlugins.add(this.uppy.getPlugin(pluginId))
     })
   }