@applicaster/zapp-react-native-utils 12.0.0-alpha.4440903139 → 12.0.0-alpha.4484269996

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/player/useAutoSeek.tsx

@@ -1,4 +1,5 @@
 import React, { useEffect, useState } from "react";
+import * as R from "ramda";
 import { usePrevious } from "@applicaster/zapp-react-native-utils/reactHooks/utils";
 import { playerManager } from "@applicaster/zapp-react-native-utils/appUtils/playerManager";
 import {
@@ -42,7 +43,7 @@ export const useAutoSeek = (resetHUDTimer = noop) => {
     if (!player) return;
 
     if (direction) {
-      player[direction](Math.min(MAX_SEEK_TIME, SKIP_TIME_BASE * multiplier));
+      player[direction](R.min(MAX_SEEK_TIME, SKIP_TIME_BASE * multiplier));
       resetHUDTimer();
     }
   }, [multiplier, direction]);
@@ -50,9 +51,7 @@ export const useAutoSeek = (resetHUDTimer = noop) => {
   useEffect(() => {
     if (isRunning && isRunning !== prevRunning) {
       setIntervalTimer(() => {
-        setMultiplier((prev) => {
-          return prev + 1;
-        });
+        setMultiplier(R.add(1));
       });
     } else if (!isRunning && isRunning !== prevRunning) {
       resetState();

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/appUtils/playerManager/playerHooks/usePlayerCurrentTime.tsx

@@ -1,57 +0,0 @@
-import { useState, useEffect, useCallback } from "react";
-import { Player } from "../player";
-import { usePlayer } from "../usePlayer";
-import { useThrottle } from "../../../functionUtils";
-
-/**
- *
- * @param listenerId - A unique identifier for the listener.
- * @param playerId - (Optional) The ID of the player to observe.
- * @returns The current playback time in seconds.
- */
-export const usePlayerCurrentTime = (
-  listenerId: string,
-  playerId?: string
-): number | null => {
-  const [currentTime, setCurrentTime] = useState<number | null>(null);
-  const player: Player = usePlayer(playerId);
-
-  const updateCurrentTime = useCallback(() => {
-    if (player) {
-      const newCurrentTime = player.getContentPosition();
-
-      setCurrentTime((prevTime) =>
-        prevTime !== newCurrentTime ? newCurrentTime : prevTime
-      );
-    }
-  }, [player]);
-
-  const { throttledFunction: throttledUpdate, cancel } = useThrottle(
-    updateCurrentTime,
-    1000
-  );
-
-  useEffect(() => {
-    if (player) {
-      throttledUpdate();
-
-      const listeners = {
-        onVideoProgress: throttledUpdate,
-      };
-
-      const id = `${listenerId}_player_current_time`;
-
-      player.addListener({
-        id: id,
-        listener: listeners,
-      });
-
-      return () => {
-        player.removeListener(id);
-        cancel();
-      };
-    }
-  }, [player, listenerId, throttledUpdate, cancel]);
-
-  return currentTime;
-};

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