@applicaster/zapp-react-native-utils 12.0.0-rc.2 → 12.0.0-rc.20

package/appUtils/orientationHelper.ts

@@ -2,6 +2,7 @@
 import * as ReactNative from "react-native";
 import { isTV, platformSelect } from "../reactUtils";
 import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
+import { useIsTablet } from "@applicaster/zapp-react-native-utils/reactHooks";
 
 import {
   QUICK_BRICK_EVENTS,
@@ -9,7 +10,6 @@ import {
   sendQuickBrickEvent,
 } from "@applicaster/zapp-react-native-bridge/QuickBrick";
 import { utilsLogger } from "../logger";
-import { useIsTablet } from "../reactHooks/device/useIsTablet";
 
 const { DeviceEventEmitter, NativeModules, NativeEventEmitter } = ReactNative;
 

package/cellUtils/index.ts

@@ -343,6 +343,19 @@ export const ifElseFocused = R.curry(
     state === "focused" ? focusedValue : defaultValue
 );
 
+export const ifElseSelected = R.curry(
+  (state: string, selectedValue, defaultValue) => {
+    switch (state) {
+      case "selected":
+        return selectedValue;
+      case "focused_selected":
+        return selectedValue;
+      default:
+        return defaultValue;
+    }
+  }
+);
+
 /**
  * Map textAlign values to their corresponding alignSelf values
  * This is so that we could use the same field for both properties

package/package.json

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

package/pluginUtils/index.ts

@@ -68,11 +68,13 @@ export function findComponentByType({
  * Returns the plugin for a given identifier, if found
  * @param identifier of the plugin to look for
  * @param plugins map of the available plugins
+ * @param doNotWarn if set to true, will not log a warning if plugin is not found
  * @return whole plugin if found, undefined otherwise
  */
 export function findPluginByIdentifier(
   identifier: string,
-  plugins: (QuickBrickPlugin | ZappPlugin | Plugin)[]
+  plugins: (QuickBrickPlugin | ZappPlugin | Plugin)[],
+  doNotWarn: boolean = false
 ): (QuickBrickPlugin | ZappPlugin | Plugin) | undefined {
   if (!identifier) {
     return undefined;
@@ -84,10 +86,12 @@ export function findPluginByIdentifier(
   )(plugins);
 
   if (!plugin && identifier !== "river" && identifier !== "hooks") {
-    pluginUtilsLogger.warning({
-      message: `Could not find plugin for identifier ${identifier}`,
-      data: { identifier },
-    });
+    if (!doNotWarn) {
+      pluginUtilsLogger.warning({
+        message: `Could not find plugin for identifier ${identifier}`,
+        data: { identifier },
+      });
+    }
   }
 
   return plugin;

package/reactHooks/device/index.ts

@@ -1,6 +1,5 @@
 export { useOrientation } from "./useOrientation";
 
-// @ts-ignore
 export { useIsTablet } from "./useIsTablet";
 
 export { useMemoizedIsTablet } from "./useMemoizedIsTablet";

package/reactHooks/device/useIsTablet.tsx

@@ -1,3 +1,28 @@
-// Template function for TS to correctly compile.
-// The RN app will use files with platform suffixes
-export const useIsTablet = (): boolean => false;
+/* eslint react-native/split-platform-components: off */
+
+import { Platform, PlatformIOSStatic, NativeModules } from "react-native";
+import { platformSelect } from "@applicaster/zapp-react-native-utils/reactUtils";
+import { F as alwaysFalse } from "ramda";
+import { toBooleanWithDefaultFalse } from "@applicaster/zapp-react-native-utils/booleanUtils";
+
+const useIsTabletIos = (): boolean => {
+  const { isPad } = Platform as PlatformIOSStatic;
+
+  return isPad;
+};
+
+const useIsTabletAndroid = (): boolean => {
+  const { initialProps } = NativeModules.QuickBrickCommunicationModule;
+
+  return toBooleanWithDefaultFalse(initialProps?.is_tablet);
+};
+
+export const useIsTablet = platformSelect({
+  ios: useIsTabletIos,
+  android: useIsTabletAndroid,
+  lg_tv: alwaysFalse,
+  samsung_tv: alwaysFalse,
+  android_tv: alwaysFalse,
+  tvos: alwaysFalse,
+  default: alwaysFalse,
+});

package/reactHooks/device/useMemoizedIsTablet.ts

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
-import { useIsTablet } from "./index";
+import { useIsTablet } from "./useIsTablet";
 
 export const useMemoizedIsTablet = () => {
   const isTablet = useIsTablet();

package/reactHooks/device/useOrientation.tsx

@@ -1,6 +1,8 @@
 import { useWindowDimensions } from "react-native";
 
-export const useOrientation = (): string => {
+type Return = "landscape" | "portrait";
+
+export const useOrientation = (): Return => {
   const { width, height } = useWindowDimensions();
   const isLandscape = width > height;
 

package/reactHooks/layout/index.ts

@@ -1,9 +1,10 @@
 import * as R from "ramda";
 import { StatusBar, Platform } from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 import { platformSelect, isTV } from "../../reactUtils";
 import { useIsNavBarVisible } from "../navigation";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
+
 import { isTablet } from "./isTablet";
 
 export { isTablet } from "./isTablet";

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/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;
-};