From 0c0f2527e3f53b99675835d754e36db6671bf077 Mon Sep 17 00:00:00 2001
From: baiyaaaaa <bigpet1991@gmail.com>
Date: Wed, 4 Jan 2017 12:32:00 +0800
Subject: [PATCH] fix tab-bar initial status bug

---
 examples/docs/zh-CN/tabs.md         |  4 +--
 packages/tabs/src/tab-bar.vue       | 39 ++++++++++++++++++++
 packages/tabs/src/tab-pane.vue      |  2 ++
 packages/tabs/src/tabs.vue          | 56 +++++++++++------------------
 packages/theme-default/src/tabs.css |  1 -
 test/unit/specs/tabs.spec.js        | 26 ++++++++------
 6 files changed, 78 insertions(+), 50 deletions(-)
 create mode 100644 packages/tabs/src/tab-bar.vue

diff --git a/examples/docs/zh-CN/tabs.md b/examples/docs/zh-CN/tabs.md
index b21bca1f8..2bc5febcf 100644
--- a/examples/docs/zh-CN/tabs.md
+++ b/examples/docs/zh-CN/tabs.md
@@ -2,7 +2,7 @@
   export default {
     data() {
       return {
-        activeName: 'first',
+        activeName: 'second',
         activeName2: 'first',
         tabs: [{
           title: 'Tab 1',
@@ -50,7 +50,7 @@
   export default {
     data() {
       return {
-        activeName: 'first'
+        activeName: 'second'
       };
     },
     methods: {
diff --git a/packages/tabs/src/tab-bar.vue b/packages/tabs/src/tab-bar.vue
new file mode 100644
index 000000000..c645d67cc
--- /dev/null
+++ b/packages/tabs/src/tab-bar.vue
@@ -0,0 +1,39 @@
+<template>
+  <div class="el-tabs__active-bar" :style="barStyle"></div>
+</template>
+<script>
+  export default {
+    props: {
+      tabs: Array
+    },
+    computed: {
+      barStyle: {
+        cache: false,
+        get() {
+          if (!this.$parent.$refs.tabs) return {};
+          let style = {};
+          let offset = 0;
+          let tabWidth = 0;
+
+          this.tabs.every((tab, index) => {
+            let $el = this.$parent.$refs.tabs[index];
+            if (!$el) { return false; }
+
+            if (!tab.active) {
+              offset += $el.clientWidth;
+              return true;
+            } else {
+              tabWidth = $el.clientWidth;
+              return false;
+            }
+          });
+
+          style.width = tabWidth + 'px';
+          style.transform = `translateX(${offset}px)`;
+
+          return style;
+        }
+      }
+    }
+  };
+</script>
\ No newline at end of file
diff --git a/packages/tabs/src/tab-pane.vue b/packages/tabs/src/tab-pane.vue
index 9f5c782dd..be2b41140 100644
--- a/packages/tabs/src/tab-pane.vue
+++ b/packages/tabs/src/tab-pane.vue
@@ -9,6 +9,8 @@
   module.exports = {
     name: 'ElTabPane',
 
+    componentName: 'ElTabPane',
+
     props: {
       label: String,
       labelContent: Function,
diff --git a/packages/tabs/src/tabs.vue b/packages/tabs/src/tabs.vue
index 8c012a789..32b6339b7 100644
--- a/packages/tabs/src/tabs.vue
+++ b/packages/tabs/src/tabs.vue
@@ -1,7 +1,12 @@
 <script>
+  import TabBar from './tab-bar';
   module.exports = {
     name: 'ElTabs',
 
+    components: {
+      TabBar
+    },
+
     props: {
       type: String,
       activeName: String,
@@ -29,10 +34,16 @@
     },
 
     computed: {
+      tabPanes: {
+        cache: false,
+        get() {
+          if (!this.$children) return [];
+          return this.$children.filter(item => item.$options.componentName === 'ElTabPane');
+        }
+      },
       currentTab() {
-        if (!this.$children) return;
         let result;
-        this.$children.forEach(tab => {
+        this.tabPanes.forEach(tab => {
           if (this.currentName === (tab.name || tab.index)) {
             result = tab;
           }
@@ -44,7 +55,7 @@
     methods: {
       handleTabRemove(tab, event) {
         event.stopPropagation();
-        const tabs = this.$children;
+        const tabs = this.tabPanes;
         const currentTab = this.currentTab;
 
         let index = tabs.indexOf(tab);
@@ -55,6 +66,7 @@
 
         this.$nextTick(_ => {
           if (tab.active) {
+            const tabs = this.tabPanes;
             let nextChild = tabs[index];
             let prevChild = tabs[index - 1];
             let nextActiveTab = nextChild || prevChild || null;
@@ -86,35 +98,11 @@
         type,
         handleTabRemove,
         handleTabClick,
-        currentName
+        currentName,
+        tabPanes
       } = this;
 
-      const getBarStyle = () => {
-        if (this.type || !this.$refs.tabs) return {};
-        let style = {};
-        let offset = 0;
-        let tabWidth = 0;
-
-        this.$children.every((tab, index) => {
-          let $el = this.$refs.tabs[index];
-          if (!$el) { return false; }
-
-          if (!tab.active) {
-            offset += $el.clientWidth;
-            return true;
-          } else {
-            tabWidth = $el.clientWidth;
-            return false;
-          }
-        });
-
-        style.width = tabWidth + 'px';
-        style.transform = `translateX(${offset}px)`;
-
-        return style;
-      };
-
-      const tabs = this.$children.map((tab, index) => {
+      const tabs = this._l(tabPanes, (tab, index) => {
         let tabName = tab.name || tab.index || index;
         if (currentName === undefined && index === 0) {
           this.setCurrentName(tabName);
@@ -122,16 +110,11 @@
 
         tab.index = index;
 
-        const activeBar = !type && index === 0
-          ? <div class="el-tabs__active-bar" style={getBarStyle()}></div>
-          : null;
-
         const btnClose = tab.isClosable
           ? <span class="el-icon-close" on-click={(ev) => { handleTabRemove(tab, ev); }}></span>
           : null;
 
         const tabLabelContent = tab.$slots.label || tab.label;
-
         return (
           <div
             class={{
@@ -146,10 +129,10 @@
           >
             {tabLabelContent}
             {btnClose}
-            {activeBar}
           </div>
         );
       });
+
       return (
         <div class={{
           'el-tabs': true,
@@ -157,6 +140,7 @@
           'el-tabs--border-card': type === 'border-card'
         }}>
           <div class="el-tabs__header">
+            {!type ? <tab-bar tabs={tabPanes}></tab-bar> : null}
             {tabs}
           </div>
           <div class="el-tabs__content">
diff --git a/packages/theme-default/src/tabs.css b/packages/theme-default/src/tabs.css
index 27b6f919d..2107af107 100644
--- a/packages/theme-default/src/tabs.css
+++ b/packages/theme-default/src/tabs.css
@@ -14,7 +14,6 @@
       position: absolute;
       bottom: 0;
       left: 0;
-      width: 100%;
       height: 3px;
       background-color: var(--color-primary);
       z-index: 1;
diff --git a/test/unit/specs/tabs.spec.js b/test/unit/specs/tabs.spec.js
index 60f50a054..d7de4e6c6 100644
--- a/test/unit/specs/tabs.spec.js
+++ b/test/unit/specs/tabs.spec.js
@@ -17,13 +17,14 @@ describe('Tabs', () => {
         </el-tabs>
       `
     }, true);
-    let tabList = vm.$el.querySelector('.el-tabs__header').children;
+
     let paneList = vm.$el.querySelector('.el-tabs__content').children;
     let spy = sinon.spy();
 
     vm.$refs.tabs.$on('tab-click', spy);
 
     setTimeout(_ => {
+      const tabList = vm.$refs.tabs.$refs.tabs;
       expect(tabList[0].classList.contains('is-active')).to.be.true;
       expect(paneList[0].style.display).to.not.ok;
 
@@ -39,7 +40,7 @@ describe('Tabs', () => {
   it('active-name', done => {
     vm = createVue({
       template: `
-        <el-tabs :active-name="activeName" @click="handleClick">
+        <el-tabs ref="tabs" :active-name="activeName" @click="handleClick">
           <el-tab-pane name="tab-A" label="用户管理">A</el-tab-pane>
           <el-tab-pane name="tab-B" label="配置管理">B</el-tab-pane>
           <el-tab-pane name="tab-C" label="角色管理">C</el-tab-pane>
@@ -57,10 +58,12 @@ describe('Tabs', () => {
         }
       }
     }, true);
-    let tabList = vm.$el.querySelector('.el-tabs__header').children;
-    let paneList = vm.$el.querySelector('.el-tabs__content').children;
     setTimeout(_ => {
+      const paneList = vm.$el.querySelector('.el-tabs__content').children;
+      const tabList = vm.$refs.tabs.$refs.tabs;
+
       expect(tabList[1].classList.contains('is-active')).to.be.true;
+      // expect(vm.$el.querySelector('.el-tabs__active-bar'))
       expect(paneList[1].style.display).to.not.ok;
 
       tabList[3].click();
@@ -150,13 +153,13 @@ describe('Tabs', () => {
       `
     }, true);
 
-    let tabList = vm.$el.querySelector('.el-tabs__header').children;
-    let paneList = vm.$el.querySelector('.el-tabs__content').children;
     let spy = sinon.spy();
-
     vm.$refs.tabs.$on('tab-remove', spy);
 
     setTimeout(_ => {
+      const tabList = vm.$refs.tabs.$refs.tabs;
+      const paneList = vm.$el.querySelector('.el-tabs__content').children;
+
       tabList[1].querySelector('.el-icon-close').click();
       vm.$nextTick(_ => {
         expect(tabList.length).to.be.equal(3);
@@ -197,9 +200,10 @@ describe('Tabs', () => {
       `
     }, true);
 
-    let tabList = vm.$el.querySelector('.el-tabs__header').children;
-    let paneList = vm.$el.querySelector('.el-tabs__content').children;
     vm.$nextTick(_ => {
+      const paneList = vm.$el.querySelector('.el-tabs__content').children;
+      const tabList = vm.$refs.tabs.$refs.tabs;
+
       tabList[0].querySelector('.el-icon-close').click();
       vm.$nextTick(_ => {
         expect(tabList.length).to.be.equal(3);
@@ -223,7 +227,7 @@ describe('Tabs', () => {
   it('disabled', done => {
     vm = createVue({
       template: `
-        <el-tabs type="card">
+        <el-tabs type="card" ref="tabs">
           <el-tab-pane label="用户管理">A</el-tab-pane>
           <el-tab-pane disabled label="配置管理" ref="disabled">B</el-tab-pane>
           <el-tab-pane label="角色管理">C</el-tab-pane>
@@ -233,7 +237,7 @@ describe('Tabs', () => {
     }, true);
 
     vm.$nextTick(_ => {
-      let tabList = vm.$el.querySelector('.el-tabs__header').children;
+      const tabList = vm.$refs.tabs.$refs.tabs;
 
       tabList[1].click();
       vm.$nextTick(_ => {