Header hiding bug (Shopify#503)

NobuGoto · Aug 26, 2021 · 79cef6f · 79cef6f
1 parent 6e4d4bc
commit 79cef6f
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/sections/header.liquid b/sections/header.liquid
@@ -465,24 +465,25 @@
     onScroll() {
       const scrollTop = window.pageYOffset || document.documentElement.scrollTop;
 
-      if (this.preventReveal) {
-        window.clearTimeout(this.isScrolling);
+      if (scrollTop > this.currentScrollTop && scrollTop > this.headerBounds.bottom) {
+        requestAnimationFrame(this.hide.bind(this));
+      } else if (scrollTop < this.currentScrollTop && scrollTop > this.headerBounds.bottom) {
+        if (!this.preventReveal) {
+          requestAnimationFrame(this.reveal.bind(this));
+        } else {
+          window.clearTimeout(this.isScrolling);
 
-        this.isScrolling = setTimeout(() => {
-          this.preventReveal = false;
-        }, 66);
+          this.isScrolling = setTimeout(() => {
+            this.preventReveal = false;
+          }, 66);
 
-        requestAnimationFrame(this.hide.bind(this));
-      } else {
-        if (scrollTop > this.currentScrollTop && scrollTop > this.headerBounds.bottom) {
           requestAnimationFrame(this.hide.bind(this));
-        } else if (scrollTop < this.currentScrollTop && scrollTop > this.headerBounds.bottom) {
-          requestAnimationFrame(this.reveal.bind(this));
-        } else if (scrollTop <= this.headerBounds.top) {
-          requestAnimationFrame(this.reset.bind(this));
         }
+      } else if (scrollTop <= this.headerBounds.top) {
+        requestAnimationFrame(this.reset.bind(this));
       }
 
+
       this.currentScrollTop = scrollTop;
     }