Skip to content
Snippets Groups Projects
Unverified Commit e37026b1 authored by Chris Beer's avatar Chris Beer Committed by GitHub
Browse files

Merge pull request #2391 from ProjectMirador/do-not-render-non-visible-components

Do not render components that are not visible
parents facca955 09fcf3ec
Branches
No related tags found
No related merge requests found
...@@ -42,7 +42,8 @@ describe('WorkspaceMenu', () => { ...@@ -42,7 +42,8 @@ describe('WorkspaceMenu', () => {
describe('handleMenuItemClose', () => { describe('handleMenuItemClose', () => {
it('resets the anchor state', () => { it('resets the anchor state', () => {
wrapper.instance().handleMenuItemClose('windowList')(); wrapper.instance().handleMenuItemClose('windowList')();
expect(wrapper.find(WindowList).props().open).toBe(false); expect(Boolean(wrapper.state('windowList').anchorEl)).toEqual(false);
expect(wrapper.find(WindowList).length).toBe(0);
}); });
}); });
......
...@@ -171,35 +171,47 @@ export class WorkspaceMenu extends Component { ...@@ -171,35 +171,47 @@ export class WorkspaceMenu extends Component {
<Typography variant="body1">{t('importWorkspace')}</Typography> <Typography variant="body1">{t('importWorkspace')}</Typography>
</MenuItem> </MenuItem>
</Menu> </Menu>
{Boolean(windowList.anchorEl) && (
<WindowList <WindowList
anchorEl={windowList.anchorEl} anchorEl={windowList.anchorEl}
open={Boolean(windowList.anchorEl)} open={Boolean(windowList.anchorEl)}
handleClose={this.handleMenuItemClose('windowList')} handleClose={this.handleMenuItemClose('windowList')}
/> />
)}
{Boolean(toggleZoom.open) && (
<WorkspaceSettings <WorkspaceSettings
open={Boolean(toggleZoom.open)} open={Boolean(toggleZoom.open)}
handleClose={this.handleMenuItemClose('toggleZoom')} handleClose={this.handleMenuItemClose('toggleZoom')}
/> />
)}
{Boolean(settings.open) && (
<WorkspaceSettings <WorkspaceSettings
open={Boolean(settings.open)} open={Boolean(settings.open)}
container={container} container={container}
handleClose={this.handleMenuItemClose('settings')} handleClose={this.handleMenuItemClose('settings')}
/> />
)}
{Boolean(workspaceSelection.open) && (
<WorkspaceSelectionDialog <WorkspaceSelectionDialog
open={Boolean(workspaceSelection.open)} open={Boolean(workspaceSelection.open)}
container={container} container={container}
handleClose={this.handleMenuItemClose('workspaceSelection')} handleClose={this.handleMenuItemClose('workspaceSelection')}
/> />
)}
{Boolean(exportWorkspace.open) && (
<WorkspaceExport <WorkspaceExport
open={Boolean(exportWorkspace.open)} open={Boolean(exportWorkspace.open)}
container={container} container={container}
handleClose={this.handleMenuItemClose('exportWorkspace')} handleClose={this.handleMenuItemClose('exportWorkspace')}
/> />
)}
{Boolean(importWorkspace.open) && (
<WorkspaceImport <WorkspaceImport
open={Boolean(importWorkspace.open)} open={Boolean(importWorkspace.open)}
container={container} container={container}
handleClose={this.handleMenuItemClose('importWorkspace')} handleClose={this.handleMenuItemClose('importWorkspace')}
/> />
)}
</> </>
); );
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment