Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion docs/src/app/app.native.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react-native';
import React, {Component} from 'react-native';
import PropTypes from 'prop-types';

const {
Platform,
Expand Down
3 changes: 2 additions & 1 deletion docs/src/app/components/AppNavDrawer.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import Drawer from 'material-ui/Drawer';
import {List, ListItem, makeSelectable} from 'material-ui/List';
import Divider from 'material-ui/Divider';
Expand Down
3 changes: 2 additions & 1 deletion docs/src/app/components/CodeExample/CodeBlock.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import MarkdownElement from '../MarkdownElement';
import transitions from 'material-ui/styles/transitions';
import CodeBlockTitle from './CodeBlockTitle';
Expand Down
3 changes: 2 additions & 1 deletion docs/src/app/components/CodeExample/CodeBlockTitle.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {PropTypes} from 'react';
import React from 'react';
import PropTypes from 'prop-types';
import IconButton from 'material-ui/IconButton';
import CodeIcon from 'material-ui/svg-icons/action/code';
import {Toolbar, ToolbarGroup, ToolbarTitle} from 'material-ui/Toolbar';
Expand Down
5 changes: 3 additions & 2 deletions docs/src/app/components/CodeExample/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import {parse} from 'react-docgen';
import CodeBlock from './CodeBlock';
import ClearFix from 'material-ui/internal/ClearFix';
Expand All @@ -10,7 +11,7 @@ class CodeExample extends Component {
code: PropTypes.string.isRequired,
component: PropTypes.bool,
description: PropTypes.string,
exampleBlockStyle: React.PropTypes.object,
exampleBlockStyle: PropTypes.object,
layoutSideBySide: PropTypes.bool,
title: PropTypes.string,
};
Expand Down
3 changes: 2 additions & 1 deletion docs/src/app/components/FullWidthSection.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import ClearFix from 'material-ui/internal/ClearFix';
import spacing from 'material-ui/styles/spacing';
import withWidth, {SMALL, LARGE} from 'material-ui/utils/withWidth';
Expand Down
3 changes: 2 additions & 1 deletion docs/src/app/components/MarkdownElement.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import marked from 'marked';

require('./mui-github-markdown.css');
Expand Down
3 changes: 2 additions & 1 deletion docs/src/app/components/Master.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import Title from 'react-title-component';
import AppBar from 'material-ui/AppBar';
import IconButton from 'material-ui/IconButton';
Expand Down
3 changes: 2 additions & 1 deletion docs/src/app/components/MobileTearSheet.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';

class MobileTearSheet extends Component {

Expand Down
3 changes: 2 additions & 1 deletion docs/src/app/components/PropTypeDescription.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import {parse} from 'react-docgen';
import {parse as parseDoctrine} from 'doctrine';
import MarkdownElement from './MarkdownElement';
Expand Down
3 changes: 2 additions & 1 deletion docs/src/app/components/pages/Home.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import HomeFeature from './HomeFeature';
import FullWidthSection from '../FullWidthSection';
import RaisedButton from 'material-ui/RaisedButton';
Expand Down
3 changes: 2 additions & 1 deletion docs/src/app/components/pages/HomeFeature.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import {Link} from 'react-router';
import withWidth, {MEDIUM, LARGE} from 'material-ui/utils/withWidth';
import spacing from 'material-ui/styles/spacing';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import MobileTearSheet from '../../../MobileTearSheet';
import {List, ListItem, makeSelectable} from 'material-ui/List';
import Avatar from 'material-ui/Avatar';
Expand Down
3 changes: 2 additions & 1 deletion docs/src/app/components/pages/customization/Colors.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import Title from 'react-title-component';
import withWidth, {MEDIUM, LARGE} from 'material-ui/utils/withWidth';
import ClearFix from 'material-ui/internal/ClearFix';
Expand Down
3 changes: 2 additions & 1 deletion docs/src/app/components/pages/customization/Themes.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import Title from 'react-title-component';
import MarkdownElement from '../../MarkdownElement';
import muiThemeable from 'material-ui/styles/muiThemeable';
Expand Down
10 changes: 6 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
"keycode": "^2.1.8",
"lodash.merge": "^4.6.0",
"lodash.throttle": "^4.1.1",
"prop-types": "^15.5.7",
"react-addons-create-fragment": "^15.4.0",
"react-addons-transition-group": "^15.4.0",
"react-event-listener": "^0.4.5",
Expand All @@ -76,8 +77,9 @@
"babel-preset-stage-1": "^6.24.1",
"chai": "^3.5.0",
"coveralls": "^2.13.0",
"create-react-class": "^15.5.0",
"cross-env": "^4.0.0",
"enzyme": "^2.8.0",
"enzyme": "^2.8.1",
"eslint": "^3.19.0",
"eslint-find-rules": "^1.14.3",
"eslint-plugin-babel": "^4.1.1",
Expand All @@ -101,9 +103,9 @@
"mocha": "^3.1.2",
"nodemon": "^1.11.0",
"phantomjs-prebuilt": "^2.1.14",
"react": "^15.4.2",
"react-addons-test-utils": "^15.4.2",
"react-dom": "^15.4.2",
"react": "^15.5.0",
"react-dom": "^15.5.0",
"react-test-renderer": "^15.5.0",
"react-tap-event-plugin": "^2.0.0",
"recursive-readdir-sync": "^1.0.6",
"rimraf": "^2.6.1",
Expand Down
3 changes: 2 additions & 1 deletion src/AppBar/AppBar.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes, cloneElement} from 'react';
import React, {Component, cloneElement} from 'react';
import PropTypes from 'prop-types';
import IconButton from '../IconButton';
import NavigationMenu from '../svg-icons/navigation/menu';
import Paper from '../Paper';
Expand Down
3 changes: 2 additions & 1 deletion src/AutoComplete/AutoComplete.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import ReactDOM from 'react-dom';
import keycode from 'keycode';
import TextField from '../TextField';
Expand Down
3 changes: 2 additions & 1 deletion src/Avatar/Avatar.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';

function getStyles(props, context) {
const {
Expand Down
3 changes: 2 additions & 1 deletion src/Badge/Badge.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';

function getStyles(props, context) {
const {primary, secondary} = props;
Expand Down
3 changes: 2 additions & 1 deletion src/BottomNavigation/BottomNavigation.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {PropTypes, Children, cloneElement} from 'react';
import React, {Children, cloneElement} from 'react';
import PropTypes from 'prop-types';

function getStyles(props, context) {
const {
Expand Down
3 changes: 2 additions & 1 deletion src/BottomNavigation/BottomNavigationItem.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {PropTypes, cloneElement} from 'react';
import React, {cloneElement} from 'react';
import PropTypes from 'prop-types';
import EnhancedButton from '../internal/EnhancedButton';

function getStyles(props, context) {
Expand Down
3 changes: 2 additions & 1 deletion src/Card/Card.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import Paper from '../Paper';
import CardExpandable from './CardExpandable';

Expand Down
3 changes: 2 additions & 1 deletion src/Card/CardActions.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';

function getStyles() {
return {
Expand Down
3 changes: 2 additions & 1 deletion src/Card/CardExpandable.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import OpenIcon from '../svg-icons/hardware/keyboard-arrow-up';
import CloseIcon from '../svg-icons/hardware/keyboard-arrow-down';
import IconButton from '../IconButton';
Expand Down
3 changes: 2 additions & 1 deletion src/Card/CardHeader.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes, isValidElement} from 'react';
import React, {Component, isValidElement} from 'react';
import PropTypes from 'prop-types';
import Avatar from '../Avatar';

function getStyles(props, context) {
Expand Down
3 changes: 2 additions & 1 deletion src/Card/CardMedia.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';

function getStyles(props, context) {
const {cardMedia} = context.muiTheme;
Expand Down
3 changes: 2 additions & 1 deletion src/Card/CardText.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';

function getStyles(props, context) {
const {cardText} = context.muiTheme;
Expand Down
3 changes: 2 additions & 1 deletion src/Card/CardTitle.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';

function getStyles(props, context) {
const {card} = context.muiTheme;
Expand Down
3 changes: 2 additions & 1 deletion src/Checkbox/Checkbox.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import EnhancedSwitch from '../internal/EnhancedSwitch';
import transitions from '../styles/transitions';
import CheckboxOutline from '../svg-icons/toggle/check-box-outline-blank';
Expand Down
3 changes: 2 additions & 1 deletion src/Checkbox/Checkbox.spec.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* eslint-env mocha */
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import {shallow, mount} from 'enzyme';
import {assert} from 'chai';
import Checkbox from './Checkbox';
Expand Down
3 changes: 2 additions & 1 deletion src/Chip/Chip.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import keycode from 'keycode';
import {fade, emphasize} from '../utils/colorManipulator';
import EnhancedButton from '../internal/EnhancedButton';
Expand Down
3 changes: 2 additions & 1 deletion src/CircularProgress/CircularProgress.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import autoPrefix from '../utils/autoPrefix';
import transitions from '../styles/transitions';

Expand Down
3 changes: 2 additions & 1 deletion src/DatePicker/Calendar.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import EventListener from 'react-event-listener';
import keycode from 'keycode';
import transitions from '../styles/transitions';
Expand Down
3 changes: 2 additions & 1 deletion src/DatePicker/CalendarActionButtons.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import FlatButton from '../FlatButton';

class CalendarActionButton extends Component {
Expand Down
3 changes: 2 additions & 1 deletion src/DatePicker/CalendarMonth.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import {isBetweenDates, isEqualDate} from './dateUtils';
import DayButton from './DayButton';

Expand Down
3 changes: 2 additions & 1 deletion src/DatePicker/CalendarToolbar.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import IconButton from '../IconButton';
import NavigationChevronLeft from '../svg-icons/navigation/chevron-left';
import NavigationChevronRight from '../svg-icons/navigation/chevron-right';
Expand Down
3 changes: 2 additions & 1 deletion src/DatePicker/CalendarYear.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import ReactDOM from 'react-dom';
import YearButton from './YearButton';

Expand Down
3 changes: 2 additions & 1 deletion src/DatePicker/DateDisplay.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import transitions from '../styles/transitions';
import SlideInTransitionGroup from '../internal/SlideIn';

Expand Down
3 changes: 2 additions & 1 deletion src/DatePicker/DatePicker.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import {dateTimeFormat, formatIso, isEqualDate} from './dateUtils';
import DatePickerDialog from './DatePickerDialog';
import TextField from '../TextField';
Expand Down
3 changes: 2 additions & 1 deletion src/DatePicker/DatePickerDialog.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import EventListener from 'react-event-listener';
import keycode from 'keycode';
import Calendar from './Calendar';
Expand Down
3 changes: 2 additions & 1 deletion src/DatePicker/DayButton.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import Transition from '../styles/transitions';
import {isEqualDate} from './dateUtils';
import EnhancedButton from '../internal/EnhancedButton';
Expand Down
3 changes: 2 additions & 1 deletion src/DatePicker/YearButton.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import EnhancedButton from '../internal/EnhancedButton';

function getStyles(props, context, state) {
Expand Down
3 changes: 2 additions & 1 deletion src/Dialog/Dialog.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import ReactDOM from 'react-dom';
import EventListener from 'react-event-listener';
import keycode from 'keycode';
Expand Down
2 changes: 1 addition & 1 deletion src/Dialog/Dialog.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Dialog from './Dialog';
import {spy} from 'sinon';
import {mount} from 'enzyme';
import {assert} from 'chai';
import TestUtils from 'react-addons-test-utils';
import TestUtils from 'react-dom/test-utils';
import getMuiTheme from '../styles/getMuiTheme';

describe('<Dialog />', () => {
Expand Down
3 changes: 2 additions & 1 deletion src/Divider/Divider.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {PropTypes} from 'react';
import React from 'react';
import PropTypes from 'prop-types';

const Divider = (props, context) => {
const {
Expand Down
3 changes: 2 additions & 1 deletion src/Drawer/Drawer.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import ReactDOM from 'react-dom';
import EventListener from 'react-event-listener';
import keycode from 'keycode';
Expand Down
3 changes: 2 additions & 1 deletion src/DropDownMenu/DropDownMenu.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import ReactDOM from 'react-dom';
import transitions from '../styles/transitions';
import DropDownArrow from '../svg-icons/navigation/arrow-drop-down';
Expand Down
5 changes: 3 additions & 2 deletions src/DropDownMenu/DropDownMenu.spec.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* eslint-env mocha */
import React, {PropTypes, Component} from 'react';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import {shallow, mount} from 'enzyme';
import {assert} from 'chai';
import keycode from 'keycode';
Expand All @@ -9,7 +10,7 @@ import getMuiTheme from '../styles/getMuiTheme';
import MenuItem from '../MenuItem';
import Menu from '../Menu/Menu';
import IconButton from '../IconButton';
import TestUtils from 'react-addons-test-utils';
import TestUtils from 'react-dom/test-utils';

describe('<DropDownMenu />', () => {
const muiTheme = getMuiTheme();
Expand Down
Loading