From cea3a77b52d00838cdc5d9444ca05d5033b7947d Mon Sep 17 00:00:00 2001 From: Evren Ozkan Date: Mon, 20 Nov 2017 16:31:26 -0500 Subject: [PATCH] Send viewport activation trigger on mouse enter only if there is no focused dropdown --- .../viewer/imageViewerViewport/imageViewerViewport.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js b/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js index 5c35c317e..314c66893 100644 --- a/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js +++ b/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js @@ -403,11 +403,18 @@ const loadDisplaySetIntoViewport = (data, templateData) => { $element.trigger(customEvent, eventData); }; + // Handle mouseenter event to send viewport activation trigger only if there is no focused dropdown + const onMouseEnter = () => { + if ($(':focus').closest('.dropdown').length) return; + + sendActivationTrigger(); + }; + // Attach the sendActivationTrigger function to all of the Cornerstone interaction events $element.off(allCornerstoneEvents, sendActivationTrigger); $element.on(allCornerstoneEvents, sendActivationTrigger); - $element.off('mouseenter', sendActivationTrigger); - $element.on('mouseenter', sendActivationTrigger); + $element.off('mouseenter', onMouseEnter); + $element.on('mouseenter', onMouseEnter); OHIF.viewer.data.loadedSeriesData = layoutManager.viewportData;