From 2f1a2273a488501d37deb90d2e7323143b7ae793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustavo=20Andr=C3=A9=20Lelis?= <galelis@gmail.com>
Date: Thu, 6 Sep 2018 15:28:26 -0300
Subject: [PATCH] BugFix(#183): Avoid adding focus on a viewport that is
 already activated (#265)

---
 .../viewer/imageViewerViewport/imageViewerViewport.js          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js b/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
index d6d202e0e..d858f7d3c 100644
--- a/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
+++ b/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
@@ -400,7 +400,6 @@ const loadDisplaySetIntoViewport = (data, templateData) => {
             const element = (eventData && eventData.element) || (event && event.currentTarget);
             if (!element) return;
             const $element = $(element);
-            $element.focus();
 
             // Stop here if we don't have eventData set
             if (!eventData) return;
@@ -410,6 +409,8 @@ const loadDisplaySetIntoViewport = (data, templateData) => {
             // If it was, no changes are necessary, so stop here.
             const activeViewportIndex = Session.get('activeViewport');
             if (viewportIndex === activeViewportIndex) return;
+            
+            $element.focus();
 
             OHIF.log.info('imageViewerViewport sendActivationTrigger');