@applicaster/quick-brick-player 16.0.0-alpha.4004661200 → 16.0.0-alpha.4065452341

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-player",
-  "version": "16.0.0-alpha.4004661200",
+  "version": "16.0.0-alpha.4065452341",
   "description": "Quick Brick Player",
   "main": "./src/index.ts",
   "types": "index.d.ts",
@@ -37,9 +37,9 @@
   "dependencies": {
     "@applicaster/quick-brick-mobile-transport-controls": "16.0.0-rc.73",
     "@applicaster/quick-brick-tv-transport-controls": "16.0.0-rc.69",
-    "@applicaster/zapp-react-native-tvos-app": "16.0.0-alpha.4004661200",
-    "@applicaster/zapp-react-native-ui-components": "16.0.0-alpha.4004661200",
-    "@applicaster/zapp-react-native-utils": "16.0.0-alpha.4004661200",
+    "@applicaster/zapp-react-native-tvos-app": "16.0.0-alpha.4065452341",
+    "@applicaster/zapp-react-native-ui-components": "16.0.0-alpha.4065452341",
+    "@applicaster/zapp-react-native-utils": "16.0.0-alpha.4065452341",
     "query-string": "7.1.3",
     "shaka-player": "4.3.5",
     "typeface-montserrat": "^0.0.54",

package/src/Player/AudioLayer/AudioPlayerWrapper.tsx

@@ -23,7 +23,6 @@ import {
   PLAYER_ACTION_IDENTIFIERS,
   registerPlayerActions,
 } from "./playerActions";
-import { usePlayerStateForEntry } from "./usePlayerStateForEntry";
 
 const { log_debug } = createLogger({
   subsystem: "UIComponent",
@@ -240,10 +239,6 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
     player?.seekTo(0);
   }, [player]);
 
-  // Only the layout gets the entry-scoped position: the callbacks above act on
-  // the live player and must keep reading its real state.
-  const layoutPlayerState = usePlayerStateForEntry(entry, playerState);
-
   const layoutStateMemo = React.useMemo(
     () => ({
       inline: layoutState.inline,
@@ -264,7 +259,7 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
       <View style={Styles.playerContainer} onLayout={onLayout}>
         <Layout
           entry={entry}
-          playerState={layoutPlayerState}
+          playerState={playerState}
           layoutState={layoutStateMemo}
           value={value}
           onPlaybackButtonPress={onPlaybackButtonPress}

package/src/Player/AudioLayer/__tests__/usePlaylistNavigation.test.ts

@@ -43,9 +43,6 @@ const stateAt = (
 
 const NOT_SEEKABLE = 0;
 
-/** Whatever the modal is currently presenting as; a playlist step must keep it. */
-const MODE = "MAXIMIZED";
-
 const renderPlaylistNavigation = async (
   entry: ZappEntry,
   playerState: QuickBrickPlayer.PlayerState
@@ -65,10 +62,7 @@ describe("usePlaylistNavigation", () => {
     replaceTop = jest.fn();
     seekTo = jest.fn();
 
-    useNavigationMock.mockReturnValue({
-      replaceTop,
-      videoModalState: { mode: MODE },
-    });
+    useNavigationMock.mockReturnValue({ replaceTop });
 
     usePlayerMock.mockReturnValue({ seekTo });
 
@@ -131,29 +125,7 @@ describe("usePlaylistNavigation", () => {
       await act(async () => result.current.goNext());
 
       expect(loadFeedEntryMock).toHaveBeenCalledWith(NEXT_URL, entry);
-      expect(replaceTop).toHaveBeenCalledWith(target, { mode: MODE });
-    });
-
-    it("keeps the modal's presentation mode instead of resetting it", async () => {
-      // `replaceTop` lands on OPEN_VIDEO_MODAL, which forces MAXIMIZED unless a
-      // mode is supplied - a track change must not re-present the player.
-      useNavigationMock.mockReturnValue({
-        replaceTop,
-        videoModalState: { mode: "MINIMIZED" },
-      });
-
-      loadFeedEntryMock.mockResolvedValue({ id: "next" } as ZappEntry);
-
-      const { result } = await renderPlaylistNavigation(
-        entryWith({ play_next_feed_url: NEXT_URL }),
-        stateAt(0)
-      );
-
-      await act(async () => result.current.goNext());
-
-      expect(replaceTop).toHaveBeenCalledWith(expect.anything(), {
-        mode: "MINIMIZED",
-      });
+      expect(replaceTop).toHaveBeenCalledWith(target);
     });
 
     it("does nothing when there is no next url", async () => {
@@ -207,7 +179,7 @@ describe("usePlaylistNavigation", () => {
       await act(async () => result.current.goPrevious());
 
       expect(seekTo).not.toHaveBeenCalled();
-      expect(replaceTop).toHaveBeenCalledWith(target, { mode: MODE });
+      expect(replaceTop).toHaveBeenCalledWith(target);
     });
 
     it("restarts the track when there is no previous entry to move to", async () => {
@@ -278,7 +250,7 @@ describe("usePlaylistNavigation", () => {
       await act(async () => result.current.goPrevious());
 
       expect(seekTo).not.toHaveBeenCalled();
-      expect(replaceTop).toHaveBeenCalledWith(target, { mode: MODE });
+      expect(replaceTop).toHaveBeenCalledWith(target);
     });
 
     it("restarts past the threshold when the stream is seekable", async () => {

package/src/Player/AudioLayer/usePlaylistNavigation.ts

@@ -36,11 +36,6 @@ export const usePlaylistNavigation = (
   // seeking would miss the receiver while casting.
   const player = usePlayer();
 
-  // `replaceTop` reaches the video modal through OPEN_VIDEO_MODAL, which resets
-  // the presentation mode unless one is passed. Stepping through a playlist
-  // changes what is playing, never how the player is presented.
-  const mode = navigator.videoModalState?.mode;
-
   const [nextUrl, setNextUrl] = React.useState<string | null>(null);
 
   React.useEffect(() => {
@@ -93,7 +88,7 @@ export const usePlaylistNavigation = (
           targetId: target.id,
         });
 
-        navigator.replaceTop(target, { mode });
+        navigator.replaceTop(target);
       } catch (error) {
         log_error("navigateTo: could not play the neighbouring entry", {
           error,
@@ -104,7 +99,7 @@ export const usePlaylistNavigation = (
         isNavigatingRef.current = false;
       }
     },
-    [entry, navigator, mode]
+    [entry, navigator]
   );
 
   const goNext = React.useCallback(async () => {

package/src/Player/AudioLayer/__tests__/usePlayerStateForEntry.test.ts

@@ -1,111 +0,0 @@
-import { renderHook, act } from "@testing-library/react-native";
-import { usePlayer } from "@applicaster/zapp-react-native-utils/appUtils/playerManager/usePlayer";
-
-import { usePlayerStateForEntry } from "../usePlayerStateForEntry";
-
-jest.mock(
-  "@applicaster/zapp-react-native-utils/appUtils/playerManager/usePlayer",
-  () => ({ usePlayer: jest.fn() })
-);
-
-const usePlayerMock = usePlayer as jest.Mock;
-
-const entryWith = (id: string) => ({ id }) as ZappEntry;
-
-const stateAt = (currentTime: number) =>
-  ({
-    currentTime,
-    duration: 600,
-    seekableDuration: 600,
-    isPaused: false,
-  }) as QuickBrickPlayer.PlayerState;
-
-describe("usePlayerStateForEntry", () => {
-  /** Fires the player's `onVideoLoad`, the way a loaded source would. */
-  let load: () => void;
-  let removeListener: jest.Mock;
-
-  beforeEach(() => {
-    removeListener = jest.fn();
-
-    usePlayerMock.mockReturnValue({
-      addListener: ({ listener }) => {
-        load = () => act(() => listener.onVideoLoad());
-
-        return removeListener;
-      },
-    });
-  });
-
-  it("reports the start of the track until the source has loaded", () => {
-    const { result } = renderHook(() =>
-      usePlayerStateForEntry(entryWith("track-1"), stateAt(42))
-    );
-
-    expect(result.current.currentTime).toBe(0);
-    expect(result.current.duration).toBe(0);
-    expect(result.current.seekableDuration).toBe(0);
-  });
-
-  it("passes the player's position through once the entry has loaded", () => {
-    const { result } = renderHook(() =>
-      usePlayerStateForEntry(entryWith("track-1"), stateAt(42))
-    );
-
-    load();
-
-    expect(result.current.currentTime).toBe(42);
-    expect(result.current.duration).toBe(600);
-  });
-
-  it("resets to the start when the entry changes, before the new source loads", () => {
-    // The player object survives the entry change, so it is still reporting the
-    // outgoing track's position here. Showing it would leave the progress bar
-    // parked at the previous track's elapsed time.
-    const { result, rerender } = renderHook(
-      ({ entry }) => usePlayerStateForEntry(entry, stateAt(42)),
-      { initialProps: { entry: entryWith("track-1") } }
-    );
-
-    load();
-
-    rerender({ entry: entryWith("track-2") });
-
-    expect(result.current.currentTime).toBe(0);
-  });
-
-  it("follows the player again once the new source loads", () => {
-    const { result, rerender } = renderHook(
-      ({ entry, state }) => usePlayerStateForEntry(entry, state),
-      {
-        initialProps: { entry: entryWith("track-1"), state: stateAt(42) },
-      }
-    );
-
-    load();
-    rerender({ entry: entryWith("track-2"), state: stateAt(3) });
-    load();
-
-    expect(result.current.currentTime).toBe(3);
-  });
-
-  it("leaves everything except the position untouched", () => {
-    const { result } = renderHook(() =>
-      usePlayerStateForEntry(entryWith("track-1"), stateAt(42))
-    );
-
-    // The transport still needs to know it is playing while the bar reads zero,
-    // which is what keeps the controls visible rather than reloading.
-    expect(result.current.isPaused).toBe(false);
-  });
-
-  it("drops its subscription on unmount", () => {
-    const { unmount } = renderHook(() =>
-      usePlayerStateForEntry(entryWith("track-1"), stateAt(42))
-    );
-
-    unmount();
-
-    expect(removeListener).toHaveBeenCalled();
-  });
-});

package/src/Player/AudioLayer/usePlayerStateForEntry.ts

@@ -1,63 +0,0 @@
-import * as React from "react";
-
-import { usePlayer } from "@applicaster/zapp-react-native-utils/appUtils/playerManager/usePlayer";
-
-/** What the transport reads before the player has loaded anything. */
-const AT_START = {
-  currentTime: 0,
-  duration: 0,
-  seekableDuration: 0,
-};
-
-/**
- * Scopes the player's reported position to the entry currently on screen.
- *
- * The player object outlives an item change - that is what keeps the player
- * shell mounted across a playlist step - so between the source swap and the
- * new track's `onVideoLoad` it still reports the outgoing track's position.
- * Rendering that would leave the progress bar sitting at the previous track's
- * elapsed time. Reporting zero instead resets the bar for the new item without
- * ever unmounting it.
- */
-export const usePlayerStateForEntry = (
-  entry: ZappEntry,
-  playerState: QuickBrickPlayer.PlayerState
-): QuickBrickPlayer.PlayerState => {
-  const player = usePlayer();
-  const entryId = entry?.id;
-
-  // `addListener` keys on the id and refuses a duplicate, so a shared constant
-  // would leave a second player silently never hearing that its source loaded.
-  const listenerId = `audio-player-loaded-entry-${React.useId()}`;
-
-  const [loadedEntryId, setLoadedEntryId] =
-    React.useState<Nullable<ZappEntry["id"]>>(null);
-
-  // Read through a ref so the subscription can span entry changes: re-binding
-  // the listener on every change would race the load event it is waiting for.
-  const entryIdRef = React.useRef(entryId);
-
-  entryIdRef.current = entryId;
-
-  React.useEffect(() => {
-    if (!player) {
-      return;
-    }
-
-    const unsubscribe = player.addListener({
-      id: listenerId,
-      listener: {
-        onVideoLoad: () => setLoadedEntryId(entryIdRef.current),
-      },
-    });
-
-    return () => unsubscribe?.();
-  }, [player, listenerId]);
-
-  const isLoaded = loadedEntryId === entryId;
-
-  return React.useMemo(
-    () => (isLoaded ? playerState : { ...playerState, ...AT_START }),
-    [isLoaded, playerState]
-  );
-};