From f6288ca4a7b6ec780942a93a84d107516db2804a Mon Sep 17 00:00:00 2001 From: Josh Ponelat Date: Fri, 9 Mar 2018 17:21:45 +0200 Subject: [PATCH] Add isShown to ModelCollapse, to tie it to state --- src/core/components/models.jsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/core/components/models.jsx b/src/core/components/models.jsx index 3bbe69ee..2d63520e 100644 --- a/src/core/components/models.jsx +++ b/src/core/components/models.jsx @@ -54,8 +54,9 @@ export default class Models extends Component { definitions.entrySeq().map( ( [ name ])=>{ const schema = specSelectors.specResolvedSubtree([...specPathBase, name]) + const isShown = layoutSelectors.isShown(["models", name], false) - if(layoutSelectors.isShown(["models", name], false) && schema === undefined) { + if(isShown && schema === undefined) { // Firing an action in a container render is not great, // but it works for now. this.props.specActions.requestResolvedSubtree([...this.getSchemaBasePath(), name]) @@ -83,7 +84,7 @@ export default class Models extends Component { title={title} modelName={name} hideSelfOnExpand={true} - expanded={defaultModelsExpandDepth > 1} + expanded={isShown || defaultModelsExpandDepth > 1 } >{content} }).toArray()