diff --git a/src/Card/CardActions.js b/src/Card/CardActions.js
index 5b43c127e76206..25de079dc8de9c 100644
--- a/src/Card/CardActions.js
+++ b/src/Card/CardActions.js
@@ -41,10 +41,18 @@ class CardActions extends Component {
};
render() {
+ const {
+ actAsExpander, // eslint-disable-line no-unused-vars
+ children,
+ expandable, // eslint-disable-line no-unused-vars
+ style,
+ ...other,
+ } = this.props;
+
const {prepareStyles} = this.context.muiTheme;
const styles = getStyles(this.props, this.context);
- const children = React.Children.map(this.props.children, (child) => {
+ const styledChildren = React.Children.map(children, (child) => {
if (React.isValidElement(child)) {
return React.cloneElement(child, {
style: Object.assign({}, styles.action, child.props.style),
@@ -53,8 +61,8 @@ class CardActions extends Component {
});
return (
-
- {children}
+
+ {styledChildren}
);
}
diff --git a/src/Card/CardHeader.js b/src/Card/CardHeader.js
index e7cf3cad81e6cc..10ced47ab1f0e6 100644
--- a/src/Card/CardHeader.js
+++ b/src/Card/CardHeader.js
@@ -107,6 +107,7 @@ class CardHeader extends Component {
actAsExpander, // eslint-disable-line no-unused-vars
avatar: avatarProp,
children,
+ expandable, // eslint-disable-line no-unused-vars
showExpandableButton, // eslint-disable-line no-unused-vars
style,
subtitle,
diff --git a/src/Card/CardMedia.js b/src/Card/CardMedia.js
index a2dd2435d16f9f..be936d28bfdf83 100644
--- a/src/Card/CardMedia.js
+++ b/src/Card/CardMedia.js
@@ -82,28 +82,36 @@ class CardMedia extends Component {
render() {
const {
+ actAsExpander, // eslint-disable-line no-unused-vars
+ children,
+ expandable, // eslint-disable-line no-unused-vars
+ mediaStyle,
overlay,
+ overlayContainerStyle,
+ overlayContentStyle,
+ overlayStyle,
+ style,
...other,
} = this.props;
const {prepareStyles} = this.context.muiTheme;
const styles = getStyles(this.props, this.context);
- const rootStyle = Object.assign(styles.root, this.props.style);
- const mediaStyle = Object.assign(styles.media, this.props.mediaStyle);
- const overlayContainerStyle = Object.assign(styles.overlayContainer, this.props.overlayContainerStyle);
- const overlayContentStyle = Object.assign(styles.overlayContent, this.props.overlayContentStyle);
- const overlayStyle = Object.assign(styles.overlay, this.props.overlayStyle);
+ const rootStyle = Object.assign(styles.root, style);
+ const extendedMediaStyle = Object.assign(styles.media, mediaStyle);
+ const extendedOverlayContainerStyle = Object.assign(styles.overlayContainer, overlayContainerStyle);
+ const extendedOverlayContentStyle = Object.assign(styles.overlayContent, overlayContentStyle);
+ const extendedOverlayStyle = Object.assign(styles.overlay, overlayStyle);
const titleColor = this.context.muiTheme.cardMedia.titleColor;
const subtitleColor = this.context.muiTheme.cardMedia.subtitleColor;
const color = this.context.muiTheme.cardMedia.color;
- const children = React.Children.map(this.props.children, (child) => {
+ const styledChildren = React.Children.map(children, (child) => {
return React.cloneElement(child, {
style: prepareStyles(Object.assign({}, styles.mediaChild, child.props.style)),
});
});
- const overlayChildren = React.Children.map(this.props.overlay, (child) => {
+ const overlayChildren = React.Children.map(overlay, (child) => {
if (child.type.muiName === 'CardHeader' || child.type.muiName === 'CardTitle') {
return React.cloneElement(child, {
titleColor: titleColor,
@@ -120,13 +128,13 @@ class CardMedia extends Component {
return (
-
- {children}
+
+ {styledChildren}
{overlay ?
-
-
-
+
+
diff --git a/src/Card/CardText.js b/src/Card/CardText.js
index fd8e69ebe83d55..9c4da147370fca 100644
--- a/src/Card/CardText.js
+++ b/src/Card/CardText.js
@@ -43,13 +43,22 @@ class CardText extends Component {
};
render() {
+ const {
+ actAsExpander, // eslint-disable-line no-unused-vars
+ children,
+ color, // eslint-disable-line no-unused-vars
+ expandable, // eslint-disable-line no-unused-vars
+ style,
+ ...other,
+ } = this.props;
+
const {prepareStyles} = this.context.muiTheme;
const styles = getStyles(this.props, this.context);
- const rootStyle = Object.assign(styles.root, this.props.style);
+ const rootStyle = Object.assign(styles.root, style);
return (
-
- {this.props.children}
+
+ {children}
);
}
diff --git a/src/Card/CardTitle.js b/src/Card/CardTitle.js
index fb31488245eb4c..2d3ebeb6cc5b02 100644
--- a/src/Card/CardTitle.js
+++ b/src/Card/CardTitle.js
@@ -77,29 +77,36 @@ class CardTitle extends Component {
};
render() {
- const {prepareStyles} = this.context.muiTheme;
- const styles = getStyles(this.props, this.context);
- const rootStyle = Object.assign({}, styles.root, this.props.style);
- const titleStyle = Object.assign({}, styles.title, this.props.titleStyle);
- const subtitleStyle = Object.assign({}, styles.subtitle, this.props.subtitleStyle);
-
const {
+ actAsExpander, // eslint-disable-line no-unused-vars
+ children,
+ expandable, // eslint-disable-line no-unused-vars
+ showExpandableButton, // eslint-disable-line no-unused-vars
+ style,
subtitle,
subtitleColor, // eslint-disable-line no-unused-vars
+ subtitleStyle,
title,
titleColor, // eslint-disable-line no-unused-vars
+ titleStyle,
...other,
} = this.props;
+ const {prepareStyles} = this.context.muiTheme;
+ const styles = getStyles(this.props, this.context);
+ const rootStyle = Object.assign({}, styles.root, style);
+ const extendedTitleStyle = Object.assign({}, styles.title, titleStyle);
+ const extendedSubtitleStyle = Object.assign({}, styles.subtitle, subtitleStyle);
+
return (
-
+
{title}
-
+
{subtitle}
- {this.props.children}
+ {children}
);
}
diff --git a/src/FloatingActionButton/FloatingActionButton.js b/src/FloatingActionButton/FloatingActionButton.js
index 4c13f632444228..56bac099c96cc6 100644
--- a/src/FloatingActionButton/FloatingActionButton.js
+++ b/src/FloatingActionButton/FloatingActionButton.js
@@ -234,6 +234,7 @@ class FloatingActionButton extends Component {
render() {
const {
+ backgroundColor, // eslint-disable-line no-unused-vars
className,
disabled,
mini,