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

@@ -17,16 +17,19 @@ export default class ArrayModel extends Component {
render(){
let { getComponent, required, schema, depth, expandDepth } = this.props
let items = schema.get("items")
let title = schema.get("title") || name
let properties = schema.filter( ( v, key) => ["type", "items", "$$ref"].indexOf(key) === -1 )
const ModelCollapse = getComponent("ModelCollapse")
const Model = getComponent("Model")
return <span className="model">
const titleEl = title &&
<span className="model-title">
<span className="model-title__text">{ schema.get("title") }</span>
<span className="model-title__text">{ title }</span>
</span>
<ModelCollapse collapsed={ depth > expandDepth } collapsedContent="[...]">
return <span className="model">
<ModelCollapse title={titleEl} collapsed={ depth > expandDepth } collapsedContent="[...]">
[
<span><Model { ...this.props } schema={ items } required={ false }/></span>
]