Clear packer rect store after each layout + simplify styles caching s…

…ystem.
haltu · Jul 9, 2021 · 042fb75 · 042fb75
1 parent 4e44c27
commit 042fb75
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 64 deletions.
diff --git a/dist/muuri.js b/dist/muuri.js
@@ -1220,19 +1220,7 @@
     return typeof val === functionType;
   }
 
-  var isWeakMapSupported = typeof WeakMap === 'function';
-  var cache$1 = isWeakMapSupported ? new WeakMap() : null;
-  var cacheInterval = 3000;
-  var cacheTimer;
-  var canClearCache = true;
-  var clearCache = function () {
-    if (canClearCache) {
-      cacheTimer = window.clearInterval(cacheTimer);
-      cache$1 = isWeakMapSupported ? new WeakMap() : null;
-    } else {
-      canClearCache = true;
-    }
-  };
+  var cache$1 = typeof WeakMap === 'function' ? new WeakMap() : null;
 
   /**
    * Returns the computed value of an element's style property as a string.
@@ -1249,14 +1237,6 @@
       if (cache$1) cache$1.set(element, styles);
     }
 
-    if (cache$1) {
-      if (!cacheTimer) {
-        cacheTimer = window.setInterval(clearCache, cacheInterval);
-      } else {
-        canClearCache = false;
-      }
-    }
-
     return styles.getPropertyValue(style);
   }
 
@@ -6474,6 +6454,7 @@
       this.slotSizes.length = 0;
       this.currentRects.length = 0;
       this.nextRects.length = 0;
+      this.rectStore.length = 0;
       this.rectId = 0;
       this.slotIndex = -1;
 

diff --git a/dist/muuri.min.js b/dist/muuri.min.js
diff --git a/dist/muuri.module.js b/dist/muuri.module.js
@@ -1214,19 +1214,7 @@ function isFunction(val) {
   return typeof val === functionType;
 }
 
-var isWeakMapSupported = typeof WeakMap === 'function';
-var cache$1 = isWeakMapSupported ? new WeakMap() : null;
-var cacheInterval = 3000;
-var cacheTimer;
-var canClearCache = true;
-var clearCache = function () {
-  if (canClearCache) {
-    cacheTimer = window.clearInterval(cacheTimer);
-    cache$1 = isWeakMapSupported ? new WeakMap() : null;
-  } else {
-    canClearCache = true;
-  }
-};
+var cache$1 = typeof WeakMap === 'function' ? new WeakMap() : null;
 
 /**
  * Returns the computed value of an element's style property as a string.
@@ -1243,14 +1231,6 @@ function getStyle(element, style) {
     if (cache$1) cache$1.set(element, styles);
   }
 
-  if (cache$1) {
-    if (!cacheTimer) {
-      cacheTimer = window.setInterval(clearCache, cacheInterval);
-    } else {
-      canClearCache = false;
-    }
-  }
-
   return styles.getPropertyValue(style);
 }
 
@@ -6468,6 +6448,7 @@ function createPackerProcessor(isWorker) {
     this.slotSizes.length = 0;
     this.currentRects.length = 0;
     this.nextRects.length = 0;
+    this.rectStore.length = 0;
     this.rectId = 0;
     this.slotIndex = -1;
 

diff --git a/src/Packer/PackerProcessor.js b/src/Packer/PackerProcessor.js
@@ -139,6 +139,7 @@ function createPackerProcessor(isWorker) {
     this.slotSizes.length = 0;
     this.currentRects.length = 0;
     this.nextRects.length = 0;
+    this.rectStore.length = 0;
     this.rectId = 0;
     this.slotIndex = -1;
 

diff --git a/src/utils/getStyle.js b/src/utils/getStyle.js
@@ -3,19 +3,8 @@
  * Released under the MIT license
  * https://github.com/haltu/muuri/blob/master/LICENSE.md
  */
-var isWeakMapSupported = typeof WeakMap === 'function';
-var cache = isWeakMapSupported ? new WeakMap() : null;
-var cacheInterval = 3000;
-var cacheTimer;
-var canClearCache = true;
-var clearCache = function () {
-  if (canClearCache) {
-    cacheTimer = window.clearInterval(cacheTimer);
-    cache = isWeakMapSupported ? new WeakMap() : null;
-  } else {
-    canClearCache = true;
-  }
-};
+
+var cache = typeof WeakMap === 'function' ? new WeakMap() : null;
 
 /**
  * Returns the computed value of an element's style property as a string.
@@ -32,13 +21,5 @@ export default function getStyle(element, style) {
     if (cache) cache.set(element, styles);
   }
 
-  if (cache) {
-    if (!cacheTimer) {
-      cacheTimer = window.setInterval(clearCache, cacheInterval);
-    } else {
-      canClearCache = false;
-    }
-  }
-
   return styles.getPropertyValue(style);
 }