Merge branch 'use-es6-class' of https://github.com/LeoAJ/react-tabs into dev-1.0

Author: danez

src/components/Tab.js

@@ -1,10 +1,9 @@
-import React, { PropTypes } from 'react';
+import React, { PropTypes, Component } from 'react';
 import cx from 'classnames';
 
-module.exports = React.createClass({
-  displayName: 'Tab',
+class Tab extends Component {
 
-  propTypes: {
+  static propTypes = {
     className: PropTypes.string,
     id: PropTypes.string,
     tabRef: PropTypes.func,
@@ -19,32 +18,30 @@ module.exports = React.createClass({
       PropTypes.object,
       PropTypes.string,
     ]),
-  },
+  };
 
-  getDefaultProps() {
-    return {
-      focus: false,
-      selected: false,
-      id: null,
-      panelId: null,
-      activeTabClassName: 'ReactTabs__Tab--selected',
-      disabledTabClassName: 'ReactTabs__Tab--disabled',
-    };
-  },
+  static defaultProps = {
+    focus: false,
+    selected: false,
+    id: null,
+    panelId: null,
+    activeTabClassName: 'ReactTabs__Tab--selected',
+    disabledTabClassName: 'ReactTabs__Tab--disabled',
+  };
 
   componentDidMount() {
     this.checkFocus();
-  },
+  }
 
   componentDidUpdate() {
     this.checkFocus();
-  },
+  }
 
   checkFocus() {
     if (this.props.selected && this.props.focus) {
       this.node.focus();
     }
-  },
+  }
 
   render() {
     const {
@@ -82,5 +79,7 @@ module.exports = React.createClass({
         {children}
       </li>
     );
-  },
-});
+  }
+}
+
+export default Tab;

src/components/TabList.js

@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, { PropTypes, Component } from 'react';
 import cx from 'classnames';
 import Tab from './Tab';
 
@@ -20,18 +20,17 @@ function renderChildren(props) {
   });
 }
 
