improvement: add isShown check to <ModelCollapse />'s prop expanded logic (via #5331)
This commit is contained in:
@@ -62,10 +62,11 @@ export default class Models extends Component {
|
||||
|
||||
const schema = Map.isMap(schemaValue) ? schemaValue : Im.Map()
|
||||
const rawSchema = Map.isMap(rawSchemaValue) ? rawSchemaValue : Im.Map()
|
||||
|
||||
const displayName = schema.get("title") || rawSchema.get("title") || name
|
||||
|
||||
if(layoutSelectors.isShown(["models", name], false) && (schema.size === 0 && rawSchema.size > 0)) {
|
||||
const displayName = schema.get("title") || rawSchema.get("title") || name
|
||||
const isShown = layoutSelectors.isShown( ["models", name], false )
|
||||
|
||||
if( isShown && (schema.size === 0 && rawSchema.size > 0) ) {
|
||||
// Firing an action in a container render is not great,
|
||||
// but it works for now.
|
||||
this.props.specActions.requestResolvedSubtree([...this.getSchemaBasePath(), name])
|
||||
@@ -100,7 +101,7 @@ export default class Models extends Component {
|
||||
displayName={displayName}
|
||||
modelName={name}
|
||||
hideSelfOnExpand={true}
|
||||
expanded={defaultModelsExpandDepth > 1}
|
||||
expanded={ defaultModelsExpandDepth > 0 && isShown }
|
||||
>{content}</ModelCollapse>
|
||||
</div>
|
||||
}).toArray()
|
||||
|
||||
Reference in New Issue
Block a user