Merge branch 'master' of github.com:callemall/material-ui

.eslintrc.js

@@ -0,0 +1,131 @@
+module.exports = {
+  // So parent files don't get applied
+  root: true,
+  env: {
+    es6: true,
+    browser: true,
+    node: true,
+  },
+  extends: 'eslint:recommended',
+  parser: 'babel-eslint',
+  parserOptions: {
+    ecmaVersion: 7,
+    sourceType: 'module',
+    ecmaFeatures: {
+      jsx: true,
+      experimentalObjectRestSpread: true,
+    }
+  },
+  plugins: [
+    'babel',
+    'react',
+    'material-ui',
+  ],
+  rules: {
+    // Errors
+    'array-bracket-spacing': ['error', 'never'],
+    'arrow-spacing': 'error',
+    'arrow-parens': 'error',
+    'block-spacing': ['error', 'always'],
+    'brace-style': 'error',
+    'comma-dangle': ['error', 'always-multiline'],
+    'comma-spacing': ['error', {before: false, after: true}],
+    'comma-style': ['error', 'last'],
+    'computed-property-spacing': ['error', 'never'],
+    'consistent-this': ['error', 'self'],
+    'consistent-return': 'off', // Wishlist, one day
+    'dot-notation': 'error',
+    'dot-location': ['error', 'property'],
+    'eqeqeq': ['error', 'smart'],
+    'eol-last': 'error',
+    'indent': ['error', 2, {SwitchCase: 1}],
+    'id-blacklist': ['error', 'e'],
+    'jsx-quotes': ['error', 'prefer-double'],
+    'keyword-spacing': 'error',
+    'key-spacing': 'error',
+    'max-len': ['error', 120, 4],
+    'new-cap': ['off', {capIsNew: true, newIsCap: true}], // Wishlist, one day
+    'no-unused-expressions': 'error',
+    'no-unused-vars': 'error',
+    'no-shadow': 'off', // Wishlist, one day
+    'no-spaced-func': 'error',
+    'no-multiple-empty-lines': 'error',
+    'no-multi-spaces': 'error',
+    'no-undef': 'error',
+    'no-empty-pattern': 'error',
+    'no-dupe-keys': 'error',
+    'no-dupe-args': 'error',
+    'no-duplicate-case': 'error',
+    'no-cond-assign': 'error',
+    'no-extra-semi': 'error',
+    'no-extra-boolean-cast': 'error',
+    'no-trailing-spaces': 'error',
+    'no-underscore-dangle': 'error',
+    'no-unneeded-ternary': 'error',
+    'no-unreachable': 'error',
+    'no-var': 'error',
+    'one-var': ['error', 'never'],
+    'operator-linebreak': ['error', 'after'],
+    'padded-blocks': ['error', 'never'],
+    'prefer-arrow-callback': 'off', // Wishlist, one day
+    'prefer-const': 'error',
+    'prefer-template': 'error',
+    'quotes': ['error', 'single', 'avoid-escape'],
+    'semi': ['error', 'always'],
+    'space-before-blocks': ['error', 'always'],
+    'space-before-function-paren': ['error', 'never'],
+    'space-infix-ops': 'error',
+    'space-unary-ops': ['error', { words: true, nonwords: false }],
+    'spaced-comment': 'error',
+    'yoda': 'error',
+
+    // Disabled
+    'strict': 'off',
+    'no-case-declarations': 'off',
+
+    // Babel
+    'babel/object-curly-spacing': ['error', 'never'],
+
+    // React
+    'react/display-name': 'error',
+    'react/jsx-boolean-value': ['error', 'always'],
+    'react/jsx-closing-bracket-location': 'error',
+    'react/jsx-curly-spacing': 'error',
+    'react/jsx-equals-spacing': 'error',
+    'react/jsx-handler-names': 'error',
+    'react/jsx-indent-props': ['error', 2],
+    'react/jsx-max-props-per-line': ['error', {maximum: 3}],
+    'react/jsx-no-duplicate-props': 'error',
+    'react/jsx-no-undef': 'error',
+    'react/jsx-pascal-case': 'error',
+    'react/jsx-space-before-closing': 'error',
+    'react/jsx-uses-react': 'error',
+    'react/jsx-uses-vars': 'error',
+    'react/no-danger': 'error',
+    'react/no-did-mount-set-state': 'error',
+    'react/no-did-update-set-state': 'error',
+    'react/no-direct-mutation-state': 'error',
+    'react/no-multi-comp': 'off', // Wishlist, one day
+    '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/prop-types': 'error',
+    'react/react-in-jsx-scope': 'error',
+    'react/require-extension': 'error',
+    'react/self-closing-comp': 'error',
+    'react/sort-comp': 'error',
+    'react/sort-prop-types': 'error',
+    'react/wrap-multilines': 'error',
+    'react/jsx-indent': ['error', 2],
+
+    // React Disabled
+    'react/jsx-no-bind': 'off',
+    'react/jsx-no-literals': 'off',
+    'react/jsx-sort-props': 'off',
+    'react/no-set-state': 'off',
+
+    // Material-UI
+    'material-ui/docgen-ignore-before-comment': 'error',
+  },
+};

