From 4ab5cf70d86a67319a03f75f1319e2d6478d3b41 Mon Sep 17 00:00:00 2001
From: tjz <415800467@qq.com>
Date: Sat, 7 Apr 2018 18:52:02 +0800
Subject: [PATCH] update vc-tabs

---
 components/tabs/index.js                          |  4 ++--
 components/tabs/tabs.jsx                          |  2 +-
 components/vc-pagination/Pagination.jsx           | 15 +++++++++++++++
 components/vc-table/index.js                      |  1 +
 components/{tabs => vc-tabs}/src/InkTabBar.jsx    |  0
 .../{tabs => vc-tabs}/src/InkTabBarMixin.js       |  5 +++--
 components/{tabs => vc-tabs}/src/KeyCode.js       |  0
 .../{tabs => vc-tabs}/src/ScrollableInkTabBar.jsx |  0
 .../{tabs => vc-tabs}/src/ScrollableTabBar.jsx    |  0
 .../src/ScrollableTabBarMixin.js                  |  0
 components/{tabs => vc-tabs}/src/TabBar.jsx       |  0
 components/{tabs => vc-tabs}/src/TabBarMixin.js   |  4 ++--
 components/{tabs => vc-tabs}/src/TabContent.jsx   |  0
 components/{tabs => vc-tabs}/src/TabPane.jsx      |  0
 components/{tabs => vc-tabs}/src/Tabs.jsx         |  4 ++--
 components/{tabs => vc-tabs}/src/utils.js         |  0
 16 files changed, 26 insertions(+), 9 deletions(-)
 rename components/{tabs => vc-tabs}/src/InkTabBar.jsx (100%)
 rename components/{tabs => vc-tabs}/src/InkTabBarMixin.js (96%)
 rename components/{tabs => vc-tabs}/src/KeyCode.js (100%)
 rename components/{tabs => vc-tabs}/src/ScrollableInkTabBar.jsx (100%)
 rename components/{tabs => vc-tabs}/src/ScrollableTabBar.jsx (100%)
 rename components/{tabs => vc-tabs}/src/ScrollableTabBarMixin.js (100%)
 rename components/{tabs => vc-tabs}/src/TabBar.jsx (100%)
 rename components/{tabs => vc-tabs}/src/TabBarMixin.js (97%)
 rename components/{tabs => vc-tabs}/src/TabContent.jsx (100%)
 rename components/{tabs => vc-tabs}/src/TabPane.jsx (100%)
 rename components/{tabs => vc-tabs}/src/Tabs.jsx (98%)
 rename components/{tabs => vc-tabs}/src/utils.js (100%)

diff --git a/components/tabs/index.js b/components/tabs/index.js
index 639756774..cf4194ce2 100644
--- a/components/tabs/index.js
+++ b/components/tabs/index.js
@@ -1,6 +1,6 @@
 import Tabs from './tabs'
-import TabPane from './src/TabPane'
-import TabContent from './src/TabContent'
+import TabPane from '../vc-tabs/src/TabPane'
+import TabContent from '../vc-tabs/src/TabContent'
 Tabs.TabPane = TabPane
 export default Tabs
 export { TabPane, TabContent }
diff --git a/components/tabs/tabs.jsx b/components/tabs/tabs.jsx
index bc6d28144..757b6bfe2 100644
--- a/components/tabs/tabs.jsx
+++ b/components/tabs/tabs.jsx
@@ -1,5 +1,5 @@
 
-import Tabs from './src/Tabs'
+import Tabs from '../vc-tabs/src/Tabs'
 import isFlexSupported from '../_util/isFlexSupported'
 import { hasProp, getComponentFromProp, getComponentName, isEmptyElement } from '../_util/props-util'
 import warning from '../_util/warning'
diff --git a/components/vc-pagination/Pagination.jsx b/components/vc-pagination/Pagination.jsx
index eb60908ac..20cc472c4 100644
--- a/components/vc-pagination/Pagination.jsx
+++ b/components/vc-pagination/Pagination.jsx
@@ -93,6 +93,20 @@ export default {
       newState.statePageSize = val
       this.setState(newState)
     },
