From 8c4dfd1afff8f54d75271736700d929ee87c512b Mon Sep 17 00:00:00 2001
From: Leopoldthecoder <Leopoldthecuber@gmail.com>
Date: Sun, 7 Jan 2018 12:22:21 +0800
Subject: [PATCH] Tabs: fix style bug when nested with different tab positions

---
 packages/tabs/src/tab-bar.vue      |  2 +-
 packages/tabs/src/tab-nav.vue      | 11 ++---
 packages/tabs/src/tabs.vue         |  2 +-
 packages/theme-chalk/src/tabs.scss | 69 +++++++++++++++++-------------
 4 files changed, 47 insertions(+), 37 deletions(-)

diff --git a/packages/tabs/src/tab-bar.vue b/packages/tabs/src/tab-bar.vue
index 7a1860c8a..5014055dc 100644
--- a/packages/tabs/src/tab-bar.vue
+++ b/packages/tabs/src/tab-bar.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="el-tabs__active-bar" :style="barStyle"></div>
+  <div class="el-tabs__active-bar" :class="`is-${ rootTabs.tabPosition }`" :style="barStyle"></div>
 </template>
 <script>
   export default {
diff --git a/packages/tabs/src/tab-nav.vue b/packages/tabs/src/tab-nav.vue
index be8ea20d7..9d3ad1a95 100644
--- a/packages/tabs/src/tab-nav.vue
+++ b/packages/tabs/src/tab-nav.vue
@@ -196,6 +196,7 @@
           <div
             class={{
               'el-tabs__item': true,
+              [`is-${ this.rootTabs.tabPosition }`]: true,
               'is-active': pane.active,
               'is-disabled': pane.disabled,
               'is-closable': closable,
@@ -204,12 +205,12 @@
             id={`tab-${tabName}`}
             aria-controls={`pane-${tabName}`}
             role="tab"
-            aria-selected= { pane.active }
+            aria-selected={ pane.active }
             ref="tabs"
-            tabindex= {tabindex}
+            tabindex={tabindex}
             refInFor
-            on-focus= { ()=> { setFocus(); }}
-            on-blur = { ()=> { removeFocus(); }}
+            on-focus={ ()=> { setFocus(); }}
+            on-blur ={ ()=> { removeFocus(); }}
             on-click={(ev) => { removeFocus(); onTabClick(pane, tabName, ev); }}
             on-keydown={(ev) => { if (closable && (ev.keyCode === 46 || ev.keyCode === 8)) { onTabRemove(pane, ev);} }}
           >
@@ -219,7 +220,7 @@
         );
       });
       return (
-        <div class={['el-tabs__nav-wrap', scrollable ? 'is-scrollable' : '']}>
+        <div class={['el-tabs__nav-wrap', scrollable ? 'is-scrollable' : '', `is-${ this.rootTabs.tabPosition }`]}>
           {scrollBtn}
           <div class={['el-tabs__nav-scroll']} ref="navScroll">
             <div class="el-tabs__nav" ref="nav" style={navStyle} role="tablist" on-keydown={ changeTab }>
diff --git a/packages/tabs/src/tabs.vue b/packages/tabs/src/tabs.vue
index e76181915..7dd20edde 100644
--- a/packages/tabs/src/tabs.vue
+++ b/packages/tabs/src/tabs.vue
@@ -122,7 +122,7 @@
         ref: 'nav'
       };
       const header = (
-        <div class="el-tabs__header">
+        <div class={['el-tabs__header', `is-${tabPosition}`]}>
           {newButton}
           <tab-nav { ...navData }></tab-nav>
         </div>
diff --git a/packages/theme-chalk/src/tabs.scss b/packages/theme-chalk/src/tabs.scss
index f8bd9d35c..e25e4c04e 100644
--- a/packages/theme-chalk/src/tabs.scss
+++ b/packages/theme-chalk/src/tabs.scss
@@ -225,10 +225,12 @@
     }
   }
   @include m((top, bottom)) {
-    .el-tabs__item:nth-child(2) {
+    .el-tabs__item.is-top:nth-child(2),
+    .el-tabs__item.is-bottom:nth-child(2) {
       padding-left: 0;
     }
-    .el-tabs__item:last-child {
+    .el-tabs__item.is-top:last-child,
+    .el-tabs__item.is-bottom:last-child {
       padding-right: 0;
     }
 
@@ -243,21 +245,23 @@
     }
   }
   @include m(bottom) {
-    .el-tabs__header {
+    .el-tabs__header.is-bottom {
       margin-bottom: 0;
       margin-top: 10px;
     }
     &.el-tabs--border-card {
-      .el-tabs__header {
+      .el-tabs__header.is-bottom {
         border-bottom: 0;
         border-top: 1px solid $--border-color-base;
       }
-      .el-tabs__nav-wrap {
+      .el-tabs__nav-wrap.is-bottom {
         margin-top: -1px;
         margin-bottom: 0;
       }
-      .el-tabs__item {
+      .el-tabs__item.is-bottom:not(.is-active) {
         border: 1px solid transparent;
+      }
+      .el-tabs__item.is-bottom {
         margin: 0 -1px -1px -1px;
       }
     }
@@ -265,20 +269,24 @@
   @include m((left, right)) {
     overflow: hidden;
 
-    .el-tabs__header,
-    .el-tabs__nav-wrap,
+    .el-tabs__header.is-left,
+    .el-tabs__header.is-right,
+    .el-tabs__nav-wrap.is-left,
+    .el-tabs__nav-wrap.is-right,
     .el-tabs__nav-scroll {
       height: 100%;
     }
 
-    .el-tabs__active-bar {
+    .el-tabs__active-bar.is-left,
+    .el-tabs__active-bar.is-right {
       top: 0;
       bottom: auto;
       width: 2px;
       height: auto;
     }
 
-    .el-tabs__nav-wrap {
+    .el-tabs__nav-wrap.is-left,
+    .el-tabs__nav-wrap.is-right {
       margin-bottom: 0;
 
       &.is-scrollable {
@@ -296,7 +304,8 @@
     .el-tabs__nav {
       float: none;
     }
-    .el-tabs__item {
+    .el-tabs__item.is-left,
+    .el-tabs__item.is-right {
       display: block;
     }
 
@@ -322,41 +331,41 @@
     }
   }
   @include m(left) {
-    .el-tabs__header {
+    .el-tabs__header.is-left {
       float: left;
       margin-bottom: 0;
       margin-right: 10px;
     }
-    .el-tabs__nav-wrap {
+    .el-tabs__nav-wrap.is-left {
       margin-right: -1px;
       &::after {
         left: auto;
         right: 0;
       }
     }
-    .el-tabs__active-bar {
+    .el-tabs__active-bar.is-left {
       right: 0;
       left: auto;
     }
-    .el-tabs__item {
+    .el-tabs__item.is-left {
       text-align: right;
     }
 
     &.el-tabs--card {
-      .el-tabs__active-bar {
+      .el-tabs__active-bar.is-left {
         display: none;
       }
-      .el-tabs__item {
+      .el-tabs__item.is-left {
         border-left: none;
         border-right: 1px solid $--border-color-light;
         border-bottom: none;
         border-top: 1px solid $--border-color-light;
       }
-      .el-tabs__item:first-child {
+      .el-tabs__item.is-left:first-child {
         border-right: 1px solid $--border-color-light;
         border-top: none;
       }
-      .el-tabs__item.is-active {
+      .el-tabs__item.is-left.is-active {
         border: 1px solid $--border-color-light;
         border-right-color: #fff;
         border-left: none;
@@ -382,10 +391,10 @@
     }
 
     &.el-tabs--border-card {
-      .el-tabs__header {
+      .el-tabs__header.is-left {
         border-right: 1px solid #dfe4ed;
       }
-      .el-tabs__item {
+      .el-tabs__item.is-left {
         border: 1px solid transparent;
         margin: -1px 0 -1px -1px;
 
@@ -398,13 +407,13 @@
     }
   }
   @include m(right) {
-    .el-tabs__header {
+    .el-tabs__header.is-right {
       float: right;
       margin-bottom: 0;
       margin-left: 10px;
     }
 
-    .el-tabs__nav-wrap {
+    .el-tabs__nav-wrap.is-right {
       margin-left: -1px;
       &::after {
         left: 0;
@@ -412,23 +421,23 @@
       }
     }
 
-    .el-tabs__active-bar {
+    .el-tabs__active-bar.is-right {
       left: 0;
     }
 
     &.el-tabs--card {
-      .el-tabs__active-bar {
+      .el-tabs__active-bar.is-right {
         display: none;
       }
-      .el-tabs__item {
+      .el-tabs__item.is-right {
         border-bottom: none;
         border-top: 1px solid $--border-color-light;
       }
-      .el-tabs__item:first-child {
+      .el-tabs__item.is-right:first-child {
         border-left: 1px solid $--border-color-light;
         border-top: none;
       }
-      .el-tabs__item.is-active {
+      .el-tabs__item.is-right.is-active {
         border: 1px solid $--border-color-light;
         border-left-color: #fff;
         border-right: none;
@@ -449,10 +458,10 @@
       }
     }
     &.el-tabs--border-card {
-      .el-tabs__header {
+      .el-tabs__header.is-right {
         border-left: 1px solid #dfe4ed;
       }
-      .el-tabs__item {
+      .el-tabs__item.is-right {
         border: 1px solid transparent;
         margin: -1px -1px -1px 0;