-module.exports = React.createClass({
-  displayName: 'TabList',
+class TabList extends Component {
 
-  propTypes: {
+  static propTypes = {
     className: PropTypes.string,
     activeTabClassName: PropTypes.string,
     disabledTabClassName: PropTypes.string,
     children: PropTypes.oneOfType([
       PropTypes.object,
       PropTypes.array,
     ]),
-  },
+  };
 
   render() {
     const {
@@ -53,5 +52,7 @@ module.exports = React.createClass({
         {renderChildren({ activeTabClassName, disabledTabClassName, children })}
       </ul>
     );
-  },
-});
+  }
+}
+
+export default TabList;

src/components/TabPanel.js

@@ -1,10 +1,9 @@
-import React, { PropTypes } from 'react';
+import React, { PropTypes, Component } from 'react';
 import cx from 'classnames';
 
-module.exports = React.createClass({
-  displayName: 'TabPanel',
+class TabPanel extends Component {
 
-  propTypes: {
+  static propTypes = {
     children: PropTypes.oneOfType([
       PropTypes.array,
       PropTypes.object,
@@ -15,23 +14,20 @@ module.exports = React.createClass({
     selected: PropTypes.bool,
     style: PropTypes.object,
     tabId: PropTypes.string,
-  },
+  };
 
-  contextTypes: {
+  static contextTypes = {
     forceRenderTabPanel: PropTypes.bool,
-  },
+  };
 
-  getDefaultProps() {
-    return {
-      selected: false,
-      id: null,
-      tabId: null,
-    };
-  },
+  static defaultProps = {
+    selected: false,
+    id: null,
+    tabId: null,
+  };
 
   render() {
     const { className, children, selected, id, tabId, style, ...attributes } = this.props;
-
     return (
       <div
         {...attributes}
@@ -50,5 +46,7 @@ module.exports = React.createClass({
         {(this.context.forceRenderTabPanel || selected) ? children : null}
       </div>
     );
-  },
-});
+  }
+}
+
+export default TabPanel;

src/components/Tabs.js

@@ -1,4 +1,4 @@
-import React, { PropTypes, cloneElement } from 'react';
+import React, { PropTypes, cloneElement, Component } from 'react';
 import cx from 'classnames';
 import jss from 'js-stylesheet';
 import uuid from '../helpers/uuid';
@@ -17,58 +17,56 @@ function isTabDisabled(node) {
 
 let useDefaultStyles = true;
 
-module.exports = React.createClass({
-  displayName: 'Tabs',
+class Tabs extends Component {
 
-  propTypes: {
+  static propTypes = {
     className: PropTypes.string,
     selectedIndex: PropTypes.number, // eslint-disable-line react/no-unused-prop-types
     onSelect: PropTypes.func,
     focus: PropTypes.bool, // eslint-disable-line react/no-unused-prop-types
     children: childrenPropType,
     forceRenderTabPanel: PropTypes.bool,
-  },
+  };
 
-  childContextTypes: {
+  static childContextTypes = {
     forceRenderTabPanel: PropTypes.bool,
-  },
+  };
 
-  statics: {
-    setUseDefaultStyles(use) {
-      useDefaultStyles = use;
-    },
-  },
+  static defaultProps = {
+    selectedIndex: -1,
+    focus: false,
+    forceRenderTabPanel: false,
+  };
 
-  getDefaultProps() {
-    return {
-      selectedIndex: -1,
-      focus: false,
-      forceRenderTabPanel: false,
-    };
-  },
+  static setUseDefaultStyles = (use) => {
+    useDefaultStyles = use;
+  };
 
-  getInitialState() {
-    return this.copyPropsToState(this.props, this.state);
-  },
+  constructor(props) {
+    super(props);
+    this.state = this.copyPropsToState(this.props, this.state);
+    this.handleClick = this.handleClick.bind(this);
+    this.handleKeyDown = this.handleKeyDown.bind(this);
+  }
 
   getChildContext() {
     return {
       forceRenderTabPanel: this.props.forceRenderTabPanel,
     };
-  },
+  }
 
   componentDidMount() {
     if (useDefaultStyles) {
       jss(require('../helpers/styles')); // eslint-disable-line global-require
     }
-  },
+  }
 
   componentWillReceiveProps(newProps) {
     // Use a transactional update to prevent race conditions
     // when reading the state in copyPropsToState
     // See https://github.com/reactjs/react-tabs/issues/51
     this.setState(state => this.copyPropsToState(newProps, state));
-  },
+  }
 
   setSelected(index, focus) {
     // Don't do anything if nothing has changed
@@ -91,7 +89,7 @@ module.exports = React.createClass({
       // Update selected index
       this.setState({ selectedIndex: index, focus: focus === true });
     }
-  },
+  }
 
   getNextTab(index) {
     const count = this.getTabsCount();
@@ -112,7 +110,7 @@ module.exports = React.createClass({
 
     // No tabs are disabled, return index
     return index;
-  },
+  }
 
   getPrevTab(index) {
     let i = index;
@@ -134,21 +132,21 @@ module.exports = React.createClass({
 
     // No tabs are disabled, return index
     return index;
-  },
+  }
 
   getTabsCount() {
     return this.props.children && this.props.children[0] ?
             React.Children.count(this.props.children[0].props.children) :
             0;
-  },
+  }
 
   getPanelsCount() {
     return React.Children.count(this.props.children.slice(1));
-  },
+  }
 
   getTab(index) {
     return this.tabNodes[`tabs-${index}`];
-  },
+  }
 
   getChildren() {
     let index = 0;
@@ -230,9 +228,9 @@ module.exports = React.createClass({
 
       return result;
     });
-  },
+  }
 
-  tabNodes: [],
+  tabNodes: [];
 
   handleKeyDown(e) {
     if (this.isTabFromContainer(e.target)) {
@@ -258,7 +256,7 @@ module.exports = React.createClass({
 
       this.setSelected(index, true);
     }
-  },
+  }
 
   handleClick(e) {
     let node = e.target;
@@ -273,7 +271,7 @@ module.exports = React.createClass({
         return;
       }
     } while ((node = node.parentNode) !== null);
-  },
+  }
 
   // This is an anti-pattern, so sue me
   copyPropsToState(props, state) {
@@ -299,7 +297,7 @@ module.exports = React.createClass({
       selectedIndex,
       focus: props.focus,
     };
-  },
+  }
 
   /**
    * Determine if a node from event.target is a Tab element for the current Tabs container.
@@ -322,7 +320,7 @@ module.exports = React.createClass({
     } while (nodeAncestor);
 
     return false;
-  },
+  }
 
   render() {
     // This fixes an issue with focus management.
@@ -371,5 +369,7 @@ module.exports = React.createClass({
         {this.getChildren()}
       </div>
     );
-  },
-});
+  }
+}
+
+export default Tabs;

src/helpers/childrenPropType.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import Tab from '../components/Tab';
 import TabList from '../components/TabList';
+import TabPanel from '../components/TabPanel';
 
 module.exports = function childrenPropTypes(props, propName) {
   let error;
@@ -27,7 +28,7 @@ module.exports = function childrenPropTypes(props, propName) {
           tabsCount++;
         }
       });
-    } else if (child.type.displayName === 'TabPanel') {
+    } else if (child.type === TabPanel) {
       panelsCount++;
     } else {
       error = new Error(