CHANGELOG.md

@@ -1,5 +1,29 @@
 ## HEAD
 
+## 0.15.0-beta.2
+###### _Apr 21, 2016_
+
+##### General
+- [.gitignore] Ignore `jsconfig.json` - VSCode config file (#4011)
+- [Docs] Update usage docs with muiTheme instructions (#4034)
+- [Docs] Add beta installation details to the README (#4048)
+- [Examples] Update import statements (#3992)
+
+##### Component Fixes / Enhancements
+- [AutoComplete] Change `error`, `hint`, `floatingLabel` property validators to `PropTypes.node` (#4019)
+- [Dialog] Add border to title and actions when content is scrollable (#4001)
+- [Dialog] Add support for the Alert (#4022)
+- [Dialog] Merge title style when title it a node (#4033)
+- [ListItem] Fix flexbox shrinking [issue](#4016) (#4044)
+- [Menu] Fix regression that caused nested menus to be unreachable (#3947)
+- [RaisedButton] fix hover overlay for icon only buttons, fixes #3815 (#4035)
+- [RefreshIndicator] Fix timer leaks (#3986)
+- [SelectField] Fix server side rendering (#4004)
+- [Tab] Fix the justify content when there is only one child (#4023)
+
+##### Deprecations
+- [List] Deprecate the `valueLink` property (#3936)
+
 ## 0.15.0-beta.1
 ###### _Apr 13, 2016_
 

README.md

@@ -36,11 +36,20 @@ for a quick introduction before you read on.)
 ## Installation
 
 Material-UI is available as an [npm package](https://www.npmjs.org/package/material-ui).
+
+**Stable channel**
 ```sh
 npm install material-ui
 ```
-After npm install, you'll find all the .js files in the /src folder and
-their compiled versions in the /lib folder.
+
+Our next version (`0.15.0`) is coming soon! If you need React 15 support or want to preview our latest updates, you can install the current beta.
+
+**Pre-release channel (React 15 support)**
+```sh
+npm install material-ui@next
+```
+
+
 
 ### React-Tap-Event-Plugin
 

docs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "material-ui-docs",
-  "version": "0.15.0-beta.1",
+  "version": "0.15.0-beta.2",
   "description": "Documentation site for material-ui",
   "repository": {
     "type": "git",
@@ -12,7 +12,7 @@
   "private": true,
   "scripts": {
     "start": "npm run browser:development",
-    "browser:development": "webpack-dev-server --config webpack-dev-server.config.js --progress --colors --inline",
+    "browser:development": "webpack-dev-server --config webpack-dev-server.config.js --progress --colors --inline --host=",
     "browser:build": "NODE_ENV=docs-production webpack --config webpack-production.config.js --progress --colors --profile",
     "browser:prd": "NODE_ENV=docs-production webpack-dev-server --config webpack-production.config.js --progress --colors",
     "gh-pages:build": "node ./gh-pages-build.js",

docs/src/app/components/AppNavDrawer.js

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {createClass, PropTypes} from 'react';
 import Drawer from 'material-ui/Drawer';
 import {List, ListItem, MakeSelectable} from 'material-ui/List';
 import Divider from 'material-ui/Divider';
@@ -10,20 +10,20 @@ import {cyan500} from 'material-ui/styles/colors';
 
 const SelectableList = MakeSelectable(List);
 
-const AppNavDrawer = React.createClass({
+const AppNavDrawer = createClass({
 
   propTypes: {
-    docked: React.PropTypes.bool.isRequired,
-    location: React.PropTypes.object.isRequired,
-    onChangeList: React.PropTypes.func.isRequired,
-    onRequestChangeNavDrawer: React.PropTypes.func.isRequired,
-    open: React.PropTypes.bool.isRequired,
-    style: React.PropTypes.object,
+    docked: PropTypes.bool.isRequired,
+    location: PropTypes.object.isRequired,
+    onChangeList: PropTypes.func.isRequired,
+    onRequestChangeNavDrawer: PropTypes.func.isRequired,
+    open: PropTypes.bool.isRequired,
+    style: PropTypes.object,
   },
 
   contextTypes: {
-    muiTheme: React.PropTypes.object.isRequired,
-    router: React.PropTypes.object.isRequired,
+    muiTheme: PropTypes.object.isRequired,
+    router: PropTypes.object.isRequired,
   },
 
   getInitialState: () => {

docs/src/app/components/CodeExample/CodeBlock.js

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {createClass, PropTypes} from 'react';
 import MarkdownElement from '../MarkdownElement';
 import PureRenderMixin from 'react-addons-pure-render-mixin';
 import transitions from 'material-ui/styles/transitions';
@@ -31,11 +31,11 @@ const styles = {
   },
 };
 
-const CodeBlock = React.createClass({
+const CodeBlock = createClass({
   propTypes: {
-    children: React.PropTypes.string,
-    description: React.PropTypes.string,
-    title: React.PropTypes.string,
+    children: PropTypes.string,
+    description: PropTypes.string,
+    title: PropTypes.string,
   },
   mixins: [
     PureRenderMixin,