@applicaster/zapp-react-native-utils 15.0.0-rc.98 → 15.1.0-rc.1

package/focusManager/aux/index.ts

@@ -49,7 +49,7 @@ export const findSelectedMenuId = (
 ) => {
   const sectionName = QUICK_BRICK_NAVBAR_SECTIONS[sectionKey];
 
-  return pathOr<string | undefined>(
+  return pathOr(
     undefined,
     ["children", index, "id"],
     focusableTree.find(sectionName)

package/headersUtils/__tests__/headersUtils.test.js

@@ -1,15 +1,6 @@
 import { appStore } from "@applicaster/zapp-react-native-redux/AppStore";
 import { getAppDataHeaders } from "../index";
 
-const mockUILanguage = "en-US";
-
-jest.mock(
-  "@applicaster/zapp-react-native-utils/appUtils/localizationsHelper",
-  () => ({
-    getUILanguage: jest.fn(() => mockUILanguage),
-  })
-);
-
 describe("getAppDataHeaders", () => {
   const mockAppData = {
     riversConfigurationId: "test-layout",
@@ -34,7 +25,7 @@ describe("getAppDataHeaders", () => {
     const expectedHeaders = {
       "x-applicaster-layout-id": mockAppData.riversConfigurationId,
       "x-applicaster-screen-id": screenId,
-      "x-applicaster-language-code": mockUILanguage,
+      "x-applicaster-language-code": mockAppData.languageCode,
       "x-applicaster-version-number": mockAppData.version_name,
       "x-applicaster-platform": mockAppData.platform,
       "x-applicaster-country-code": mockAppData.countryCode,
@@ -42,7 +33,6 @@ describe("getAppDataHeaders", () => {
         mockAppData.signedDeviceInfoToken,
       "x-applicaster-device-make": mockAppData.deviceMake,
       "x-applicaster-device-model": mockAppData.deviceModel,
-      "x-applicaster-uuid": undefined,
     };
 
     const headers = getAppDataHeaders(screenId);

package/headersUtils/index.ts

@@ -1,7 +1,6 @@
 import { appStore } from "@applicaster/zapp-react-native-redux/AppStore";
 import { getPlatform } from "@applicaster/zapp-react-native-utils/reactUtils";
 import { utilsLogger } from "../logger";
-import { getUILanguage } from "../localizationUtils";
 
 const logger = utilsLogger.addSubsystem("headersUtils");
 
@@ -22,7 +21,7 @@ export const getAppDataHeaders = (screenId: string) => {
     "x-applicaster-layout-id":
       appData.riversConfigurationId || appData.rivers_configuration_id,
     "x-applicaster-screen-id": screenId,
-    "x-applicaster-language-code": getUILanguage(),
+    "x-applicaster-language-code": appData.languageCode,
     "x-applicaster-version-number": appData.version_name || appData.versionName,
     "x-applicaster-platform": (platform || appData.platform).toLowerCase(),
     "x-applicaster-country-code": appData.countryCode,

package/manifestUtils/defaultManifestConfigurations/player.js

@@ -123,6 +123,12 @@ function getPlayerConfiguration({ platform, version }) {
         key: "skip_button_localization_text_skip_intro",
         initial_value: "Skip Intro",
       },
+      {
+        type: "text_input",
+        label: "Stream error message",
+        key: "stream_error_message",
+        initial_value: "Cannot play stream",
+      },
       {
         type: "text_input",
         label: "Locked message",
@@ -364,20 +370,6 @@ function getPlayerConfiguration({ platform, version }) {
   };
 
   if (isTV(platform)) {
-    localizations.fields.push({
-      key: "back_to_live_label",
-      label: "Back to live label",
-      initial_value: "Back To Live",
-      type: "text_input",
-    });
-
-    localizations.fields.push({
-      key: "start_over_label",
-      label: "Start over label",
-      initial_value: "Start Over",
-      type: "text_input",
-    });
-
     styles.fields.push(
       fieldsGroup("Always Show Scrub Bar & Timestamp", "", [
         {
@@ -490,7 +482,7 @@ function getPlayerConfiguration({ platform, version }) {
       ),
       fieldsGroup(
         "Skip Button",
-        "This section allows you to configure the skip button behaviour",
+        "This section allows you to configure the skip button styles for tv",
         [
           {
             type: "switch",
@@ -507,12 +499,6 @@ function getPlayerConfiguration({ platform, version }) {
             label: "Persistent Button Toggle",
             initial_value: true,
           },
-        ]
-      ),
-      fieldsGroup(
-        "Labeled Button Style",
-        "This section allows you to configure the labeled button styles",
-        [
           {
             type: "color_picker_rgba",
             label_tooltip: "",
@@ -668,61 +654,7 @@ function getPlayerConfiguration({ platform, version }) {
     );
   }
 
-  if (isTV(platform)) {
-    general.fields.push(
-      {
-        key: "liveSeekingEnabled",
-        label: "Live Seeking Enabled",
-        initial_value: false,
-        type: "switch",
-        label_tooltip: "Enable Live Seek",
-      },
-      {
-        key: "minimumAllowedSeekableDurationInSeconds",
-        label: "Minimum allowed seekable duration in seconds",
-        initial_value: 300,
-        type: "number_input",
-        label_tooltip:
-          "If duration less than this value, player will disable 'liveSeekingEnabled' value",
-      },
-      {
-        key: "live_image",
-        label: "Live badge",
-        type: "uploader",
-        label_tooltip: "Override default live badge / icon",
-      },
-      {
-        key: "live_width",
-        label: "Live badge width",
-        type: "number_input",
-        initial_value: 85,
-      },
-      {
-        key: "live_height",
-        label: "Live badge height",
-        type: "number_input",
-        initial_value: 50,
-      }
-    );
-  }
-
   if (isMobile(platform)) {
-    localizations.fields.push(
-      {
-        type: "text_input",
-        label: "Restrict playback on mobile networks alert title",
-        key: "mobile_connection_restricted_alert_title",
-        initial_value: "Restricted Connection Type",
-      },
-      {
-        type: "text_input",
-        label: "Restrict playback on mobile networks alert message",
-        key: "mobile_connection_restricted_alert_message",
-        initial_value:
-          "This content can only be viewed over a Wi-Fi or LAN network.",
-      }
-    );
-
     general.fields.push(
       {
         section: "Default Timestamp Type",

package/manifestUtils/platformIsTV.js

@@ -0,0 +1,13 @@
+function platformIsTV(platform) {
+  return [
+    "tvos_for_quickbrick",
+    "android_tv_for_quickbrick",
+    "amazon_fire_tv_for_quickbrick",
+    "lg_tv",
+    "samsung_tv",
+    "web",
+    "vizio",
+  ].includes(platform);
+}
+
+module.exports = { platformIsTV };

package/manifestUtils/tvAction/container/index.js

@@ -38,7 +38,7 @@ function tvActionButtonsContainer({ label, description, defaults }) {
     generateFieldsFromDefaultsWithoutPrefixedLabel(
       label,
       defaults,
-      tvActionButtonContainerFields(defaults.position)
+      tvActionButtonContainerFields(defaults["position"])
     )
   );
 

package/numberUtils/__tests__/toNumber.test.ts

@@ -11,16 +11,6 @@ describe("toNumber", () => {
     });
   });
 
-  it("return number if input is BigInt", () => {
-    const inputs = [5n, -5n];
-    expect.assertions(inputs.length);
-
-    inputs.forEach((input) => {
-      const output = toNumber(input);
-      expect(output).toBe(Number(input));
-    });
-  });
-
   it("return number if input is string as number", () => {
     const inputs = ["-1", "0", "1", "100", "0.2"];
     expect.assertions(inputs.length);
@@ -42,8 +32,6 @@ describe("toNumber", () => {
       { test: 1 },
       [],
       [1],
-      "5n",
-      "-5n",
     ];
 
     expect.assertions(inputs.length);

package/numberUtils/index.ts

@@ -8,7 +8,7 @@ export const toNumber = (value: unknown): number | undefined => {
     return undefined;
   }
 
-  if (R.is(Number, value) || R.is(BigInt, value) || R.is(String, value)) {
+  if (R.is(Number, value) || R.is(String, value)) {
     const numberOrNan = Number(value);
 
     return Number.isNaN(numberOrNan) ? undefined : numberOrNan;
@@ -69,24 +69,6 @@ export const isMinusZero = (value: number) => {
   return 1 / value === -Infinity;
 };
 
-export const toPositiveNumber = (value: unknown): number | undefined => {
-  const possibleNumber = toNumber(value);
-
-  if (R.isNil(possibleNumber)) {
-    return undefined;
-  }
-
-  if (possibleNumber < 0) {
-    return undefined;
-  }
-
-  if (isZero(possibleNumber)) {
-    return undefined;
-  }
-
-  return possibleNumber;
-};
-
 export const toPositiveNumberWithDefault = (
   defaultValue: number,
   value: unknown

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-utils",
-  "version": "15.0.0-rc.98",
+  "version": "15.1.0-rc.1",
   "description": "Applicaster Zapp React Native utilities package",
   "main": "index.js",
   "types": "index.d.ts",
@@ -27,13 +27,13 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/applicaster-types": "15.0.0-rc.98",
+    "@applicaster/applicaster-types": "15.1.0-rc.1",
     "buffer": "^5.2.1",
     "camelize": "^1.0.0",
     "dayjs": "^1.11.10",
-    "handlebars": "4.7.8",
     "memoizee": "0.4.15",
-    "prop-types": "^15.0.0"
+    "prop-types": "^15.0.0",
+    "react-native-handlebars": "^5.0.0-alpha.1"
   },
   "peerDependencies": {
     "@applicaster/zapp-pipes-v2-client": "*",

package/pluginUtils/index.ts

@@ -6,7 +6,6 @@ import { deprecationMessage } from "../appUtils";
 
 import { pluginUtilsLogger } from "./logger";
 import { platformSelect } from "../reactUtils";
-import { get } from "../utils";
 
 type PluginModule = any;
 type Plugin = {
@@ -30,10 +29,7 @@ export function getComponentModule({
   components: ComponentsMap;
   plugins: Plugin[] | QuickBrickPlugin[];
 }) {
-  const component = R.compose(
-    R.prop(R.__, components),
-    toPascalCase
-  )(componentType);
+  const component = components[toPascalCase(componentType)];
 
   if (component) {
     return component;
@@ -60,7 +56,9 @@ export function findComponentByType({
     ? R.compose(...R.reverse(decorators))
     : decorators;
 
-  const component = getComponentModule({ componentType, components, plugins });
+  const module = getComponentModule({ componentType, components, plugins });
+
+  const component = module?.Component || module;
 
   return R.unless(R.isNil, applyDecorators)(component);
 }
@@ -255,6 +253,3 @@ const getPluginType = R.pathOr("unknown_plugin_type", [
 
 export const isPlayerPlugin = (routeState): boolean =>
   getPluginType(routeState) === "player";
-
-export const getPluginModuleUrlScheme = (plugin) =>
-  get(plugin, ["module", "urlScheme"]);

package/reactHooks/advertising/index.ts

@@ -3,7 +3,7 @@ import { View } from "react-native";
 import * as R from "ramda";
 
 import { useNavigation } from "../navigation";
-import { usePlugins } from "@applicaster/zapp-react-native-redux/hooks";
+import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
 import { platformSelect } from "@applicaster/zapp-react-native-utils/reactUtils";
 import { dismissModal, openModal } from "../../modalState";
 
@@ -16,7 +16,7 @@ const ModalContainer = platformSelect({
 
 export function useAdvertisingInterstitial() {
   const { screenData, currentRoute } = useNavigation();
-  const plugins = usePlugins();
+  const { plugins } = usePickFromState();
 
   return useEffect(() => {
     // TODD: typing problem: fix any type

package/reactHooks/app/__tests__/useAppState.test.ts

@@ -1,5 +1,5 @@
 import EventEmitter from "events";
-import { renderHook, act } from "@testing-library/react-native";
+import { renderHook, act } from "@testing-library/react-hooks";
 import { useAppState } from "../useAppState";
 
 const emitter = new EventEmitter();

package/reactHooks/autoscrolling/__tests__/useTrackCurrentAutoScrollingElement.test.ts

@@ -1,4 +1,4 @@
-import { renderHook } from "@testing-library/react-native";
+import { renderHook } from "@testing-library/react-hooks";
 
 jest.mock(
   "@applicaster/zapp-react-native-ui-components/Contexts/ScreenTrackedViewPositionsContext",

package/reactHooks/autoscrolling/__tests__/useTrackedView.test.tsx

@@ -1,6 +1,7 @@
 import React from "react";
 
-import { renderHook, act, waitFor } from "@testing-library/react-native";
+import { renderHook } from "@testing-library/react-hooks";
+import { act, waitFor } from "@testing-library/react-native";
 import { Provider } from "react-redux";
 import configureStore from "redux-mock-store";
 import { useTrackedView } from "../useTrackedView";

package/reactHooks/casting/index.ts

@@ -0,0 +1 @@
+export { useIsCasting } from "./useIsCasting";

package/reactHooks/casting/useIsCasting.tsx

@@ -0,0 +1,57 @@
+import React from "react";
+import { useActions } from "@applicaster/zapp-react-native-utils/reactHooks/actions";
+import { useAppState } from "@applicaster/zapp-react-native-utils/reactHooks/app";
+import { isApplePlatform } from "@applicaster/zapp-react-native-utils/reactUtils";
+
+const CHROMECAST_IDENTIFIER = "quick-brick-chromecast-action";
+
+const fakeEntry: any = {
+  title: "Chromecast use is casting fake entry",
+  id: "quick-brick-use-is-casting-fake-entry",
+};
+
+/**
+ * Returns the cast action state connection status, does not update when app is in background on Apple platforms
+ * On other platforms, it continues to check the cast action state even when the app is in background
+ */
+export const useIsCasting = () => {
+  const actionContext = useActions(CHROMECAST_IDENTIFIER);
+  const appState = useAppState();
+  const isAppInForeground = appState === "active";
+  const shouldOnlyUpdateInForeground = isApplePlatform();
+
+  const [castActionState, setCastActionState] = React.useState(
+    !actionContext ? null : actionContext.initialEntryState(fakeEntry)
+  );
+
+  React.useEffect(() => {
+    if (!shouldOnlyUpdateInForeground || isAppInForeground) {
+      if (actionContext && castActionState === null) {
+        setCastActionState(actionContext.initialEntryState(fakeEntry));
+      }
+    }
+  }, [
+    actionContext,
+    setCastActionState,
+    isAppInForeground,
+    shouldOnlyUpdateInForeground,
+  ]);
+
+  React.useEffect(() => {
+    if (typeof actionContext?.addListener === "function") {
+      return actionContext?.addListener(String(fakeEntry.id), (state) => {
+        // Only check foreground state on Apple platforms
+        if (!shouldOnlyUpdateInForeground || isAppInForeground) {
+          setCastActionState(state);
+        }
+      });
+    }
+  }, [
+    setCastActionState,
+    actionContext,
+    isAppInForeground,
+    shouldOnlyUpdateInForeground,
+  ]);
+
+  return !!castActionState?.connected;
+};

package/reactHooks/cell-click/__tests__/index.test.js

@@ -1,8 +1,10 @@
 import * as React from "react";
-import { cleanup, renderHook, waitFor } from "@testing-library/react-native";
+import { cleanup, renderHook } from "@testing-library/react-hooks";
 import { CellTapContext } from "@applicaster/zapp-react-native-ui-components/Contexts/CellTapContext";
 import { ActionExecutorContext } from "@applicaster/zapp-react-native-utils/actionsExecutor/ActionExecutorContext";
 
+import { waitFor } from "@testing-library/react-native";
+
 const mockNavigator = {
   getPathname: () => "pathnameMock",
   push: jest.fn(),

package/reactHooks/componentsMap/index.ts

@@ -0,0 +1,55 @@
+import * as React from "react";
+
+const layoutReducer = (state, { payload }) => {
+  return state.map((item, index, _state) => ({
+    height: index === payload.index ? payload.height : item.height,
+    y:
+      index > 0
+        ? _state.slice(0, index).reduce((acc, value) => acc + value.height, 0)
+        : 0,
+  }));
+};
+
+export const useComponentsLayout = (count, onFinishLoadingVisible) => {
+  const [itemsLayout, dispatchItemLayout] = React.useReducer(
+    layoutReducer,
+    Array.from({ length: count }, () => ({ height: 0, y: 0 }))
+  );
+
+  const notified = React.useRef(false);
+  const [listHeight, setListHeight] = React.useState<number>(0);
+
+  const onItemLayout = React.useCallback(
+    (index) => (event) => {
+      const { height } = event.nativeEvent.layout;
+      dispatchItemLayout({ payload: { index, height } });
+    },
+    []
+  );
+
+  const onListLayout = React.useCallback((event) => {
+    const { height } = event.nativeEvent.layout;
+    setListHeight(height);
+  }, []);
+
+  React.useEffect(() => {
+    if (!notified.current) {
+      const finishLoadingVisible = !!itemsLayout.find(
+        (item) => item.y > listHeight
+      );
+
+      if (finishLoadingVisible) {
+        notified.current = true;
+        onFinishLoadingVisible?.();
+      }
+    }
+  }, [itemsLayout, listHeight]);
+
+  return React.useMemo(
+    () => ({
+      onItemLayout,
+      onListLayout,
+    }),
+    []
+  );
+};

package/reactHooks/configuration/__tests__/index.test.tsx

@@ -1,6 +1,6 @@
 /* eslint-disable react/prop-types */
 import React from "react";
-import { renderHook, cleanup } from "@testing-library/react-native";
+import { renderHook, cleanup } from "@testing-library/react-hooks";
 import { ConfigurationContext } from "@applicaster/zapp-react-native-ui-components/Contexts/ConfigutaionContext";
 import { useConfiguration } from "@applicaster/zapp-react-native-utils/reactHooks/configuration";
 

package/reactHooks/connection/__tests__/index.test.js

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { renderHook, cleanup } from "@testing-library/react-native";
+import { renderHook, cleanup } from "@testing-library/react-hooks";
 import { NetworkStatusContext } from "@applicaster/zapp-react-native-ui-components/Contexts/NetworkStatusContext";
 
 const MockNetInfo = {

package/reactHooks/debugging/__tests__/index.test.js

@@ -27,20 +27,20 @@ describe("Debug utils", () => {
     it("should create new timer if timer with a label does not exist", () => {
       performanceNowMock.mockReturnValue(1000);
       time("timer1");
-      expect(timers.timer1).toBeDefined();
-      expect(timers.timer1.startTime).toBe(1000);
+      expect(timers["timer1"]).toBeDefined();
+      expect(timers["timer1"].startTime).toBe(1000);
     });
 
     it("should update start time of timer if timer with a label exists", () => {
       // First call to time()
       performanceNowMock.mockReturnValue(1000);
       time("timer1");
-      const previousStartTime = timers.timer1.startTime;
+      const previousStartTime = timers["timer1"].startTime;
 
       // Second call to time()
       performanceNowMock.mockReturnValue(2000);
       time("timer1");
-      const currentStartTime = timers.timer1.startTime;
+      const currentStartTime = timers["timer1"].startTime;
 
       expect(previousStartTime).toBe(1000);
       expect(currentStartTime).toBe(2000);

package/reactHooks/device/useIsTablet.tsx

@@ -1,23 +1,28 @@
 /* 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";
 
-export const useIsTablet = (): boolean => {
-  const platform = Platform.OS;
+const useIsTabletIos = (): boolean => {
+  const { isPad } = Platform as PlatformIOSStatic;
 
-  if (platform === "ios") {
-    const { isPad } = Platform as PlatformIOSStatic;
-
-    return Boolean(isPad);
-  }
-
-  if (platform === "android") {
-    const initialProps =
-      NativeModules.QuickBrickCommunicationModule?.initialProps;
+  return isPad;
+};
 
-    return toBooleanWithDefaultFalse(initialProps?.is_tablet);
-  }
+const useIsTabletAndroid = (): boolean => {
+  const { initialProps } = NativeModules.QuickBrickCommunicationModule;
 
-  return false;
+  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 "./useIsTablet";
-import { useAppData } from "@applicaster/zapp-react-native-redux";
 
 export const useMemoizedIsTablet = () => {
   const isTablet = useIsTablet();
@@ -14,9 +14,9 @@ export const useMemoizedIsTablet = () => {
 };
 
 export const useIsTabletLandscape = (): boolean => {
-  const { isTabletPortrait } = useAppData();
+  const { appData } = usePickFromState(["appData"]);
 
   const isTablet = useIsTablet();
 
-  return isTablet && !isTabletPortrait;
+  return isTablet && !appData.isTabletPortrait;
 };

package/reactHooks/events/index.ts

@@ -0,0 +1,20 @@
+import * as React from "react";
+import { scrollEndReached$ } from "@applicaster/zapp-react-native-ui-components/events";
+import { filter } from "rxjs/operators";
+
+/**
+ * Subscribe to scroll-end-reached and call loadNextData only when this item is last in the river.
+ * Use in Grid/List so they load next page when the user scrolls to the end (river or tabs scroll container).
+ */
+export function useScrollEndReachedLoadNext(
+  isLast: boolean,
+  loadNextData: () => void
+): void {
+  React.useEffect(() => {
+    const sub = scrollEndReached$.pipe(filter(() => isLast)).subscribe(() => {
+      loadNextData();
+    });
+
+    return () => sub.unsubscribe();
+  }, [isLast, loadNextData]);
+}