From e2c4d60058e7acf5e493656070b9a2dfa2904546 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=95=8F?= <cookfront@gmail.com>
Date: Sat, 15 Dec 2018 18:04:25 +0800
Subject: [PATCH] =?UTF-8?q?[bugfix]=20Tabs=EF=BC=9A=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=BC=80=E5=90=AFanimated=E5=B1=9E=E6=80=A7=E6=97=B6=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E7=9A=84=E6=BB=9A=E5=8A=A8=E9=97=AE=E9=A2=98=20(#2238?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/tab/demo/index.vue                   | 15 +++-
 packages/tab/index.vue                        | 10 +--
 .../tab/test/__snapshots__/demo.spec.js.snap  | 88 +++++++++----------
 .../tab/test/__snapshots__/index.spec.js.snap | 64 +++++++-------
 packages/tabs/index.less                      | 22 ++++-
 packages/tabs/index.vue                       | 28 ++----
 6 files changed, 118 insertions(+), 109 deletions(-)

diff --git a/packages/tab/demo/index.vue b/packages/tab/demo/index.vue
index 648478d96..e1f029b7b 100644
--- a/packages/tab/demo/index.vue
+++ b/packages/tab/demo/index.vue
@@ -92,15 +92,15 @@
 
     <demo-block :title="$t('title8')">
       <van-tabs
-        :active="active"
         animated
+        class="animated-tabs"
       >
         <van-tab
           :title="$t('tab') + index"
           v-for="index in tabs"
           :key="index"
         >
-          {{ $t('content') }} {{ index }}
+          <div class="custom-content-wrap">{{ $t('content') }} {{ index }}</div>
         </van-tab>
       </van-tabs>
     </demo-block>
@@ -214,5 +214,16 @@ export default {
       padding: 50px 20px;
     }
   }
+
+  .animated-tabs {
+    .van-tab__pane {
+      padding: 0 20px;
+    }
+  }
+
+  .custom-content-wrap {
+    height: 60px;
+    line-height: 60px;
+  }
 }
 </style>
diff --git a/packages/tab/index.vue b/packages/tab/index.vue
index 6a87fecbd..1423f9c79 100644
--- a/packages/tab/index.vue
+++ b/packages/tab/index.vue
@@ -1,8 +1,6 @@
 <template>
   <div
-    v-show="parent.animated || isSelected"
-    :class="b('pane', { float: parent.animated })"
-    :style="paneStyle"
+    :class="b('pane', { inactive: !isSelected, active: isSelected })"
   >
     <slot v-if="inited" />
     <div
