Merge pull request #3425 from scottohara/remove-array-model-name
Remove fallback to name for array model title (Fixes #3424)
This commit is contained in:
@@ -15,7 +15,7 @@ export default class ArrayModel extends Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
render(){
|
render(){
|
||||||
let { getComponent, required, schema, depth, expandDepth } = this.props
|
let { getComponent, required, schema, depth, expandDepth, name } = this.props
|
||||||
let items = schema.get("items")
|
let items = schema.get("items")
|
||||||
let title = schema.get("title") || name
|
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", "$$ref"].indexOf(key) === -1 )
|
||||||
@@ -23,7 +23,7 @@ export default class ArrayModel extends Component {
|
|||||||
const ModelCollapse = getComponent("ModelCollapse")
|
const ModelCollapse = getComponent("ModelCollapse")
|
||||||
const Model = getComponent("Model")
|
const Model = getComponent("Model")
|
||||||
|
|
||||||
const titleEl = title &&
|
const titleEl = title &&
|
||||||
<span className="model-title">
|
<span className="model-title">
|
||||||
<span className="model-title__text">{ title }</span>
|
<span className="model-title__text">{ title }</span>
|
||||||
</span>
|
</span>
|
||||||
@@ -44,4 +44,4 @@ export default class ArrayModel extends Component {
|
|||||||
{ required && <span style={{ color: "red" }}>*</span>}
|
{ required && <span style={{ color: "red" }}>*</span>}
|
||||||
</span>
|
</span>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user