Fix scrollspy reset when scrolling above the countUp (#295)

* Fix scrollspy reset when scrolling above the countUp * Fix scrollspy reset when scrolling above the countUp * Fix scrollspy reset when scrolling above the countUp * correct spaces * replace tabs with spaces * add spaces for indent and remove empty lines * indent function * indent line 119
inorganik · Jan 28, 2023 · e3bbc8d · e3bbc8d
1 parent 9680601
commit e3bbc8d
Show file tree

Hide file tree

Showing 6 changed files with 11,959 additions and 254 deletions.
diff --git a/dist/countUp.js b/dist/countUp.js
@@ -158,6 +158,7 @@ var CountUp = /** @class */ (function () {
             return;
         var bottomOfScroll = window.innerHeight + window.scrollY;
         var rect = self.el.getBoundingClientRect();
+        var topOfEl = rect.top + window.pageYOffset;
         var bottomOfEl = rect.top + rect.height + window.pageYOffset;
         if (bottomOfEl < bottomOfScroll && bottomOfEl > window.scrollY && self.paused) {
             // in view
@@ -166,8 +167,9 @@ var CountUp = /** @class */ (function () {
             if (self.options.scrollSpyOnce)
                 self.once = true;
         }
-        else if (window.scrollY > bottomOfEl && !self.paused) {
-            // scrolled past
+        else if ((window.scrollY > bottomOfEl || topOfEl > bottomOfScroll) &&
+            !self.paused) {
+            // out of view
             self.reset();
         }
     };

diff --git a/dist/countUp.min.js b/dist/countUp.min.js
diff --git a/dist/countUp.umd.js b/dist/countUp.umd.js
@@ -164,6 +164,7 @@
                 return;
             var bottomOfScroll = window.innerHeight + window.scrollY;
             var rect = self.el.getBoundingClientRect();
+            var topOfEl = rect.top + window.pageYOffset;
             var bottomOfEl = rect.top + rect.height + window.pageYOffset;
             if (bottomOfEl < bottomOfScroll && bottomOfEl > window.scrollY && self.paused) {
                 // in view
@@ -172,8 +173,9 @@
                 if (self.options.scrollSpyOnce)
                     self.once = true;
             }
-            else if (window.scrollY > bottomOfEl && !self.paused) {
-                // scrolled past
+            else if ((window.scrollY > bottomOfEl || topOfEl > bottomOfScroll) &&
+                !self.paused) {
+                // out of view
                 self.reset();
             }
         };