Merge pull request #835 from finos/throttle-fix-2

Throttle fix
finos · Dec 7, 2019 · 1fd5829 · 1fd5829
2 parents e2eaf66 + 28b7226
commit 1fd5829
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/packages/perspective-viewer/src/js/viewer/perspective_element.js b/packages/perspective-viewer/src/js/viewer/perspective_element.js
@@ -79,16 +79,6 @@ function get_aggregates_with_defaults(aggregate_attribute, schema, cols) {
     return aggregates;
 }
 
-function calculate_throttle_timeout(render_time) {
-    if (!render_time || render_time.length < 5) {
-        return 0;
-    }
-    const view_count = document.getElementsByTagName("perspective-viewer").length;
-    const avg = render_time.reduce((x, y) => x + y, 0) / render_time.length;
-    const timeout = avg * view_count * 2;
-    return Math.min(10000, Math.max(0, timeout));
-}
-
 const _total_template = args => {
     if (args) {
         const x = numberWithCommas(args[0]);
@@ -271,6 +261,16 @@ export class PerspectiveElement extends StateElement {
         return false;
     }
 
+    _calculate_throttle_timeout() {
+        if (!this.__render_times || this.__render_times.length < 5) {
+            return 0;
+        }
+        const view_count = document.getElementsByTagName("perspective-viewer").length;
+        const avg = this.__render_times.reduce((x, y) => x + y, 0) / this.__render_times.length;
+        const timeout = avg * view_count * 2;
+        return Math.min(10000, Math.max(0, timeout));
+    }
+
     _view_on_update(limit_points) {
         if (!this._debounced) {
             this._debounced = setTimeout(async () => {
@@ -298,7 +298,7 @@ export class PerspectiveElement extends StateElement {
                 } finally {
                     this.dispatchEvent(new Event("perspective-view-update"));
                 }
-            }, calculate_throttle_timeout(this.__render_times));
+            }, this._calculate_throttle_timeout());
         }
     }
 
@@ -427,8 +427,10 @@ export class PerspectiveElement extends StateElement {
 
     _render_time() {
         const t = performance.now();
-        let i = 0;
-        return () => (this.__render_times[i++ % 5] = performance.now() - t);
+        return () => {
+            this.__render_times.unshift(performance.now() - t);
+            this.__render_times = this.__render_times.slice(0, 5);
+        };
     }
 
     _restyle_plugin() {