@@ -51,12 +49,6 @@ export default create({
       this.inited = this.inited || this.isSelected;
     },
 
-    'parent.computedWidth'(width) {
-      this.paneStyle = {
-        width: `${width}px`
-      };
-    },
-
     title() {
       this.parent.setLine();
     }
diff --git a/packages/tab/test/__snapshots__/demo.spec.js.snap b/packages/tab/test/__snapshots__/demo.spec.js.snap
index 1de803278..10d05a574 100644
--- a/packages/tab/test/__snapshots__/demo.spec.js.snap
+++ b/packages/tab/test/__snapshots__/demo.spec.js.snap
@@ -10,20 +10,20 @@ exports[`renders demo correctly 1`] = `
         </div>
       </div>
       <div class="van-tabs__content">
-        <div class="van-tabs__track" style="display:none;">
-          <div class="van-tab__pane" style="display:none;">
+        <div class="van-tabs__track" style="left:0%;">
+          <div class="van-tab__pane van-tab__pane--inactive">
             <!---->
             <!---->
           </div>
-          <div class="van-tab__pane" style="display:none;">
+          <div class="van-tab__pane van-tab__pane--inactive">
             <!---->
             <!---->
           </div>
-          <div class="van-tab__pane" style="display:none;">
+          <div class="van-tab__pane van-tab__pane--inactive">
             <!---->
             <!---->
           </div>
-          <div class="van-tab__pane" style="display:none;">
+          <div class="van-tab__pane van-tab__pane--inactive">
             <!---->
             <!---->
           </div>
@@ -39,36 +39,36 @@ exports[`renders demo correctly 1`] = `
         </div>
       </div>
       <div class="van-tabs__content">
-        <div class="van-tabs__track" style="display:none;">
-          <div class="van-tab__pane" style="display:none;">
+        <div class="van-tabs__track" style="left:0%;">
+          <div class="van-tab__pane van-tab__pane--inactive">
             <!---->
             <!---->
           </div>
-          <div class="van-tab__pane" style="display:none;">
+          <div class="van-tab__pane van-tab__pane--inactive">
             <!---->
             <!---->
           </div>
-          <div class="van-tab__pane" style="display:none;">
+          <div class="van-tab__pane van-tab__pane--inactive">
             <!---->
             <!---->
           </div>
-          <div class="van-tab__pane" style="display:none;">
+          <div class="van-tab__pane van-tab__pane--inactive">
             <!---->
             <!---->
           </div>
-          <div class="van-tab__pane" style="display:none;">
+          <div class="van-tab__pane van-tab__pane--inactive">
             <!---->
             <!---->
           </div>
-          <div class="van-tab__pane" style="display:none;">
+          <div class="van-tab__pane van-tab__pane--inactive">
             <!---->
             <!---->
           </div>
-          <div class="van-tab__pane" style="display:none;">
+          <div class="van-tab__pane van-tab__pane--inactive">
             <!---->
             <!---->
           </div>
-          <div class="van-tab__pane" style="display:none;">
+          <div class="van-tab__pane van-tab__pane--inactive">
             <!---->
             <!---->
           </div>
@@ -84,16 +84,16 @@ exports[`renders demo correctly 1`] = `
         </div>
       </div>
       <div class="van-tabs__content">
-        <div class="van-tabs__track" style="display:none;">
-          <div class="van-tab__pane" style="display:none;">
+        <div class="van-tabs__track" style="left:0%;">
+          <div class="van-tab__pane van-tab__pane--inactive">
             <!---->
             <!---->
           </div>
-          <div class="van-tab__pane" style="display:none;">
+          <div class="van-tab__pane van-tab__pane--inactive">
             <!---->
             <!---->
           </div>
-          <div class="van-tab__pane" style="display:none;">
+          <div class="van-tab__pane van-tab__pane--inactive">
             <!---->
             <!---->
           </div>
@@ -109,16 +109,16 @@ exports[`renders demo correctly 1`] = `
         </div>
       </div>
       <div class="van-tabs__content">
-        <div class="van-tabs__track" style="display:none;">
-          <div class="van-tab__pane" style="display:none;">
+        <div class="van-tabs__track" style="left:0%;">
+          <div class="van-tab__pane van-tab__pane--inactive">
             <!---->
             <!---->
           </div>
-          <div class="van-tab__pane" style="display:none;">
+          <div class="van-tab__pane van-tab__pane--inactive">
             <!---->
             <!---->
           </div>
-          <div class="van-tab__pane" style="display:none;">
+          <div class="van-tab__pane van-tab__pane--inactive">
             <!---->
             <!---->
           </div>
@@ -134,12 +134,12 @@ exports[`renders demo correctly 1`] = `
         </div>
       </div>
       <div class="van-tabs__content">
-        <div class="van-tabs__track" style="display:none;">
-          <div class="van-tab__pane" style="display:none;">
+        <div class="van-tabs__track" style="left:0%;">
+          <div class="van-tab__pane van-tab__pane--inactive">
             <!---->
             <!---->
           </div>
-          <div class="van-tab__pane" style="display:none;">
+          <div class="van-tab__pane van-tab__pane--inactive">
             <!---->
             <!---->
           </div>
@@ -155,20 +155,20 @@ exports[`renders demo correctly 1`] = `
         </div>
       </div>
       <div class="van-tabs__content">
-        <div class="van-tabs__track" style="display:none;">
-          <div class="van-tab__pane" style="display:none;">
+        <div class="van-tabs__track" style="left:0%;">
+          <div class="van-tab__pane van-tab__pane--inactive">
             <!---->
             <!---->
           </div>
-          <div class="van-tab__pane" style="display:none;">
+          <div class="van-tab__pane van-tab__pane--inactive">
             <!---->
             <!---->
           </div>
-          <div class="van-tab__pane" style="display:none;">
+          <div class="van-tab__pane van-tab__pane--inactive">
             <!---->
             <!---->
           </div>
-          <div class="van-tab__pane" style="display:none;">
+          <div class="van-tab__pane van-tab__pane--inactive">
             <!---->
             <!---->
           </div>
@@ -184,8 +184,8 @@ exports[`renders demo correctly 1`] = `
         </div>
       </div>
       <div class="van-tabs__content">
-        <div class="van-tabs__track" style="display:none;">
-          <div class="van-tab__pane" style="display:none;">
+        <div class="van-tabs__track" style="left:0%;">
+          <div class="van-tab__pane van-tab__pane--inactive">
             <!---->
             <div>
               <div><i class="van-icon van-icon-more-o" style="color:undefined;font-size:undefined;">
@@ -194,7 +194,7 @@ exports[`renders demo correctly 1`] = `
               </div>
             </div>
           </div>
-          <div class="van-tab__pane" style="display:none;">
+          <div class="van-tab__pane van-tab__pane--inactive">
             <!---->
             <div>
               <div><i class="van-icon van-icon-more-o" style="color:undefined;font-size:undefined;">
@@ -208,27 +208,27 @@ exports[`renders demo correctly 1`] = `
     </div>
   </div>
   <div>
-    <div class="van-tabs van-tabs--line">
+    <div class="animated-tabs van-tabs van-tabs--line">
       <div class="van-tabs__wrap van-hairline--top-bottom">
         <div class="van-tabs__nav van-tabs__nav--line" style="border-color:undefined;">
           <div class="van-tabs__line"></div>
         </div>
       </div>
       <div class="van-tabs__content">
-        <div class="van-tabs__track" style="width:0px;transition-duration:0.3s;transform:translateX(0px);display:none;">
-          <div class="van-tab__pane van-tab__pane--float">
+        <div class="van-tabs__track" style="left:0%;transition-duration:0.3s;">
+          <div class="van-tab__pane van-tab__pane--inactive">
             <!---->
             <!---->
           </div>
-          <div class="van-tab__pane van-tab__pane--float">
+          <div class="van-tab__pane van-tab__pane--inactive">
             <!---->
             <!---->
           </div>
-          <div class="van-tab__pane van-tab__pane--float">
+          <div class="van-tab__pane van-tab__pane--inactive">
             <!---->
             <!---->
           </div>
-          <div class="van-tab__pane van-tab__pane--float">
+          <div class="van-tab__pane van-tab__pane--inactive">
             <!---->
             <!---->
           </div>
@@ -244,20 +244,20 @@ exports[`renders demo correctly 1`] = `
         </div>
       </div>
       <div class="van-tabs__content">
-        <div class="van-tabs__track" style="display:none;">
-          <div class="van-tab__pane" style="display:none;">
+        <div class="van-tabs__track" style="left:0%;">
+          <div class="van-tab__pane van-tab__pane--inactive">
             <!---->
             <!---->
           </div>
-          <div class="van-tab__pane" style="display:none;">
+          <div class="van-tab__pane van-tab__pane--inactive">
             <!---->
             <!---->
           </div>
-          <div class="van-tab__pane" style="display:none;">
+          <div class="van-tab__pane van-tab__pane--inactive">
             <!---->
             <!---->
           </div>
-          <div class="van-tab__pane" style="display:none;">
+          <div class="van-tab__pane van-tab__pane--inactive">
             <!---->
             <!---->
           </div>
diff --git a/packages/tab/test/__snapshots__/index.spec.js.snap b/packages/tab/test/__snapshots__/index.spec.js.snap
index 64e2f598d..2e188c7b8 100644
--- a/packages/tab/test/__snapshots__/index.spec.js.snap
+++ b/packages/tab/test/__snapshots__/index.spec.js.snap
@@ -8,16 +8,16 @@ exports[`change tabs data 1`] = `
     </div>
   </div>
   <div class="van-tabs__content">
-    <div class="van-tabs__track" style="display: none;">
-      <div class="van-tab__pane" style="display: none;">
+    <div class="van-tabs__track" style="left: 0%;">
+      <div class="van-tab__pane van-tab__pane--inactive">
         <!---->
         <!---->
       </div>
-      <div class="van-tab__pane" style="display: none;">
+      <div class="van-tab__pane van-tab__pane--inactive">
         <!---->
         <div><span>title2</span></div>
       </div>
-      <div class="van-tab__pane" style="display: none;">
+      <div class="van-tab__pane van-tab__pane--inactive">
         <!---->
         <!---->
       </div>
@@ -43,16 +43,16 @@ exports[`change tabs data 2`] = `
     </div>
   </div>
   <div class="van-tabs__content">
-    <div class="van-tabs__track" style="display: none;">
-      <div class="van-tab__pane" style="">
+    <div class="van-tabs__track" style="left: 0%;">
+      <div class="van-tab__pane van-tab__pane--active">
         <!---->
         <!---->
       </div>
-      <div class="van-tab__pane" style="display: none;">
+      <div class="van-tab__pane van-tab__pane--inactive">
         <!---->
         <div><span>title2</span></div>
       </div>
-      <div class="van-tab__pane" style="display: none;">
+      <div class="van-tab__pane van-tab__pane--inactive">
         <!---->
         <!---->
       </div>
@@ -78,14 +78,14 @@ exports[`click to switch tab 1`] = `
     </div>
   </div>
   <div class="van-tabs__content">
-    <div class="van-tabs__track" style="display: none;">
-      <div class="van-tab__pane" style="width: 0px;">Text
+    <div class="van-tabs__track" style="left: 0%;">
+      <div class="van-tab__pane van-tab__pane--active">Text
         <!---->
       </div>
-      <div class="van-tab__pane" style="display: none; width: 0px;">
+      <div class="van-tab__pane van-tab__pane--inactive">
         <!---->
       </div>
-      <div class="van-tab__pane" style="display: none; width: 0px;">
+      <div class="van-tab__pane van-tab__pane--inactive">
         <!---->
         <!---->
       </div>
@@ -111,14 +111,14 @@ exports[`click to switch tab 2`] = `
     </div>
   </div>
   <div class="van-tabs__content">
-    <div class="van-tabs__track" style="display: none;">
-      <div class="van-tab__pane" style="width: 0px; display: none;">Text
+    <div class="van-tabs__track" style="left: -100%;">
+      <div class="van-tab__pane van-tab__pane--inactive">Text
         <!---->
       </div>
-      <div class="van-tab__pane" style="width: 0px;">
+      <div class="van-tab__pane van-tab__pane--active">
         Text
       </div>
-      <div class="van-tab__pane" style="display: none; width: 0px;">
+      <div class="van-tab__pane van-tab__pane--inactive">
         <!---->
         <!---->
       </div>
@@ -144,14 +144,14 @@ exports[`swipe to switch tab 1`] = `
     </div>
   </div>
   <div class="van-tabs__content">
-    <div class="van-tabs__track" style="display: none;">
-      <div class="van-tab__pane" style="width: 0px;">Text
+    <div class="van-tabs__track" style="left: 0%;">
+      <div class="van-tab__pane van-tab__pane--active">Text
         <!---->
       </div>
-      <div class="van-tab__pane" style="display: none; width: 0px;">
+      <div class="van-tab__pane van-tab__pane--inactive">
         <!---->
       </div>
-      <div class="van-tab__pane" style="display: none; width: 0px;">
+      <div class="van-tab__pane van-tab__pane--inactive">
         <!---->
         <!---->
       </div>
@@ -177,14 +177,14 @@ exports[`swipe to switch tab 2`] = `
     </div>
   </div>
   <div class="van-tabs__content">
-    <div class="van-tabs__track" style="display: none;">
-      <div class="van-tab__pane" style="width: 0px; display: none;">Text
+    <div class="van-tabs__track" style="left: -100%;">
+      <div class="van-tab__pane van-tab__pane--inactive">Text
         <!---->
       </div>
-      <div class="van-tab__pane" style="width: 0px;">
+      <div class="van-tab__pane van-tab__pane--active">
         Text
       </div>
-      <div class="van-tab__pane" style="display: none; width: 0px;">
+      <div class="van-tab__pane van-tab__pane--inactive">
         <!---->
         <!---->
       </div>
@@ -210,14 +210,14 @@ exports[`swipe to switch tab 3`] = `
     </div>
   </div>
   <div class="van-tabs__content">
-    <div class="van-tabs__track" style="display: none;">
-      <div class="van-tab__pane" style="width: 0px; display: none;">Text
+    <div class="van-tabs__track" style="left: -100%;">
+      <div class="van-tab__pane van-tab__pane--inactive">Text
         <!---->
       </div>
-      <div class="van-tab__pane" style="width: 0px;">
+      <div class="van-tab__pane van-tab__pane--active">
         Text
       </div>
-      <div class="van-tab__pane" style="display: none; width: 0px;">
+      <div class="van-tab__pane van-tab__pane--inactive">
         <!---->
         <!---->
       </div>
@@ -243,14 +243,14 @@ exports[`swipe to switch tab 4`] = `
     </div>
   </div>
   <div class="van-tabs__content">
-    <div class="van-tabs__track" style="display: none;">
-      <div class="van-tab__pane" style="width: 0px;">Text
+    <div class="van-tabs__track" style="left: 0%;">
+      <div class="van-tab__pane van-tab__pane--active">Text
         <!---->
       </div>
-      <div class="van-tab__pane" style="width: 0px; display: none;">
+      <div class="van-tab__pane van-tab__pane--inactive">
         Text
       </div>
-      <div class="van-tab__pane" style="display: none; width: 0px;">
+      <div class="van-tab__pane van-tab__pane--inactive">
         <!---->
         <!---->
       </div>
diff --git a/packages/tabs/index.less b/packages/tabs/index.less
index 0e1b89ebd..74b282159 100644
--- a/packages/tabs/index.less
+++ b/packages/tabs/index.less
@@ -122,6 +122,14 @@
     overflow: hidden;
   }
 
