Skip to content

Commit

Permalink
Merge pull request #3531 from mhw/array-model-markdown-description
Browse files Browse the repository at this point in the history
Array description should be processed as Markdown.
  • Loading branch information
shockey authored Sep 29, 2017
2 parents cecc3b3 + 4488270 commit 3739995
Showing 1 changed file with 12 additions and 8 deletions.
20 changes: 12 additions & 8 deletions src/core/components/array-model.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@ export default class ArrayModel extends Component {

render(){
let { getComponent, schema, depth, expandDepth, name } = this.props
let description = schema.get("description")
let items = schema.get("items")
let title = schema.get("title") || name
let properties = schema.filter( ( v, key) => ["type", "items", "$$ref"].indexOf(key) === -1 )
let properties = schema.filter( ( v, key) => ["type", "items", "description", "$$ref"].indexOf(key) === -1 )

const Markdown = getComponent("Markdown")
const ModelCollapse = getComponent("ModelCollapse")
const Model = getComponent("Model")

Expand All @@ -36,15 +38,17 @@ export default class ArrayModel extends Component {
return <span className="model">
<ModelCollapse title={titleEl} collapsed={ depth > expandDepth } collapsedContent="[...]">
[
{
properties.size ? properties.entrySeq().map( ( [ key, v ] ) => <span key={`${key}-${v}`} style={ propStyle }>
<br />{ key }: { String(v) }</span>)
: null
}
{
!description ? null :
<Markdown source={ description } />
}
<span><Model { ...this.props } name={null} schema={ items } required={ false } depth={ depth + 1 } /></span>
]
{
properties.size ? <span>
{ properties.entrySeq().map( ( [ key, v ] ) => <span key={`${key}-${v}`} style={propStyle}>
<br />{ key }: { String(v) }</span>)
}<br /></span>
: null
}
</ModelCollapse>
</span>
}
Expand Down

0 comments on commit 3739995

Please sign in to comment.