@applicaster/zapp-react-native-ui-components 15.1.0-rc.1 → 15.1.0-rc.11

package/Components/CellRendererResolver/index.ts

@@ -83,7 +83,7 @@ export function CellRendererResolver({
 
   if (!cellRendererPlugin && !isGroup(component)) {
     logger.warning({
-      message: "Could not resolve cell builder plugin",
+      message: `Could not resolve cell builder plugin: ${component?.component_type}`,
       data: { component },
     });
   }

package/Components/ComponentResolver/__tests__/componentResolver.test.js

@@ -107,7 +107,7 @@ describe("ComponentResolverComponent", () => {
     expect(mockLogger.warning).toHaveBeenNthCalledWith(
       1,
       expect.objectContaining({
-        message: "Could not resolve cell builder plugin",
+        message: "Could not resolve cell builder plugin: foo",
       })
     );
 

package/Components/Layout/TV/ScreenContainer.tsx

@@ -133,6 +133,11 @@ export const ScreenContainer = React.memo(function ScreenContainer({
     []
   );
 
+  // We need to render menu first and then proceed with screen content,
+  // otherwise screen will stay black until everything is loaded and screen
+  // rendering put huge load the CPU pushing rendering even further.
+  // With this approach, menu will be rendered immediately and screen content
+  // will be rendered after paint, which makes it more responsive and prevents black screen.
   const [navBarReady, setNavBarReady] = React.useState(false);
 
   const navBarContainer = (

package/Components/PlayerContainer/PlayerContainer.tsx

@@ -262,9 +262,14 @@ const PlayerContainerComponent = (props: Props) => {
 
     showNavBar(true);
     navigator.goBack();
-  }, [isModal, navigator.goBack, state.playerId, showNavBar]);
+  }, [isModal, state.playerId, showNavBar, navigator]);
 
-  const playEntry = (entry) => navigator.replaceTop(entry, { mode });
+  const pluginConfiguration = React.useMemo(
+    () => player?.getPluginConfiguration(),
+    [player]
+  );
+
+  const playEntry = (entry: ZappEntry) => navigator.replaceTop(entry, { mode });
 
   const onPlayNextPerformNextVideoPlay = React.useCallback(() => {
     if (!playNextOverlayState.entry) {
@@ -448,13 +453,6 @@ const PlayerContainerComponent = (props: Props) => {
     }
   }, []);
 
-  const pluginConfiguration = React.useMemo(() => {
-    return (
-      playerManager.getPluginConfiguration() ||
-      R.prop("__plugin_configuration", Player)
-    );
-  }, [playerManager.isRegistered()]);
-
   const disableMiniPlayer = React.useMemo(() => {
     return pluginConfiguration?.disable_mini_player_when_inline;
   }, [pluginConfiguration]);

package/Components/Screen/TV/hooks/__tests__/useAfterPaint.test.ts

@@ -0,0 +1,60 @@
+import { renderHook, act } from "@testing-library/react-native";
+
+import { useAfterPaint } from "../useAfterPaint";
+
+describe("useAfterPaint", () => {
+  let frameCallbacks: FrameRequestCallback[];
+  let originalRaf: typeof requestAnimationFrame;
+  let originalCancelRaf: typeof cancelAnimationFrame;
+
+  const flushFrame = () => {
+    const callbacks = frameCallbacks;
+    frameCallbacks = [];
+
+    act(() => {
+      callbacks.forEach((cb) => cb(0));
+    });
+  };
+
+  beforeEach(() => {
+    frameCallbacks = [];
+    originalRaf = global.requestAnimationFrame;
+    originalCancelRaf = global.cancelAnimationFrame;
+
+    global.requestAnimationFrame = jest.fn((cb: FrameRequestCallback) => {
+      frameCallbacks.push(cb);
+
+      return frameCallbacks.length;
+    }) as unknown as typeof requestAnimationFrame;
+
+    global.cancelAnimationFrame = jest.fn();
+  });
+
+  afterEach(() => {
+    global.requestAnimationFrame = originalRaf;
+    global.cancelAnimationFrame = originalCancelRaf;
+  });
+
+  it("returns false on the initial render", () => {
+    const { result } = renderHook(() => useAfterPaint());
+
+    expect(result.current).toBe(false);
+  });
+
+  it("stays false after only one animation frame (before paint completes)", () => {
+    const { result } = renderHook(() => useAfterPaint());
+
+    flushFrame();
+
+    expect(result.current).toBe(false);
+  });
+
+  it("returns true after two animation frames (a real post-paint boundary)", () => {
+    const { result } = renderHook(() => useAfterPaint());
+
+    flushFrame();
+    flushFrame();
+
+    expect(result.current).toBe(true);
+  });
+});

package/Components/Screen/TV/hooks/index.ts

@@ -1 +1,3 @@
 export { useInitialFocus } from "./useInitialFocus";
+
+export { useAfterPaint } from "./useAfterPaint";

package/Components/Screen/TV/hooks/useAfterPaint.ts

@@ -0,0 +1,23 @@
+import * as React from "react";
+
+export const useAfterPaint = (): boolean => {
+  const [painted, setPainted] = React.useState(false);
+
+  React.useEffect(() => {
+    let secondFrame: number | undefined;
+
+    const firstFrame = requestAnimationFrame(() => {
+      secondFrame = requestAnimationFrame(() => setPainted(true));
+    });
+
+    return () => {
+      cancelAnimationFrame(firstFrame);
+
+      if (secondFrame !== undefined) {
+        cancelAnimationFrame(secondFrame);
+      }
+    };
+  }, []);
+
+  return painted;
+};

package/Components/Screen/TV/index.web.tsx

@@ -20,7 +20,7 @@ import { isNilOrEmpty } from "@applicaster/zapp-react-native-utils/reactUtils/he
 
 import { NavBarContainer } from "../../Layout/TV/NavBarContainer";
 import { ScreenResolver } from "../../ScreenResolver";
-import { useInitialFocus } from "./hooks";
+import { useInitialFocus, useAfterPaint } from "./hooks";
 import { isPlayerPlugin } from "@applicaster/zapp-react-native-utils/pluginUtils";
 import { focusManager } from "@applicaster/zapp-react-native-utils/appUtils";
 import { FreezeWithCallback } from "../../FreezeWithCallback";
@@ -155,6 +155,13 @@ export const Screen = ({ route, Components }: Props) => {
 
   const isScreenActive = useIsScreenActive();
 
+  // We need to render menu first and then proceed with screen content,
+  // otherwise screen will stay black until everything is loaded and screen
+  // rendering put huge load the CPU pushing rendering even further.
+  // With this approach, menu will be rendered immediately and screen content
+  // will be rendered after paint, which makes it more responsive and prevents black screen.
+  const isContentReady = useAfterPaint();
+
   return (
     <FreezeWithCallback freeze={!isScreenActive} onRelease={onRelease}>
       <View style={[styles.container, { backgroundColor }]}>
@@ -165,12 +172,14 @@ export const Screen = ({ route, Components }: Props) => {
             navigationProps={navigationProps}
           />
         </NavBarContainer>
-        <ScreenResolver
-          screenType={screenType}
-          screenId={screenId}
-          screenData={screenData}
-          groupId={route}
-        />
+        {isContentReady ? (
+          <ScreenResolver
+            screenType={screenType}
+            screenId={screenId}
+            screenData={screenData}
+            groupId={route}
+          />
+        ) : null}
       </View>
     </FreezeWithCallback>
   );

package/Components/ScreenRevealManager/withScreenRevealManager.tsx

@@ -77,7 +77,7 @@ export const withScreenRevealManager = (Component) => {
 
     if (isFirstComponentScreenPicker(componentsToRender)) {
       // for screen-picker with have additional internal ComponentsMap, no need to add this wrapper
-      return <Component {...props} />;
+      return <Component {...props} initialNumberToLoad={1} />;
     }
 
     return (

package/Components/VideoLive/LiveImageManager.ts

@@ -48,7 +48,6 @@ type Position = {
 type PlayerFactoryConfig = {
   player: any; // React ref for native view
   playerId: string;
-  muted: boolean;
   playerPluginId: string;
   screenConfig: Record<string, any>;
   entry: ZappEntry; // original entry, used as fallback if no hooks
@@ -296,7 +295,7 @@ export class LiveImageManager implements PlayerLifecycleListener {
 
     setUserCellPlayerMutedPreference(true);
 
-    this.items.forEach((liveImage) => liveImage.player?.mute());
+    this.items.forEach((liveImage) => liveImage.mute());
   };
 
   public unmuteAll = () => {
@@ -304,7 +303,7 @@ export class LiveImageManager implements PlayerLifecycleListener {
 
     setUserCellPlayerMutedPreference(false);
 
-    this.items.forEach((liveImage) => liveImage.player?.unmute());
+    this.items.forEach((liveImage) => liveImage.unmute());
   };
 
   public onViewPositionChanged = (item: LiveImage) => {
@@ -574,6 +573,20 @@ export class LiveImage implements QuickBrickPlayer.SharedPlayerCallBacks {
     left: 0,
   };
 
+  // Keeps muted state in sync: updates the initial value for deferred
+  // player creation and forwards to the player if it already exists.
+  public initiallyMuted: boolean = true;
+
+  mute = () => {
+    this.initiallyMuted = true;
+    this.player?.mute();
+  };
+
+  unmute = () => {
+    this.initiallyMuted = false;
+    this.player?.unmute();
+  };
+
   positionToString() {
     if (!this.position) {
       return "position not set";
@@ -611,48 +624,7 @@ export class LiveImage implements QuickBrickPlayer.SharedPlayerCallBacks {
       return this._preparePromise;
     }
 
-    this._preparePromise = (async (): Promise<boolean> => {
-      // 1. Run hooks if configured
-      let entry = this.factoryConfig.entry;
-
-      if (this.preloadHooks?.length) {
-        const result = await executePreloadHooks({
-          preloadHooks: this.preloadHooks,
-          entry,
-        });
-
-        if (result) {
-          this.processedEntry = result;
-          entry = result;
-        } else {
-          return false;
-        }
-      }
-
-      // 2. Create the player with the correct entry
-      const factoryItem = playerFactory({
-        player: this.factoryConfig.player,
-        playerId: this.factoryConfig.playerId,
-        autoplay: false,
-        entry,
-        muted: this.factoryConfig.muted,
-        playerPluginId: this.factoryConfig.playerPluginId,
-        screenConfig: this.factoryConfig.screenConfig,
-        playerRole: PlayerRole.Cell,
-      });
-
-      if (!factoryItem) {
-        throw new Error("Player factory returned null");
-      }
-
-      this.player = factoryItem.controller;
-      this.component = factoryItem.Component;
-
-      // 3. Register callbacks — player now exists
-      this.player.addListener({ id: "live-image", listener: this });
-
-      return true;
-    })()
+    this._preparePromise = this.createPreparedPlayer()
       .then((result) => {
         this._preparePromise = null;
 
@@ -672,6 +644,45 @@ export class LiveImage implements QuickBrickPlayer.SharedPlayerCallBacks {
     return this._preparePromise;
   }
 
+  private async createPreparedPlayer(): Promise<boolean> {
+    let entry = this.factoryConfig.entry;
+
+    if (this.preloadHooks?.length) {
+      const result = await executePreloadHooks({
+        preloadHooks: this.preloadHooks,
+        entry,
+      });
+
+      if (!result) return false;
+
+      this.processedEntry = result;
+      entry = result;
+    }
+
+    const factoryItem = await playerFactory({
+      player: this.factoryConfig.player,
+      playerId: this.factoryConfig.playerId,
+      autoplay: false,
+      entry,
+      muted: this.initiallyMuted,
+      playerPluginId: this.factoryConfig.playerPluginId,
+      screenConfig: this.factoryConfig.screenConfig,
+      playerRole: PlayerRole.Cell,
+    });
+
+    if (!factoryItem) {
+      throw new Error(
+        `Player factory returned null (playerId: ${this.factoryConfig.playerId}, playerPluginId: ${this.factoryConfig.playerPluginId})`
+      );
+    }
+
+    this.player = factoryItem.controller;
+    this.component = factoryItem.Component;
+    this.player.addListener({ id: "live-image", listener: this });
+
+    return true;
+  }
+
   public getPlayer = (): Player | null => {
     return this.player;
   };

package/Components/VideoLive/PlayerLiveImageComponent.tsx

@@ -126,14 +126,16 @@ const PlayerLiveImageComponent = (props: Props) => {
       factoryConfig: {
         player: ref,
         playerId,
-        muted,
         playerPluginId: playerPluginId,
         screenConfig: screenConfig,
         entry: item,
       },
       tag: item.title?.toString(),
     });
-  }, [playerId, preloadHooks, muted, playerPluginId, screenConfig, item]);
+  }, [playerId, preloadHooks, playerPluginId, screenConfig, item]);
+
+  // Keep the muted state in sync with user preference and player state
+  liveImageItem.initiallyMuted = muted;
 
   React.useEffect(() => {
     liveImageItem.setMode = setModeDebounced;

package/Components/VideoModal/utils.ts

@@ -5,6 +5,7 @@ import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks/n
 import { useIsTablet } from "@applicaster/zapp-react-native-utils/reactHooks/device/useIsTablet";
 import { playerManager } from "@applicaster/zapp-react-native-utils/appUtils";
 import { create } from "zustand";
+import { usePlayer } from "@applicaster/zapp-react-native-utils/appUtils/playerManager/usePlayer";
 
 export const useConfiguration = () => {
   const {
@@ -17,13 +18,18 @@ export const useConfiguration = () => {
     "pluginConfigurations",
   ]);
 
+  const player = usePlayer();
+
   const targetScreenId = contentTypes?.[item?.type?.value]?.screen_id;
   const targetScreenConfiguration = rivers?.[targetScreenId];
 
   const pluginConfiguration =
     pluginConfigurations[targetScreenConfiguration?.type]?.configuration_json;
 
-  const playerPluginConfig = playerManager.getPluginConfiguration();
+  const playerPluginConfig =
+    player?.getPluginConfiguration() ??
+    playerManager.getInstanceController()?.getPluginConfiguration() ??
+    {};
 
   const config = mergeRight(playerPluginConfig, {
     ...pluginConfiguration,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-ui-components",
-  "version": "15.1.0-rc.1",
+  "version": "15.1.0-rc.11",
   "description": "Applicaster Zapp React Native ui components for the Quick Brick App",
   "main": "index.js",
   "types": "index.d.ts",
@@ -28,10 +28,10 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/applicaster-types": "15.1.0-rc.1",
-    "@applicaster/zapp-react-native-bridge": "15.1.0-rc.1",
-    "@applicaster/zapp-react-native-redux": "15.1.0-rc.1",
-    "@applicaster/zapp-react-native-utils": "15.1.0-rc.1",
+    "@applicaster/applicaster-types": "15.1.0-rc.11",
+    "@applicaster/zapp-react-native-bridge": "15.1.0-rc.11",
+    "@applicaster/zapp-react-native-redux": "15.1.0-rc.11",
+    "@applicaster/zapp-react-native-utils": "15.1.0-rc.11",
     "fast-json-stable-stringify": "^2.1.0",
     "promise": "^8.3.0",
     "url": "^0.11.0",