Merge pull request #324 from d-mo/hide-components-below-focused-template

mrin9 · web-flow · commit c7f9b72afa69 · 2020-10-17T09:39:43.000-07:00
Hide components under 'focused' template
diff --git a/src/templates/main-body-template.js b/src/templates/main-body-template.js
@@ -113,13 +113,17 @@ export default function mainBodyTemplate() {
                   ? this.renderStyle === 'read'
                     ? expandedEndpointTemplate.call(this)
                     : this.renderStyle === 'focused'
-                      ? focusedEndpointTemplate.call(this)
+                      ? this.selectedContentId.startsWith('cmp-')
+                        ? componentsTemplate.call(this)
+                        : focusedEndpointTemplate.call(this)
                       : endpointTemplate.call(this)
                   : ''
                 }
               </div>
 
-              ${this.showComponents === 'true' ? componentsTemplate.call(this) : ''}
+              ${this.showComponents === 'true' && this.renderStyle !== 'focused'
+                  ? componentsTemplate.call(this)
+                  : ''}
             `
             : ''
           }

Original file line number	Diff line number	Diff line change
`@@ -113,13 +113,17 @@ export default function mainBodyTemplate() {`
`113`	`113`	`? this.renderStyle === 'read'`
`114`	`114`	`? expandedEndpointTemplate.call(this)`
`115`	`115`	`: this.renderStyle === 'focused'`
`116`		`- ? focusedEndpointTemplate.call(this)`
	`116`	`+ ? this.selectedContentId.startsWith('cmp-')`
	`117`	`+ ? componentsTemplate.call(this)`
	`118`	`+ : focusedEndpointTemplate.call(this)`
`117`	`119`	`: endpointTemplate.call(this)`
`118`	`120`	`: ''`
`119`	`121`	`}`
`120`	`122`	`</div>`
`121`	`123`
`122`		`- ${this.showComponents === 'true' ? componentsTemplate.call(this) : ''}`
	`124`	`+ ${this.showComponents === 'true' && this.renderStyle !== 'focused'`
	`125`	`+ ? componentsTemplate.call(this)`
	`126`	`+ : ''}`
`123`	`127`	`
`124`	`128`	`: ''`
`125`	`129`	`}`