From 1a0f73b12eb12843ff8e26d5899ca24dd36c7acf Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Thu, 7 Dec 2017 11:52:55 +0800
Subject: [PATCH] [Improment] improve Tab sticky fluency (#388)

---
 docs/demos/views/tab.vue        |  8 ++++++-
 packages/tabs/index.vue         | 28 ++++++++++++++++------
 packages/vant-css/src/field.css |  4 ++++
 packages/vant-css/src/tab.css   | 42 ++++++++++++++++++++-------------
 test/unit/specs/tabs.spec.js    |  2 +-
 5 files changed, 58 insertions(+), 26 deletions(-)

diff --git a/docs/demos/views/tab.vue b/docs/demos/views/tab.vue
index 7517efc84..9585a7efc 100644
--- a/docs/demos/views/tab.vue
+++ b/docs/demos/views/tab.vue
@@ -99,7 +99,7 @@ export default {
 
 <style lang="postcss">
 .demo-tab {
-  margin-bottom: 1000px;
+  margin-bottom: 700px;
 
   .van-tab__pane {
     background-color: #fff;
@@ -121,5 +121,11 @@ export default {
     height: 50px;
     line-height: 50px;
   }
+
+  .van-doc-demo-block:last-child {
+    .van-tab__pane {
+      padding: 50px 20px;
+    }
+  }
 }
 </style>
diff --git a/packages/tabs/index.vue b/packages/tabs/index.vue
index 8b6183000..fd8911ff5 100644
--- a/packages/tabs/index.vue
+++ b/packages/tabs/index.vue
@@ -1,6 +1,9 @@
 <template>
-  <div class="van-tabs" :class="[`van-tabs--${type}`, { 'van-tabs--fixed': fixed }]">
-    <div class="van-tabs__wrap" :class="{ 'van-tabs--scrollbale': scrollable, 'van-hairline--top-bottom': type === 'line' }">
+  <div class="van-tabs" :class="[`van-tabs--${type}`]">
+    <div class="van-tabs__wrap" :class="[`van-tabs__wrap--${position}`, {
+      'van-tabs--scrollable': scrollable,
+      'van-hairline--top-bottom': type === 'line'
+    }]">
       <div class="van-tabs__nav" :class="`van-tabs__nav--${type}`" ref="nav">
         <div v-if="type === 'line'" class="van-tabs__nav-bar" :style="navBarStyle" />
         <div
@@ -57,7 +60,7 @@ export default {
 
     return {
       tabs: [],
-      fixed: false,
+      position: 'content-top',
       curActive: 0,
       navBarStyle: {}
     };
@@ -92,7 +95,7 @@ export default {
     }
   },
 
-  destoryed() {
+  beforeDestroy() {
     /* istanbul ignore next */
     if (this.sticky) {
       this.scrollHandler(false);
@@ -111,12 +114,23 @@ export default {
     scrollHandler(init) {
       this.scrollEl = this.scrollEl || scrollUtils.getScrollEventTarget(this.$el);
       this.scrollEl[init ? 'addEventListener' : 'removeEventListener']('scroll', this.onScroll);
-      this.onScroll();
+      if (init) {
+        this.onScroll();
+      }
     },
 
-    // fixed tab when scrollTop > distance to top
+    // adjust tab position
     onScroll() {
-      this.fixed = scrollUtils.getScrollTop(this.scrollEl) > scrollUtils.getElementTop(this.$el);
+      const scrollTop = scrollUtils.getScrollTop(this.scrollEl);
+      const elTopToPageTop = scrollUtils.getElementTop(this.$el);
+      const elBottomToPageTop = elTopToPageTop + this.$el.offsetHeight - this.$refs.nav.offsetHeight;
+      if (scrollTop > elBottomToPageTop) {
+        this.position = 'content-bottom';
+      } else if (scrollTop > elTopToPageTop) {
+        this.position = 'page-top';
+      } else {
+        this.position = 'content-top';
+      }
     },
 
     // update nav bar style
diff --git a/packages/vant-css/src/field.css b/packages/vant-css/src/field.css
index 1178c9a57..956804408 100644
--- a/packages/vant-css/src/field.css
+++ b/packages/vant-css/src/field.css
@@ -85,6 +85,10 @@
     display: block;
     width: 100%;
     resize: none;
+
+    &[disabled] {
+      background-color: transparent;
+    }
   }
 
   &__icon {
diff --git a/packages/vant-css/src/tab.css b/packages/vant-css/src/tab.css
index 7285c3d42..323c14d4b 100644
--- a/packages/vant-css/src/tab.css
+++ b/packages/vant-css/src/tab.css
@@ -7,10 +7,27 @@ $van-tabs-card-height: 28px;
 .van-tabs {
   position: relative;
 
+  &__wrap {
+    top: 0;
+    left: 0;
+    right: 0;
+    z-index: 1;
+    position: absolute;
+
+    &--page-top {
+      position: fixed;
+    }
+
+    &--content-bottom {
+      top: auto;
+      bottom: 0;
+    }
+  }
+
   &__nav {
     display: flex;
-    position: relative;
     user-select: none;
+    position: relative;
     background-color: $white;
 
     &--line {
@@ -49,13 +66,13 @@ $van-tabs-card-height: 28px;
     background-color: $red;
   }
 
-  &--scrollbale {
+  &--scrollable {
     .van-tab {
       flex: 0 0 22%;
     }
 
     .van-tabs__nav {
-      overflow-y: auto;
+      overflow-x: auto;
       -webkit-overflow-scrolling: touch;
 
       &::-webkit-scrollbar {
@@ -65,21 +82,12 @@ $van-tabs-card-height: 28px;
     }
   }
 
-  &--fixed {
-    .van-tabs__wrap {
-      top: 0;
-      left: 0;
-      right: 0;
-      position: fixed;
-    }
+  &--line {
+    padding-top: $van-tabs-line-height;
+  }
 
-    &.van-tabs--line {
-      padding-top: $van-tabs-line-height;
-    }
-
-    &.van-tabs--card {
-      padding-top: $van-tabs-card-height;
-    }
+  &--card {
+    padding-top: $van-tabs-card-height;
   }
 }
 
diff --git a/test/unit/specs/tabs.spec.js b/test/unit/specs/tabs.spec.js
index 5160c2e68..7dacb080f 100644
--- a/test/unit/specs/tabs.spec.js
+++ b/test/unit/specs/tabs.spec.js
@@ -125,7 +125,7 @@ describe('Tabs', () => {
     wrapper.vm.sticky = false;
 
     setTimeout(() => {
-      expect(wrapper.vm.$children[0].fixed).to.be.false;
+      expect(wrapper.vm.$children[0].position).to.equal('content-top');
       done();
     }, 30);
   });