@applicaster/zapp-react-native-ui-components 14.0.0-alpha.8419134002 → 14.0.0-alpha.8557119261

package/Contexts/ScreenContext/index.tsx

@@ -13,7 +13,8 @@ import {
 } from "@applicaster/zapp-react-native-utils/reactHooks";
 import { useModalNavigationContext } from "@applicaster/zapp-react-native-ui-components/Contexts/ModalNavigationContext";
 import { useNestedNavigationContext } from "@applicaster/zapp-react-native-ui-components/Contexts/NestedNavigationContext";
-import { create, StoreApi, UseBoundStore } from "zustand";
+import { create } from "zustand";
+import { subscribeWithSelector } from "zustand/middleware";
 import { useShallow } from "zustand/react/shallow";
 import { Animated } from "react-native";
 
@@ -39,11 +40,26 @@ interface NavBarState {
   setSummary: (subtitle: string) => void;
 }
 
-type ScreenContextType = {
-  _navBarStore: UseBoundStore<StoreApi<NavBarStoreState>>;
-  navBar: NavBarState;
-  legacyFormatScreenData: LegacyNavigationScreenData | null;
-};
+const createStateStore = () =>
+  create(
+    subscribeWithSelector<ScreenStateStore>((set) => ({
+      data: {},
+      setValue: (key, value) =>
+        set((state) => ({
+          data: {
+            ...state.data,
+            [key]: value,
+          },
+        })),
+      removeValue: (key) =>
+        set((state) => {
+          const newData = { ...state.data };
+          delete newData[key];
+
+          return { data: newData };
+        }),
+    }))
+  );
 
 const createStore = () =>
   create<NavBarStoreState>((set) => ({
@@ -65,7 +81,15 @@ const createStore = () =>
     },
   }));
 
