fix issue where background uploads took way too long

pqina · Apr 13, 2020 · b2ff1f4 · b2ff1f4
1 parent 8d9f523
commit b2ff1f4
Show file tree

Hide file tree

Showing 13 changed files with 67 additions and 85 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 4.13.2
+
+- Fix issue where FilePond running in an inactive tab would be very slow to pick up new files.
+
+
 ## 4.13.1
 
 - Fix issue where HEAD fetch request would try turn response into zero byte file.

diff --git a/dist/filepond.css b/dist/filepond.css
@@ -1,5 +1,5 @@
 /*!
- * FilePond 4.13.1
+ * FilePond 4.13.2
  * Licensed under MIT, https://opensource.org/licenses/MIT/
  * Please visit https://pqina.nl/filepond/ for details.
  */

diff --git a/dist/filepond.esm.js b/dist/filepond.esm.js
@@ -1,5 +1,5 @@
 /*!
- * FilePond 4.13.1
+ * FilePond 4.13.2
  * Licensed under MIT, https://opensource.org/licenses/MIT/
  * Please visit https://pqina.nl/filepond/ for details.
  */
@@ -302,11 +302,9 @@ const spring =
       let resting = false;
 
       // updates spring state
-      const interpolate = () => {
+      const interpolate = (ts, skipToEndState) => {
         // in rest, don't animate
-        if (resting) {
-          return;
-        }
+        if (resting) return;
 
         // need at least a target or position to do springy things
         if (!(isNumber(target) && isNumber(position))) {
@@ -328,7 +326,7 @@ const spring =
         velocity *= damping;
 
         // we've arrived if we're near target and our velocity is near zero
-        if (thereYet(position, target, velocity)) {
+        if (thereYet(position, target, velocity) || skipToEndState) {
           position = target;
           velocity = 0;
           resting = true;
@@ -409,30 +407,26 @@ const tween =
       let reverse = false;
       let target = null;
 
-      const interpolate = ts => {
-        if (resting || target === null) {
-          return;
-        }
+      const interpolate = (ts, skipToEndState) => {
+        if (resting || target === null) return;
 
         if (start === null) {
           start = ts;
         }
 
-        if (ts - start < delay) {
-          return;
-        }
+        if (ts - start < delay) return;
 
         t = ts - start - delay;
 
-        if (t < duration) {
-          p = t / duration;
-          api.onupdate((t >= 0 ? easing(reverse ? 1 - p : p) : 0) * target);
-        } else {
+        if (t >= duration || skipToEndState) {
           t = 1;
           p = reverse ? 0 : 1;
           api.onupdate(p * target);
           api.oncomplete(p * target);
           resting = true;
+        } else {
+          p = t / duration;
+          api.onupdate((t >= 0 ? easing(reverse ? 1 - p : p) : 0) * target);
         }
       };
 
@@ -525,8 +519,6 @@ const addGetSet = (keys, obj, props, overwrite = false) => {
   });
 };
 
-const isDefined = value => value != null;
-
 // add to state,
 // add getters and setters to internal and external api (if not set)
 // setup animators
@@ -535,8 +527,7 @@ const animations = ({
   mixinConfig,
   viewProps,
   viewInternalAPI,
-  viewExternalAPI,
-  viewState
+  viewExternalAPI
 }) => {
   // initial properties
   const initialProps = { ...viewProps };
@@ -583,12 +574,11 @@ const animations = ({
   // expose internal write api
   return {
     write: ts => {
+      let skipToEndState = document.hidden;
       let resting = true;
       animations.forEach(animation => {
-        if (!animation.resting) {
-          resting = false;
-        }
-        animation.interpolate(ts);
+        if (!animation.resting) resting = false;
+        animation.interpolate(ts, skipToEndState);
       });
       return resting;
     },
@@ -653,6 +643,8 @@ const apis = ({ mixinConfig, viewProps, viewExternalAPI }) => {
   addGetSet(mixinConfig, viewExternalAPI, viewProps);
 };
 
+const isDefined = value => value != null;
+
 // add to state,
 // add getters and setters to internal and external api (if not set)
 // set initial state based on props in viewProps

diff --git a/dist/filepond.esm.min.js b/dist/filepond.esm.min.js
diff --git a/dist/filepond.js b/dist/filepond.js
@@ -1,5 +1,5 @@
 /*!
- * FilePond 4.13.1
+ * FilePond 4.13.2
  * Licensed under MIT, https://opensource.org/licenses/MIT/
  * Please visit https://pqina.nl/filepond/ for details.
  */
@@ -373,11 +373,9 @@
       var resting = false;
 
       // updates spring state
-      var interpolate = function interpolate() {
+      var interpolate = function interpolate(ts, skipToEndState) {
         // in rest, don't animate
-        if (resting) {
-          return;
-        }
+        if (resting) return;
 
         // need at least a target or position to do springy things
         if (!(isNumber(target) && isNumber(position))) {
@@ -399,7 +397,7 @@
         velocity *= damping;
 
         // we've arrived if we're near target and our velocity is near zero
-        if (thereYet(position, target, velocity)) {
+        if (thereYet(position, target, velocity) || skipToEndState) {
           position = target;
           velocity = 0;
           resting = true;
@@ -499,30 +497,26 @@
       var reverse = false;
       var target = null;
 
-      var interpolate = function interpolate(ts) {
-        if (resting || target === null) {
-          return;
-        }
+      var interpolate = function interpolate(ts, skipToEndState) {
+        if (resting || target === null) return;
 
         if (start === null) {
           start = ts;
         }
 
-        if (ts - start < delay) {
-          return;
-        }
+        if (ts - start < delay) return;
 
         t = ts - start - delay;
 
-        if (t < duration) {
-          p = t / duration;
-          api.onupdate((t >= 0 ? easing(reverse ? 1 - p : p) : 0) * target);
-        } else {
+        if (t >= duration || skipToEndState) {
           t = 1;
           p = reverse ? 0 : 1;
           api.onupdate(p * target);
           api.oncomplete(p * target);
           resting = true;
+        } else {
+          p = t / duration;
+          api.onupdate((t >= 0 ? easing(reverse ? 1 - p : p) : 0) * target);
         }
       };
 
@@ -627,10 +621,6 @@
     });
   };
 
-  var isDefined = function isDefined(value) {
-    return value != null;
-  };
-
   // add to state,
   // add getters and setters to internal and external api (if not set)
   // setup animators
@@ -639,8 +629,7 @@
     var mixinConfig = _ref.mixinConfig,
       viewProps = _ref.viewProps,
       viewInternalAPI = _ref.viewInternalAPI,
-      viewExternalAPI = _ref.viewExternalAPI,
-      viewState = _ref.viewState;
+      viewExternalAPI = _ref.viewExternalAPI;
     // initial properties
     var initialProps = Object.assign({}, viewProps);
 
@@ -688,12 +677,11 @@
     // expose internal write api
     return {
       write: function write(ts) {
+        var skipToEndState = document.hidden;
         var resting = true;
         animations.forEach(function(animation) {
-          if (!animation.resting) {
-            resting = false;
-          }
-          animation.interpolate(ts);
+          if (!animation.resting) resting = false;
+          animation.interpolate(ts, skipToEndState);
         });
         return resting;
       },
@@ -768,6 +756,10 @@
     addGetSet(mixinConfig, viewExternalAPI, viewProps);
   };
 
+  var isDefined = function isDefined(value) {
+    return value != null;
+  };
+
   // add to state,
   // add getters and setters to internal and external api (if not set)
   // set initial state based on props in viewProps

diff --git a/dist/filepond.min.css b/dist/filepond.min.css
diff --git a/dist/filepond.min.js b/dist/filepond.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "filepond",
-    "version": "4.13.1",
+    "version": "4.13.2",
     "description": "FilePond, Where files go to stretch their bits.",
     "license": "MIT",
     "author": {

diff --git a/src/js/app/actions.js b/src/js/app/actions.js
@@ -748,7 +748,7 @@ export const actions = (dispatch, query, state) => ({
     }),
 
     PROCESS_ITEM: getItemByQueryFromState(state, (item, success, failure) => {
-        
+
         const maxParallelUploads = query('GET_MAX_PARALLEL_UPLOADS');
         const totalCurrentUploads = query('GET_ITEMS_BY_STATUS', ItemStatus.PROCESSING).length;
 

diff --git a/src/js/app/frame/mixins/animations.js b/src/js/app/frame/mixins/animations.js
@@ -1,7 +1,6 @@
 import { createAnimator } from '../utils/createAnimator';
 import { forin } from '../../../utils/forin';
 import { addGetSet } from './utils/addGetSet';
-import { isDefined } from '../../../utils/isDefined';
 
 // add to state,
 // add getters and setters to internal and external api (if not set)
@@ -11,8 +10,7 @@ export const animations = ({
     mixinConfig,
     viewProps,
     viewInternalAPI,
-    viewExternalAPI,
-    viewState
+    viewExternalAPI
 }) => {
     // initial properties
     const initialProps = { ...viewProps };
@@ -60,12 +58,11 @@ export const animations = ({
     // expose internal write api
     return {
         write: ts => {
+            let skipToEndState = document.hidden;
             let resting = true;
             animations.forEach(animation => {
-                if (!animation.resting) {
-                    resting = false;
-                }
-                animation.interpolate(ts);
+                if (!animation.resting) resting = false;
+                animation.interpolate(ts, skipToEndState);
             });
             return resting;
         },

diff --git a/src/js/app/frame/utils/animators/spring.js b/src/js/app/frame/utils/animators/spring.js
@@ -30,12 +30,10 @@ export const spring =
             let resting = false;
 
             // updates spring state
-            const interpolate = () => {
+            const interpolate = (ts, skipToEndState) => {
 
                 // in rest, don't animate
-                if (resting) {
-                    return;
-                }
+                if (resting) return;
 
                 // need at least a target or position to do springy things
                 if (!(isNumber(target) && isNumber(position))) {
@@ -57,7 +55,7 @@ export const spring =
                 velocity *= damping;
 
                 // we've arrived if we're near target and our velocity is near zero
-                if (thereYet(position, target, velocity)) {
+                if (thereYet(position, target, velocity) || skipToEndState) {
                     position = target;
                     velocity = 0;
                     resting = true;

diff --git a/src/js/app/frame/utils/animators/tween.js b/src/js/app/frame/utils/animators/tween.js
@@ -13,33 +13,30 @@ export const tween =
             let reverse = false;
             let target = null;
 
-            const interpolate = ts => {
-                if (resting || target === null) {
-                    return;
-                }
+            const interpolate = (ts, skipToEndState) => {
+                if (resting || target === null) return;
 
                 if (start === null) {
                     start = ts;
                 }
 
-                if (ts - start < delay) {
-                    return;
-                }
+                if (ts - start < delay) return;
 
                 t = ts - start - delay;
 
-                if (t < duration) {
-                    p = t / duration;
-                    api.onupdate(
-                        (t >= 0 ? easing(reverse ? 1 - p : p) : 0) * target
-                    );
-                } else {
+                if (t >= duration || skipToEndState) {
                     t = 1;
                     p = reverse ? 0 : 1;
                     api.onupdate(p * target);
                     api.oncomplete(p * target);
                     resting = true;
                 }
+                else {
+                    p = t / duration;
+                    api.onupdate(
+                        (t >= 0 ? easing(reverse ? 1 - p : p) : 0) * target
+                    );
+                }
             };
 
             // need 'api' to call onupdate callback

diff --git a/src/js/app/utils/createFileProcessor.js b/src/js/app/utils/createFileProcessor.js
@@ -122,6 +122,7 @@ export const createFileProcessor = processFn => {
 
             // actual processing progress
             (computable, current, total) => {
+
                 // update actual duration
                 state.duration = Date.now() - state.timestamp;