Merge branch 'master' of ssh://github.com/potato4d/vue-fixed-header

potato4d · Nov 6, 2019 · e81d57d · e81d57d
2 parents 2bc109b + 09d3e2e
commit e81d57d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/src/components/ExampleApp.vue b/src/components/ExampleApp.vue
@@ -15,9 +15,12 @@
         </el-menu>
       </nav>
     </VueFixedHeader>
-    <div class="container" :class="{
-      headerIsFixed: fixedStatus.headerIsFixed
-    }">
+    <div
+      class="container"
+      :class="{
+        headerIsFixed: fixedStatus.headerIsFixed
+      }"
+    >
       <el-card>
         <h3 class="heading">
           vue-fixed-header debugging

diff --git a/src/components/vue-fixed-header.tsx b/src/components/vue-fixed-header.tsx
@@ -52,8 +52,11 @@ export default Vue.extend({
       this.check = () => {
         const { threshold, hideScrollUp } = this
         let currentScrollPos = this.getScrollTop()
-        this.isFixed = (currentScrollPos >= this.lastScrollTop) ? currentScrollPos > threshold : !hideScrollUp
-        this.lastScrollTop = currentScrollPos;
+        this.isFixed =
+          currentScrollPos >= this.lastScrollTop
+            ? currentScrollPos > threshold
+            : !hideScrollUp
+        this.lastScrollTop = currentScrollPos
         this.$emit('change', this.isFixed)
         this.$forceUpdate()
       }

diff --git a/yarn.lock b/yarn.lock
@@ -1676,10 +1676,10 @@
   version "20.0.1"
   resolved "https://registry.yarnpkg.com/@types/jest-diff/-/jest-diff-20.0.1.tgz#35cc15b9c4f30a18ef21852e255fdb02f6d59b89"
 
-"@types/jest@24.0.21":
-  version "24.0.21"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.0.21.tgz#2c0a25440e025bb265f4a17d8b79b11b231426bf"
-  integrity sha512-uyqFvx78Tuy0h5iLCPWRCvi5HhWwEqhIj30doitp191oYLqlCxUyAJHdWVm5+Nr271/vPnkyt6rWeEIjGowBTg==
+"@types/jest@24.0.22":
+  version "24.0.22"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.0.22.tgz#08a50be08e78aba850a1185626e71d31e2336145"
+  integrity sha512-t2OvhNZnrNjlzi2i0/cxbLVM59WN15I2r1Qtb7wDv28PnV9IzrPtagFRey/S9ezdLD0zyh1XGMQIEQND2YEfrw==
   dependencies:
     "@types/jest-diff" "*"