@applicaster/zapp-react-native-utils 13.0.0-alpha.2330880002 → 13.0.0-alpha.4585770583

package/appUtils/playerManager/index.ts

@@ -169,12 +169,8 @@ export class PlayerManager {
     this.addPlayer(id, playerController);
 
     if (playerController.playerRole === PlayerRole.Primary) {
-      if (RNPlayerManager) {
-        Object.keys(RNPlayerManager).forEach((pluginId) => {
-          if (pluginId !== playerController.playerPluginId) {
-            RNPlayerManager[pluginId].stopBackgroundPlayback?.();
-          }
-        });
+      if (playerController.playerPluginId !== "QuickBrickPlayerPlugin") {
+        RNPlayerManager?.["QuickBrickPlayerPlugin"]?.stopBackgroundPlayback?.();
       }
 
       playerController.addListener({

package/appUtils/playerManager/playerFactory.ts

@@ -40,14 +40,13 @@ export const playerFactory = (
 
   const playerPlugin = findPluginByIdentifier(IDENTIFIER, plugins);
 
-  if (!playerPlugin?.module?.playerProtocol) {
+  if (!playerPlugin) {
     return null;
   }
 
-  const playerProtocol: PlayerConstructor = playerPlugin.module.playerProtocol(
-    config?.screenConfig,
-    config?.entry
-  );
+  // TODO: Fix type:
+  const playerProtocol: PlayerConstructor =
+    playerPlugin?.module?.playerProtocol(config?.screenConfig);
 
   const playerView = (playerProtocol as any)?.Component || null;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-utils",
-  "version": "13.0.0-alpha.2330880002",
+  "version": "13.0.0-alpha.4585770583",
   "description": "Applicaster Zapp React Native utilities package",
   "main": "index.js",
   "types": "index.d.ts",
@@ -28,7 +28,7 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/applicaster-types": "13.0.0-alpha.2330880002",
+    "@applicaster/applicaster-types": "13.0.0-alpha.4585770583",
     "buffer": "^5.2.1",
     "camelize": "^1.0.0",
     "create-react-context": "^0.2.3",

package/reactHooks/feed/__tests__/useFeedLoader.test.tsx

@@ -135,11 +135,7 @@ describe("useFeedLoader", () => {
       );
 
       expect(result.current.data).toBeNull();
-
-      expect(loadPipesDataSpy).toBeCalledWith(feedUrl, {
-        clearCache: true,
-        riverId: undefined,
-      });
+      expect(loadPipesDataSpy).toBeCalledWith(feedUrl, {});
 
       const store2 = mockStore({
         plugins: [],
@@ -176,11 +172,7 @@ describe("useFeedLoader", () => {
       );
 
       expect(result.current.data).toBeNull();
-
-      expect(loadPipesDataSpy).toBeCalledWith(feedUrl, {
-        clearCache: true,
-        riverId: undefined,
-      });
+      expect(loadPipesDataSpy).toBeCalledWith(feedUrl, {});
 
       const store2 = mockStore({
         plugins: [],

package/reactHooks/feed/useFeedLoader.tsx

@@ -1,11 +1,12 @@
 import React, { useEffect } from "react";
+import { path } from "ramda";
 import { useDispatch } from "react-redux";
 
 import { loadPipesData } from "@applicaster/zapp-react-native-redux/ZappPipes";
 import { useZappPipesFeed } from "@applicaster/zapp-react-native-redux/hooks";
 
 import { reactHooksLogger } from "../logger";
-import { useIsInitialRender, shouldDispatchData } from "../utils";
+import { useIsInitialRender } from "../utils";
 import { useInflatedUrl } from "./useInflatedUrl";
 import { useRoute } from "../navigation";
 
@@ -55,6 +56,8 @@ export const useFeedLoader = ({
 
   const currentFeed = useZappPipesFeed(callableFeedUrl);
 
+  const cachedFeed = React.useMemo(() => path(["data"])(currentFeed), []);
+
   const riverId = screenData?.id;
 
   const reloadData = React.useCallback<ReloadDataFunction>(
@@ -89,18 +92,11 @@ export const useFeedLoader = ({
     }
   }, [callableFeedUrl, currentFeed?.data]);
 
+  // If feed doesn't exist, load it
   useEffect(() => {
-    if (
-      shouldDispatchData(callableFeedUrl, currentFeed, pipesOptions.clearCache)
-    ) {
+    if (!cachedFeed || pipesOptions.clearCache) {
       if (callableFeedUrl) {
-        dispatch(
-          loadPipesData(callableFeedUrl, {
-            ...pipesOptions,
-            clearCache: true,
-            riverId,
-          })
-        );
+        dispatch(loadPipesData(callableFeedUrl, { ...pipesOptions, riverId }));
       } else {
         logger.info({
           message:

package/reactHooks/utils/index.ts

@@ -30,16 +30,3 @@ export const useIsInitialRender = (): boolean => {
 
   return isInitialRenderRef.current;
 };
-
-export const checkIsLocalFeed = (feedUrl) => feedUrl?.startsWith("pipesv2://");
-
-export const shouldDispatchData = (
-  url: string,
-  feed: ZappPipesData | null,
-  clearCache: boolean
-) => {
-  const currentFeedHasData = feed?.data;
-  const isLocalFeed = checkIsLocalFeed(url);
-
-  return !currentFeedHasData || clearCache || isLocalFeed;
-};