From d7424ff2489c725e67333af7e2e80a93261b0a59 Mon Sep 17 00:00:00 2001 From: "Mark H. Wilkinson" Date: Mon, 7 Aug 2017 12:33:15 +0100 Subject: [PATCH] Array description should be processed as Markdown. --- src/core/components/array-model.jsx | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/core/components/array-model.jsx b/src/core/components/array-model.jsx index f0046aec1c4..6e7ba679d7f 100644 --- a/src/core/components/array-model.jsx +++ b/src/core/components/array-model.jsx @@ -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") @@ -31,15 +33,17 @@ export default class ArrayModel extends Component { return expandDepth } collapsedContent="[...]"> [ + { + properties.size ? properties.entrySeq().map( ( [ key, v ] ) => +
{ key }: { String(v) }
) + : null + } + { + !description ? null : + + } ] - { - properties.size ? - { properties.entrySeq().map( ( [ key, v ] ) => -
{ `${key}:`}{ String(v) }
) - }
- : null - }
}