Merge branch 'master' into feature/add-is-shown-to-model-collapse

Add isShown to ModelCollapse, to tie it to state
2018-03-12 11:43:50 +02:00 · 2018-03-09 17:26:23 +02:00 · 2018-03-09 17:21:45 +02:00
1 changed files with 3 additions and 2 deletions
@@ -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}</ModelCollapse>
              </div>
          }).toArray()
Author	SHA1	Message	Date
Josh Ponelat	576d6e4d01	Merge branch 'master' into feature/add-is-shown-to-model-collapse	2018-03-12 11:43:50 +02:00
Josh Ponelat	f2e37ea292	Merge branch 'master' into feature/add-is-shown-to-model-collapse	2018-03-09 17:26:23 +02:00
Josh Ponelat	f6288ca4a7	Add isShown to ModelCollapse, to tie it to state	2018-03-09 17:21:45 +02:00