Merge pull request missive#300 from nolanlawson/nolan/simplify-rIC

fix: improve requestIdleCallback usage
nolanlawson · Mar 13, 2019 · 1e6f956 · 1e6f956
2 parents 5984122 + d1978c0
commit 1e6f956
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/src/utils/index.js b/src/utils/index.js
@@ -192,18 +192,20 @@ function measureScrollbar() {
 // Use requestIdleCallback() if available, else fall back to setTimeout().
 // Throttle so as not to run too frequently.
 function throttleIdleTask(func) {
-  const queue =
+  const doIdleTask =
     typeof requestIdleCallback === 'function' ? requestIdleCallback : setTimeout
-  const clear =
-    typeof cancelIdleCallback === 'function' ? cancelIdleCallback : clearTimeout
 
-  let id
+  let running = false
 
   return function throttled() {
-    if (id) {
-      clear(id)
+    if (running) {
+      return
     }
-    id = queue(func)
+    running = true
+    doIdleTask(() => {
+      running = false
+      func()
+    })
   }
 }