+  &__track {
+    position: relative;
+    display: flex;
+    width: 100%;
+    height: 100%;
+    will-change: left;
+  }
+
   &--line {
     padding-top: @tabs-line-height;
 
@@ -139,10 +147,18 @@
   }
 
   .van-tab__pane {
+    width: 100%;
     box-sizing: border-box;
-  
-    &--float {
-      float: left;
+    flex-shrink: 0;
+    overflow-y: auto;
+
+    &--inactive {
+      height: 0;
+      overflow: visible;
+    }
+
+    &--active {
+      height: auto;
     }
   }
 }
diff --git a/packages/tabs/index.vue b/packages/tabs/index.vue
index 976387215..e7da8d176 100644
--- a/packages/tabs/index.vue
+++ b/packages/tabs/index.vue
@@ -44,7 +44,6 @@
       :class="b('content')"
     >
       <div
-        v-show="computedWidth !== 0"
         :class="b('track')"
         :style="trackStyle"
       >
@@ -112,8 +111,7 @@ export default create({
         resize: false,
         sticky: false,
         swipeable: false
-      },
-      computedWidth: 0
+      }
     };
   },
 
@@ -149,18 +147,18 @@ export default create({
     trackStyle() {
       const {
         curActive,
-        computedWidth = 0,
-        tabs,
         animated
       } = this;
-      if (!animated) return {};
 
-      const offset = -1 * computedWidth * curActive;
-      return {
-        width: `${computedWidth * tabs.length}px`,
-        transitionDuration: `${this.duration}s`,
-        transform: `translateX(${offset}px)`
+      const trackStyle = {
+        left: `${-1 * curActive * 100}%`
       };
+
+      if (animated) {
+        trackStyle.transitionDuration = `${this.duration}s`;
+      }
+
+      return trackStyle;
     }
   },
 
@@ -203,7 +201,6 @@ export default create({
   mounted() {
     this.correctActive(this.active);
     this.setLine();
-    this.setWidth();
 
     this.$nextTick(() => {
       this.handlers(true);
@@ -227,13 +224,6 @@ export default create({
   },
 
   methods: {
-    setWidth() {
-      if (this.$el) {
-        const rect = this.$el.getBoundingClientRect() || {};
-        this.computedWidth = rect.width;
-      }
-    },
-
     // whether to bind sticky listener
     handlers(bind) {
       const { events } = this;