@applicaster/zapp-react-native-utils 13.0.0-rc.2 → 13.0.0-rc.4

package/appUtils/playerManager/playerFactory.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-utils",
-  "version": "13.0.0-rc.2",
+  "version": "13.0.0-rc.4",
   "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-rc.2",
+    "@applicaster/applicaster-types": "13.0.0-rc.4",
     "buffer": "^5.2.1",
     "camelize": "^1.0.0",
     "create-react-context": "^0.2.3",

package/reactHooks/feed/useFeedLoader.tsx

@@ -1,12 +1,11 @@
 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 } from "../utils";
+import { useIsInitialRender, shouldUseCachedData } from "../utils";
 import { useInflatedUrl } from "./useInflatedUrl";
 import { useRoute } from "../navigation";
 
@@ -56,8 +55,6 @@ export const useFeedLoader = ({
 
   const currentFeed = useZappPipesFeed(callableFeedUrl);
 
-  const cachedFeed = React.useMemo(() => path(["data"])(currentFeed), []);
-
   const riverId = screenData?.id;
 
   const reloadData = React.useCallback<ReloadDataFunction>(
@@ -94,7 +91,9 @@ export const useFeedLoader = ({
 
   // If feed doesn't exist, load it
   useEffect(() => {
-    if (!cachedFeed || pipesOptions.clearCache) {
+    if (
+      shouldUseCachedData(callableFeedUrl, currentFeed, pipesOptions.clearCache)
+    ) {
       if (callableFeedUrl) {
         dispatch(loadPipesData(callableFeedUrl, { ...pipesOptions, riverId }));
       } else {

package/reactHooks/utils/index.ts

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