Merge pull request joltup#130 from pexels/fix/scoped-cancel-task

🐛 Fix Task Scoping for Fetch Cancellation
BeApp · Mar 25, 2022 · 50ae139 · 50ae139
2 parents 5e17a74 + 3c3fd48
commit 50ae139
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/polyfill/Fetch.js b/polyfill/Fetch.js
@@ -59,10 +59,12 @@ class ReactNativeBlobUtilFetchPolyfill {
             // task.then is not, so we have to extend task.then with progress and
             // cancel function
             let progressHandler, uploadHandler, cancelHandler;
+            let scopedTask = null;
             let statefulPromise = promise
                 .then((body) => {
                     let task = RNconfig(config)
                         .fetch(options.method, url, options.headers, body);
+                    scopedTask = task;
                     if (progressHandler)
                         task.progress(progressHandler);
                     if (uploadHandler)
@@ -87,8 +89,8 @@ class ReactNativeBlobUtilFetchPolyfill {
             };
             statefulPromise.cancel = () => {
                 cancelHandler = true;
-                if (task.cancel)
-                    task.cancel();
+                if (scopedTask && scopedTask.cancel)
+                    scopedTask.cancel();
             };
 
             return statefulPromise;