@applicaster/zapp-react-native-utils 12.0.0-alpha.5035843303 → 12.0.0-alpha.5053228432

package/reactHooks/screen/index.ts

@@ -2,6 +2,8 @@ export { useCurrentScreenData } from "./useCurrentScreenData";
 
 export { useTargetScreenData } from "./useTargetScreenData";
 
+export { useScreenData } from "./useScreenData";
+
 export {
   useScreenContext,
   useLegacyScreenData,

package/reactHooks/screen/useScreenData.ts

@@ -4,7 +4,7 @@ import { useRivers } from "../state";
 
 const logger = utilsLogger.addSubsystem("useScreenData");
 
-export const useScreenData = (screenId?: string): ZappRiver => {
+export const useScreenData = (screenId: string): ZappRiver => {
   const rivers = useRivers();
 
   React.useEffect(() => {

package/reactHooks/screen/useTargetScreenData.ts

@@ -1,6 +1,7 @@
 import React from "react";
 import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
 import * as R from "ramda";
+import { appStore } from "@applicaster/zapp-react-native-redux/AppStore";
 
 export function getTargetScreenData(
   entry: ZappEntry,
@@ -35,6 +36,12 @@ export function getTargetScreenData(
   return rivers?.[screenId];
 }
 
+export function getTargetScreenDataFromEntry(entry: ZappEntry): ZappRiver {
+  const { rivers, contentTypes } = appStore.get(["rivers", "contentTypes"]);
+
+  return getTargetScreenData(entry, rivers, contentTypes);
+}
+
 export const useTargetScreenData = (entry: ZappEntry) => {
   const { rivers, contentTypes } = usePickFromState(["rivers", "contentTypes"]);
 

package/reactHooks/state/useRivers.ts

@@ -1,7 +1,9 @@
 import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
 
+const riversSelector = ["rivers"];
+
 export const useRivers = () => {
-  const { rivers } = usePickFromState(["rivers"]);
+  const { rivers } = usePickFromState(riversSelector as any);
 
   return rivers;
 };

package/reactHooks/useListenEventBusEvent.ts

@@ -1,6 +1,5 @@
 import React from "react";
 import { DeviceEventEmitter, NativeModules, Platform } from "react-native";
-import { PushTopicManager } from "@applicaster/zapp-react-native-bridge/PushNotifications/PushTopicManager";
 
 const { ReactNativeEventBusBridge } = NativeModules;
 
@@ -11,26 +10,21 @@ export const useListenEventBusEvent = (
   handler: (event) => void
 ) => {
   React.useEffect(() => {
-    let sub;
-
     // TODO: remove after implementing ReactNativeEventBusBridge on iOS
     if (Platform.OS === "android") {
       // subscribe to DeviceEventEmitter using subsciption ID
-      sub = DeviceEventEmitter.addListener(
+      const sub = DeviceEventEmitter.addListener(
         subscriptionID,
         handler
       );
 
       // ask native to start routing these events to RN
       ReactNativeEventBusBridge.subscribe(subscriptionID, { [source]: events });
-    }
 
-    // getting tags right after subscription
-    PushTopicManager.getInstance().prepareTags();
-
-    return () => {
-      ReactNativeEventBusBridge?.unsubscribe?.(subscriptionID); // ask EventBus to stop routing these events to RN
-      sub?.remove?.(); // stop listening to DeviceEventEmitter
-    };
+      return () => {
+        ReactNativeEventBusBridge.unsubscribe(subscriptionID); // ask EventBus to stop routing these events to RN
+        sub.remove(); // stop listening to DeviceEventEmitter
+      };
+    }
   }, []);
 };

package/reactHooks/videoModal/hooks/useVideoModalScreenData.tsx

@@ -1,8 +1,7 @@
-import {
-  useContentTypes,
-  usePickFromState,
-} from "@applicaster/zapp-react-native-redux/hooks";
+import React from "react";
+import { useContentTypes } from "@applicaster/zapp-react-native-redux/hooks";
 import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks";
+import { useRivers } from "../../state";
 
 export const useVideoModalScreenData = ():
   | (ZappEntry & { targetScreen: any }) // TODO: fix ZappEntry type ( was ZappRiver but conflict )
@@ -12,11 +11,13 @@ export const useVideoModalScreenData = ():
   } = useNavigation();
 
   const contentTypes = useContentTypes();
-  const { rivers } = usePickFromState(["rivers"]);
+  const rivers = useRivers();
 
-  if (item?.type?.value) {
-    const screenId = contentTypes[item?.type?.value].screen_id;
+  return React.useMemo(() => {
+    if (item?.type?.value) {
+      const screenId = contentTypes[item?.type?.value].screen_id;
 
-    return { ...item, targetScreen: rivers?.[screenId] };
-  }
+      return { ...item, targetScreen: rivers?.[screenId] };
+    }
+  }, [item]);
 };

package/riverComponetsMeasurementProvider/index.tsx

@@ -3,7 +3,7 @@ import { NativeModules, StyleSheet, View } from "react-native";
 import { getXray } from "@applicaster/zapp-react-native-utils/logger";
 
 import { isApplePlatform, isWeb } from "../reactUtils";
-import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
+import { useRivers } from "../reactHooks/state";
 
 const layoutReducer = (state, { payload }) => {
   return state.map((item, index, _state) => ({
@@ -58,7 +58,7 @@ export const ScreenLoadingMeasurements = ({
   numberOfComponents,
   riverId,
 }: Props) => {
-  const { rivers } = usePickFromState(["rivers"]);
+  const rivers = useRivers();
   const screenData = rivers?.[riverId];
 
   const [itemsLayout, dispatchItemLayout] = React.useReducer(

package/screenState/index.ts

@@ -49,3 +49,11 @@ export function useScreenState(
     setSelectedEntry: (entryId) => setSelectedEntry(screenId, entryId),
   };
 }
+
+export const useScreenScrollStore = create<{
+  scrollPosition: number;
+  scrollingVelocity: number;
+}>(() => ({
+  scrollPosition: 0,
+  scrollingVelocity: 0,
+}));

package/zappFrameworkUtils/loginPluginUtils.ts

@@ -2,7 +2,7 @@ import * as R from "ramda";
 import { createLogger } from "../logger";
 import { requiresAuthentication } from "../configurationUtils";
 import { PresentHookPluginOneTime } from "./presentPluginOneTime";
-import { skipHook } from "./hooksPresentation";
+import { isPlayerHook, skipHook } from "./hooksPresentation";
 type LoginPluginUtils = {
   pluginId: string;
 };
@@ -36,10 +36,20 @@ const isAuthenticationRequired = ({ payload, logs }) => {
     return requires_authentication;
   }
 
+  const isPlayer = isPlayerHook(payload);
+
+  if (isPlayer) {
+    log_info(
+      "isAuthenticationRequired: Payload is player screen, authentication not required"
+    );
+
+    return;
+  }
+
   const _isPayloadScreen = isPayloadScreen({ payload });
 
   log_info(
-    `isAuthenticationRequired: Payload is screen, authentefication required: ${_isPayloadScreen}`
+    `isAuthenticationRequired: Payload is screen, authentication required: ${_isPayloadScreen}`
   );
 
   return _isPayloadScreen;

package/reactHooks/device/useIsTablet.android.tsx

@@ -1,14 +0,0 @@
-import { useWindowDimensions } from "react-native";
-import { useOrientation } from "./useOrientation";
-import { isTablet } from "../layout";
-
-/**
- * Determines weather the given device is a tablet based on dimensions, orientation, and platform
- * @returns {Boolean} isTablet - returns whether the given device is a tablet
- */
-export const useIsTablet = (): boolean => {
-  const dimensions = useWindowDimensions();
-  const orientation = useOrientation();
-
-  return isTablet(dimensions, orientation);
-};

package/reactHooks/device/useIsTablet.ios.tsx

@@ -1,7 +0,0 @@
-import { Platform, PlatformIOSStatic } from "react-native";
-
-export const useIsTablet = (): boolean => {
-  const { isPad } = Platform as PlatformIOSStatic;
-
-  return isPad;
-};

package/reactHooks/device/useIsTablet.web.tsx

@@ -1,3 +0,0 @@
-export const useIsTablet = (): boolean => {
-  return false;
-};