From 64cea03ce05bb9ab26a642e19b3b797d23e6709f Mon Sep 17 00:00:00 2001
From: nick-delirium <nikita@openreplay.com>
Date: Thu, 9 Mar 2023 10:50:17 +0100
Subject: [PATCH] fix(player): fix abs time tooltip tracking

---
 .../Session/Player/ClickMapRenderer/ThinPlayer.tsx       | 6 +++++-
 .../app/components/Session_/Player/Controls/Timeline.tsx | 9 +++++++--
 .../Session_/Player/Controls/components/TimeTooltip.tsx  | 2 +-
 tracker/tracker-assist/package.json                      | 2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/frontend/app/components/Session/Player/ClickMapRenderer/ThinPlayer.tsx b/frontend/app/components/Session/Player/ClickMapRenderer/ThinPlayer.tsx
index 886bb848c..1855a5046 100644
--- a/frontend/app/components/Session/Player/ClickMapRenderer/ThinPlayer.tsx
+++ b/frontend/app/components/Session/Player/ClickMapRenderer/ThinPlayer.tsx
@@ -25,7 +25,11 @@ function WebPlayer(props: any) {
     );
     setContextValue({ player: WebPlayerInst, store: PlayerStore });
 
-    return () => WebPlayerInst.clean();
+    return () => {
+      WebPlayerInst.clean();
+      // @ts-ignore
+      setContextValue(defaultContextValue);
+    }
   }, [session.sessionId]);
 
   const isPlayerReady = contextValue.store?.get().ready
diff --git a/frontend/app/components/Session_/Player/Controls/Timeline.tsx b/frontend/app/components/Session_/Player/Controls/Timeline.tsx
index 7cde52a96..678982aa9 100644
--- a/frontend/app/components/Session_/Player/Controls/Timeline.tsx
+++ b/frontend/app/components/Session_/Player/Controls/Timeline.tsx
@@ -81,7 +81,12 @@ function Timeline(props: IProps) {
   };
 
   const showTimeTooltip = (e: React.MouseEvent<HTMLDivElement>) => {
-    if (e.target !== progressRef.current && e.target !== timelineRef.current) {
+    if (
+      e.target !== progressRef.current
+      && e.target !== timelineRef.current
+      // @ts-ignore black magic
+      && !progressRef.current.contains(e.target)
+    ) {
       return props.tooltipVisible && hideTimeTooltip();
     }
 
@@ -91,7 +96,7 @@ function Timeline(props: IProps) {
     const timeLineTooltip = {
       time: Duration.fromMillis(time).toFormat(`mm:ss`),
       timeStr,
-      offset: e.nativeEvent.offsetX,
+      offset: e.nativeEvent.pageX,
       isVisible: true,
     };
 
diff --git a/frontend/app/components/Session_/Player/Controls/components/TimeTooltip.tsx b/frontend/app/components/Session_/Player/Controls/components/TimeTooltip.tsx
index e47593b97..5f746f336 100644
--- a/frontend/app/components/Session_/Player/Controls/components/TimeTooltip.tsx
+++ b/frontend/app/components/Session_/Player/Controls/components/TimeTooltip.tsx
@@ -22,7 +22,7 @@ function TimeTooltip({
       className={stl.timeTooltip}
       style={{
         top: 0,
-        left: offset,
+        left: `calc(${offset}px - 0.5rem)`,
         display: isVisible ? 'block' : 'none',
         transform: 'translate(-50%, -110%)',
         whiteSpace: 'nowrap',
diff --git a/tracker/tracker-assist/package.json b/tracker/tracker-assist/package.json
index 4277e2e36..4c8c98d53 100644
--- a/tracker/tracker-assist/package.json
+++ b/tracker/tracker-assist/package.json
@@ -31,7 +31,7 @@
     "socket.io-client": "^4.4.1"
   },
   "peerDependencies": {
-    "@openreplay/tracker": ">=3.6.0"
+    "@openreplay/tracker": ">=5.0.0"
   },
   "devDependencies": {
     "@openreplay/tracker": "file:../tracker",