Merge pull request #3514 from owenconti/bug/3505-schema-title-in-array-schemes

Fixes #3505 - Choose modelName before name in Model component
This commit is contained in:
Kyle
2017-08-04 16:37:11 -07:00
committed by GitHub

View File

@@ -55,14 +55,14 @@ export default class Model extends Component {
return <ObjectModel return <ObjectModel
className="object" { ...this.props } className="object" { ...this.props }
schema={ modelSchema } schema={ modelSchema }
name={ name || modelName } name={ modelName || name }
deprecated={deprecated} deprecated={deprecated}
isRef={ isRef!== undefined ? isRef : !!$$ref } /> isRef={ isRef!== undefined ? isRef : !!$$ref } />
case "array": case "array":
return <ArrayModel return <ArrayModel
className="array" { ...this.props } className="array" { ...this.props }
schema={ modelSchema } schema={ modelSchema }
name={ name || modelName } name={ modelName || name }
deprecated={deprecated} deprecated={deprecated}
required={ required } /> required={ required } />
case "string": case "string":
@@ -74,7 +74,7 @@ export default class Model extends Component {
{ ...this.props } { ...this.props }
getComponent={ getComponent } getComponent={ getComponent }
schema={ modelSchema } schema={ modelSchema }
name={ modelName } name={ modelName || name }
deprecated={deprecated} deprecated={deprecated}
required={ required }/> } required={ required }/> }
} }