@applicaster/zapp-react-native-utils 13.0.0-alpha.8865907528 → 13.0.0-alpha.9053464934

package/analyticsUtils/AnalyticsEvents/sendHeaderClickEvent.ts

@@ -4,7 +4,7 @@ import { postAnalyticEvent } from "../manager";
 import { ANALYTICS_CORE_EVENTS } from "../events";
 
 type SendHeaderClickEventProps = {
-  extraProps: Record<string, any>;
+  extraProps: ExtraProps;
   component?: ZappUIComponent;
   zappPipesData?: ZappPipesData;
   item?: ZappEntry;

package/analyticsUtils/AnalyticsEvents/sendMenuClickEvent.ts

@@ -1,11 +1,10 @@
-/// <reference types="../../" />
 import { log_error, log_debug } from "../logger";
 import { replaceAnalyticsPropsNils } from "./helper";
 import { postAnalyticEvent } from "../manager";
 
 import { ANALYTICS_CORE_EVENTS } from "../events";
 
-type AnalyticsDefaultHelperProperties = {
+declare type AnalyticsDefaultHelperProperties = {
   analyticsScreenData: AnalyticsScreenProperties;
   extraProps: any;
   props;

package/analyticsUtils/index.tsx

@@ -1,3 +1,4 @@
+/// <reference types="@applicaster/zapp-react-native-utils" />
 import * as R from "ramda";
 import * as React from "react";
 import { isWeb } from "@applicaster/zapp-react-native-utils/reactUtils";
@@ -30,7 +31,7 @@ import { ANALYTICS_CORE_EVENTS } from "./events";
 import { noop } from "../functionUtils";
 
 type ComponentWithChildrenProps = {
-  children: React.ReactElement;
+  children: React.ReactChildren;
 };
 
 export function sendSelectCellEvent(item, component, headerTitle, itemIndex) {
@@ -119,11 +120,11 @@ export function getAnalyticsFunctions({
 export const AnalyticsContext =
   React.createContext<GetAnalyticsFunctions>(noop);
 
-export function AnalyticsProvider({ children }: ComponentWithChildrenProps) {
+export function AnalyticsProvider(props: ComponentWithChildrenProps) {
   return (
     // @ts-ignore - this is a valid context provider
     <AnalyticsContext.Provider value={getAnalyticsFunctions}>
-      {children}
+      {props?.children}
     </AnalyticsContext.Provider>
   );
 }

package/analyticsUtils/manager.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-use-before-define */
 import * as R from "ramda";
 import { NativeModules } from "react-native";
-import { ANALYTICS_CORE_EVENTS } from "./events";
+import { ANALYTICS_CORE_EVENTS } from "@applicaster/zapp-react-native-utils/analyticsUtils/events";
 
 import { analyticsUtilsLogger } from "./logger";
 

package/appUtils/orientationHelper.ts

@@ -1,7 +1,8 @@
 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/device/useIsTablet";
+
+import { isTV, platformSelect } from "../reactUtils";
+import { useIsTablet } from "../reactHooks";
 
 import {
   QUICK_BRICK_EVENTS,
@@ -120,8 +121,15 @@ export const removeOrientationChangeListener = (listener: any): void => {
  */
 export const isOrientationCompatible = ({
   orientation,
-  layoutData: { width, height },
+  layoutData: { width, height, isTablet, isTabletPortrait },
 }) => {
+  // We count portrait as compatible, because if default in zapp for mobile layout
+  // We count landscape as compatible, because if isTabletPortrait is false,
+  // it defaults for device
+  if (isTablet && !isTabletPortrait) {
+    return true;
+  }
+
   const isLandscape = width > height;
 
   if (
@@ -145,15 +153,6 @@ export const isOrientationCompatible = ({
   return true;
 };
 
-export const useIsOrientationCompatible = (orientation) => {
-  const { height, width } = ReactNative.useWindowDimensions();
-
-  return isOrientationCompatible({
-    orientation,
-    layoutData: { width, height },
-  });
-};
-
 /**
  * Determine final screen orientation based on device type,
  * settings and orientation value provided by screen data settings

package/appUtils/playerManager/player.ts

@@ -97,7 +97,7 @@ export class Player {
     this.onVideoLoad = this.onVideoLoad.bind(this);
     this.isFullScreenSupported = this.isFullScreenSupported.bind(this);
     this.onPlayerSeekComplete = this.onPlayerSeekComplete.bind(this);
-
+    this.onAdBreakEnd = this.onAdBreakEnd.bind(this);
     this.entryObservable = null;
   }
 
@@ -201,17 +201,25 @@ export class Player {
         adPosition: currentTime,
       };
     } else {
-      if (!isEmptyOrNil(seekableDuration) && seekableDuration >= 0) {
-        this.playerState.seekableDuration = seekableDuration;
-      }
+      this.updateContentDuration({ seekableDuration, duration, currentTime });
+    }
+  };
 
-      if (!isEmptyOrNil(duration) && duration >= 0) {
-        this.playerState.contentDuration = duration;
-      }
+  protected updateContentDuration = ({
+    seekableDuration = null,
+    duration = null,
+    currentTime = null,
+  }) => {
+    if (!isEmptyOrNil(seekableDuration) && seekableDuration >= 0) {
+      this.playerState.seekableDuration = seekableDuration;
+    }
 
-      if (!isEmptyOrNil(currentTime) && currentTime >= 0) {
-        this.playerState.contentPosition = currentTime;
-      }
+    if (!isEmptyOrNil(duration) && duration >= 0) {
+      this.playerState.contentDuration = duration;
+    }
+
+    if (!isEmptyOrNil(currentTime) && currentTime >= 0) {
+      this.playerState.contentPosition = currentTime;
     }
   };
 
@@ -559,7 +567,7 @@ export class Player {
     });
   };
 
-  onAdBreakEnd = (event) => {
+  onAdBreakEnd(event) {
     this.playerState.adState = null;
     this.playerState.isInAdBreak = false;
 
@@ -567,7 +575,7 @@ export class Player {
       callbackName: SharedPlayerCallBacksKeys.OnAdBreakEnd,
       event,
     });
-  };
+  }
 
   onAdEnd = (event) => {
     this.playerState.adState = null;
@@ -736,6 +744,10 @@ export class Player {
     return null;
   };
 
+  public hasResumePosition() {
+    return false;
+  }
+
   public getConfig = () => this.config;
 
   // TODO: replace with enum of supported orientations

package/appUtils/playerManager/playerNative.ts

@@ -54,6 +54,10 @@ export class PlayerNative extends Player {
     });
   }
 
+  public hasResumePosition() {
+    return true;
+  }
+
   getContentPosition = () => {
     return this.playerState.contentPosition;
   };
@@ -221,11 +225,13 @@ export class PlayerNative extends Player {
   };
 
   onVideoLoad = (event) => {
-    if (this.startPosition) {
-      this.seekTo(this.startPosition);
-      this.startPosition = null;
+    this.updateContentDuration(event);
 
+    if (this.startPosition && !this.playerState.isInAdBreak) {
       super.onVideoLoad({ ...event, ignoreContinueWatching: true });
+
+      this.seekTo(this.startPosition);
+      this.startPosition = null;
     } else {
       super.onVideoLoad(event);
     }
@@ -249,6 +255,15 @@ export class PlayerNative extends Player {
     }
   };
 
+  onAdBreakEnd = (event) => {
+    super.onAdBreakEnd(event);
+
+    if (this.startPosition) {
+      this.seekTo(this.startPosition);
+      this.startPosition = null;
+    }
+  };
+
   // This function is called when native player used directly without wrapped component,
   // Since event from native comes with wrapped in NativeEvent property
   getNativeViewListener = (): QuickBrickPlayer.SharedPlayerCallBacks => {

package/focusManager/index.ts

@@ -117,17 +117,25 @@ export const useIsFocusable = (props: Props): void => {
     isNilOrEmpty(zappPipesData?.data) ||
     isNilOrEmpty(zappPipesData?.data?.entry);
 
+  const hasNoUIComponents = isNilOrEmpty(component?.ui_components);
+
   const hasDataError = !!zappPipesData?.error;
 
   const hasEmptyGroup = shouldShowEmptyGroup(component);
 
   const isGallery = component?.component_type === "gallery-qb";
 
+  const isGroup = component?.component_type === "group-qb";
+
   const isHiddenDueToEmptyData =
     !isLoadingData && hasNoData && hideIfDataEmpty && !hasEmptyGroup;
 
+  const isEmptyGroup = isGroup && hasNoUIComponents;
+
   const defaultFocusableLogic =
-    componentCellsFocusable && (!hasNoData || !hideIfDataEmpty);
+    componentCellsFocusable &&
+    (!hasNoData || !hideIfDataEmpty) &&
+    !isEmptyGroup;
 
   React.useEffect(() => {
     if (isAndroidTVPlatform()) {

package/manifestUtils/defaultManifestConfigurations/player.js

@@ -50,6 +50,14 @@ function getPlayerConfiguration({ platform }) {
         label_tooltip:
           "Set the query params which control the size of the image e.g width, height. This will help to optimize the loading time, when magic background is enabled.",
       },
+      {
+        key: "audio_player_background_image_default_color",
+        label: "Audio Player Background Image Default Color",
+        initial_value: "",
+        type: "text_input",
+        label_tooltip:
+          "Set the default color for the audio player background image if not image or set of gradient colors are not provided.",
+      },
     ],
   };
 

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "@applicaster/zapp-react-native-utils",
-  "version": "13.0.0-alpha.8865907528",
+  "version": "13.0.0-alpha.9053464934",
   "description": "Applicaster Zapp React Native utilities package",
   "main": "index.js",
   "types": "index.d.ts",
   "scripts": {
-    "test": "jest -w=2",
     "build": "echo skipping hybrid ts build in main packages for now"
   },
   "publishConfig": {
@@ -28,7 +27,7 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/applicaster-types": "13.0.0-alpha.8865907528",
+    "@applicaster/applicaster-types": "13.0.0-alpha.9053464934",
     "buffer": "^5.2.1",
     "camelize": "^1.0.0",
     "dayjs": "^1.11.10",

package/playerUtils/configurationGenerator.ts

@@ -55,6 +55,14 @@ function getPlayerConfiguration({ platform }) {
         label_tooltip:
           "Set the query params which control the size of the image e.g width, height. This will help to optimize the loading time, when magic background is enabled.",
       },
+      {
+        key: "audio_player_background_image_default_color",
+        label: "Audio Player Background Image Default Color",
+        initial_value: "",
+        type: "text_input",
+        label_tooltip:
+          "Set the default color for the audio player background image if not image or set of gradient colors are not provided.",
+      },
     ],
   };
 

package/reactHooks/app/useAppState.ts

@@ -14,10 +14,10 @@ export function useAppState(returnIsActive) {
   };
 
   React.useEffect(() => {
-    const unsubscribe = AppState.addEventListener("change", setAppState);
+    AppState.addEventListener("change", setAppState);
 
     return () => {
-      unsubscribe.remove();
+      AppState.removeEventListener("change", setAppState);
     };
   }, []);
 

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

@@ -1,7 +1,8 @@
 import { renderHook } from "@testing-library/react-hooks";
-import { allFeedsIsReady, useBatchLoading } from "../useBatchLoading";
-import { WrappedWithProviders } from "@applicaster/zapp-react-native-utils/testUtils";
-import { appStore } from "@applicaster/zapp-react-native-redux/AppStore";
+import * as reduxMockStore from "redux-mock-store";
+import thunk from "redux-thunk";
+import React from "react";
+import * as ReactRedux from "react-redux";
 
 jest.mock("../../navigation");
 
@@ -12,18 +13,17 @@ jest.mock(
   })
 );
 
-const wrapper = WrappedWithProviders;
+const useBatchLoading = require("../useBatchLoading").useBatchLoading;
+const allFeedsIsReady = require("../useBatchLoading").allFeedsIsReady;
+
+const mockStore = reduxMockStore.default([thunk]);
+
+const wrapper: React.FC<any> = ({ children, store }) => (
+  <ReactRedux.Provider store={store}>{children}</ReactRedux.Provider>
+);
 
 describe("useBatchLoading", () => {
-  const data = [
-    { data: { source: "url1" }, component_type: "any" },
-    { data: { source: "url2" }, component_type: "any" },
-    { data: { source: "url3" }, component_type: "any" },
-    { data: { source: "url4" }, component_type: "any" },
-    { data: { source: "url5" }, component_type: "any" },
-    { data: { source: "url6" }, component_type: "any" },
-    // ... more items
-  ];
+  const useDispatchSpy = jest.spyOn(ReactRedux, "useDispatch");
 
   beforeAll(() => {
     jest.useFakeTimers();
@@ -34,7 +34,7 @@ describe("useBatchLoading", () => {
   });
 
   it("loadPipesData start loading not started requests", () => {
-    const store = {
+    const store = mockStore({
       zappPipes: {
         url1: {
           loading: true,
@@ -53,17 +53,29 @@ describe("useBatchLoading", () => {
         },
       },
       test: "true",
-    };
+    });
+
+    useDispatchSpy.mockReturnValue(store.dispatch);
 
     const initialBatchSize = 3;
     const riverId = "123";
 
+    const data = [
+      { data: { source: "url1" } },
+      { data: { source: "url2" } },
+      { data: { source: "url3" } },
+      { data: { source: "url4" } },
+      { data: { source: "url5" } },
+      { data: { source: "url6" } },
+      // ... more items
+    ];
+
     renderHook(() => useBatchLoading(data, { initialBatchSize, riverId }), {
       wrapper,
       initialProps: { store },
     });
 
-    const actions = (appStore.getStore() as any).getActions();
+    const actions = store.getActions();
 
     expect(actions).toHaveLength(2);
 
@@ -79,7 +91,7 @@ describe("useBatchLoading", () => {
   });
 
   it("loadPipesData start loading new feed when 1 feed is done loading and 1 is in loading state", () => {
-    const store = {
+    const store = mockStore({
       zappPipes: {
         url1: {
           loading: false,
@@ -98,17 +110,31 @@ describe("useBatchLoading", () => {
         },
       },
       test: "true",
-    };
+    });
+
+    useDispatchSpy.mockReturnValue(store.dispatch);
 
     const initialBatchSize = 3;
     const riverId = "123";
 
+    const data = [
+      { data: { source: "url1" } },
+      { data: { source: "url2" } },
+      { data: { source: "url3" } },
+      { data: { source: "url4" } },
+      { data: { source: "url5" } },
+      { data: { source: "url6" } },
+      // ... more items
+    ];
+
+    expect(useDispatchSpy).toBeCalledTimes(0);
+
     renderHook(() => useBatchLoading(data, { initialBatchSize, riverId }), {
       wrapper,
       initialProps: { store },
     });
 
-    const actions = (appStore.getStore() as any).getActions();
+    const actions = store.getActions();
 
     expect(actions).toHaveLength(1);
 
@@ -119,26 +145,38 @@ describe("useBatchLoading", () => {
   });
 
   it("loadPipesData has been called when no data cached", () => {
-    const store = {
+    const store = mockStore({
       zappPipes: {},
       test: "true",
-    };
+    });
+
+    useDispatchSpy.mockReturnValue(store.dispatch);
 
     const initialBatchSize = 3;
     const riverId = "123";
 
+    const data = [
+      { data: { source: "url1" } },
+      { data: { source: "url2" } },
+      { data: { source: "url3" } },
+      { data: { source: "url4" } },
+      { data: { source: "url5" } },
+      { data: { source: "url6" } },
+      // ... more items
+    ];
+
     renderHook(() => useBatchLoading(data, { initialBatchSize, riverId }), {
       wrapper,
       initialProps: { store },
     });
 
-    const actions = (appStore.getStore() as any).getActions();
+    const actions = store.getActions();
 
     expect(actions).toHaveLength(3);
   });
 
   it("initial batch ready when all initial items loaded", () => {
-    const store = {
+    const store = mockStore({
       zappPipes: {
         url1: {
           loading: false,
@@ -156,11 +194,19 @@ describe("useBatchLoading", () => {
           data: {},
         },
       },
-    };
+    });
+
+    useDispatchSpy.mockReturnValue(store.dispatch);
 
     const initialBatchSize = 3;
     const riverId = "123";
 
+    const data: Partial<ZappUIComponent>[] = [
+      { data: { source: "url1" } },
+      { data: { source: "url2" } },
+      { data: { source: "url3" } },
+    ];
+
     const { result } = renderHook(
       () => useBatchLoading(data, { initialBatchSize, riverId }),
       { wrapper, initialProps: { store } }
@@ -170,10 +216,12 @@ describe("useBatchLoading", () => {
   });
 
   it("gallery-qb: loadPipesData should be called only once for first component in the gallery", () => {
-    const store = {
+    const store = mockStore({
       zappPipes: {},
       test: "true",
-    };
+    });
+
+    useDispatchSpy.mockReturnValue(store.dispatch);
 
     const initialBatchSize = 3;
     const riverId = "123";
@@ -183,11 +231,11 @@ describe("useBatchLoading", () => {
         component_type: "gallery-qb",
         ui_components: [{ data: { source: "url1" } }],
       },
-      { data: { source: "url2" }, component_type: "any" },
-      { data: { source: "url3" }, component_type: "any" },
-      { data: { source: "url4" }, component_type: "any" },
-      { data: { source: "url5" }, component_type: "any" },
-      { data: { source: "url6" }, component_type: "any" },
+      { data: { source: "url2" } },
+      { data: { source: "url3" } },
+      { data: { source: "url4" } },
+      { data: { source: "url5" } },
+      { data: { source: "url6" } },
       // ... more items
     ];
 
@@ -196,13 +244,13 @@ describe("useBatchLoading", () => {
       initialProps: { store },
     });
 
-    const actions = (appStore.getStore() as any).getActions();
+    const actions = store.getActions();
 
     expect(actions).toHaveLength(1);
   });
 
   it("gallery-qb: initial batch ready when all initial items loaded", () => {
-    const store = {
+    const store = mockStore({
       zappPipes: {
         url1: {
           loading: false,
@@ -210,19 +258,20 @@ describe("useBatchLoading", () => {
           data: {},
         },
       },
-    };
+    });
+
+    useDispatchSpy.mockReturnValue(store.dispatch);
 
     const initialBatchSize = 3;
     const riverId = "123";
 
-    const data = [
+    const data: Partial<ZappUIComponent>[] = [
       {
         component_type: "gallery-qb",
-        data: {},
-        ui_components: [{ data: { source: "url1" } }] as any,
+        ui_components: [{ data: { source: "url1" } }],
       },
-      { data: { source: "url2" }, component_type: "any" },
-      { data: { source: "url3" }, component_type: "any" },
+      { data: { source: "url2" } },
+      { data: { source: "url3" } },
     ];
 
     const { result } = renderHook(

package/reactHooks/navigation/index.ts

@@ -108,9 +108,11 @@ export function isNavBarVisible(
     return false;
   }
 
-  const showSecondaryLevel = screenData?.navigations?.some(
-    (navigation) => navigation.styles?.show_secondary_level_menu
-  );
+  const showSecondaryLevel =
+    !isTV() ||
+    screenData?.navigations?.some(
+      (navigation) => navigation.styles?.show_secondary_level_menu
+    );
 
   if (canGoBack && !showSecondaryLevel) {
     return false;
@@ -125,10 +127,10 @@ export function isNavBarVisible(
 
 export const useBackHandler = (cb: () => boolean) => {
   useEffect(() => {
-    const unsubscribe = BackHandler.addEventListener("hardwareBackPress", cb);
+    BackHandler.addEventListener("hardwareBackPress", cb);
 
     return () => {
-      unsubscribe.remove();
+      BackHandler.removeEventListener("hardwareBackPress", cb);
     };
   }, [cb]);
 };