diff --git a/docs/src/app/components/pages/customization/Themes.js b/docs/src/app/components/pages/customization/Themes.js index 64643d8c49af40..90f5050129ae57 100644 --- a/docs/src/app/components/pages/customization/Themes.js +++ b/docs/src/app/components/pages/customization/Themes.js @@ -253,8 +253,8 @@ class ThemesPage extends Component { open={this.state.drawerOpen} docked={false} onRequestChange={this.handleRequestChangeDrawer} > - Menu Item - Menu Item 2 + Menu Item + Menu Item 2 diff --git a/src/AutoComplete/AutoComplete.js b/src/AutoComplete/AutoComplete.js index 8278d084d30c57..dcfdb7b352629c 100644 --- a/src/AutoComplete/AutoComplete.js +++ b/src/AutoComplete/AutoComplete.js @@ -163,7 +163,7 @@ class AutoComplete extends Component { /** * If true, will update when focus event triggers. */ - triggerUpdateOnFocus: deprecated(PropTypes.bool, 'Instead, use openOnFocus'), + triggerUpdateOnFocus: deprecated(PropTypes.bool, 'Instead, use openOnFocus. It will be removed with v0.16.0.'), }; static defaultProps = { @@ -239,7 +239,8 @@ class AutoComplete extends Component { }; setValue(textValue) { - warning(false, 'setValue() is deprecated, use the searchText property.'); + warning(false, `setValue() is deprecated, use the searchText property. + It will be removed with v0.16.0.`); this.setState({ searchText: textValue, @@ -247,7 +248,7 @@ class AutoComplete extends Component { } getValue() { - warning(false, 'getValue() is deprecated.'); + warning(false, 'getValue() is deprecated. It will be removed with v0.16.0.'); return this.state.searchText; } @@ -393,7 +394,7 @@ class AutoComplete extends Component { onNewRequest, // eslint-disable-line no-unused-vars onUpdateInput, // eslint-disable-line no-unused-vars openOnFocus, // eslint-disable-line no-unused-vars - searchText: searchTextProps, // eslint-disable-line no-unused-vars + searchText: searchTextProp, // eslint-disable-line no-unused-vars ...other, } = this.props; diff --git a/src/Badge/Badge.spec.js b/src/Badge/Badge.spec.js index 06671d5bacdc47..5d31f1afe9f186 100644 --- a/src/Badge/Badge.spec.js +++ b/src/Badge/Badge.spec.js @@ -35,7 +35,7 @@ describe('', () => { it('renders children by default', () => { const wrapper = shallowWithContext( - {testChildren} + {testChildren} ); assert.ok(wrapper.contains(testChildren), 'should contain the children'); @@ -43,7 +43,7 @@ describe('', () => { it('renders children and className', () => { const wrapper = shallowWithContext( - {testChildren} + {testChildren} ); assert.ok(wrapper.contains(testChildren), 'should contain the children'); @@ -79,7 +79,7 @@ describe('', () => { backgroundColor: 'red', }; const wrapper = shallowWithContext( - {testChildren} + {testChildren} ); assert.ok(wrapper.contains(testChildren), 'should contain the children'); diff --git a/src/Card/Card.js b/src/Card/Card.js index 1cdd9a8b676f93..b9fc771e13bf5e 100644 --- a/src/Card/Card.js +++ b/src/Card/Card.js @@ -85,7 +85,7 @@ class Card extends Component { containerStyle, children, expandable, // eslint-disable-line no-unused-vars - expanded: expandedProps, // eslint-disable-line no-unused-vars + expanded: expandedProp, // eslint-disable-line no-unused-vars initiallyExpanded, // eslint-disable-line no-unused-vars onExpandChange, // eslint-disable-line no-unused-vars ...other, diff --git a/src/Card/CardHeader.js b/src/Card/CardHeader.js index 343f4a03329a18..e7cf3cad81e6cc 100644 --- a/src/Card/CardHeader.js +++ b/src/Card/CardHeader.js @@ -105,7 +105,7 @@ class CardHeader extends Component { render() { const { actAsExpander, // eslint-disable-line no-unused-vars - avatar: avatarProps, + avatar: avatarProp, children, showExpandableButton, // eslint-disable-line no-unused-vars style, @@ -120,14 +120,14 @@ class CardHeader extends Component { const {prepareStyles} = this.context.muiTheme; const styles = getStyles(this.props, this.context); - let avatar = avatarProps; + let avatar = avatarProp; - if (isValidElement(avatarProps)) { + if (isValidElement(avatarProp)) { avatar = React.cloneElement(avatar, { style: Object.assign(styles.avatar, avatar.props.style), }); } else if (avatar !== null) { - avatar = ; + avatar = ; } return ( diff --git a/src/Checkbox/Checkbox.js b/src/Checkbox/Checkbox.js index e79aa6fab642db..d71b2818a7cfca 100644 --- a/src/Checkbox/Checkbox.js +++ b/src/Checkbox/Checkbox.js @@ -109,7 +109,7 @@ class Checkbox extends Component { * This is useful to create icon toggles. */ unCheckedIcon: deprecated(PropTypes.element, - 'Use uncheckedIcon instead.'), + 'Use uncheckedIcon instead. It will be removed with v0.16.0.'), /** * The SvgIcon to use for the unchecked state. * This is useful to create icon toggles. diff --git a/src/DatePicker/DatePicker.js b/src/DatePicker/DatePicker.js index ce61c9034dae05..b8cee6ed729f7e 100644 --- a/src/DatePicker/DatePicker.js +++ b/src/DatePicker/DatePicker.js @@ -137,7 +137,8 @@ class DatePicker extends Component { /** * Wordings used inside the button of the dialog. */ - wordings: deprecated(PropTypes.object, 'Instead, use `cancelLabel` and `okLabel`.'), + wordings: deprecated(PropTypes.object, `Instead, use \`cancelLabel\` and \`okLabel\`. + It will be removed with v0.16.0.`), }; static defaultProps = { @@ -269,6 +270,7 @@ class DatePicker extends Component { dialogContainerStyle, disableYearSelection, firstDayOfWeek, + formatDate: formatDateProp, locale, maxDate, minDate, @@ -286,7 +288,7 @@ class DatePicker extends Component { } = this.props; const {prepareStyles} = this.context.muiTheme; - const formatDate = this.props.formatDate || this.formatDate; + const formatDate = formatDateProp || this.formatDate; return (
diff --git a/src/DatePicker/DatePickerDialog.js b/src/DatePicker/DatePickerDialog.js index 4306b05365962a..554fb566e07aaf 100644 --- a/src/DatePicker/DatePickerDialog.js +++ b/src/DatePicker/DatePickerDialog.js @@ -33,10 +33,10 @@ class DatePickerDialog extends Component { static defaultProps = { DateTimeFormat: dateTimeFormat, + cancelLabel: 'Cancel', container: 'dialog', locale: 'en-US', okLabel: 'OK', - cancelLabel: 'Cancel', }; static contextTypes = { @@ -48,14 +48,20 @@ class DatePickerDialog extends Component { }; show = () => { - if (this.props.onShow && !this.state.open) this.props.onShow(); + if (this.props.onShow && !this.state.open) { + this.props.onShow(); + } + this.setState({ open: true, }); }; dismiss = () => { - if (this.props.onDismiss && this.state.open) this.props.onDismiss(); + if (this.props.onDismiss && this.state.open) { + this.props.onDismiss(); + } + this.setState({ open: false, }); @@ -96,6 +102,7 @@ class DatePickerDialog extends Component { render() { const { DateTimeFormat, + autoOk, cancelLabel, container, containerStyle, @@ -108,6 +115,8 @@ class DatePickerDialog extends Component { mode, okLabel, onAccept, // eslint-disable-line no-unused-vars + onDismiss, // eslint-disable-line no-unused-vars + onShow, // eslint-disable-line no-unused-vars shouldDisableDate, style, // eslint-disable-line no-unused-vars wordings, @@ -147,7 +156,7 @@ class DatePickerDialog extends Component { onKeyUp={this.handleWindowKeyUp} /> {}, onMouseEnter: () => {}, onMouseUp: () => {}, - onTouchTap: () => {}, onRequestChange: () => {}, + onTouchTap: () => {}, targetOrigin: { vertical: 'top', horizontal: 'left', @@ -233,10 +233,12 @@ class IconMenu extends Component { onMouseLeave, onMouseEnter, onMouseUp, + onRequestChange, // eslint-disable-line no-unused-vars onTouchTap, menuStyle, style, targetOrigin, + touchTapCloseDelay, // eslint-disable-line no-unused-vars useLayerForClickAway, ...other, } = this.props; @@ -270,7 +272,6 @@ class IconMenu extends Component { const menu = ( { valueLink: deprecated(PropTypes.shape({ value: PropTypes.any, requestChange: PropTypes.func, - }), 'This property is deprecated due to his low popularity. Use the value and onChange property.'), + }), `This property is deprecated due to his low popularity. Use the value and onChange property. + It will be removed with v0.16.0.`), }; static contextTypes = { diff --git a/src/Menu/Menu.js b/src/Menu/Menu.js index 231de924fcf568..2b8677d4cea5d3 100644 --- a/src/Menu/Menu.js +++ b/src/Menu/Menu.js @@ -70,7 +70,8 @@ class Menu extends Component { * is added to the DOM. In order for transitions to * work, wrap the menu inside a `ReactTransitionGroup`. */ - animated: deprecated(PropTypes.bool, 'Instead, use a [Popover](/#/components/popover).'), + animated: deprecated(PropTypes.bool, `Instead, use a [Popover](/#/components/popover). + It will be removed with v0.16.0.`), /** * If true, the width of the menu will be set automatically * according to the widths of its children, @@ -141,7 +142,8 @@ class Menu extends Component { /** * This is the placement of the menu relative to the `IconButton`. */ - openDirection: deprecated(propTypes.corners, 'Instead, use a [Popover](/#/components/popover).'), + openDirection: deprecated(propTypes.corners, `Instead, use a [Popover](/#/components/popover). + It will be removed with v0.16.0.`), /** * Override the inline-styles of selected menu items. */ @@ -207,8 +209,12 @@ class Menu extends Component { } componentDidMount() { - if (this.props.autoWidth) this.setWidth(); - if (!this.props.animated) this.animateOpen(); + if (this.props.autoWidth) { + this.setWidth(); + } + if (!this.props.animated) { + this.animateOpen(); + } this.setScollPosition(); } @@ -537,7 +543,7 @@ class Menu extends Component { } = this.props; warning((typeof zDepth === 'undefined'), 'Menu no longer supports `zDepth`. Instead, wrap it in `Paper` ' + - 'or another component that provides `zDepth`.'); + 'or another component that provides `zDepth`. It will be removed with v0.16.0.'); const {focusIndex} = this.state; diff --git a/src/SelectField/SelectField.js b/src/SelectField/SelectField.js index 47ad66d363f07b..2dd0356f29e8ad 100644 --- a/src/SelectField/SelectField.js +++ b/src/SelectField/SelectField.js @@ -105,7 +105,7 @@ class SelectField extends Component { * Override the inline-styles of the underlying `DropDownMenu` element. */ selectFieldRoot: deprecated(PropTypes.object, - 'Instead, use `menuStyle`.'), + 'Instead, use `menuStyle`. It will be removed with v0.16.0.'), /** * Override the inline-styles of the root element. */ diff --git a/src/Slider/Slider.js b/src/Slider/Slider.js index 7f06f9c595decf..b1ecd3795a117c 100644 --- a/src/Slider/Slider.js +++ b/src/Slider/Slider.js @@ -333,7 +333,9 @@ class Slider extends Component { value = this.props.defaultValue !== undefined ? this.props.defaultValue : this.props.min; } let percent = (value - this.props.min) / (this.props.max - this.props.min); - if (isNaN(percent)) percent = 0; + if (isNaN(percent)) { + percent = 0; + } this.setState({ percent: percent, @@ -516,13 +518,13 @@ class Slider extends Component { return this.state.value; } - setValue(i) { + setValue(value) { // calculate percentage - let percent = (i - this.props.min) / (this.props.max - this.props.min); + let percent = (value - this.props.min) / (this.props.max - this.props.min); if (isNaN(percent)) percent = 0; // update state this.setState({ - value: i, + value: value, percent: percent, }); } @@ -568,12 +570,21 @@ class Slider extends Component { handleFocus = (event) => { this.setState({focused: true}); - if (this.props.onFocus) this.props.onFocus(event); + + if (this.props.onFocus) { + this.props.onFocus(event); + } }; handleBlur = (event) => { - this.setState({focused: false, active: false}); - if (this.props.onBlur) this.props.onBlur(event); + this.setState({ + focused: false, + active: false, + }); + + if (this.props.onBlur) { + this.props.onBlur(event); + } }; handleMouseDown = (event) => { @@ -593,7 +604,9 @@ class Slider extends Component { }; handleMouseUp = () => { - if (!this.props.disabled) this.setState({active: false}); + if (!this.props.disabled) { + this.setState({active: false}); + } }; handleMouseEnter = () => { @@ -613,7 +626,10 @@ class Slider extends Component { dragging: true, active: true, }); - if (this.props.onDragStart) this.props.onDragStart(event); + + if (this.props.onDragStart) { + this.props.onDragStart(event); + } } onDragStop(event) { @@ -621,23 +637,36 @@ class Slider extends Component { dragging: false, active: false, }); - if (this.props.onDragStop) this.props.onDragStop(event); + + if (this.props.onDragStop) { + this.props.onDragStop(event); + } } onDragUpdate(event, pos) { - if (!this.state.dragging) return; - if (!this.props.disabled) this.dragTo(event, pos); + if (!this.state.dragging) { + return; + } + if (!this.props.disabled) { + this.dragTo(event, pos); + } } dragTo(event, pos) { const max = this.refs.track[mainAxisClientProperty[this.props.axis]]; - if (pos < 0) pos = 0; else if (pos > max) pos = max; + if (pos < 0) { + pos = 0; + } else if (pos > max) { + pos = max; + } this.updateWithChangeEvent(event, pos / max); } updateWithChangeEvent(event, percent) { this.setPercent(percent, () => { - if (this.props.onChange) this.props.onChange(event, this.state.value); + if (this.props.onChange) { + this.props.onChange(event, this.state.value); + } }); } @@ -647,6 +676,7 @@ class Slider extends Component { render() { const { + axis, // eslint-disable-line no-unused-vars description, disabled, disableFocusRipple, @@ -654,6 +684,11 @@ class Slider extends Component { max, min, name, + onBlur, // eslint-disable-line no-unused-vars + onChange, // eslint-disable-line no-unused-vars + onDragStart, // eslint-disable-line no-unused-vars + onDragStop, // eslint-disable-line no-unused-vars + onFocus, // eslint-disable-line no-unused-vars required, step, style, @@ -666,7 +701,11 @@ class Slider extends Component { let handleStyles = {}; let percent = this.state.percent; - if (percent > 1) percent = 1; else if (percent < 0) percent = 0; + if (percent > 1) { + percent = 1; + } else if (percent < 0) { + percent = 0; + } if (percent === 0) { handleStyles = Object.assign( diff --git a/src/Stepper/StepLabel.spec.js b/src/Stepper/StepLabel.spec.js index 05301df2cec675..6c09c4f0cbb28b 100644 --- a/src/Stepper/StepLabel.spec.js +++ b/src/Stepper/StepLabel.spec.js @@ -11,7 +11,9 @@ describe('', () => { return shallow(node, { context: { muiTheme, - stepper: {orientation: 'horizontal'}, + stepper: { + orientation: 'horizontal', + }, ...context, }, }); @@ -21,14 +23,14 @@ describe('', () => { const wrapper = shallowWithContext( ); - const {style, myProp} = wrapper.props(); - assert.strictEqual(style.paddingRight, 200); - assert.strictEqual(style.color, 'purple'); - assert.strictEqual(style.border, '1px solid tomato'); - assert.strictEqual(myProp, 'hello'); + const props = wrapper.props(); + assert.strictEqual(props.style.paddingRight, 200); + assert.strictEqual(props.style.color, 'purple'); + assert.strictEqual(props.style.border, '1px solid tomato'); + assert.strictEqual(props['data-myProp'], 'hello'); }); describe('label content', () => { diff --git a/src/Table/TableBody.js b/src/Table/TableBody.js index 5c2102bdad1634..4bc0de65c3716b 100644 --- a/src/Table/TableBody.js +++ b/src/Table/TableBody.js @@ -164,19 +164,20 @@ class TableBody extends Component { return React.Children.map(this.props.children, (child) => { if (React.isValidElement(child)) { const props = { - displayRowCheckbox: this.props.displayRowCheckbox, hoverable: this.props.showRowHover, selected: this.isRowSelected(rowNumber), striped: this.props.stripedRows && (rowNumber % 2 === 0), rowNumber: rowNumber++, }; - const checkboxColumn = this.createRowCheckboxColumn(props); if (rowNumber === numChildren) { props.displayBorder = false; } - const children = [checkboxColumn]; + const children = [ + this.createRowCheckboxColumn(props), + ]; + React.Children.forEach(child.props.children, (child) => { children.push(child); }); @@ -187,7 +188,9 @@ class TableBody extends Component { } createRowCheckboxColumn(rowProps) { - if (!this.props.displayRowCheckbox) return null; + if (!this.props.displayRowCheckbox) { + return null; + } const key = `${rowProps.rowNumber}-cb`; const disabled = !this.props.selectable; @@ -357,30 +360,42 @@ class TableBody extends Component { onCellClick = (event, rowNumber, columnNumber) => { event.stopPropagation(); - if (this.props.onCellClick) this.props.onCellClick(rowNumber, this.getColumnId(columnNumber), event); + if (this.props.onCellClick) { + this.props.onCellClick(rowNumber, this.getColumnId(columnNumber), event); + } }; onCellHover = (event, rowNumber, columnNumber) => { - if (this.props.onCellHover) this.props.onCellHover(rowNumber, this.getColumnId(columnNumber), event); + if (this.props.onCellHover) { + this.props.onCellHover(rowNumber, this.getColumnId(columnNumber), event); + } this.onRowHover(event, rowNumber); }; onCellHoverExit = (event, rowNumber, columnNumber) => { - if (this.props.onCellHoverExit) this.props.onCellHoverExit(rowNumber, this.getColumnId(columnNumber), event); + if (this.props.onCellHoverExit) { + this.props.onCellHoverExit(rowNumber, this.getColumnId(columnNumber), event); + } this.onRowHoverExit(event, rowNumber); }; onRowHover = (event, rowNumber) => { - if (this.props.onRowHover) this.props.onRowHover(rowNumber); + if (this.props.onRowHover) { + this.props.onRowHover(rowNumber); + } }; onRowHoverExit = (event, rowNumber) => { - if (this.props.onRowHoverExit) this.props.onRowHoverExit(rowNumber); + if (this.props.onRowHoverExit) { + this.props.onRowHoverExit(rowNumber); + } }; getColumnId(columnNumber) { let columnId = columnNumber; - if (this.props.displayRowCheckbox) columnId--; + if (this.props.displayRowCheckbox) { + columnId--; + } return columnId; } @@ -392,12 +407,11 @@ class TableBody extends Component { } = this.props; const {prepareStyles} = this.context.muiTheme; - const rows = this.createRows(); return ( - {rows} + {this.createRows()} ); diff --git a/src/Table/TableHeaderColumn.js b/src/Table/TableHeaderColumn.js index 0571005d35f69a..0fb1848dd1bba0 100644 --- a/src/Table/TableHeaderColumn.js +++ b/src/Table/TableHeaderColumn.js @@ -36,8 +36,23 @@ class TableHeaderColumn extends Component { * is automatically populated when used with TableHeader. */ columnNumber: PropTypes.number, + /** + * @ignore + * Not used here but we need to remove it from the root element. + */ + hoverable: PropTypes.bool, /** @ignore */ onClick: PropTypes.func, + /** + * @ignore + * Not used here but we need to remove it from the root element. + */ + onHover: PropTypes.func, + /** + * @ignore + * Not used here but we need to remove it from the root element. + */ + onHoverExit: PropTypes.func, /** * Override the inline-styles of the root element. */ @@ -62,15 +77,21 @@ class TableHeaderColumn extends Component { }; onMouseEnter = () => { - if (this.props.tooltip !== undefined) this.setState({hovered: true}); + if (this.props.tooltip !== undefined) { + this.setState({hovered: true}); + } }; onMouseLeave = () => { - if (this.props.tooltip !== undefined) this.setState({hovered: false}); + if (this.props.tooltip !== undefined) { + this.setState({hovered: false}); + } }; onClick = (event) => { - if (this.props.onClick) this.props.onClick(event, this.props.columnNumber); + if (this.props.onClick) { + this.props.onClick(event, this.props.columnNumber); + } }; render() { @@ -78,7 +99,10 @@ class TableHeaderColumn extends Component { children, className, columnNumber, // eslint-disable-line no-unused-vars + hoverable, // eslint-disable-line no-unused-vars onClick, // eslint-disable-line no-unused-vars + onHover, // eslint-disable-line no-unused-vars + onHoverExit, // eslint-disable-line no-unused-vars style, tooltip, tooltipStyle, diff --git a/src/Table/TableRow.js b/src/Table/TableRow.js index a67bcd5ab82448..97a35b2b4800ae 100644 --- a/src/Table/TableRow.js +++ b/src/Table/TableRow.js @@ -172,6 +172,7 @@ class TableRow extends Component { className, displayBorder, // eslint-disable-line no-unused-vars hoverable, // eslint-disable-line no-unused-vars + hovered, // eslint-disable-line no-unused-vars onCellClick, // eslint-disable-line no-unused-vars onCellHover, // eslint-disable-line no-unused-vars onCellHoverExit, // eslint-disable-line no-unused-vars diff --git a/src/Table/TableRowColumn.js b/src/Table/TableRowColumn.js index 676e2b8515ebb0..46196320934107 100644 --- a/src/Table/TableRowColumn.js +++ b/src/Table/TableRowColumn.js @@ -69,20 +69,26 @@ class TableRowColumn extends Component { }; onClick = (event) => { - if (this.props.onClick) this.props.onClick(event, this.props.columnNumber); + if (this.props.onClick) { + this.props.onClick(event, this.props.columnNumber); + } }; onMouseEnter = (event) => { if (this.props.hoverable) { this.setState({hovered: true}); - if (this.props.onHover) this.props.onHover(event, this.props.columnNumber); + if (this.props.onHover) { + this.props.onHover(event, this.props.columnNumber); + } } }; onMouseLeave = (event) => { if (this.props.hoverable) { this.setState({hovered: false}); - if (this.props.onHoverExit) this.props.onHoverExit(event, this.props.columnNumber); + if (this.props.onHoverExit) { + this.props.onHoverExit(event, this.props.columnNumber); + } } }; diff --git a/src/TextField/TextField.js b/src/TextField/TextField.js index b6fa4a94dde319..3b77a6a78cbfe6 100644 --- a/src/TextField/TextField.js +++ b/src/TextField/TextField.js @@ -50,7 +50,7 @@ const getStyles = (props, context, state) => { pointerEvents: 'none', }, input: { - WebkitTapHighlightColor: 'rgba(0,0,0,0)', // Remove mobile color flashing (deprecated) + WebkitTapHighlightColor: 'rgba(0,0,0,0)', // Remove mobile color flashing (deprecated style) padding: 0, position: 'relative', width: '100%', @@ -193,7 +193,7 @@ class TextField extends Component { * The function to call when the user presses the Enter key. */ onEnterKeyDown: deprecated(PropTypes.func, - 'Use onKeyDown and check for keycode instead.'), + 'Use onKeyDown and check for keycode instead. It will be removed with v0.16.0.'), /** @ignore */ onFocus: PropTypes.func, /** @ignore */ diff --git a/src/TimePicker/ClockMinutes.js b/src/TimePicker/ClockMinutes.js index db98a591c9cf4a..34121306423fee 100644 --- a/src/TimePicker/ClockMinutes.js +++ b/src/TimePicker/ClockMinutes.js @@ -46,7 +46,9 @@ class ClockMinutes extends Component { handleMove = (event) => { event.preventDefault(); - if (this.isMousePressed(event) !== 1 ) return; + if (this.isMousePressed(event) !== 1 ) { + return; + } this.setClock(event.nativeEvent, false); }; @@ -96,10 +98,14 @@ class ClockMinutes extends Component { const numbers = minutes.map((minute) => { const isSelected = selectedMinutes === minute; - if (isSelected) hasSelected = true; + if (isSelected) { + hasSelected = true; + } return ( ); @@ -135,12 +141,11 @@ class ClockMinutes extends Component { return (
- + {minutes.numbers}
this.props.onSelectAffix('pm')} + onTouchTap={() => onSelectAffix('pm')} > - {"PM"} + {'PM'}
,
this.props.onSelectAffix('am')} + onTouchTap={() => onSelectAffix('am')} > - {"AM"} + {'AM'}
, ]; } @@ -130,7 +134,7 @@ class TimeDisplay extends Component {
{hour} @@ -138,7 +142,7 @@ class TimeDisplay extends Component { {min} diff --git a/src/TimePicker/TimePicker.js b/src/TimePicker/TimePicker.js index d0ae8d88262761..2645f72b8770fa 100644 --- a/src/TimePicker/TimePicker.js +++ b/src/TimePicker/TimePicker.js @@ -89,14 +89,14 @@ class TimePicker extends Component { }; static defaultProps = { + autoOk: false, + cancelLabel: 'Cancel', defaultTime: null, disabled: false, format: 'ampm', + okLabel: 'OK', pedantic: false, - autoOk: false, style: {}, - okLabel: 'OK', - cancelLabel: 'Cancel', value: null, }; @@ -124,7 +124,7 @@ class TimePicker extends Component { getTime() { warning(false, `getTime() method is deprecated. Use the defaultTime property instead. Or use the TimePicker as a controlled component with the value - property.`); + property. It will be removed with v0.16.0.`); return this.state.time; } @@ -135,7 +135,7 @@ class TimePicker extends Component { setTime(time) { warning(false, `setTime() method is deprecated. Use the defaultTime property instead. Or use the TimePicker as a controlled component with the value - property.`); + property. It will be removed with v0.16.0.`); this.setState({time: time ? time : emptyTime}); } @@ -195,6 +195,7 @@ class TimePicker extends Component { const { autoOk, cancelLabel, + defaultTime, // eslint-disable-line no-unused-vars dialogBodyStyle, dialogStyle, format, diff --git a/src/internal/EnhancedButton.js b/src/internal/EnhancedButton.js index e4117d3a9e5f7b..30fc9fac0af62d 100644 --- a/src/internal/EnhancedButton.js +++ b/src/internal/EnhancedButton.js @@ -52,7 +52,8 @@ class EnhancedButton extends Component { focusRippleOpacity: PropTypes.number, href: PropTypes.string, keyboardFocused: PropTypes.bool, - linkButton: deprecated(PropTypes.bool, 'LinkButton is no longer required when the `href` property is provided.'), + linkButton: deprecated(PropTypes.bool, `LinkButton is no longer required when the \`href\` property is provided. + It will be removed with v0.16.0.`), onBlur: PropTypes.func, onClick: PropTypes.func, onFocus: PropTypes.func, diff --git a/src/styles/themeDecorator.js b/src/styles/themeDecorator.js index fe0d674f2e2bba..4839cfc3b6edb9 100644 --- a/src/styles/themeDecorator.js +++ b/src/styles/themeDecorator.js @@ -3,7 +3,8 @@ import React, {PropTypes} from 'react'; import warning from 'warning'; export default (customTheme) => { - warning(false, 'ThemeDecorator is deprecated, please use MuiThemeProvider instead.'); + warning(false, `ThemeDecorator is deprecated, please use MuiThemeProvider instead. + It will be removed with v0.16.0.`); return function(Component) { return React.createClass({ diff --git a/src/styles/themeManager.js b/src/styles/themeManager.js index 78fb820fd7f45a..89d2511511e4eb 100644 --- a/src/styles/themeManager.js +++ b/src/styles/themeManager.js @@ -5,23 +5,27 @@ import warning from 'warning'; export default { getMuiTheme(baseTheme, muiTheme) { - warning(false, 'ThemeManager is deprecated. please import getMuiTheme' + - ' directly from "material-ui/styles/getMuiTheme"'); + warning(false, `ThemeManager is deprecated. please import getMuiTheme + directly from "material-ui/styles/getMuiTheme". + It will be removed with v0.16.0.`); return getMuiTheme(baseTheme, muiTheme); }, modifyRawThemeSpacing(muiTheme, spacing) { - warning(false, 'modifyRawThemeSpacing is deprecated. please use getMuiTheme ' + - ' to modify your theme directly. http://www.material-ui.com/#/customization/themes'); + warning(false, `modifyRawThemeSpacing is deprecated. please use getMuiTheme + to modify your theme directly. http://www.material-ui.com/#/customization/themes. + It will be removed with v0.16.0.`); return getMuiTheme(merge({}, muiTheme.baseTheme, {spacing})); }, modifyRawThemePalette(muiTheme, palette) { - warning(false, 'modifyRawThemePalette is deprecated. please use getMuiTheme ' + - ' to modify your theme directly. http://www.material-ui.com/#/customization/themes'); + warning(false, `modifyRawThemePalette is deprecated. please use getMuiTheme + to modify your theme directly. http://www.material-ui.com/#/customization/themes. + It will be removed with v0.16.0.`); return getMuiTheme(merge({}, muiTheme.baseTheme, {baseTheme: {palette}})); }, modifyRawThemeFontFamily(muiTheme, fontFamily) { - warning(false, 'modifyRawThemeFontFamily is deprecated. please use getMuiTheme ' + - ' to modify your theme directly. http://www.material-ui.com/#/customization/themes'); + warning(false, `modifyRawThemeFontFamily is deprecated. please use getMuiTheme + to modify your theme directly. http://www.material-ui.com/#/customization/themes. + It will be removed with v0.16.0.`); return getMuiTheme(merge({}, muiTheme.baseTheme, {fontFamily})); }, }; diff --git a/src/utils/stylePropable.js b/src/utils/stylePropable.js index c433e18ecc55e1..9680dbdd70c2ee 100644 --- a/src/utils/stylePropable.js +++ b/src/utils/stylePropable.js @@ -3,8 +3,8 @@ import warning from 'warning'; let hasWarned; const warn = () => { - warning(hasWarned, 'The \'material-ui/lib/mixins/style-propable.js\' mixin has been deprecated.' + - ' Please do not use this mixin as it will be removed in an upcoming release.'); + warning(hasWarned, `The 'material-ui/lib/mixins/style-propable.js' mixin has been deprecated. + It will be removed with v0.16.0.`); hasWarned = true; }; diff --git a/src/utils/styleResizable.js b/src/utils/styleResizable.js index d580ef3d8ac2ac..88e2ce01b1e87d 100644 --- a/src/utils/styleResizable.js +++ b/src/utils/styleResizable.js @@ -3,8 +3,9 @@ import warning from 'warning'; let hasWarned; const warn = () => { - warning(hasWarned, 'The \'material-ui/utils/styleResizable.js\' mixin has been deprecated.' + - ' Please do not use this mixin as it will be removed in an upcoming release.'); + warning(hasWarned, `The 'material-ui/utils/styleResizable.js' mixin has been deprecated. + It will be removed with v0.16.0.` + ); hasWarned = true; }; diff --git a/src/utils/styles.js b/src/utils/styles.js index c9edb1d784352a..2c2083845c6698 100644 --- a/src/utils/styles.js +++ b/src/utils/styles.js @@ -2,8 +2,8 @@ import warning from 'warning'; let hasWarned; const warn = () => { - warning(hasWarned, 'The \'material-ui/lib/utils/styles.js\' utility module has been deprecated.' + - ' Please do not use this utility module as it will be removed in an upcoming release.'); + warning(hasWarned, `The 'material-ui/lib/utils/styles.js' utility module has been deprecated. + It will be removed with v0.16.0.`); hasWarned = true; };