From 222c00bb2600f89615b55cbf97055ccb01e296c1 Mon Sep 17 00:00:00 2001 From: Merlijn Vos Date: Thu, 18 Aug 2022 16:25:59 +0200 Subject: [PATCH] aws-s3: fix incorrect comparison for `file-removed` (#3962) Add check for file object vs file id --- packages/@uppy/aws-s3/src/MiniXHRUpload.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/@uppy/aws-s3/src/MiniXHRUpload.js b/packages/@uppy/aws-s3/src/MiniXHRUpload.js index 87a7148ee0..b4b3e2fa4e 100644 --- a/packages/@uppy/aws-s3/src/MiniXHRUpload.js +++ b/packages/@uppy/aws-s3/src/MiniXHRUpload.js @@ -100,8 +100,12 @@ export default class MiniXHRUpload { } #addEventHandlerForFile (eventName, fileID, eventHandler) { - this.uploaderEvents[fileID].on(eventName, (targetFileID) => { - if (fileID === targetFileID) eventHandler() + this.uploaderEvents[fileID].on(eventName, (fileOrID) => { + // TODO (major): refactor Uppy events to consistently send file objects (or consistently IDs) + // We created a generic `addEventListenerForFile` but not all events + // use file IDs, some use files, so we need to do this weird check. + const id = fileOrID?.id ?? fileOrID + if (fileID === id) eventHandler() }) }