feat: use rc-util

Author: paranoidjk

package.json

@@ -80,6 +80,7 @@
     "create-react-class": "15.x",
     "prop-types": "15.x",
     "rc-hammerjs": "~0.6.0",
+    "rc-util": "^4.0.4",
     "warning": "^3.0.0"
   }
 }

src/TabBarMixin.js

@@ -1,6 +1,7 @@
 import React, { cloneElement } from 'react';
 import classnames from 'classnames';
 import warning from 'warning';
+import pickAttrs from 'rc-util/lib/pickAttrs';
 
 export default {
   getDefaultProps() {
@@ -12,11 +13,9 @@ export default {
     this.props.onTabClick(key);
   },
   getTabs() {
-    const props = this.props;
-    const children = props.panels;
-    const activeKey = props.activeKey;
+    const { panels, activeKey, prefixCls } = this.props;
+    const { children } = panels;
     const rst = [];
-    const prefixCls = props.prefixCls;
 
     React.Children.forEach(children, (child) => {
       if (!child) {
@@ -58,7 +57,6 @@ export default {
   getRootNode(contents) {
     const {
       prefixCls, onKeyDown, className, extraContent, style, tabBarPosition,
-      pageSize, styles, inkBarAnimated, hammerOptions, onTabClick, panels, activeKey,
       ...restProps,
     } = this.props;
     const cls = classnames(`${prefixCls}-bar`, {
@@ -89,7 +87,7 @@ export default {
         ref="root"
         onKeyDown={onKeyDown}
         style={style}
-        {...restProps}
+        {...pickAttrs(restProps)}
       >
         {children}
       </div>

src/TabPane.js

@@ -2,6 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import classnames from 'classnames';
+import pickAttrs from 'rc-util/lib/pickAttrs';
 
 const TabPane = createReactClass({
   displayName: 'TabPane',
@@ -18,9 +19,8 @@ const TabPane = createReactClass({
   },
   render() {
     const {
-      className, destroyInactiveTabPane, active, forceRender, rootPrefixCls, style,
-      children, placeholder, tab,
-      ...restProps,
+      className, destroyInactiveTabPane, active, forceRender,
+      rootPrefixCls, style, children, placeholder, ...restProps,
     } = this.props;
     this._isActived = this._isActived || active;
     const prefixCls = `${rootPrefixCls}-tabpane`;
@@ -37,7 +37,7 @@ const TabPane = createReactClass({
         role="tabpanel"
         aria-hidden={active ? 'false' : 'true'}
         className={cls}
-        {...restProps}
+        {...pickAttrs(restProps)}
       >
         {isRender || forceRender ? children : placeholder}
       </div>

src/Tabs.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import pickAttrs from 'rc-util/lib/pickAttrs';
 import KeyCode from './KeyCode';
 import TabPane from './TabPane';
 import classnames from 'classnames';
@@ -117,7 +118,6 @@ export default class Tabs extends React.Component {
       tabBarPosition, className,
       renderTabContent,
       renderTabBar,
-      defaultActiveKey,
       destroyInactiveTabPane,
       ...restProps,
     } = props;
@@ -155,7 +155,7 @@ export default class Tabs extends React.Component {
       <div
         className={cls}
         style={props.style}
-        {...restProps}
+        {...pickAttrs(restProps)}
       >
         {contents}
       </div>