Reimplemented changes after merge with master

This commit is contained in:
Owen Conti
2017-07-11 17:02:53 -06:00
parent fce8b7275b
commit bd31d3dedf
3 changed files with 23 additions and 16 deletions

View File

@@ -5,12 +5,14 @@ export default class ModelCollapse extends Component {
static propTypes = {
collapsedContent: PropTypes.any,
collapsed: PropTypes.bool,
children: PropTypes.any
children: PropTypes.any,
title: PropTypes.element
}
static defaultProps = {
collapsedContent: "{...}",
collapsed: true,
title: null
}
constructor(props, context) {
@@ -31,11 +33,15 @@ export default class ModelCollapse extends Component {
}
render () {
return (<span>
<span onClick={ this.toggleCollapsed } style={{ "cursor": "pointer" }}>
<span className={ "model-toggle" + ( this.state.collapsed ? " collapsed" : "" ) }></span>
const {title} = this.props
return (
<span>
{ title && <span onClick={this.toggleCollapsed} style={{ "cursor": "pointer" }}>{title}</span> }
<span onClick={ this.toggleCollapsed } style={{ "cursor": "pointer" }}>
<span className={ "model-toggle" + ( this.state.collapsed ? " collapsed" : "" ) }></span>
</span>
{ this.state.collapsed ? this.state.collapsedContent : this.props.children }
</span>
{ this.state.collapsed ? this.state.collapsedContent : this.props.children }
</span>)
)
}
}