+    stateCurrent(val, oldValue) {
+      // When current page change, fix focused style of prev item
+      // A hacky solution of https://github.com/ant-design/ant-design/issues/8948
+      this.$nextTick(()=>{
+        if(this.$refs.paginationNode) {
+          const lastCurrentNode = this.$refs.paginationNode.querySelector(
+            `.${this.prefixCls}-item-${oldValue}`
+          );
+          if (lastCurrentNode && document.activeElement === lastCurrentNode) {
+            lastCurrentNode.blur();
+          }
+        }
+      })
+    },
   },
   methods: {
     isValid (page) {
@@ -494,6 +508,7 @@ export default {
       <ul
         class={`${prefixCls}`}
         unselectable='unselectable'
+        ref='paginationNode'
       >
         {totalText}
         <li
diff --git a/components/vc-table/index.js b/components/vc-table/index.js
index 09e6c095c..7b5793e00 100644
--- a/components/vc-table/index.js
+++ b/components/vc-table/index.js
@@ -1,3 +1,4 @@
+// base rc-table 6.1.7 7cd6abab4a2bd55adc7a9207c23feb62c3cd015b
 import T from './src/Table'
 import Column from './src/Column'
 import ColumnGroup from './src/ColumnGroup'
diff --git a/components/tabs/src/InkTabBar.jsx b/components/vc-tabs/src/InkTabBar.jsx
similarity index 100%
rename from components/tabs/src/InkTabBar.jsx
rename to components/vc-tabs/src/InkTabBar.jsx
diff --git a/components/tabs/src/InkTabBarMixin.js b/components/vc-tabs/src/InkTabBarMixin.js
similarity index 96%
rename from components/tabs/src/InkTabBarMixin.js
rename to components/vc-tabs/src/InkTabBarMixin.js
index d09dc3839..55de75e0d 100644
--- a/components/tabs/src/InkTabBarMixin.js
+++ b/components/vc-tabs/src/InkTabBarMixin.js
@@ -36,7 +36,8 @@ function offset (elem) {
 
 function componentDidUpdate (component, init) {
   const { styles = {}} = component.$props
-  const wrapNode = component.$refs.nav || component.$refs.root
+  const rootNode = component.$refs.root
+  const wrapNode = component.$refs.nav || rootNode
   const containerOffset = offset(wrapNode)
   const inkBarNode = component.$refs.inkBar
   const activeTab = component.$refs.activeTab
@@ -57,7 +58,7 @@ function componentDidUpdate (component, init) {
       // If tabNode'width width equal to wrapNode'width when tabBarPosition is top or bottom
       // It means no css working, then ink bar should not have width until css is loaded
       // Fix https://github.com/ant-design/ant-design/issues/7564
-      if (width === wrapNode.offsetWidth) {
+      if (width === rootNode.offsetWidth) {
         width = 0
       } else if (styles.inkBar && styles.inkBar.width !== undefined) {
         width = parseFloat(styles.inkBar.width, 10)
diff --git a/components/tabs/src/KeyCode.js b/components/vc-tabs/src/KeyCode.js
similarity index 100%
rename from components/tabs/src/KeyCode.js
rename to components/vc-tabs/src/KeyCode.js
diff --git a/components/tabs/src/ScrollableInkTabBar.jsx b/components/vc-tabs/src/ScrollableInkTabBar.jsx
similarity index 100%
rename from components/tabs/src/ScrollableInkTabBar.jsx
rename to components/vc-tabs/src/ScrollableInkTabBar.jsx
diff --git a/components/tabs/src/ScrollableTabBar.jsx b/components/vc-tabs/src/ScrollableTabBar.jsx
similarity index 100%
rename from components/tabs/src/ScrollableTabBar.jsx
rename to components/vc-tabs/src/ScrollableTabBar.jsx
diff --git a/components/tabs/src/ScrollableTabBarMixin.js b/components/vc-tabs/src/ScrollableTabBarMixin.js
similarity index 100%
rename from components/tabs/src/ScrollableTabBarMixin.js
rename to components/vc-tabs/src/ScrollableTabBarMixin.js
diff --git a/components/tabs/src/TabBar.jsx b/components/vc-tabs/src/TabBar.jsx
similarity index 100%
rename from components/tabs/src/TabBar.jsx
rename to components/vc-tabs/src/TabBar.jsx
diff --git a/components/tabs/src/TabBarMixin.js b/components/vc-tabs/src/TabBarMixin.js
similarity index 97%
rename from components/tabs/src/TabBarMixin.js
rename to components/vc-tabs/src/TabBarMixin.js
index 2face3730..997402510 100644
--- a/components/tabs/src/TabBarMixin.js
+++ b/components/vc-tabs/src/TabBarMixin.js
@@ -43,8 +43,8 @@ export default {
           cls += ` ${prefixCls}-tab-disabled`
         } else {
         }
-        const onClick = () => {
-          !disabled && this.__emit('tabClick', tabKey)
+        const onClick = (e) => {
+          !disabled && this.__emit('tabClick', tabKey, e)
         }
 
         let tabC = typeof tab === 'function' ? child.tab(h) : tab
diff --git a/components/tabs/src/TabContent.jsx b/components/vc-tabs/src/TabContent.jsx
similarity index 100%
rename from components/tabs/src/TabContent.jsx
rename to components/vc-tabs/src/TabContent.jsx
diff --git a/components/tabs/src/TabPane.jsx b/components/vc-tabs/src/TabPane.jsx
similarity index 100%
rename from components/tabs/src/TabPane.jsx
rename to components/vc-tabs/src/TabPane.jsx
diff --git a/components/tabs/src/Tabs.jsx b/components/vc-tabs/src/Tabs.jsx
similarity index 98%
rename from components/tabs/src/Tabs.jsx
rename to components/vc-tabs/src/Tabs.jsx
index e3c3ee7b1..eb0ff90eb 100644
--- a/components/tabs/src/Tabs.jsx
+++ b/components/vc-tabs/src/Tabs.jsx
@@ -89,8 +89,8 @@ export default {
       }
       return activeKey
     },
-    handleTabClick (activeKey) {
-      this.__emit('tabClick', activeKey)
+    handleTabClick (activeKey,e) {
+      this.__emit('tabClick', activeKey, e)
       this.setActiveKey(activeKey)
     },
 
diff --git a/components/tabs/src/utils.js b/components/vc-tabs/src/utils.js
similarity index 100%
rename from components/tabs/src/utils.js
rename to components/vc-tabs/src/utils.js