From b9bd71d04cfc5eba3ce491f878f4b44ef0886658 Mon Sep 17 00:00:00 2001
From: Josh Hawkins <32435876+hawkeye217@users.noreply.github.com>
Date: Sun, 24 Mar 2024 21:19:15 -0500
Subject: [PATCH] rename vars for clarity and use timeout instead of interval

---
 web/src/views/events/EventView.tsx | 44 ++++++++++++++++--------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/web/src/views/events/EventView.tsx b/web/src/views/events/EventView.tsx
index 7057395f2..2dfb957d7 100644
--- a/web/src/views/events/EventView.tsx
+++ b/web/src/views/events/EventView.tsx
@@ -720,7 +720,7 @@ function MotionReview({
   const [playbackRate, setPlaybackRate] = useState(8);
   const [controlsOpen, setControlsOpen] = useState(false);
 
-  const ranges = useMemo(() => {
+  const noMotionRanges = useMemo(() => {
     if (!motionData || !reviewItems) {
       return;
     }
@@ -769,14 +769,14 @@ function MotionReview({
   }, [motionData, reviewItems, motionOnly]);
 
   const nextTimestamp = useMemo(() => {
-    if (!ranges) {
+    if (!noMotionRanges) {
       return;
     }
     let currentRange = 0;
     let nextTimestamp = currentTime + 0.5;
 
-    while (currentRange < ranges.length) {
-      const [start, end] = ranges[currentRange];
+    while (currentRange < noMotionRanges.length) {
+      const [start, end] = noMotionRanges[currentRange];
 
       if (start && end) {
         // If the current time is before the start of the current range
@@ -799,26 +799,30 @@ function MotionReview({
     }
 
     return nextTimestamp;
-  }, [currentTime, ranges]);
+  }, [currentTime, noMotionRanges]);
+
+  const timeoutIdRef = useRef<NodeJS.Timeout | null>(null);
 
   useEffect(() => {
-    if (!playing) {
-      return;
-    }
-
-    const interval = 500 / playbackRate;
-
-    const intervalId = setInterval(() => {
-      if (nextTimestamp) {
-        setCurrentTime(nextTimestamp);
+    if (nextTimestamp) {
+      if (!playing && timeoutIdRef.current != null) {
+        clearTimeout(timeoutIdRef.current);
+        return;
       }
-    }, interval);
 
-    return () => {
-      clearInterval(intervalId);
-    };
-    // do not render when current time changes
-    // eslint-disable-next-line react-hooks/exhaustive-deps
+      const handleTimeout = () => {
+        setCurrentTime(nextTimestamp);
+        timeoutIdRef.current = setTimeout(handleTimeout, 500 / playbackRate);
+      };
+
+      timeoutIdRef.current = setTimeout(handleTimeout, 500 / playbackRate);
+
+      return () => {
+        if (timeoutIdRef.current) {
+          clearTimeout(timeoutIdRef.current);
+        }
+      };
+    }
   }, [playing, playbackRate, nextTimestamp]);
 
   const { alignStartDateToTimeline } = useTimelineUtils({