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