From 7c80e8c783fc7dcf8a2845c9240eff8bd997d981 Mon Sep 17 00:00:00 2001 From: Cooper Ransom Date: Thu, 21 Mar 2024 11:41:53 -0400 Subject: [PATCH] Fix issue with next episode vol. 2 --- .../player/atoms/NextEpisodeButton.tsx | 42 ++++++++++--------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/src/components/player/atoms/NextEpisodeButton.tsx b/src/components/player/atoms/NextEpisodeButton.tsx index 921d86c0..95140e77 100644 --- a/src/components/player/atoms/NextEpisodeButton.tsx +++ b/src/components/player/atoms/NextEpisodeButton.tsx @@ -90,27 +90,31 @@ export function NextEpisodeButton(props: { }, [setDirectMeta, meta, props, setShouldStartFromBeginning]); useEffect(() => { - let intervalId: number = 0; - if (show && countdown > 0) { - intervalId = window.setInterval(() => { - setCountdown((currentCountdown) => { - // When countdown reaches 1, load the next episode on the next tick - if (currentCountdown === 1) { - // Ensure this runs only once by setting countdown to a non-positive number - setCountdown(-1); - loadNextEpisode(); - } - return currentCountdown - 1; - }); - }, 1000); - } else { - window.clearInterval(intervalId); - if (!show) { - setCountdown(15); // Reset countdown when not showing. - } + // Only start the countdown if the button is supposed to show. + if (!show) { + return; } + + // Initialize the countdown only once when the condition to show the button is met. + setCountdown(15); // Reset to 15 seconds whenever the conditions to show the button are met. + + const intervalId = window.setInterval(() => { + setCountdown((currentCountdown) => { + const newCountdown = currentCountdown - 1; + // When countdown reaches 0, load the next episode. + if (newCountdown <= 0) { + loadNextEpisode(); + // Stop the countdown by clearing the interval. + window.clearInterval(intervalId); + return 0; // Optionally reset the countdown or keep it at 0. + } + return newCountdown; + }); + }, 1000); + + // Cleanup function to clear the interval when the component unmounts or the dependencies change. return () => window.clearInterval(intervalId); - }, [show, countdown, loadNextEpisode]); + }, [show, loadNextEpisode]); // Removed countdown from dependencies to prevent resetting it unnecessarily. if (!meta?.episode || !nextEp) return null; if (metaType !== "show") return null;