From 7ee383129c97c4a8a7eee509ed9ee390849b4582 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Fri, 1 Feb 2019 17:58:06 +0800
Subject: [PATCH] [improvement] Tabs: jsx (#2665)

---
 .../test/__snapshots__/index.spec.js.snap     |   4 +-
 .../list/test/__snapshots__/demo.spec.js.snap |   8 +-
 packages/tab/index.js                         |   2 +-
 .../tab/test/__snapshots__/demo.spec.js.snap  | 230 +++++++++++-------
 .../tab/test/__snapshots__/index.spec.js.snap |  65 +++--
 packages/tabs/{index.vue => index.js}         | 126 +++++-----
 6 files changed, 265 insertions(+), 170 deletions(-)
 rename packages/tabs/{index.vue => index.js} (83%)

diff --git a/packages/coupon-list/test/__snapshots__/index.spec.js.snap b/packages/coupon-list/test/__snapshots__/index.spec.js.snap
index 392554260..bd1c9eae4 100644
--- a/packages/coupon-list/test/__snapshots__/index.spec.js.snap
+++ b/packages/coupon-list/test/__snapshots__/index.spec.js.snap
@@ -117,7 +117,9 @@ exports[`render coupon list 1`] = `
           </div>
         </div>
       </div>
-      <div class="van-tab__pane" style="display: none;"></div>
+      <div class="van-tab__pane" style="display: none;">
+        <!---->
+      </div>
     </div>
   </div><button class="van-button van-button--default van-button--large van-coupon-list__close"><span class="van-button__text">不使用优惠</span></button>
 </div>
diff --git a/packages/list/test/__snapshots__/demo.spec.js.snap b/packages/list/test/__snapshots__/demo.spec.js.snap
index 2f4f26bcb..df597cb79 100644
--- a/packages/list/test/__snapshots__/demo.spec.js.snap
+++ b/packages/list/test/__snapshots__/demo.spec.js.snap
@@ -9,8 +9,12 @@ exports[`renders demo correctly 1`] = `
       </div>
     </div>
     <div class="van-tabs__content">
-      <div class="van-tab__pane" style="display:none;"></div>
-      <div class="van-tab__pane" style="display:none;"></div>
+      <div class="van-tab__pane" style="display:none;">
+        <!---->
+      </div>
+      <div class="van-tab__pane" style="display:none;">
+        <!---->
+      </div>
     </div>
   </div>
 </div>
diff --git a/packages/tab/index.js b/packages/tab/index.js
index f912a2be1..6f856b0fb 100644
--- a/packages/tab/index.js
+++ b/packages/tab/index.js
@@ -60,7 +60,7 @@ export default sfc({
     const slots = this.$slots;
     return (
       <div v-show={this.selected || this.parent.animated} class={bem('pane')}>
-        {this.inited && slots.default}
+        {this.inited ? slots.default : h()}
         {slots.title && <div ref="title">{slots.title}</div>}
       </div>
     );
diff --git a/packages/tab/test/__snapshots__/demo.spec.js.snap b/packages/tab/test/__snapshots__/demo.spec.js.snap
index c575e3e1f..5fba105af 100644
--- a/packages/tab/test/__snapshots__/demo.spec.js.snap
+++ b/packages/tab/test/__snapshots__/demo.spec.js.snap
@@ -10,85 +10,18 @@ exports[`renders demo correctly 1`] = `
         </div>
       </div>
       <div class="van-tabs__content">
-        <div class="van-tab__pane" style="display:none;"></div>
-        <div class="van-tab__pane" style="display:none;"></div>
-        <div class="van-tab__pane" style="display:none;"></div>
-        <div class="van-tab__pane" style="display:none;"></div>
-      </div>
-    </div>
-  </div>
-  <div>
-    <div class="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" style="background-color:undefined;"></div>
-        </div>
-      </div>
-      <div class="van-tabs__content">
-        <div class="van-tab__pane" style="display:none;"></div>
-        <div class="van-tab__pane" style="display:none;"></div>
-        <div class="van-tab__pane" style="display:none;"></div>
-        <div class="van-tab__pane" style="display:none;"></div>
-        <div class="van-tab__pane" style="display:none;"></div>
-        <div class="van-tab__pane" style="display:none;"></div>
-        <div class="van-tab__pane" style="display:none;"></div>
-        <div class="van-tab__pane" style="display:none;"></div>
-      </div>
-    </div>
-  </div>
-  <div>
-    <div class="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" style="background-color:undefined;"></div>
-        </div>
-      </div>
-      <div class="van-tabs__content">
-        <div class="van-tab__pane" style="display:none;"></div>
-        <div class="van-tab__pane" style="display:none;"></div>
-        <div class="van-tab__pane" style="display:none;"></div>
-      </div>
-    </div>
-  </div>
-  <div>
-    <div class="van-tabs van-tabs--card">
-      <div class="van-tabs__wrap">
-        <div class="van-tabs__nav van-tabs__nav--card" style="border-color:undefined;">
+        <div class="van-tab__pane" style="display:none;">
           <!---->
         </div>
-      </div>
-      <div class="van-tabs__content">
-        <div class="van-tab__pane" style="display:none;"></div>
-        <div class="van-tab__pane" style="display:none;"></div>
-        <div class="van-tab__pane" style="display:none;"></div>
-      </div>
-    </div>
-  </div>
-  <div>
-    <div class="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" style="background-color:undefined;"></div>
+        <div class="van-tab__pane" style="display:none;">
+          <!---->
         </div>
-      </div>
-      <div class="van-tabs__content">
-        <div class="van-tab__pane" style="display:none;"></div>
-        <div class="van-tab__pane" style="display:none;"></div>
-      </div>
-    </div>
-  </div>
-  <div>
-    <div class="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" style="background-color:undefined;"></div>
+        <div class="van-tab__pane" style="display:none;">
+          <!---->
+        </div>
+        <div class="van-tab__pane" style="display:none;">
+          <!---->
         </div>
-      </div>
-      <div class="van-tabs__content">
-        <div class="van-tab__pane" style="display:none;"></div>
-        <div class="van-tab__pane" style="display:none;"></div>
-        <div class="van-tab__pane" style="display:none;"></div>
-        <div class="van-tab__pane" style="display:none;"></div>
       </div>
     </div>
   </div>
@@ -101,6 +34,120 @@ exports[`renders demo correctly 1`] = `
       </div>
       <div class="van-tabs__content">
         <div class="van-tab__pane" style="display:none;">
+          <!---->
+        </div>
+        <div class="van-tab__pane" style="display:none;">
+          <!---->
+        </div>
+        <div class="van-tab__pane" style="display:none;">
+          <!---->
+        </div>
+        <div class="van-tab__pane" style="display:none;">
+          <!---->
+        </div>
+        <div class="van-tab__pane" style="display:none;">
+          <!---->
+        </div>
+        <div class="van-tab__pane" style="display:none;">
+          <!---->
+        </div>
+        <div class="van-tab__pane" style="display:none;">
+          <!---->
+        </div>
+        <div class="van-tab__pane" style="display:none;">
+          <!---->
+        </div>
+      </div>
+    </div>
+  </div>
+  <div>
+    <div class="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" style="background-color:undefined;"></div>
+        </div>
+      </div>
+      <div class="van-tabs__content">
+        <div class="van-tab__pane" style="display:none;">
+          <!---->
+        </div>
+        <div class="van-tab__pane" style="display:none;">
+          <!---->
+        </div>
+        <div class="van-tab__pane" style="display:none;">
+          <!---->
+        </div>
+      </div>
+    </div>
+  </div>
+  <div>
+    <div class="van-tabs van-tabs--card">
+      <div class="van-tabs__wrap">
+        <div class="van-tabs__nav van-tabs__nav--card" style="border-color:undefined;"></div>
+      </div>
+      <div class="van-tabs__content">
+        <div class="van-tab__pane" style="display:none;">
+          <!---->
+        </div>
+        <div class="van-tab__pane" style="display:none;">
+          <!---->
+        </div>
+        <div class="van-tab__pane" style="display:none;">
+          <!---->
+        </div>
+      </div>
+    </div>
+  </div>
+  <div>
+    <div class="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" style="background-color:undefined;"></div>
+        </div>
+      </div>
+      <div class="van-tabs__content">
+        <div class="van-tab__pane" style="display:none;">
+          <!---->
+        </div>
+        <div class="van-tab__pane" style="display:none;">
+          <!---->
+        </div>
+      </div>
+    </div>
+  </div>
+  <div>
+    <div class="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" style="background-color:undefined;"></div>
+        </div>
+      </div>
+      <div class="van-tabs__content">
+        <div class="van-tab__pane" style="display:none;">
+          <!---->
+        </div>
+        <div class="van-tab__pane" style="display:none;">
+          <!---->
+        </div>
+        <div class="van-tab__pane" style="display:none;">
+          <!---->
+        </div>
+        <div class="van-tab__pane" style="display:none;">
+          <!---->
+        </div>
+      </div>
+    </div>
+  </div>
+  <div>
+    <div class="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" style="background-color:undefined;"></div>
+        </div>
+      </div>
+      <div class="van-tabs__content">
+        <div class="van-tab__pane" style="display:none;">
+          <!---->
           <div>
             <div><i class="van-icon van-icon-more-o" style="color:undefined;font-size:undefined;">
                 <!----></i>标签
@@ -108,6 +155,7 @@ exports[`renders demo correctly 1`] = `
           </div>
         </div>
         <div class="van-tab__pane" style="display:none;">
+          <!---->
           <div>
             <div><i class="van-icon van-icon-more-o" style="color:undefined;font-size:undefined;">
                 <!----></i>标签
@@ -126,10 +174,18 @@ exports[`renders demo correctly 1`] = `
       </div>
       <div class="van-tabs__content van-tabs__content--animated">
         <div class="van-tabs__track" style="left:0%;transition-duration:0.3s;">
-          <div class="van-tab__pane"></div>
-          <div class="van-tab__pane"></div>
-          <div class="van-tab__pane"></div>
-          <div class="van-tab__pane"></div>
+          <div class="van-tab__pane">
+            <!---->
+          </div>
+          <div class="van-tab__pane">
+            <!---->
+          </div>
+          <div class="van-tab__pane">
+            <!---->
+          </div>
+          <div class="van-tab__pane">
+            <!---->
+          </div>
         </div>
       </div>
     </div>
@@ -142,10 +198,18 @@ exports[`renders demo correctly 1`] = `
         </div>
       </div>
       <div class="van-tabs__content">
-        <div class="van-tab__pane" style="display:none;"></div>
-        <div class="van-tab__pane" style="display:none;"></div>
-        <div class="van-tab__pane" style="display:none;"></div>
-        <div class="van-tab__pane" style="display:none;"></div>
+        <div class="van-tab__pane" style="display:none;">
+          <!---->
+        </div>
+        <div class="van-tab__pane" style="display:none;">
+          <!---->
+        </div>
+        <div class="van-tab__pane" style="display:none;">
+          <!---->
+        </div>
+        <div class="van-tab__pane" style="display:none;">
+          <!---->
+        </div>
       </div>
     </div>
   </div>
diff --git a/packages/tab/test/__snapshots__/index.spec.js.snap b/packages/tab/test/__snapshots__/index.spec.js.snap
index 7e97f0339..32be0804a 100644
--- a/packages/tab/test/__snapshots__/index.spec.js.snap
+++ b/packages/tab/test/__snapshots__/index.spec.js.snap
@@ -8,11 +8,16 @@ exports[`change tabs data 1`] = `
     </div>
   </div>
   <div class="van-tabs__content">
-    <div class="van-tab__pane" style="display: none;"></div>
     <div class="van-tab__pane" style="display: none;">
+      <!---->
+    </div>
+    <div class="van-tab__pane" style="display: none;">
+      <!---->
       <div><span>title2</span></div>
     </div>
-    <div class="van-tab__pane" style="display: none;"></div>
+    <div class="van-tab__pane" style="display: none;">
+      <!---->
+    </div>
   </div>
 </div>
 `;
@@ -31,8 +36,12 @@ exports[`change tabs data 2`] = `
   </div>
   <div class="van-tabs__content">
     <div class="van-tab__pane" style="">Text</div>
-    <div class="van-tab__pane" style="display: none;"></div>
-    <div class="van-tab__pane" style="display: none;"></div>
+    <div class="van-tab__pane" style="display: none;">
+      <!---->
+    </div>
+    <div class="van-tab__pane" style="display: none;">
+      <!---->
+    </div>
   </div>
 </div>
 `;
@@ -51,8 +60,12 @@ exports[`click to switch tab 1`] = `
   </div>
   <div class="van-tabs__content">
     <div class="van-tab__pane" style="">Text</div>
-    <div class="van-tab__pane" style="display: none;"></div>
-    <div class="van-tab__pane" style="display: none;"></div>
+    <div class="van-tab__pane" style="display: none;">
+      <!---->
+    </div>
+    <div class="van-tab__pane" style="display: none;">
+      <!---->
+    </div>
   </div>
 </div>
 `;
@@ -71,8 +84,12 @@ exports[`click to switch tab 2`] = `
   </div>
   <div class="van-tabs__content">
     <div class="van-tab__pane" style="display: none;">Text</div>
-    <div class="van-tab__pane" style=""></div>
-    <div class="van-tab__pane" style="display: none;"></div>
+    <div class="van-tab__pane" style="">
+      Text
+    </div>
+    <div class="van-tab__pane" style="display: none;">
+      <!---->
+    </div>
   </div>
 </div>
 `;
@@ -91,8 +108,12 @@ exports[`swipe to switch tab 1`] = `
   </div>
   <div class="van-tabs__content">
     <div class="van-tab__pane" style="">Text</div>
-    <div class="van-tab__pane" style="display: none;"></div>
-    <div class="van-tab__pane" style="display: none;"></div>
+    <div class="van-tab__pane" style="display: none;">
+      <!---->
+    </div>
+    <div class="van-tab__pane" style="display: none;">
+      <!---->
+    </div>
   </div>
 </div>
 `;
@@ -111,8 +132,12 @@ exports[`swipe to switch tab 2`] = `
   </div>
   <div class="van-tabs__content">
     <div class="van-tab__pane" style="display: none;">Text</div>
-    <div class="van-tab__pane" style=""></div>
-    <div class="van-tab__pane" style="display: none;"></div>
+    <div class="van-tab__pane" style="">
+      Text
+    </div>
+    <div class="van-tab__pane" style="display: none;">
+      <!---->
+    </div>
   </div>
 </div>
 `;
@@ -131,8 +156,12 @@ exports[`swipe to switch tab 3`] = `
   </div>
   <div class="van-tabs__content">
     <div class="van-tab__pane" style="display: none;">Text</div>
-    <div class="van-tab__pane" style=""></div>
-    <div class="van-tab__pane" style="display: none;"></div>
+    <div class="van-tab__pane" style="">
+      Text
+    </div>
+    <div class="van-tab__pane" style="display: none;">
+      <!---->
+    </div>
   </div>
 </div>
 `;
@@ -151,8 +180,12 @@ exports[`swipe to switch tab 4`] = `
   </div>
   <div class="van-tabs__content">
     <div class="van-tab__pane" style="">Text</div>
-    <div class="van-tab__pane" style="display: none;"></div>
-    <div class="van-tab__pane" style="display: none;"></div>
+    <div class="van-tab__pane" style="display: none;">
+      Text
+    </div>
+    <div class="van-tab__pane" style="display: none;">
+      <!---->
+    </div>
   </div>
 </div>
 `;
diff --git a/packages/tabs/index.vue b/packages/tabs/index.js
similarity index 83%
rename from packages/tabs/index.vue
rename to packages/tabs/index.js
index 37b3494df..e9c14f1cb 100644
--- a/packages/tabs/index.vue
+++ b/packages/tabs/index.js
@@ -1,69 +1,13 @@
-<template>
-  <div :class="b([type])">
-    <div
-      ref="wrap"
-      :style="wrapStyle"
-      :class="[
-        b('wrap', { scrollable }),
-        { 'van-hairline--top-bottom': type === 'line' }
-      ]"
-    >
-      <div
-        ref="nav"
-        :class="b('nav', [type])"
-        :style="navStyle"
-      >
-        <div
-          v-if="type === 'line'"
-          :class="b('line')"
-          :style="lineStyle"
-        />
-        <div
-          v-for="(tab, index) in tabs"
-          ref="tabs"
-          class="van-tab"
-          :class="{
-            'van-tab--active': index === curActive,
-            'van-tab--disabled': tab.disabled,
-            'van-tab--complete': !ellipsis
-          }"
-          :style="getTabStyle(tab, index)"
-          @click="onClick(index)"
-        >
-          <span
-            v-text="tab.title"
-            ref="title"
-            :class="{ 'van-ellipsis': ellipsis }"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      ref="content"
-      :class="b('content', { animated })"
-    >
-      <div
-        v-if="animated"
-        :class="b('track')"
-        :style="trackStyle"
-      >
-        <slot />
-      </div>
-      <slot v-else />
-    </div>
-  </div>
-</template>
-
-<script>
-import create from '../utils/create';
+import { use, isDef } from '../utils';
 import { raf } from '../utils/raf';
 import { on, off } from '../utils/event';
 import scrollUtils from '../utils/scroll';
 import Touch from '../mixins/touch';
 
-export default create({
-  name: 'tabs',
+const [sfc, bem] = use('tabs');
+const tabBem = use('tab')[1];
 
+export default sfc({
   mixins: [Touch],
 
   model: {
@@ -273,7 +217,8 @@ export default create({
     onScroll() {
       const scrollTop = scrollUtils.getScrollTop(window) + this.offsetTop;
       const elTopToPageTop = scrollUtils.getElementTop(this.$el);
-      const elBottomToPageTop = elTopToPageTop + this.$el.offsetHeight - this.$refs.wrap.offsetHeight;
+      const elBottomToPageTop =
+        elTopToPageTop + this.$el.offsetHeight - this.$refs.wrap.offsetHeight;
       if (scrollTop > elBottomToPageTop) {
         this.position = 'bottom';
       } else if (scrollTop > elTopToPageTop) {
@@ -301,7 +246,7 @@ export default create({
 
         const tab = tabs[this.curActive];
         const { lineWidth, lineHeight } = this;
-        const width = this.isDef(lineWidth) ? lineWidth : (tab.offsetWidth / 2);
+        const width = isDef(lineWidth) ? lineWidth : tab.offsetWidth / 2;
         const left = tab.offsetLeft + (tab.offsetWidth - width) / 2;
 
         const lineStyle = {
@@ -314,7 +259,7 @@ export default create({
           lineStyle.transitionDuration = `${this.duration}s`;
         }
 
-        if (this.isDef(lineHeight)) {
+        if (isDef(lineHeight)) {
           const height = `${lineHeight}px`;
           lineStyle.height = height;
           lineStyle.borderRadius = height;
@@ -334,7 +279,7 @@ export default create({
 
     setCurActive(active) {
       active = this.findAvailableTab(active, active < this.curActive);
-      if (this.isDef(active) && active !== this.curActive) {
+      if (isDef(active) && active !== this.curActive) {
         this.$emit('input', active);
 
         if (this.curActive !== null) {
@@ -390,7 +335,7 @@ export default create({
       }
 
       let count = 0;
-      const frames = Math.round(this.duration * 1000 / 16);
+      const frames = Math.round((this.duration * 1000) / 16);
       const animate = () => {
         el.scrollLeft += (to - from) / frames;
         /* istanbul ignore next */
@@ -428,11 +373,58 @@ export default create({
       }
 
       if (this.scrollable && this.ellipsis) {
-        style.flexBasis = 88 / (this.swipeThreshold) + '%';
+        style.flexBasis = 88 / this.swipeThreshold + '%';
       }
 
       return style;
     }
+  },
+
+  render(h) {
+    const { type, ellipsis, animated, scrollable } = this;
+
+    const Nav = this.tabs.map((tab, index) => (
+      <div
+        ref="tabs"
+        refInFor
+        class={tabBem({
+          active: index === this.curActive,
+          disabled: tab.disabled,
+          complete: !ellipsis
+        })}
+        style={this.getTabStyle(tab, index)}
+        onClick={() => {
+          this.onClick(index);
+        }}
+      >
+        <span ref="title" refInFor class={{ 'van-ellipsis': ellipsis }}>
+          {tab.title}
+        </span>
+      </div>
+    ));
+
+    return (
+      <div class={bem([type])}>
+        <div
+          ref="wrap"
+          style={this.wrapStyle}
+          class={[bem('wrap', { scrollable }), { 'van-hairline--top-bottom': type === 'line' }]}
+        >
+          <div ref="nav" class={bem('nav', [type])} style={this.navStyle}>
+            {type === 'line' && <div class={bem('line')} style={this.lineStyle} />}
+            {Nav}
+          </div>
+        </div>
+        <div ref="content" class={bem('content', { animated })}>
+          {animated ? (
+            <div class={bem('track')} style={this.trackStyle}>
+              {this.$slots.default}
+            </div>
+          ) : (
+            this.$slots.default
+          )}
+        </div>
+      </div>
+    );
   }
 });
-</script>