From 0d48faba2f40fd32055aabfc6ea4f10a813bf2e2 Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Sat, 25 Dec 2021 12:41:10 +0100
Subject: [PATCH] Composer: Fix arrow keys reset forwarding

---
 src/components/mediaViewer/MediaViewer.tsx | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/mediaViewer/MediaViewer.tsx b/src/components/mediaViewer/MediaViewer.tsx
index 3585c9eeb..6022e3522 100644
--- a/src/components/mediaViewer/MediaViewer.tsx
+++ b/src/components/mediaViewer/MediaViewer.tsx
@@ -394,7 +394,11 @@ const MediaViewer: FC<StateProps & DispatchProps> = ({
   });
 
   useEffect(() => {
-    const handleKeyDown = (e: KeyboardEvent) => {
+    if (!isOpen) {
+      return undefined;
+    }
+
+    function handleKeyDown(e: KeyboardEvent) {
       switch (e.key) {
         case 'Left': // IE/Edge specific value
         case 'ArrowLeft':
@@ -406,14 +410,14 @@ const MediaViewer: FC<StateProps & DispatchProps> = ({
           selectMessage(nextMessageId);
           break;
       }
-    };
+    }
 
     document.addEventListener('keydown', handleKeyDown, false);
 
     return () => {
       document.removeEventListener('keydown', handleKeyDown, false);
     };
-  }, [nextMessageId, previousMessageId, selectMessage]);
+  }, [isOpen, nextMessageId, previousMessageId, selectMessage]);
 
   useEffect(() => {
     if (isZoomed || IS_TOUCH_ENV) return undefined;