@applicaster/zapp-react-native-utils 12.0.0-alpha.4223432180 → 12.0.0-alpha.4241289980

package/appUtils/accessibilityManager/index.ts

@@ -85,7 +85,18 @@ export class AccessibilityManager {
       textToRead = localizedMessage;
     }
 
-    this.ttsManager && this.ttsManager.readText(textToRead);
+    if (this.ttsManager) {
+      logger.debug({
+        message: `Reading text: ${textToRead}`,
+        data: {
+          textToRead,
+          text,
+          keyOfLocalizedText,
+        },
+      });
+
+      this.ttsManager.readText(textToRead);
+    }
 
     this.announcements$.next({
       message: textToRead,

package/appUtils/platform/platformUtils.ts

@@ -29,7 +29,8 @@ const { log_debug } = createLogger({
   parent: utilsLogger,
 });
 
-export const getUserAgent = () => window?.navigator?.userAgent;
+export const getUserAgent = () =>
+  window?.navigator?.userAgent || global?.navigator?.userAgent;
 
 /** VIZIO UTILS */
 
@@ -42,8 +43,6 @@ export const getUserAgent = () => window?.navigator?.userAgent;
 export const isVizioPlatform = () => {
   const userAgent = getUserAgent();
 
-  if (!userAgent) return false;
-
   const isVizioAgent =
     userAgent.includes(PLATFORMS.vizio) ||
     userAgent.includes(PLATFORMS.smartcast) ||

package/appUtils/playerManager/playerFactory.ts

@@ -46,7 +46,7 @@ export const playerFactory = (
 
   // TODO: Fix type:
   const playerProtocol: PlayerConstructor =
-    playerPlugin?.module?.playerProtocol(config?.screenConfig);
+    playerPlugin?.module?.playerProtocol(config?.screenConfig, config?.entry);
 
   const playerView = (playerProtocol as any)?.Component || null;
 

package/arrayUtils/index.ts

@@ -1,6 +1,5 @@
 /* eslint-disable unused-imports/no-unused-vars */
 import * as R from "ramda";
-import { invariant } from "@applicaster/zapp-react-native-utils/errorUtils";
 
 /**
  * shifts an array by the given offset. a negative offset will take items
@@ -101,13 +100,3 @@ export const makeListOf = (value: unknown, size: number): number[] => {
 export function isFilledArray(value: unknown): boolean {
   return R.is(Array, value) && R.length(value) > 0;
 }
-
-// get random item from the list
-export const sample = (xs: unknown[]): unknown => {
-  invariant(R.is(Array, xs), `input value is not a array: ${xs}`);
-  invariant(isFilledArray(xs), `input array is empty: ${xs}`);
-
-  const index = Math.floor(Math.random() * xs.length);
-
-  return xs[index];
-};

package/focusManager/FocusManager.ts

@@ -18,7 +18,6 @@ class FocusManager {
   private static instance: FocusManager;
 
   private _focusedId: string | null = null;
-  private _prevFocusedId: string | null = null;
   public previousNavigationDirection: FocusManager.Android.NavDir = null;
 
   /**
@@ -48,22 +47,10 @@ class FocusManager {
     return focusedRef?.current;
   }
 
-  get prevFocused() {
-    const focusedRef = this.prevFocusedId
-      ? FocusManager.findFocusable(this.prevFocusedId)
-      : { current: null };
-
-    return focusedRef?.current;
-  }
-
   get focusedId() {
     return FocusManager.instance._focusedId;
   }
 
-  get prevFocusedId() {
-    return FocusManager.instance._prevFocusedId;
-  }
-
   public static getInstance(): FocusManager {
     if (!FocusManager.instance) {
       FocusManager.instance = new FocusManager();
@@ -164,8 +151,9 @@ class FocusManager {
   }
 
   private setFocusLocal(nextFocus: FocusManager.TouchableReactRef) {
-    FocusManager.instance._prevFocusedId = FocusManager.instance._focusedId;
     FocusManager.instance._focusedId = nextFocus?.current?.props?.id ?? null;
+
+    this.eventHandler?.invokeHandler?.(FOCUS_EVENTS.FOCUS, nextFocus);
   }
 
   private setPreviousNavigationDirection(
@@ -229,11 +217,8 @@ class FocusManager {
 
       FocusManager.instance.setFocus(nextNextFocus, options);
     } else {
-      FocusManager.instance.setFocusLocal(nextFocus);
-
       FocusManager.instance.blurPrevious(options);
-      this.eventHandler?.invokeHandler?.(FOCUS_EVENTS.FOCUS, nextFocus);
-
+      FocusManager.instance.setFocusLocal(nextFocus);
       FocusManager.instance.setPreviousNavigationDirection(options ?? null);
 
       nextFocus?.current?.onFocus?.(nextFocus.current, options ?? {});
@@ -242,8 +227,8 @@ class FocusManager {
 
   blurPrevious(options?: FocusManager.Android.CallbackOptions) {
     if (options) {
-      FocusManager.instance.prevFocused?.onBlur?.(
-        FocusManager.instance.prevFocused,
+      FocusManager.instance.focused?.onBlur?.(
+        FocusManager.instance.focused,
         options
       );
     }

package/focusManager/__tests__/FocusManager.test.ts

@@ -156,6 +156,7 @@ describe("FocusManager", () => {
     child1.current.onBlur.mockClear();
     focusManager.setFocus(child1.current.props.id);
     focusManager.blurPrevious({ direction: "down" });
+    expect(child1.current.onBlur).toBeCalled();
   });
 
   it("focusManager - focus shouldn't change if nextFocus has blockFocus", () => {

package/manifestUtils/defaultManifestConfigurations/player.js

@@ -18,7 +18,6 @@ function getDevice(platform) {
     case "lg_tv":
     case "samsung_tv":
     case "web":
-    case "vizio":
       return "tv";
   }
 }
@@ -1796,30 +1795,6 @@ function getPlayerConfiguration({ platform }) {
             key: "menu_header_samsung_letter_spacing",
             initial_value: 0,
           },
-          {
-            type: "vizio_font_selector",
-            label: "Vizio Font Family",
-            key: "menu_header_vizio_font_family",
-            initial_value: "SmsungOneUI-Bold",
-          },
-          {
-            type: "number_input",
-            label: "Vizio Font Size",
-            key: "menu_header_vizio_font_size",
-            initial_value: 30,
-          },
-          {
-            type: "number_input",
-            label: "Vizio Line Height",
-            key: "menu_header_vizio_line_height",
-            initial_value: 60,
-          },
-          {
-            type: "number_input",
-            label: "Vizio Letter Spacing",
-            key: "menu_header_vizio_letter_spacing",
-            initial_value: 0,
-          },
         ]
       ),
       // Captions Menu - Item Text Label
@@ -1899,30 +1874,6 @@ function getPlayerConfiguration({ platform }) {
             key: "menu_item_samsung_letter_spacing",
             initial_value: 0,
           },
-          {
-            type: "vizio_font_selector",
-            label: "Vizio Font Family",
-            key: "menu_item_vizio_font_family",
-            initial_value: "SmsungOneUI-Bold",
-          },
-          {
-            type: "number_input",
-            label: "Vizio Font Size",
-            key: "menu_item_vizio_font_size",
-            initial_value: 25,
-          },
-          {
-            type: "number_input",
-            label: "Vizio Line Height",
-            key: "menu_item_vizio_line_height",
-            initial_value: 40,
-          },
-          {
-            type: "number_input",
-            label: "Vizio Letter Spacing",
-            key: "menu_item_vizio_letter_spacing",
-            initial_value: 0,
-          },
         ]
       ),
       // Captions Menu - Item Border
@@ -2066,18 +2017,6 @@ function getPlayerConfiguration({ platform }) {
             key: "samsung_tv_video_player_title_font_size",
             initial_value: 64,
           },
-          {
-            type: "vizio_font_selector",
-            label: "Vizio Font Family",
-            key: "vizio_video_player_title_font_family",
-            initial_value: "Ubuntu-Bold",
-          },
-          {
-            type: "number_input",
-            label: "Vizio Font Size",
-            key: "vizio_video_player_title_font_size",
-            initial_value: 64,
-          },
           {
             type: "tvos_font_selector",
             label: "tvOS Font Family",
@@ -2151,18 +2090,6 @@ function getPlayerConfiguration({ platform }) {
             key: "samsung_tv_video_player_summary_font_size",
             initial_value: 30,
           },
-          {
-            type: "vizio_font_selector",
-            label: "Vizio Font Family",
-            key: "vizio_video_player_summary_font_family",
-            initial_value: "Ubuntu-Bold",
-          },
-          {
-            type: "number_input",
-            label: "Vizio Font Size",
-            key: "vizio_video_player_summary_font_size",
-            initial_value: 30,
-          },
           {
             type: "tvos_font_selector",
             label: "tvOS Font Family",
@@ -2230,18 +2157,6 @@ function getPlayerConfiguration({ platform }) {
             key: "samsung_tv_audio_player_title_font_size",
             initial_value: 38,
           },
-          {
-            type: "vizio_font_selector",
-            label: "Vizio Font Family",
-            key: "vizio_tv_audio_player_title_font_family",
-            initial_value: "Ubuntu-Bold",
-          },
-          {
-            type: "number_input",
-            label: "Vizio Font Size",
-            key: "vizio_audio_player_title_font_size",
-            initial_value: 38,
-          },
           {
             type: "tvos_font_selector",
             label: "tvOS Font Family",
@@ -2297,18 +2212,6 @@ function getPlayerConfiguration({ platform }) {
             key: "samsung_tv_audio_player_summary_font_size",
             initial_value: 20,
           },
-          {
-            type: "vizio_font_selector",
-            label: "Vizio Font Family",
-            key: "vizio_audio_player_summary_font_family",
-            initial_value: "Ubuntu-Bold",
-          },
-          {
-            type: "number_input",
-            label: "Vizio Font Size",
-            key: "vizio_audio_player_summary_font_size",
-            initial_value: 20,
-          },
           {
             type: "tvos_font_selector",
             label: "tvOS Font Family",
@@ -2364,18 +2267,6 @@ function getPlayerConfiguration({ platform }) {
             key: "samsung_tv_player_time_font_size",
             initial_value: 20,
           },
-          {
-            type: "vizio_font_selector",
-            label: "Vizio Font Family",
-            key: "vizio_player_time_font_family",
-            initial_value: "Ubuntu-Bold",
-          },
-          {
-            type: "number_input",
-            label: "Vizio Font Size",
-            key: "vizio_player_time_font_size",
-            initial_value: 20,
-          },
           {
             type: "android_font_selector",
             label: "Android TV Font Family",
@@ -2431,18 +2322,6 @@ function getPlayerConfiguration({ platform }) {
             key: "samsung_tv_audio_player_run_time_font_size",
             initial_value: 20,
           },
-          {
-            type: "vizio_font_selector",
-            label: "Vizio Font Family",
-            key: "vizio_audio_player_run_time_font_family",
-            initial_value: "Ubuntu-Bold",
-          },
-          {
-            type: "number_input",
-            label: "Vizio Font Size",
-            key: "vizio_audio_player_run_time_font_size",
-            initial_value: 20,
-          },
           {
             type: "tvos_font_selector",
             label: "tvOS Font Family",

package/manifestUtils/keys.js

@@ -17,11 +17,10 @@ const ZAPPIFEST_FIELDS = {
     lg: "lg_tv_font_selector",
     samsung: "samsung_font_selector",
     roku: "roku_font_selector",
-    vizio: "vizio_font_selector",
   },
 };
 
-const TV_PLATFORMS = ["tvOS", "android", "LG", "samsung", "roku", "vizio"];
+const TV_PLATFORMS = ["tvOS", "android", "LG", "samsung", "roku"];
 
 const FontPropsForTVPlatform = (platform) => ({
   [`${R.toLower(platform)}FontFamily`]: {

package/navigationUtils/index.ts

@@ -263,7 +263,7 @@ export function getTargetRoute(
   pathname = "",
   {
     contentTypes = undefined,
-    layoutVersion = "v2",
+    layoutVersion = undefined,
     rivers = {},
   }: {
     contentTypes?: ZappContentTypes | null;

package/numberUtils/index.ts

@@ -66,23 +66,3 @@ export const isZero = (value: unknown): boolean =>
 export const isMinusZero = (value: number) => {
   return 1 / value === -Infinity;
 };
-
-export const toPositiveNumberWithDefault = (
-  defaultValue: number,
-  value: unknown
-): number => {
-  const possibleNumber = toNumber(value);
-
-  if (R.isNil(possibleNumber)) {
-    return defaultValue;
-  }
-
-  if (possibleNumber < 0) {
-    return defaultValue;
-  }
-
-  return possibleNumber;
-};
-
-export const toPositiveNumberWithDefaultZero = (value: unknown): number =>
-  toPositiveNumberWithDefault(0, value);

package/package.json

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

package/playerUtils/configurationGenerator.ts

@@ -1798,30 +1798,6 @@ function getPlayerConfiguration({ platform }) {
             key: "menu_header_samsung_letter_spacing",
             initial_value: 0,
           },
-          {
-            type: "vizio_font_selector",
-            label: "Vizio Font Family",
-            key: "menu_header_vizio_font_family",
-            initial_value: "Ubuntu-Bold",
-          },
-          {
-            type: "number_input",
-            label: "Vizio Font Size",
-            key: "menu_header_vizio_font_size",
-            initial_value: 30,
-          },
-          {
-            type: "number_input",
-            label: "Vizio Line Height",
-            key: "menu_header_vizio_line_height",
-            initial_value: 60,
-          },
-          {
-            type: "number_input",
-            label: "Vizio Letter Spacing",
-            key: "menu_header_vizio_letter_spacing",
-            initial_value: 0,
-          },
         ]
       ),
       // Captions Menu - Item Text Label
@@ -1901,30 +1877,6 @@ function getPlayerConfiguration({ platform }) {
             key: "menu_item_samsung_letter_spacing",
             initial_value: 0,
           },
-          {
-            type: "vizio_font_selector",
-            label: "Vizio Font Family",
-            key: "menu_item_vizio_font_family",
-            initial_value: "Ubuntu-Medium",
-          },
-          {
-            type: "number_input",
-            label: "Vizio Font Size",
-            key: "menu_item_vizio_font_size",
-            initial_value: 25,
-          },
-          {
-            type: "number_input",
-            label: "Vizio Line Height",
-            key: "menu_item_vizio_line_height",
-            initial_value: 40,
-          },
-          {
-            type: "number_input",
-            label: "Vizio Letter Spacing",
-            key: "menu_item_vizio_letter_spacing",
-            initial_value: 0,
-          },
         ]
       ),
       // Captions Menu - Item Border
@@ -2068,18 +2020,6 @@ function getPlayerConfiguration({ platform }) {
             key: "samsung_tv_video_player_title_font_size",
             initial_value: 58,
           },
-          {
-            type: "vizio_font_selector",
-            label: "Vizio Font Family",
-            key: "vizio_video_player_title_font_family",
-            initial_value: "Ubuntu-Bold",
-          },
-          {
-            type: "number_input",
-            label: "Vizio Font Size",
-            key: "vizio_video_player_title_font_size",
-            initial_value: 58,
-          },
           {
             type: "tvos_font_selector",
             label: "tvOS Font Family",
@@ -2153,18 +2093,6 @@ function getPlayerConfiguration({ platform }) {
             key: "samsung_tv_video_player_summary_font_size",
             initial_value: 30,
           },
-          {
-            type: "vizio_font_selector",
-            label: "Vizio Font Family",
-            key: "vizio_video_player_summary_font_family",
-            initial_value: "Ubuntu-Medium",
-          },
-          {
-            type: "number_input",
-            label: "Vizio Font Size",
-            key: "vizio_video_player_summary_font_size",
-            initial_value: 30,
-          },
           {
             type: "tvos_font_selector",
             label: "tvOS Font Family",
@@ -2232,18 +2160,6 @@ function getPlayerConfiguration({ platform }) {
             key: "samsung_tv_audio_player_title_font_size",
             initial_value: 40,
           },
-          {
-            type: "vizio_font_selector",
-            label: "Vizio Font Family",
-            key: "vizio_audio_player_title_font_family",
-            initial_value: "Ubuntu-Bold",
-          },
-          {
-            type: "number_input",
-            label: "Vizio Font Size",
-            key: "vizio_audio_player_title_font_size",
-            initial_value: 40,
-          },
           {
             type: "tvos_font_selector",
             label: "tvOS Font Family",
@@ -2299,18 +2215,6 @@ function getPlayerConfiguration({ platform }) {
             key: "samsung_tv_audio_player_summary_font_size",
             initial_value: 22,
           },
-          {
-            type: "vizio_font_selector",
-            label: "Vizio Font Family",
-            key: "vizio_audio_player_summary_font_family",
-            initial_value: "Ubuntu-Medium",
-          },
-          {
-            type: "number_input",
-            label: "Vizio Font Size",
-            key: "vizio_audio_player_summary_font_size",
-            initial_value: 22,
-          },
           {
             type: "tvos_font_selector",
             label: "tvOS Font Family",
@@ -2366,18 +2270,6 @@ function getPlayerConfiguration({ platform }) {
             key: "samsung_tv_player_time_font_size",
             initial_value: 20,
           },
-          {
-            type: "vizio_font_selector",
-            label: "Vizio Font Family",
-            key: "vizio_player_time_font_family",
-            initial_value: "Ubuntu-Medium",
-          },
-          {
-            type: "number_input",
-            label: "Vizio Font Size",
-            key: "vizio_player_time_font_size",
-            initial_value: 20,
-          },
           {
             type: "android_font_selector",
             label: "Android TV Font Family",
@@ -2433,18 +2325,6 @@ function getPlayerConfiguration({ platform }) {
             key: "samsung_tv_audio_player_run_time_font_size",
             initial_value: 20,
           },
-          {
-            type: "vizio_font_selector",
-            label: "Vizio Font Family",
-            key: "vizio_audio_player_run_time_font_family",
-            initial_value: "Ubuntu-Medium",
-          },
-          {
-            type: "number_input",
-            label: "Vizio Font Size",
-            key: "vizio_audio_player_run_time_font_size",
-            initial_value: 20,
-          },
           {
             type: "tvos_font_selector",
             label: "tvOS Font Family",

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

@@ -60,13 +60,13 @@ const wrapper = ({ children }) => (
 describe("useCellClick", () => {
   it("returns a function", () => {
     const { result } = renderHook(() => useCellClick(mockProps));
-    expect(typeof result.current.current).toBe("function");
+    expect(typeof result.current).toBe("function");
     cleanup();
   });
 
   it("runs default logic", () => {
     const { result } = renderHook(() => useCellClick(mockProps));
-    const useCellClickHook = result.current.current;
+    const useCellClickHook = result.current;
 
     useCellClickHook();
 
@@ -76,7 +76,7 @@ describe("useCellClick", () => {
 
   it("runs onCellTap", async () => {
     const { result } = renderHook(() => useCellClick(mockProps), { wrapper });
-    const useCellClickHook = result.current.current;
+    const useCellClickHook = result.current;
 
     useCellClickHook();
 

package/reactHooks/cell-click/index.ts

@@ -30,15 +30,7 @@ type Props = {
   zappPipesData?: ZappPipesData;
 };
 
-type onPressReturnFn =
-  | ((_item?: ZappEntry | any, _index?: number) => Promise<void>)
-  | (() => void);
-
-export const useCellClick = ({
-  component,
-  zappPipesData,
-  item,
-}: Props): React.MutableRefObject<onPressReturnFn> => {
+export const useCellClick = ({ component, zappPipesData, item }: Props) => {
   const { push, currentRoute } = useNavigation();
   const { pathname } = useRoute();
 
@@ -114,15 +106,9 @@ export const useCellClick = ({
     ]
   );
 
-  const onPressRef = React.useRef<onPressReturnFn>();
-
   if (!cellSelectable) {
-    // update ref with dummy function
-    onPressRef.current = noop;
-  } else {
-    // update ref with the latest onPress function
-    onPressRef.current = onPress;
+    return noop;
   }
 
-  return onPressRef;
+  return onPress;
 };

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

@@ -77,6 +77,8 @@ describe("useBatchLoading", () => {
 
     const actions = store.getActions();
 
+    expect(useDispatchSpy).toBeCalledTimes(1);
+
     expect(actions).toHaveLength(2);
 
     expect(actions[0]).toMatchObject({
@@ -127,8 +129,6 @@ describe("useBatchLoading", () => {
       // ... more items
     ];
 
-    expect(useDispatchSpy).toBeCalledTimes(0);
-
     renderHook(() => useBatchLoading(data, { initialBatchSize, riverId }), {
       wrapper,
       initialProps: { store },
@@ -136,6 +136,8 @@ describe("useBatchLoading", () => {
 
     const actions = store.getActions();
 
+    expect(useDispatchSpy).toBeCalledTimes(1);
+
     expect(actions).toHaveLength(1);
 
     expect(actions[0]).toMatchObject({
@@ -170,6 +172,8 @@ describe("useBatchLoading", () => {
       initialProps: { store },
     });
 
+    expect(useDispatchSpy).toBeCalledTimes(1);
+
     const actions = store.getActions();
 
     expect(actions).toHaveLength(3);
@@ -214,73 +218,6 @@ describe("useBatchLoading", () => {
 
     expect(result.current).toBe(true);
   });
-
-  it("gallery-qb: loadPipesData should be called only once for first component in the gallery", () => {
-    const store = mockStore({
-      zappPipes: {},
-      test: "true",
-    });
-
-    useDispatchSpy.mockReturnValue(store.dispatch);
-
-    const initialBatchSize = 3;
-    const riverId = "123";
-
-    const data = [
-      {
-        component_type: "gallery-qb",
-        ui_components: [{ 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 = store.getActions();
-
-    expect(actions).toHaveLength(1);
-  });
-
-  it("gallery-qb: initial batch ready when all initial items loaded", () => {
-    const store = mockStore({
-      zappPipes: {
-        url1: {
-          loading: false,
-          error: false,
-          data: {},
-        },
-      },
-    });
-
-    useDispatchSpy.mockReturnValue(store.dispatch);
-
-    const initialBatchSize = 3;
-    const riverId = "123";
-
-    const data: Partial<ZappUIComponent>[] = [
-      {
-        component_type: "gallery-qb",
-        ui_components: [{ data: { source: "url1" } }],
-      },
-      { data: { source: "url2" } },
-      { data: { source: "url3" } },
-    ];
-
-    const { result } = renderHook(
-      () => useBatchLoading(data, { initialBatchSize, riverId }),
-      { wrapper, initialProps: { store } }
-    );
-
-    expect(result.current).toBe(true);
-  });
 });
 
 describe("allFeedsIsReady", () => {

package/reactHooks/feed/useBatchLoading.ts

@@ -45,23 +45,19 @@ const filterEmptyData = (data) => {
   return true;
 };
 
-const getData = (rawData) =>
-  rawData.component_type === "gallery-qb"
-    ? rawData.ui_components[0].data
-    : rawData.data;
-
-const extractData = compose(uniq, map(getData));
+const extractData = compose(uniq, map(dataOf));
 
 export const allFeedsIsReady = (
   feeds: ZappPipesCollection,
   urls: (ZappDataSourceSource | null)[]
 ): boolean =>
-  urls.every((url) =>
-    isNil(url) ? true : url && feeds[url] ? checkFeedIsReady(feeds[url]) : false
-  );
+  urls
+    .filter(complement(isNil))
+    .map((url) => (url ? checkFeedIsReady(feeds[url]) : false))
+    .every(Boolean);
 
 export const useBatchLoading = (
-  componentsToRender: { data?: ZappDataSource; component_type: string }[],
+  data: { data?: ZappDataSource }[],
   options: Options
 ) => {
   const dispatch = useDispatch();
@@ -69,18 +65,10 @@ export const useBatchLoading = (
   const [searchContext] = ZappPipesSearchContext.useZappPipesContext();
   const [hasEverBeenReady, setHasEverBeenReady] = React.useState(false);
 
-  // if first component is gallery-qb, take only one component for initial load
-  const takeSize =
-    componentsToRender?.[0]?.component_type === "gallery-qb"
-      ? 1
-      : min(
-          options.initialBatchSize ?? DEFAULT_BATCH_SIZE,
-          componentsToRender.length
-        );
-
-  const takeBatchSize = React.useCallback(take(takeSize), [takeSize]);
+  const takeBatchSize = take(
+    min(options.initialBatchSize ?? DEFAULT_BATCH_SIZE, data.length)
+  );
 
-  // Prepare inflated url for datasource
   const getUrl = React.useCallback(
     (data) => {
       const mappedFeed = data.mapping
@@ -100,16 +88,13 @@ export const useBatchLoading = (
     [entryContext, screenContext, searchContext]
   );
 
-  // components for initial load
-  const batchComponents = takeBatchSize(componentsToRender);
+  const batchData = takeBatchSize(data);
 
-  // contains datasources from batch components loading
   const feedData: ZappDataSource[] = React.useMemo(
-    () => extractData(batchComponents).filter(filterEmptyData),
-    [batchComponents]
+    () => extractData(batchData).filter(filterEmptyData),
+    [batchData]
   );
 
-  // contains inflated urls from batch components loading
   const feedUrls: ZappDataSourceSource[] = React.useMemo(
     () =>
       feedData.map((data) => {
@@ -117,43 +102,34 @@ export const useBatchLoading = (
 
         return mappedFeedUrl;
       }),
-    []
+    [] // No watchers as batch loaders is used only for initial load
   );
 
   const feeds = useZappPipesFeeds(feedUrls);
 
-  // dispatch loadPipesData for each feed that is not loaded
-  const runBatchLoading = React.useCallback(() => {
-    batchComponents.forEach((rawData: any) => {
-      // 1. get data (dataOf)
-
-      const data = getData(rawData);
+  React.useEffect(() => {
+    const datasources = map(dataOf, batchData)
+      .filter(filterEmptyData)
+      .filter((data) => {
+        const feed = feeds[data.source];
 
-      // 2. filter out empty data filterEmptyData
-      if (!filterEmptyData(data)) return false;
+        if (!feed) return true;
 
-      // 3. filter out data that is already loaded (feeds[data.source]) &  !feedHasData(feed) && !feedIsLoading(feed);
-      const feed = feeds[data?.source];
+        return !feedHasData(feed) && !feedIsLoading(feed);
+      });
 
-      if (!feed || (!feedHasData(feed) && !feedIsLoading(feed))) {
-        const mappedFeedUrl = getUrl(data);
+    datasources.forEach((data) => {
+      const mappedFeedUrl = getUrl(data);
 
-        if (mappedFeedUrl) {
-          // 4. load data
-          return dispatch(
-            loadPipesData(mappedFeedUrl, { riverId: options.riverId })
-          );
-        }
+      if (mappedFeedUrl) {
+        return dispatch(
+          loadPipesData(mappedFeedUrl, { riverId: options.riverId })
+        );
       }
     });
-  }, [feedUrls]);
-
-  React.useEffect(() => {
-    runBatchLoading();
-  }, []);
+  }, []); // No watchers as batch loaders is used only for initial load
 
   React.useEffect(() => {
-    // check if all feeds are ready and set hasEverBeenReady to true
     if (allFeedsIsReady(feeds, feedUrls) && !hasEverBeenReady) {
       setHasEverBeenReady(true);
     }

package/reactHooks/navigation/index.ts

@@ -17,7 +17,7 @@ import {
   QUICK_BRICK_NAVBAR,
   QUICK_BRICK_CONTENT,
 } from "@applicaster/quick-brick-core/const";
-import { useZappHooksModalState } from "@applicaster/zapp-react-dom-ui-components/Components/ZappHooksModal/hooks/useZappHooksModalState";
+import { useZappHooksModalState } from "@applicaster/zapp-react-dom-ui-components/Components/ZappHooksModal/ZappHooksModal";
 import { ZappHookModalContext } from "@applicaster/zapp-react-native-ui-components/Contexts";
 import { PathnameContext } from "@applicaster/zapp-react-native-ui-components/Contexts/PathnameContext";
 import { HookModalContextT } from "@applicaster/zapp-react-native-ui-components/Contexts/ZappHookModalContext";

package/reactHooks/useConfiguration.ts

@@ -67,7 +67,7 @@ export const useConfiguration = ({
       if (component) {
         const remappedStylesConfiguration = remapUpdatedKeys(
           pluginManifest,
-          component
+          component.styles
         );
 
         R.forEachObjIndexed((value, key) => {
@@ -83,7 +83,7 @@ export const useConfiguration = ({
 
         const styles = populateConfigurationValues(
           pluginManifest?.styles?.fields,
-          remappedStylesConfiguration.styles,
+          remappedStylesConfiguration,
           skipDefaults
         );
 

package/testUtils/index.tsx

@@ -7,11 +7,9 @@ import { Provider } from "react-redux";
 import thunk from "redux-thunk";
 import configureStore from "redux-mock-store";
 import { SafeAreaProvider } from "react-native-safe-area-context";
-import { appStore } from "@applicaster/zapp-react-native-redux/AppStore";
 
 import { render } from "@testing-library/react-native";
 import { AnalyticsProvider } from "../analyticsUtils";
-import { ThemeContext } from "../theme";
 
 export { getByTestId } from "./getByTestId";
 
@@ -61,9 +59,7 @@ const initialState = {
   appSettings: {},
   plugins: [],
   appState: { appReady: true, appLaunched: true },
-  pluginConfigurations: {},
   appData: { layoutVersion: "v1" },
-  zappPipes: {},
   contentTypes: null,
 };
 
@@ -72,49 +68,20 @@ export const WrappedWithProviders = ({
   store: storeObj = {},
 }: any) => {
   const _store = configureStore([thunk])(
-    R.mergeDeepRight(initialState, { ...storeObj })
+    R.mergeDeepWith(R.concat, { ...initialState }, storeObj)
   );
 
-  appStore.set(_store);
-
   return (
-    <ThemeContext.Provider
-      value={{
-        themes: {
-          light: {
-            component_margin_top: 0,
-            component_margin_bottom: 0,
-            component_margin_left: 0,
-            component_margin_right: 0,
-            component_padding_top: 0,
-            component_padding_bottom: 0,
-            component_padding_left: 0,
-            component_padding_right: 0,
-            component_gutter_vertical: 0,
-            component_gutter_horizontal: 0,
-            component_corner_radius: 0,
-            app_background_color: "rgba(0,0,0,0)",
-            screen_margin_top: 0,
-            screen_margin_bottom: 0,
-            component_anchor_point_y: 0,
-            assets: "",
-          },
-        },
-        selectedThemeId: "light",
-        setSelectedThemeId: () => {},
+    <SafeAreaProvider
+      initialMetrics={{
+        insets: { top: 0, left: 0, right: 0, bottom: 0 },
+        frame: { x: 0, y: 0, width: 0, height: 0 },
       }}
     >
-      <SafeAreaProvider
-        initialMetrics={{
-          insets: { top: 0, left: 0, right: 0, bottom: 0 },
-          frame: { x: 0, y: 0, width: 0, height: 0 },
-        }}
-      >
-        <Provider store={_store}>
-          <AnalyticsProvider>{children}</AnalyticsProvider>
-        </Provider>
-      </SafeAreaProvider>
-    </ThemeContext.Provider>
+      <Provider store={_store}>
+        <AnalyticsProvider>{children}</AnalyticsProvider>
+      </Provider>
+    </SafeAreaProvider>
   );
 };
 

package/numberUtils/__tests__/toPositiveNumberWithDefault.test.ts

@@ -1,66 +0,0 @@
-import { toPositiveNumberWithDefault } from "..";
-
-describe("toNumber", () => {
-  const DEFAULT = 5;
-
-  it("return number if input is positive number", () => {
-    const inputs = [0, 1, 2, 100, 200.12, Infinity];
-    expect.assertions(inputs.length);
-
-    inputs.forEach((input) => {
-      const output = toPositiveNumberWithDefault(DEFAULT, input);
-      expect(output).toBe(input);
-    });
-  });
-
-  it("return number if input is positive number as string", () => {
-    const inputs = ["0", "1", "2", "100", "200.12"];
-    expect.assertions(inputs.length);
-
-    inputs.forEach((input) => {
-      const output = toPositiveNumberWithDefault(DEFAULT, input);
-      expect(output).toBe(Number(input));
-    });
-  });
-
-  it("return default number if input is negative number", () => {
-    const inputs = [-1, -2, -100, -Infinity];
-    expect.assertions(inputs.length);
-
-    inputs.forEach((input) => {
-      const output = toPositiveNumberWithDefault(DEFAULT, input);
-      expect(output).toBe(DEFAULT);
-    });
-  });
-
-  it("return default number if input is negative number as string", () => {
-    const inputs = ["-1", "-2", "-100"];
-    expect.assertions(inputs.length);
-
-    inputs.forEach((input) => {
-      const output = toPositiveNumberWithDefault(DEFAULT, input);
-      expect(output).toBe(DEFAULT);
-    });
-  });
-
-  it("return default if input is not a number or infinite", () => {
-    const inputs = [
-      "vfdvf",
-      null,
-      undefined,
-      NaN,
-      "",
-      {},
-      { test: 1 },
-      [],
-      [1],
-    ];
-
-    expect.assertions(inputs.length);
-
-    inputs.forEach((input) => {
-      const output = toPositiveNumberWithDefault(DEFAULT, input);
-      expect(output).toBe(DEFAULT);
-    });
-  });
-});

package/numberUtils/__tests__/toPositiveNumberWithDefaultZero.test.ts

@@ -1,66 +0,0 @@
-import { toPositiveNumberWithDefaultZero } from "..";
-
-const DEFAULT = 0;
-
-describe("toNumber", () => {
-  it("return number if input is positive number", () => {
-    const inputs = [0, 1, 2, 100, 200.12];
-    expect.assertions(inputs.length);
-
-    inputs.forEach((input) => {
-      const output = toPositiveNumberWithDefaultZero(input);
-      expect(output).toBe(input);
-    });
-  });
-
-  it("return number if input is positive number as string", () => {
-    const inputs = ["0", "1", "2", "100", "200.12"];
-    expect.assertions(inputs.length);
-
-    inputs.forEach((input) => {
-      const output = toPositiveNumberWithDefaultZero(input);
-      expect(output).toBe(Number(input));
-    });
-  });
-
-  it("return default number if input is negative number", () => {
-    const inputs = [-1, -2, -100];
-    expect.assertions(inputs.length);
-
-    inputs.forEach((input) => {
-      const output = toPositiveNumberWithDefaultZero(input);
-      expect(output).toBe(DEFAULT);
-    });
-  });
-
-  it("return default number if input is negative number as string", () => {
-    const inputs = ["-1", "-2", "-100"];
-    expect.assertions(inputs.length);
-
-    inputs.forEach((input) => {
-      const output = toPositiveNumberWithDefaultZero(input);
-      expect(output).toBe(DEFAULT);
-    });
-  });
-
-  it("return default if input is not a number or infinite", () => {
-    const inputs = [
-      "vfdvf",
-      null,
-      undefined,
-      NaN,
-      "",
-      {},
-      { test: 1 },
-      [],
-      [1],
-    ];
-
-    expect.assertions(inputs.length);
-
-    inputs.forEach((input) => {
-      const output = toPositiveNumberWithDefaultZero(input);
-      expect(output).toBe(DEFAULT);
-    });
-  });
-});

package/reactHooks/layout/useDimensions/__tests__/useDimensions.test.ts

@@ -1,134 +0,0 @@
-import { renderHook } from "@testing-library/react-hooks";
-import { Dimensions, StatusBar } from "react-native";
-
-const mockUsePickFromState = jest.fn();
-const mockUseIsScreenActive = jest.fn();
-const mockGetInitialDimensions = jest.fn();
-const mockGetDeviceInfo = jest.fn();
-
-jest.mock("@applicaster/zapp-react-native-redux/hooks", () => ({
-  ...(jest.requireActual("@applicaster/zapp-react-native-redux/hooks") as {}),
-  usePickFromState: mockUsePickFromState,
-}));
-
-jest.mock("../../../navigation", () => ({
-  useIsScreenActive: mockUseIsScreenActive,
-}));
-
-jest.mock("../helpers", () => ({
-  getInitialDimensions: mockGetInitialDimensions,
-}));
-
-jest.mock("../../getDeviceInfo", () => ({
-  getDeviceInfo: mockGetDeviceInfo,
-}));
-
-const { useDimensions } = require("../useDimensions");
-
-describe("useDimensions", () => {
-  const mockDimensions = { width: 100, height: 200, scale: 1, fontScale: 1 };
-  const mockAppData = { someData: "test" };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-    Dimensions.get = jest.fn().mockReturnValue(mockDimensions);
-
-    Dimensions.addEventListener = jest.fn().mockReturnValue({
-      remove: jest.fn(),
-    });
-
-    mockUsePickFromState.mockReturnValue({ appData: mockAppData });
-    mockUseIsScreenActive.mockReturnValue(true);
-    mockGetInitialDimensions.mockReturnValue(mockDimensions);
-    mockGetDeviceInfo.mockReturnValue({ deviceInfo: "testDeviceInfo" });
-  });
-
-  it("returns correct initial dimensions", () => {
-    const { result } = renderHook(() =>
-      useDimensions("window", { fullDimensions: false })
-    );
-
-    expect(result.current).toEqual({
-      ...mockDimensions,
-      statusBarHeight: StatusBar.currentHeight,
-    });
-
-    expect(mockGetInitialDimensions).toHaveBeenCalledWith("window");
-  });
-
-  it("calls handler on mount", () => {
-    renderHook(() => useDimensions("window", { fullDimensions: false }));
-
-    expect(Dimensions.addEventListener).toHaveBeenCalledWith(
-      "change",
-      expect.any(Function)
-    );
-  });
-
-  it("calls handler on isActive change", () => {
-    const { rerender } = renderHook(() =>
-      useDimensions("window", { fullDimensions: false })
-    );
-
-    mockUseIsScreenActive.mockReturnValue(false);
-    rerender();
-
-    expect(Dimensions.addEventListener).toHaveBeenCalledWith(
-      "change",
-      expect.any(Function)
-    );
-  });
-
-  it("handles fullDimensions option", () => {
-    const { result } = renderHook(() =>
-      useDimensions("window", { fullDimensions: true })
-    );
-
-    expect(result.current).toEqual({
-      ...mockDimensions,
-      scale: 1,
-      fontScale: 1,
-      statusBarHeight: StatusBar.currentHeight,
-    });
-  });
-
-  it("handles excludeStatusBar option", () => {
-    const { result } = renderHook(() =>
-      useDimensions("window", { excludeStatusBar: true })
-    );
-
-    expect(result.current.height).toBe(
-      mockDimensions.height - StatusBar.currentHeight ?? 0
-    );
-  });
-
-  it("handles rounded option", () => {
-    const { result } = renderHook(() =>
-      useDimensions("window", { rounded: true })
-    );
-
-    expect(result.current.width).toBe(Math.ceil(mockDimensions.width));
-    expect(result.current.height).toBe(Math.ceil(mockDimensions.height));
-  });
-
-  it("handles deviceInfo option", () => {
-    const { result } = renderHook(() =>
-      useDimensions("window", { deviceInfo: true })
-    );
-
-    expect(result.current.deviceInfo).toMatchObject({
-      deviceInfo: "testDeviceInfo",
-    });
-  });
-
-  it("logs deprecation warning when fullDimensions is boolean", () => {
-    const consoleWarnSpy = jest.spyOn(console, "warn").mockImplementation();
-    renderHook(() => useDimensions("window", true));
-
-    expect(consoleWarnSpy).toHaveBeenCalledWith(
-      "Deprecation Warning\nSecond argument is now the options object. {fullDimensions: boolean, ...}"
-    );
-
-    consoleWarnSpy.mockRestore();
-  });
-});