feat(series): inline player and query init fix

jwplayer · May 31, 2023 · e248131 · e248131
1 parent 6c7523f
commit e248131
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/hooks/series/useNextEpisode.ts b/src/hooks/series/useNextEpisode.ts
@@ -20,7 +20,7 @@ export const useNextEpisode = ({
 
       return item;
     },
-    { staleTime: SERIES_CACHE_TIME, cacheTime: SERIES_CACHE_TIME },
+    { staleTime: SERIES_CACHE_TIME, cacheTime: SERIES_CACHE_TIME, enabled: !!(series?.series_id && episodeId && episodeMetadata) },
   );
 
   return {

diff --git a/src/pages/ScreenRouting/mediaScreens/MediaSeries/MediaSeries.tsx b/src/pages/ScreenRouting/mediaScreens/MediaSeries/MediaSeries.tsx
@@ -91,7 +91,7 @@ const MediaSeries: ScreenComponent<PlaylistItem> = ({ data: seriesMedia }) => {
     [seriesMedia, series, episodes],
   );
   const episodesInSeason = getEpisodesInSeason(episodeMetadata, series);
-  const { data: nextItem } = useNextEpisode({ series, episodeMetadata, episodeId });
+  const { data: nextItem } = useNextEpisode({ series, episodeMetadata, episodeId: episode?.mediaid || firstEpisode?.mediaid });
 
   // Watch history
   const watchHistoryArray = useWatchHistoryStore((state) => state.watchHistory);
@@ -122,6 +122,12 @@ const MediaSeries: ScreenComponent<PlaylistItem> = ({ data: seriesMedia }) => {
     setSearchParams({ ...searchParams, e: (nextItem || episode)?.mediaid, r: feedId || '', play: nextItem ? '1' : '0' });
   }, [setSearchParams, nextItem, episode, feedId, searchParams]);
 
+  const handleInlinePlay = useCallback(async () => {
+    if (!episode) {
+      setSearchParams({ ...searchParams, e: firstEpisode?.mediaid, r: feedId || '', play: '1' });
+    }
+  }, [setSearchParams, firstEpisode, feedId, episode, searchParams]);
+
   // Effects
   useEffect(() => {
     (document.scrollingElement || document.body).scroll({ top: 0 });
@@ -262,6 +268,7 @@ const MediaSeries: ScreenComponent<PlaylistItem> = ({ data: seriesMedia }) => {
               item={episode || firstEpisode}
               onComplete={handleComplete}
               feedId={feedId ?? undefined}
+              onPlay={handleInlinePlay}
               startWatchingButton={startWatchingButton}
               paywall={isLocked(accessModel, isLoggedIn, hasSubscription, episode || firstEpisode)}
               autostart={play || undefined}