fixed scrubbing in full screen or after dragging slider

1 files changed, 7 insertions, 5 deletions

diff --git a/src/client/views/nodes/VideoBox.tsx b/src/client/views/nodes/VideoBox.tsx
index 43f052859..4c6680dcf 100644
--- a/src/client/views/nodes/VideoBox.tsx
+++ b/src/client/views/nodes/VideoBox.tsx
@@ -163,7 +163,8 @@ export class VideoBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProp
     @action
     keyEvents = (e: KeyboardEvent) => {
         if (
-            !(e.target instanceof HTMLInputElement) &&
+            // need to include range inputs because after dragging time slider it becomes target element
+            !(e.target instanceof HTMLInputElement && !(e.target.type === "range")) &&
             this.props.isSelected(true)
         ) {
             switch (e.key) {
@@ -283,10 +284,11 @@ export class VideoBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProp
     // fades out controls in fullscreen after mouse stops moving
     @action controlsFade = (e: PointerEvent) => {
         e.stopPropagation();
-        clearTimeout(this._controlsFadeTimer);
-        this._controlsVisible = true;
-        this._scrubbing = false;
-        this._controlsFadeTimer = setTimeout(action(() => this._controlsVisible = false), 3000);
+        if (!this._scrubbing) {
+            clearTimeout(this._controlsFadeTimer);
+            this._controlsVisible = true;
+            this._controlsFadeTimer = setTimeout(action(() => this._controlsVisible = false), 3000);
+        }
     }