Merge pull request #4126 from oliviertassinari/with-width-hoc

[Style] Add a withWidth HOC
mui · May 2, 2016 · 2ee7024 · 2ee7024
2 parents 99ac508 + 013f1c3
commit 2ee7024
Show file tree

Hide file tree

Showing 66 changed files with 737 additions and 816 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -110,7 +110,7 @@ module.exports = {
     'react/no-unknown-property': 'error',
     'react/no-is-mounted': 'error',
     'react/prefer-arrow-callback': 'off', // Wishlist, one day
-    'react/prefer-es6-class': 'off', // Wishlist, one day
+    'react/prefer-es6-class': 'error',
     'react/prop-types': 'error',
     'react/react-in-jsx-scope': 'error',
     'react/require-extension': 'error',

diff --git a/docs/package.json b/docs/package.json
@@ -29,7 +29,7 @@
     "doctrine": "^1.1.0",
     "eslint": "^2.5.1",
     "eslint-plugin-babel": "^3.1.0",
-    "eslint-plugin-react": "^4.0.0",
+    "eslint-plugin-react": "^5.0.1",
     "highlight.js": "^9.0.0",
     "history": "^2.0.0",
     "html-webpack-plugin": "^2.8.1",
@@ -39,7 +39,6 @@
     "marked": "^0.3.5",
     "raw-loader": "^0.5.1",
     "react-addons-perf": "^15.0.1",
-    "react-addons-pure-render-mixin": "^15.0.1",
     "react-docgen": "^2.4.0",
     "react-hot-loader": "^1.2.8",
     "react-motion": "^0.4.2",

diff --git a/docs/src/app/components/AppNavDrawer.js b/docs/src/app/components/AppNavDrawer.js
@@ -1,4 +1,4 @@
-import React, {createClass, PropTypes} from 'react';
+import React, {Component, PropTypes} from 'react';
 import Drawer from 'material-ui/Drawer';
 import {List, ListItem, MakeSelectable} from 'material-ui/List';
 import Divider from 'material-ui/Divider';
@@ -10,29 +10,43 @@ import {cyan500} from 'material-ui/styles/colors';
 
 const SelectableList = MakeSelectable(List);
 
-const AppNavDrawer = createClass({
+const styles = {
+  logo: {
+    cursor: 'pointer',
+    fontSize: 24,
+    color: typography.textFullWhite,
+    lineHeight: `${spacing.desktopKeylineIncrement}px`,
+    fontWeight: typography.fontWeightLight,
+    backgroundColor: cyan500,
+    paddingLeft: spacing.desktopGutter,
+    marginBottom: 8,
+  },
+  version: {
+    paddingLeft: spacing.desktopGutterLess,
+    fontSize: 16,
+  },
+};
 
-  propTypes: {
+class AppNavDrawer extends Component {
+  static propTypes = {
     docked: PropTypes.bool.isRequired,
     location: PropTypes.object.isRequired,
     onChangeList: PropTypes.func.isRequired,
     onRequestChangeNavDrawer: PropTypes.func.isRequired,
     open: PropTypes.bool.isRequired,
     style: PropTypes.object,
-  },
+  };
 
-  contextTypes: {
+  static contextTypes = {
     muiTheme: PropTypes.object.isRequired,
     router: PropTypes.object.isRequired,
-  },
+  };
 
-  getInitialState: () => {
-    return ({
-      muiVersions: [],
-    });
-  },
+  state = {
+    muiVersions: [],
+  };
 
-  componentDidMount: function() {
+  componentDidMount() {
     const self = this;
     const url = '/versions.json';
     const request = new XMLHttpRequest();
@@ -48,9 +62,9 @@ const AppNavDrawer = createClass({
 
     request.open('GET', url, true);
     request.send();
-  },
+  }
 
-  firstNonPreReleaseVersion: function() {
+  firstNonPreReleaseVersion() {
     let version;
     for (let i = 0; i < this.state.muiVersions.length; i++) {
       version = this.state.muiVersions[i];
@@ -60,50 +74,33 @@ const AppNavDrawer = createClass({
       }
     }
     return version;
-  },
+  }
 
-  handleVersionChange: function(event, index, value) {
+  handleVersionChange = (event, index, value) => {
     if (value === this.firstNonPreReleaseVersion()) {
       window.location = 'http://www.material-ui.com/';
     } else {
       window.location = `http://www.material-ui.com/${value}`;
     }
-  },
+  };
 
-  currentVersion: function() {
+  currentVersion() {
     if (window.location.hostname === 'localhost') return this.state.muiVersions[0];
     if (window.location.pathname === '/') {
       return this.firstNonPreReleaseVersion();
     } else {
       return window.location.pathname.replace(/\//g, '');
     }
-  },
+  }
 
-  handleRequestChangeLink(event, value) {
+  handleRequestChangeLink = (event, value) => {
     window.location = value;
-  },
+  };
 
-  handleTouchTapHeader() {
+  handleTouchTapHeader = () => {
     this.context.router.push('/');
     this.props.onRequestChangeNavDrawer(false);
-  },
-
-  styles: {
-    logo: {
-      cursor: 'pointer',
-      fontSize: 24,
-      color: typography.textFullWhite,
-      lineHeight: `${spacing.desktopKeylineIncrement}px`,
-      fontWeight: typography.fontWeightLight,
-      backgroundColor: cyan500,
-      paddingLeft: spacing.desktopGutter,
-      marginBottom: 8,
-    },
-    version: {
-      paddingLeft: spacing.desktopGutterLess,
-      fontSize: 16,
-    },
-  },
+  };
 
   render() {
     const {
@@ -123,10 +120,10 @@ const AppNavDrawer = createClass({
         onRequestChange={onRequestChangeNavDrawer}
         containerStyle={{zIndex: zIndex.navDrawer - 100}}
       >
-        <div style={this.styles.logo} onTouchTap={this.handleTouchTapHeader}>
+        <div style={styles.logo} onTouchTap={this.handleTouchTapHeader}>
           Material-UI
         </div>
-        <span style={this.styles.version}>Version:</span>
+        <span style={styles.version}>Version:</span>
         <DropDownMenu
           value={this.currentVersion()}
           onChange={this.handleVersionChange}
@@ -265,7 +262,7 @@ const AppNavDrawer = createClass({
         </SelectableList>
       </Drawer>
     );
-  },
-});
+  }
+}
 
 export default AppNavDrawer;
diff --git a/docs/src/app/components/CodeExample/CodeBlock.js b/docs/src/app/components/CodeExample/CodeBlock.js
@@ -1,6 +1,5 @@
-import React, {createClass, PropTypes} from 'react';
+import React, {Component, PropTypes} from 'react';
 import MarkdownElement from '../MarkdownElement';
-import PureRenderMixin from 'react-addons-pure-render-mixin';
 import transitions from 'material-ui/styles/transitions';
 import CodeBlockTitle from './CodeBlockTitle';
 
@@ -31,25 +30,23 @@ const styles = {
   },
 };
 
-const CodeBlock = createClass({
-  propTypes: {
+class CodeBlock extends Component {
+  static propTypes = {
     children: PropTypes.string,
     description: PropTypes.string,
     title: PropTypes.string,
-  },
-  mixins: [
-    PureRenderMixin,
-  ],
-  getInitialState: function() {
-    return {
-      expand: false,
-    };
-  },
-  handleTouchTap() {
+  };
+
+  state = {
+    expand: false,
+  };
+
+  handleTouchTap = () => {
     this.setState({
       expand: !this.state.expand,
     });
-  },
+  };
+
   render() {
     const text = `\`\`\`js
 ${this.props.children}
@@ -73,7 +70,7 @@ ${this.props.children}
         <MarkdownElement style={descriptionStyle} text={this.props.description} />
       </div>
     );
-  },
-});
+  }
+}
 
 export default CodeBlock;
diff --git a/docs/src/app/components/ComponentDoc.js b/docs/src/app/components/ComponentDoc.js