Merge pull request #2397 from subjectix/card-header-optional-avatar

[CardHeader] Make avatar prop optional
mui · Dec 6, 2015 · 28a309f · 28a309f
2 parents 0749065 + ee0d16c
commit 28a309f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/docs/src/app/components/pages/components/cards.jsx b/docs/src/app/components/pages/components/cards.jsx
@@ -140,9 +140,8 @@ export default class CardPage extends React.Component {
           <br />
           <Card initiallyExpanded={true}>
             <CardHeader
-              title="Title"
+              title="Without Avatar"
               subtitle="Subtitle"
-              avatar={<Avatar style={{color:'red'}}>A</Avatar>}
               actAsExpander={true}
               showExpandableButton={true} />
             <CardText expandable={true}>

diff --git a/src/card/card-header.jsx b/src/card/card-header.jsx
@@ -59,6 +59,7 @@ const CardHeader = React.createClass({
     return {
       titleColor: Styles.Colors.darkBlack,
       subtitleColor: Styles.Colors.lightBlack,
+      avatar: null,
     };
   },
 
@@ -103,8 +104,9 @@ const CardHeader = React.createClass({
       let avatarMergedStyle = this.mergeStyles(styles.avatar, avatar.props.style);
       avatar = React.cloneElement(avatar, {style:avatarMergedStyle});
     }
-    else
+    else if (avatar !== null) {
       avatar = <Avatar src={this.props.avatar} style={styles.avatar}/>;
+    }
 
     return (
       <div {...this.props} style={rootStyle}>