+type ScreenContextType = {
+  _navBarStore: ReturnType<typeof createStore>;
+  _stateStore: ReturnType<typeof createStateStore>;
+  navBar: NavBarState;
+  legacyFormatScreenData: LegacyNavigationScreenData | null;
+};
+
 export const ScreenContext = createContext<ScreenContextType>({
+  _stateStore: createStateStore(),
   _navBarStore: createStore(),
   navBar: {
     visible: true,
@@ -103,6 +127,21 @@ export function ScreenContextProvider({
     null
   );
 
+  const screenStateRef = useRef<null | ReturnType<typeof createStateStore>>(
+    null
+  );
+
+  const getScreenState = useCallback(() => {
+    if (screenStateRef.current !== null) {
+      return screenStateRef.current;
+    }
+
+    const stateStore = createStateStore();
+    screenStateRef.current = stateStore;
+
+    return stateStore;
+  }, []);
+
   const getScreenNavBarState = useCallback(() => {
     if (screenNavBarStateRef.current !== null) {
       return screenNavBarStateRef.current;
@@ -163,6 +202,7 @@ export function ScreenContextProvider({
       value={useMemo(
         () => ({
           _navBarStore: getScreenNavBarState(),
+          _stateStore: getScreenState(),
           navBar: navBarState,
           legacyFormatScreenData: routeScreenData,
         }),

package/Decorators/ConfigurationWrapper/__tests__/withConfigurationProvider.test.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import TestRenderer from "react-test-renderer";
+import { render } from "@testing-library/react-native";
 import { useConfiguration } from "@applicaster/zapp-react-native-utils/reactHooks/configuration";
 import { View } from "react-native";
 import { withConfigurationProvider } from "@applicaster/zapp-react-native-ui-components/Decorators/ConfigurationWrapper";
@@ -15,12 +15,12 @@ describe("withConfigurationProvider", () => {
   it("correctly passes all the configuration keys child component", () => {
     const Component = withConfigurationProvider(TestComponent);
 
-    const wrapper = TestRenderer.create(
+    const { toJSON } = render(
       <Component
         screenData={{ styles: {}, general: {}, data: { source: "test" } }}
       />
     );
 
-    expect(wrapper.toJSON()).toMatchSnapshot();
+    expect(toJSON()).toMatchSnapshot();
   });
 });

package/Decorators/ConfigurationWrapper/withConfigurationProvider.tsx

@@ -21,13 +21,13 @@ const prepareConfiguration = (
   keys: [string]
 ) => R.compose(R.evolve(keysMap), R.pickAll(keys))(configuration);
 
+const configurationKeys = R.keys(keysMap);
+
 export function withConfigurationProvider(Component: React.ComponentType<any>) {
   return function WithConfigurationProvider(props: Props) {
     const styles = props?.screenData?.styles;
     const general = props?.screenData?.general;
 
-    const configurationKeys = React.useMemo(() => R.keys(keysMap), []);
-
     const configuration = React.useMemo(
       () => prepareConfiguration({ ...general, ...styles }, configurationKeys),
       []

package/Decorators/RiverFeedLoader/__tests__/__snapshots__/riverFeedLoader.test.tsx.snap

@@ -1,214 +1,226 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`WithRiverFeedLoader renders correctly 1`] = `
-<View
-  dispatch={[MockFunction]}
-  river={
-    {
-      "id": "A1234",
-      "ui_components": [
-        {
-          "data": {
-            "source": "http://datasource0",
-          },
-          "rules": {
-            "clear_cache_on_reload": false,
-          },
-        },
-        {
-          "data": {
-            "source": "http://datasource1",
-          },
-          "rules": {
-            "clear_cache_on_reload": false,
-          },
-        },
-        {
-          "data": {
-            "source": "http://datasource2",
-          },
-          "rules": {
-            "clear_cache_on_reload": false,
-          },
-        },
-        {
-          "data": {
-            "source": "http://datasource3",
-          },
-          "rules": {
-            "clear_cache_on_reload": false,
-          },
-        },
-        {
-          "data": {
-            "source": "http://datasource4",
-          },
-          "rules": {
-            "clear_cache_on_reload": false,
-          },
-        },
-        {
-          "data": {
-            "source": "http://datasource5",
-          },
-          "rules": {
-            "clear_cache_on_reload": false,
-          },
-        },
-        {
-          "data": {
-            "source": "http://datasource6",
-          },
-          "rules": {
-            "clear_cache_on_reload": false,
-          },
-        },
-        {
-          "data": {
-            "source": "http://datasource7",
-          },
-          "rules": {
-            "clear_cache_on_reload": false,
-          },
-        },
-        {
-          "data": {
-            "source": "http://datasource8",
-          },
-          "rules": {
-            "clear_cache_on_reload": false,
-          },
-        },
-        {
-          "data": {
-            "source": "http://datasource9",
-          },
-          "rules": {
-            "clear_cache_on_reload": false,
-          },
-        },
-        {
-          "data": {
-            "source": "http://datasource10",
-          },
-          "rules": {
-            "clear_cache_on_reload": false,
-          },
-        },
-        {
-          "data": {
-            "source": "http://datasource11",
-          },
-          "rules": {
-            "clear_cache_on_reload": false,
-          },
-        },
-        {
-          "data": {
-            "source": "http://datasource12",
-          },
-          "rules": {
-            "clear_cache_on_reload": true,
-          },
-        },
-        {
-          "data": {
-            "source": "http://datasource13",
-          },
-          "rules": {
-            "clear_cache_on_reload": false,
-          },
-        },
-        {
-          "data": {
-            "source": "http://datasource14",
-          },
-          "rules": {
-            "clear_cache_on_reload": false,
-          },
-        },
-        {
-          "data": {
-            "source": "http://datasource15",
-          },
-          "rules": {
-            "clear_cache_on_reload": false,
-          },
-        },
-        {
-          "data": {
-            "source": "http://datasource16",
-          },
-          "rules": {
-            "clear_cache_on_reload": false,
-          },
-        },
-        {
-          "data": {
-            "source": "http://datasource17",
-          },
-          "rules": {
-            "clear_cache_on_reload": false,
-          },
-        },
-        {
-          "data": {
-            "source": "http://datasource18",
-          },
-          "rules": {
-            "clear_cache_on_reload": false,
-          },
-        },
-        {
-          "data": {
-            "source": "http://datasource19",
-          },
-          "rules": {
-            "clear_cache_on_reload": false,
-          },
-        },
-        {
-          "data": {
-            "source": "http://datasource20",
-          },
-          "rules": {
-            "clear_cache_on_reload": true,
-          },
-        },
-        {
-          "data": {
-            "source": "http://datasource21",
-          },
-          "rules": {
-            "clear_cache_on_reload": false,
-          },
-        },
-        {
-          "data": {
-            "source": "http://datasource22",
-          },
-          "rules": {
-            "clear_cache_on_reload": false,
-          },
-        },
-        {
-          "data": {
-            "source": "http://datasource23",
-          },
-          "rules": {
-            "clear_cache_on_reload": false,
-          },
-        },
-        {
-          "data": {
-            "source": "http://datasource24",
-          },
-          "rules": {
-            "clear_cache_on_reload": false,
-          },
-        },
-      ],
-    }
+<RNCSafeAreaProvider
+  onInsetsChange={[Function]}
+  style={
+    [
+      {
+        "flex": 1,
+      },
+      undefined,
+    ]
   }
-/>
+>
+  <View
+    dispatch={[MockFunction]}
+    river={
+      {
+        "id": "A1234",
+        "ui_components": [
+          {
+            "data": {
+              "source": "http://datasource0",
+            },
+            "rules": {
+              "clear_cache_on_reload": false,
+            },
+          },
+          {
+            "data": {
+              "source": "http://datasource1",
+            },
+            "rules": {
+              "clear_cache_on_reload": false,
+            },
+          },
+          {
+            "data": {
+              "source": "http://datasource2",
+            },
+            "rules": {
+              "clear_cache_on_reload": false,
+            },
+          },
+          {
+            "data": {
+              "source": "http://datasource3",
+            },
+            "rules": {
+              "clear_cache_on_reload": false,
+            },
+          },
+          {
+            "data": {
+              "source": "http://datasource4",
+            },
+            "rules": {
+              "clear_cache_on_reload": false,
+            },
+          },
+          {
+            "data": {
+              "source": "http://datasource5",
+            },
+            "rules": {
+              "clear_cache_on_reload": false,
+            },
+          },
+          {
+            "data": {
+              "source": "http://datasource6",
+            },
+            "rules": {
+              "clear_cache_on_reload": false,
+            },
+          },
+          {
+            "data": {
+              "source": "http://datasource7",
+            },
+            "rules": {
+              "clear_cache_on_reload": false,
+            },
+          },
+          {
+            "data": {
+              "source": "http://datasource8",
+            },
+            "rules": {
+              "clear_cache_on_reload": false,
+            },
+          },
+          {
+            "data": {
+              "source": "http://datasource9",
+            },
+            "rules": {
+              "clear_cache_on_reload": false,
+            },
+          },
+          {
+            "data": {
+              "source": "http://datasource10",
+            },
+            "rules": {
+              "clear_cache_on_reload": false,
+            },
+          },
+          {
+            "data": {
+              "source": "http://datasource11",
+            },
+            "rules": {
+              "clear_cache_on_reload": false,
+            },
+          },
+          {
+            "data": {
+              "source": "http://datasource12",
+            },
+            "rules": {
+              "clear_cache_on_reload": true,
+            },
+          },
+          {
+            "data": {
+              "source": "http://datasource13",
+            },
+            "rules": {
+              "clear_cache_on_reload": false,
+            },
+          },
+          {
+            "data": {
+              "source": "http://datasource14",
+            },
+            "rules": {
+              "clear_cache_on_reload": false,
+            },
+          },
+          {
+            "data": {
+              "source": "http://datasource15",
+            },
+            "rules": {
+              "clear_cache_on_reload": false,
+            },
+          },
+          {
+            "data": {
+              "source": "http://datasource16",
+            },
+            "rules": {
+              "clear_cache_on_reload": false,
+            },
+          },
+          {
+            "data": {
+              "source": "http://datasource17",
+            },
+            "rules": {
+              "clear_cache_on_reload": false,
+            },
+          },
+          {
+            "data": {
+              "source": "http://datasource18",
+            },
+            "rules": {
+              "clear_cache_on_reload": false,
+            },
+          },
+          {
+            "data": {
+              "source": "http://datasource19",
+            },
+            "rules": {
+              "clear_cache_on_reload": false,
+            },
+          },
+          {
+            "data": {
+              "source": "http://datasource20",
+            },
+            "rules": {
+              "clear_cache_on_reload": true,
+            },
+          },
+          {
+            "data": {
+              "source": "http://datasource21",
+            },
+            "rules": {
+              "clear_cache_on_reload": false,
+            },
+          },
+          {
+            "data": {
+              "source": "http://datasource22",
+            },
+            "rules": {
+              "clear_cache_on_reload": false,
+            },
+          },
+          {
+            "data": {
+              "source": "http://datasource23",
+            },
+            "rules": {
+              "clear_cache_on_reload": false,
+            },
+          },
+          {
+            "data": {
+              "source": "http://datasource24",
+            },
+            "rules": {
+              "clear_cache_on_reload": false,
+            },
+          },
+        ],
+      }
+    }
+  />
+</RNCSafeAreaProvider>
 `;

package/Decorators/RiverFeedLoader/__tests__/riverFeedLoader.test.tsx

@@ -1,9 +1,8 @@
 import React from "react";
-import * as R from "ramda";
 import { View } from "react-native";
-import { render } from "@testing-library/react-native";
 
 import * as mock_fixtures from "./fixtures";
+import { renderWithProviders } from "@applicaster/zapp-react-native-utils/testUtils";
 
 const mockUsePipesContexts = () => ({
   entry: mock_fixtures.entryContext,
@@ -11,8 +10,13 @@ const mockUsePipesContexts = () => ({
   search: mock_fixtures.searchContext,
 });
 
-const mockGetDatasourceUrl = jest.fn(
-  R.curry((_, component) => component.data.source)
+const mockDispatchLoadPipesData = jest.fn();
+
+jest.mock(
+  "@applicaster/zapp-react-native-utils/reactHooks/feed/useLoadPipesDataDispatch",
+  () => ({
+    useLoadPipesDataDispatch: jest.fn(() => mockDispatchLoadPipesData),
+  })
 );
 
 jest.mock(
@@ -31,8 +35,6 @@ jest.mock(
 
 jest.mock("../utils", () => ({
   ...jest.requireActual("../utils"),
-  loadDatasources: jest.fn(),
-  getDatasourceUrl: mockGetDatasourceUrl,
   usePipesContexts: mockUsePipesContexts,
 }));
 
@@ -45,27 +47,23 @@ const riverProps = {
   dispatch: jest.fn(),
 };
 
-const { loadDatasources, getDatasourceUrl } = require("../utils");
-
 const { WithRiverFeedLoader } = require("..");
 
 describe("WithRiverFeedLoader", () => {
   const DecoratedRiver = WithRiverFeedLoader(River);
-  const wrapper = render(<DecoratedRiver {...riverProps} />);
+  const wrapper = renderWithProviders(<DecoratedRiver {...riverProps} />);
 
   it("renders correctly", () => {
     expect(wrapper.toJSON()).toMatchSnapshot();
   });
 
   it("collects the datasources in the screen and loads them", () => {
-    expect(getDatasourceUrl).toHaveBeenCalledTimes(1);
-    expect(loadDatasources).toHaveBeenCalledTimes(1);
+    expect(mockDispatchLoadPipesData).toHaveBeenCalledTimes(23);
 
-    expect(loadDatasources).toHaveBeenNthCalledWith(
-      1,
-      mock_fixtures.riverDataSources,
-      mock_fixtures.river.id,
-      riverProps.dispatch
+    expect(mockDispatchLoadPipesData).toHaveBeenLastCalledWith(
+      "http://datasource24",
+      {},
+      { withResolvers: true, withScreenRouteMapping: true }
     );
   });
 });

package/Decorators/RiverFeedLoader/__tests__/utils.test.ts

@@ -14,31 +14,11 @@ jest.mock("@applicaster/zapp-react-native-redux/ZappPipes", () => ({
 }));
 
 const {
-  loadDatasources,
   riverIsCurrentRoute,
   getDatasourceUrl,
   ignoreComponentsWithClearCacheFlag,
 } = require("../utils");
 
-const {
-  loadPipesData,
-} = require("@applicaster/zapp-react-native-redux/ZappPipes");
-
-const dispatch = (value) => Promise.resolve(value);
-
-describe("loadDataSource", () => {
-  it("calls loadPipesData for each provided urls", async () => {
-    const urls = [
-      ["http://datasource1", "http://datasource2"],
-      ["http://datasource3", "http://datasource4"],
-    ];
-
-    await loadDatasources(urls, river.id, dispatch);
-
-    expect(loadPipesData).toHaveBeenCalledTimes(R.flatten(urls).length);
-  });
-});
-
 describe("riverIsCurrentRoute", () => {
   const route = "/river/homeId/river/screenId";
   const riverId = "screenId";