From 4febbeeed847b12232256903481e367b31b7127d Mon Sep 17 00:00:00 2001
From: Nikolai Berestevich <nikolai.berestevich@regentmarkets.com>
Date: Thu, 7 Oct 2021 17:18:21 +0300
Subject: [PATCH 1/4] nikolai.berestevich/fix/academy-video-bug after pressing
 space

---
 src/pages/academy/components/_video-player.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/pages/academy/components/_video-player.js b/src/pages/academy/components/_video-player.js
index 277e37d1836..f25f3275e00 100644
--- a/src/pages/academy/components/_video-player.js
+++ b/src/pages/academy/components/_video-player.js
@@ -67,7 +67,7 @@ const VideoPlayer = ({ video_src, closeVideo }) => {
     let vidElement
 
     useEffect(() => {
-        document.addEventListener('keydown', handleEscape, false)
+        document.addEventListener('keydown', handleKeyboardEvent, false)
 
         vidElement = vidRef.current
         vidElement.addEventListener('enterpictureinpicture', () => {
@@ -93,12 +93,14 @@ const VideoPlayer = ({ video_src, closeVideo }) => {
         }
 
         return () => {
-            document.removeEventListener('keydown', handleEscape, false)
+            document.removeEventListener('keydown', handleKeyboardEvent, false)
         }
     }, [])
 
-    const handleEscape = (e) => {
-        setIsShow(!is_show)
+    const handleKeyboardEvent = (e) => {
+        if (e.code === 'Space') {
+            vidElement.paused ? vidElement.play() : vidElement.pause()
+        }
         if (e.key === 'Escape') {
             closeVideo()
         }

From adacb0b1fbafa23c8ff7d4a13ca9369941b2aed7 Mon Sep 17 00:00:00 2001
From: Nikolai Berestevich <nikolai.berestevich@regentmarkets.com>
Date: Mon, 18 Oct 2021 10:25:18 +0300
Subject: [PATCH 2/4] nikolai.berestevich/fix/video-player

---
 src/pages/academy/components/_video-player.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/pages/academy/components/_video-player.js b/src/pages/academy/components/_video-player.js
index f25f3275e00..6d2a3f2e335 100644
--- a/src/pages/academy/components/_video-player.js
+++ b/src/pages/academy/components/_video-player.js
@@ -54,6 +54,7 @@ const VidPlayer = styled.video`
     width: 100%;
     max-height: 558px;
     background-color: var(--color-black);
+    outline: none;
 
     @media ${device.desktopS} {
         max-height: 900px;
@@ -91,10 +92,8 @@ const VideoPlayer = ({ video_src, closeVideo }) => {
                 setIsShow(!is_show)
             }
         }
-
-        return () => {
-            document.removeEventListener('keydown', handleKeyboardEvent, false)
-        }
+        vidElement.focus()
+        return document.removeEventListener('keydown', handleKeyboardEvent, false)
     }, [])
 
     const handleKeyboardEvent = (e) => {
@@ -122,7 +121,6 @@ const VideoPlayer = ({ video_src, closeVideo }) => {
                         </StyledFlex>
                         <VidPlayer
                             controls
-                            disablePictureInPicture
                             controlsList="nodownload"
                             autoPlay
                             onClick={(event) => event.stopPropagation()}

From 0ed56ef46fa7d0e0777ed62d0c6cc40bbb38e5fc Mon Sep 17 00:00:00 2001
From: Nikolai Berestevich <nikolai.berestevich@regentmarkets.com>
Date: Mon, 18 Oct 2021 12:23:19 +0300
Subject: [PATCH 3/4] nikolai.berestevich/fix/video-player

---
 src/pages/academy/components/_video-player.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/academy/components/_video-player.js b/src/pages/academy/components/_video-player.js
index 6d2a3f2e335..fec071bfbea 100644
--- a/src/pages/academy/components/_video-player.js
+++ b/src/pages/academy/components/_video-player.js
@@ -121,6 +121,7 @@ const VideoPlayer = ({ video_src, closeVideo }) => {
                         </StyledFlex>
                         <VidPlayer
                             controls
+                            disablePictureInPicture
                             controlsList="nodownload"
                             autoPlay
                             onClick={(event) => event.stopPropagation()}

From 178a73b2f8e6138ad551eb60c5e7fa3925d7bde8 Mon Sep 17 00:00:00 2001
From: Nikolai Berestevich <nikolai.berestevich@regentmarkets.com>
Date: Mon, 18 Oct 2021 14:33:21 +0300
Subject: [PATCH 4/4] nikolai.berestevich/fix/video-player

---
 src/pages/academy/components/_video-player.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/pages/academy/components/_video-player.js b/src/pages/academy/components/_video-player.js
index fec071bfbea..fdf303562cb 100644
--- a/src/pages/academy/components/_video-player.js
+++ b/src/pages/academy/components/_video-player.js
@@ -93,13 +93,10 @@ const VideoPlayer = ({ video_src, closeVideo }) => {
             }
         }
         vidElement.focus()
-        return document.removeEventListener('keydown', handleKeyboardEvent, false)
+        return () => document.removeEventListener('keydown', handleKeyboardEvent, false)
     }, [])
 
     const handleKeyboardEvent = (e) => {
-        if (e.code === 'Space') {
-            vidElement.paused ? vidElement.play() : vidElement.pause()
-        }
         if (e.key === 'Escape') {
             closeVideo()
         }