diff --git a/LesionTracker/client/components/viewerSection/viewerSection.js b/LesionTracker/client/components/viewerSection/viewerSection.js index 0aabd12cc..29f8a978e 100644 --- a/LesionTracker/client/components/viewerSection/viewerSection.js +++ b/LesionTracker/client/components/viewerSection/viewerSection.js @@ -1,14 +1,19 @@ -const isSidebarOpen = sidebarName => { - handleResize(); - return Template.instance().data.state.get(sidebarName); -}; +Template.viewerSection.events({ + 'transitionend .sidebarMenu'(event) { + if (!event.target.classList.contains('sidebarMenu')) { + return; + } + + handleResize(); + } + }); Template.viewerSection.helpers({ leftSidebarOpen() { - return isSidebarOpen('leftSidebar'); + return Template.instance().data.state.get('leftSidebar'); }, rightSidebarOpen() { - return isSidebarOpen('rightSidebar'); + return Template.instance().data.state.get('rightSidebar'); } -}); +}); \ No newline at end of file diff --git a/LesionTracker/client/components/viewerSection/viewerSection.styl b/LesionTracker/client/components/viewerSection/viewerSection.styl index 100d08651..fce5df131 100644 --- a/LesionTracker/client/components/viewerSection/viewerSection.styl +++ b/LesionTracker/client/components/viewerSection/viewerSection.styl @@ -30,11 +30,11 @@ margin-left: - $studiesSidebarMenuWidth max-width: $studiesSidebarMenuWidth order: 1 - display: none + visibility: hidden &.sidebar-open margin-left: 0 - display: block + visibility: visible .mainContent flex: 1 @@ -52,7 +52,7 @@ order: 3 padding-left: 6px position: relative - display: none + visibility: hidden &[data-timepoints="3"] margin-right: - ($lesionsSidebarMenuWidth + 135.5px) @@ -64,7 +64,7 @@ &.sidebar-open margin-right: 0 - display: block + visibility: visible .studiesListedChanger theme('border-bottom', '%s solid $uiBorderColor' % $uiBorderThickness) diff --git a/Packages/ohif-viewerbase/client/components/viewer/gridLayout/gridLayout.styl b/Packages/ohif-viewerbase/client/components/viewer/gridLayout/gridLayout.styl index e44474eaf..2593492fe 100644 --- a/Packages/ohif-viewerbase/client/components/viewer/gridLayout/gridLayout.styl +++ b/Packages/ohif-viewerbase/client/components/viewer/gridLayout/gridLayout.styl @@ -4,7 +4,7 @@ height: 100% padding-bottom: 1px width: 100% - padding-right: 0 + padding-right: 12px .mainContent &.sidebar-right-open @@ -13,7 +13,7 @@ &.sidebar-left-open:not(.sidebar-right-open) #imageViewerViewports - padding-right: 1px + padding-right: 13px &.sidebar-left-open.sidebar-right-open #imageViewerViewports