@applicaster/quick-brick-core 14.0.0-alpha.9203091422 → 14.0.0-alpha.9551591420

package/App/ActionsProvider/index.js

@@ -1,7 +1,7 @@
 import * as React from "react";
 import * as R from "ramda";
 
-import { connectToStore } from "@applicaster/zapp-react-native-redux";
+import { connectToStore } from "@applicaster/zapp-react-native-redux/utils/connectToStore";
 
 import { ActionsProvider as ActionsProviderComponent } from "./ActionsProvider";
 

package/App/AppStateDecorator/index.tsx

@@ -2,9 +2,9 @@ import * as React from "react";
 import { AppState, AppStateStatus } from "react-native";
 import * as R from "ramda";
 
-import { connectToStore } from "@applicaster/zapp-react-native-redux";
+import { connectToStore } from "@applicaster/zapp-react-native-redux/utils/connectToStore";
 import { setAppState } from "@applicaster/zapp-react-native-redux/appState";
-import { Dispatch } from "redux";
+import { Dispatch } from "@reduxjs/toolkit";
 
 type Props = {
   Component: () => React.ComponentType<any>;

package/App/DeepLinking/URLSchemeHandler/SchemeHandlerHooks/__tests__/usePresentSchemeHandler.test.tsx

@@ -4,7 +4,6 @@ import { renderHook } from "@testing-library/react-native";
 import { sessionStorage } from "@applicaster/zapp-react-native-bridge/ZappStorage/SessionStorage";
 import * as helpers from "../../../helpers";
 import * as feedLoader from "@applicaster/zapp-react-native-utils/reactHooks/feed/useFeedLoader";
-import * as useNavigationHooks from "@applicaster/zapp-react-native-utils/reactHooks/navigation/useNavigation";
 import { WrappedWithProviders } from "@applicaster/zapp-react-native-utils/testUtils";
 import { usePresentSchemeHandler } from "../usePresentSchemeHandler";
 
@@ -16,15 +15,20 @@ const rivers = {
   },
 };
 
-const navigator = {
+const mock_navigator = {
   currentRoute: "/river/A1234",
   replace: jest.fn(),
   goHome: jest.fn(),
 } as any;
 
-const mockStore = configureStore();
+jest.mock(
+  "@applicaster/zapp-react-native-utils/reactHooks/navigation/useNavigation",
+  () => ({
+    useNavigation: jest.fn(() => mock_navigator),
+  })
+);
 
-jest.spyOn(useNavigationHooks, "useNavigation").mockReturnValue(navigator);
+const mockStore = configureStore();
 
 const helperSpy = jest.spyOn(helpers, "handlePresentNavigation");
 const feedLoaderSpy = jest.spyOn(feedLoader, "useFeedLoader");
@@ -33,6 +37,7 @@ const onFinish = jest.fn((cb) => {
   cb();
 });
 
+const navigator = mock_navigator;
 jest.useFakeTimers();
 
 describe("usePresentSchemeHandler", () => {
@@ -210,6 +215,8 @@ describe("usePresentSchemeHandler", () => {
           actions?.find(R.propEq("type", "SET_APP_NOT_READY"))
         ).toBeDefined();
 
+        expect(actions?.find(R.propEq("type", "SET_APP_READY"))).toBeDefined();
+
         expect(navigator.replace).toBeCalledWith({});
       };
     });

package/App/DeepLinking/URLSchemeHandler/SchemeHandlerHooks/useOpenSchemeHandler/index.ts

@@ -1,4 +1,8 @@
-import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
+import {
+  useAppSelector,
+  selectContentTypes,
+  selectRivers,
+} from "@applicaster/zapp-react-native-redux";
 import { ZappPipesEntryContext } from "@applicaster/zapp-react-native-ui-components/Contexts";
 import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks/navigation";
 import { useEffect } from "react";
@@ -97,7 +101,8 @@ async function handleQuery({
 }
 
 export function useOpenSchemeHandler({ query, url, onFinish }) {
-  const { rivers, contentTypes } = usePickFromState(["rivers", "contentTypes"]);
+  const rivers = useAppSelector(selectRivers);
+  const contentTypes = useAppSelector(selectContentTypes);
   const navigator = useNavigation();
   const homeId = getHomeScreenId(rivers);
   const homeRoute = `/river/${homeId}`;

package/App/DeepLinking/URLSchemeHandler/SchemeHandlerHooks/usePresentSchemeHandler.ts

@@ -1,15 +1,17 @@
-import { useActions } from "@applicaster/zapp-react-native-redux/hooks";
+import {
+  loadAppContextData,
+  useAppDispatch,
+  useActions,
+} from "@applicaster/zapp-react-native-redux";
 import * as R from "ramda";
 import * as React from "react";
 import axios from "axios";
-import { useDispatch } from "react-redux";
 
 import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks";
 
 import { useFeedLoader } from "@applicaster/zapp-react-native-utils/reactHooks/feed/useFeedLoader";
 
 import { sessionStorage } from "@applicaster/zapp-react-native-bridge/ZappStorage/SessionStorage";
-import { loadAppContextData } from "@applicaster/zapp-react-native-redux";
 import { noop } from "@applicaster/zapp-react-native-utils/functionUtils";
 
 import {
@@ -60,7 +62,7 @@ export function usePresentSchemeHandler({
 
   const rivers = useRivers();
   const screenRiver = findRiver({ screen_id, rivers });
-  const dispatch = useDispatch();
+  const dispatch = useAppDispatch();
 
   const actions = useActions({
     setAppReady,

package/App/DeepLinking/URLSchemeHandler/__tests__/URLSchemeHandler.test.tsx

@@ -6,16 +6,16 @@ const theme = {
   app_background_color: "white",
 };
 
-const plugins = [];
-
-jest.mock("@applicaster/zapp-react-native-utils/reactHooks/navigation");
+jest.mock(
+  "@applicaster/zapp-react-native-utils/reactHooks/navigation/useNavigation"
+);
 
 jest.mock("@applicaster/zapp-react-native-utils/theme", () => ({
   useTheme: jest.fn(() => theme),
 }));
 
 jest.mock("@applicaster/zapp-react-native-redux/hooks", () => ({
-  usePickFromState: jest.fn(() => plugins),
+  usePickFromState: jest.fn(() => ({})),
 }));
 
 const { URLSchemeHandler } = require("../URLSchemeHandler");

package/App/NavigationProvider/navigator/__tests__/__snapshots__/reducer.test.ts.snap

@@ -44,7 +44,6 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
           "supports_offline": false,
           "type": "general_content",
         },
-        "screenStateStore": [Function],
       },
     },
     "options": {
@@ -80,7 +79,6 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
               "supports_offline": false,
               "type": "general_content",
             },
-            "screenStateStore": undefined,
           },
         },
       ],
@@ -116,7 +114,6 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
           "supports_offline": false,
           "type": "general_content",
         },
-        "screenStateStore": [Function],
       },
     },
     "options": {
@@ -152,7 +149,6 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
               "supports_offline": false,
               "type": "general_content",
             },
-            "screenStateStore": undefined,
           },
         },
         {
@@ -184,7 +180,6 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
               "supports_offline": false,
               "type": "general_content",
             },
-            "screenStateStore": undefined,
           },
         },
       ],
@@ -220,7 +215,6 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
           "supports_offline": false,
           "type": "general_content",
         },
-        "screenStateStore": [Function],
       },
     },
     "options": {
@@ -256,7 +250,6 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
               "supports_offline": false,
               "type": "general_content",
             },
-            "screenStateStore": undefined,
           },
         },
         {
@@ -288,7 +281,6 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
               "supports_offline": false,
               "type": "general_content",
             },
-            "screenStateStore": undefined,
           },
         },
         {
@@ -320,7 +312,6 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
               "supports_offline": false,
               "type": "general_content",
             },
-            "screenStateStore": undefined,
           },
         },
       ],
@@ -357,7 +348,6 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
           "supports_offline": false,
           "type": "general_content",
         },
-        "screenStateStore": undefined,
       },
     },
     "options": {
@@ -393,7 +383,6 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
               "supports_offline": false,
               "type": "general_content",
             },
-            "screenStateStore": undefined,
           },
         },
         {
@@ -425,7 +414,6 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
               "supports_offline": false,
               "type": "general_content",
             },
-            "screenStateStore": undefined,
           },
         },
       ],
@@ -461,7 +449,6 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
           "supports_offline": false,
           "type": "general_content",
         },
-        "screenStateStore": [Function],
       },
     },
     "options": {
@@ -497,7 +484,6 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
               "supports_offline": false,
               "type": "general_content",
             },
-            "screenStateStore": undefined,
           },
         },
         {
@@ -529,7 +515,6 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
               "supports_offline": false,
               "type": "general_content",
             },
-            "screenStateStore": undefined,
           },
         },
         {
@@ -561,7 +546,6 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
               "supports_offline": false,
               "type": "general_content",
             },
-            "screenStateStore": undefined,
           },
         },
       ],
@@ -598,7 +582,6 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
           "supports_offline": false,
           "type": "general_content",
         },
-        "screenStateStore": undefined,
       },
     },
     "options": {
@@ -634,7 +617,6 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
               "supports_offline": false,
               "type": "general_content",
             },
-            "screenStateStore": undefined,
           },
         },
         {
@@ -666,7 +648,6 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
               "supports_offline": false,
               "type": "general_content",
             },
-            "screenStateStore": undefined,
           },
         },
       ],

package/App/NavigationProvider/navigator/reducer.ts

@@ -5,7 +5,6 @@ import {
   firstStackEntriesSelector,
   previousStackEntriesSelector,
 } from "./selectors";
-import { create, StoreApi, UseBoundStore } from "zustand";
 
 /* initial state */
 
@@ -121,12 +120,12 @@ export const setNestedContent = (
 
 const navigationEntry = (
   type: ActionValues,
-  { route, screen, entry, key, options, screenStateStore }: AnyRecord
+  { route, screen, entry, key, options }: AnyRecord
 ) => ({
   key,
   action: type,
   route,
-  state: { screen, entry, options, screenStateStore },
+  state: { screen, entry, options },
 });
 
 function updatePopActions(state) {
@@ -275,25 +274,6 @@ function locationReducer(
 ) {
   const { route, key, screen, entry, options } = payload;
 
-  const screenStateStore: UseBoundStore<StoreApi<ScreenStateStore>> =
-    create<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 };
-        }),
-    }));
-
   switch (type) {
     case ACTIONS.BACK:
       // eslint-disable-next-line no-case-declarations
@@ -314,18 +294,14 @@ function locationReducer(
     case ACTIONS.REPLACE:
     case ACTIONS.REPLACE_TOP:
     case ACTIONS.BACK_PLAYER_NESTED_CONTENT:
-      return {
-        pathname: route,
-        state: { screen, entry, options, screenStateStore },
-        key,
-      };
+      return { pathname: route, state: { screen, entry, options }, key };
 
     case ACTIONS.SET_NESTED_CONTENT:
       // eslint-disable-next-line no-case-declarations
-      const nestedEntry = navigationEntry(ACTIONS.REPLACE, {
-        ...payload,
-        screenStateStore,
-      } as AnyRecord);
+      const nestedEntry = navigationEntry(
+        ACTIONS.REPLACE,
+        payload as AnyRecord
+      );
 
       return R.assocPath(["state", "nested"], nestedEntry.state, state);
     default:
@@ -429,34 +405,18 @@ export default function navigationReducer(
     case ACTIONS.REPLACE:
     case ACTIONS.REPLACE_TOP:
     case ACTIONS.BACK:
-    // eslint-disable-next-line
-    case ACTIONS.BACK_PLAYER_NESTED_CONTENT: {
-      // TODO: Check this solution with Pawel, does not work without it on tvs
-      const screenStateStore: UseBoundStore<StoreApi<ScreenStateStore>> =
-        create<ScreenStateStore>((set) => ({
-          data: {},
-          setValue: (key, value) =>
-            set((s) => ({ data: { ...s.data, [key]: value } })),
-          removeValue: (key) =>
-            set((s) => {
-              const data = { ...s.data };
-              delete data[key];
-
-              return { data };
-            }),
-        }));
-
-      const actionWithStore = {
-        type,
-        payload: { ...payload, screenStateStore },
-        meta: state,
-      };
-
-      const stack = applyReducer(navigationStackReducer, actionWithStore);
-      const location = applyReducer(locationReducer, actionWithStore);
-
-      return R.evolve({ stack, location }, state);
-    }
+    case ACTIONS.BACK_PLAYER_NESTED_CONTENT:
+      return R.evolve(
+        {
+          stack: applyReducer(navigationStackReducer, { type, payload }),
+          location: applyReducer(locationReducer, {
+            type,
+            payload,
+            meta: state,
+          }),
+        },
+        state
+      );
 
     case ACTIONS.SET_NESTED_CONTENT:
       return R.evolve(

package/App/NavigationProvider/navigator/selectors.ts

@@ -1,5 +1,5 @@
 import * as R from "ramda";
-import { createSelector } from "reselect";
+import { createSelector } from "@reduxjs/toolkit";
 
 import { getPathAttributes } from "@applicaster/zapp-react-native-utils/navigationUtils";
 
@@ -7,6 +7,7 @@ const riverSelector = R.prop("rivers");
 const pathnameSelector = R.prop("pathname");
 const navigationStackSelector = R.prop("stack");
 
+// @TODO extract to zapp-react-native-redux/selectors, remove ramda
 export const homeRiverSelector = createSelector(
   riverSelector,
   R.compose(R.find(R.propEq("home", true)), R.values)

package/App/StoreConnector/index.ts

@@ -1,5 +1,5 @@
 import * as R from "ramda";
-import { connectToStore } from "@applicaster/zapp-react-native-redux";
+import { connectToStore } from "@applicaster/zapp-react-native-redux/utils/connectToStore";
 
 const REDUX_STORE_PROPS = [
   "components",

package/App/appLifeCycleManager/__tests__/appLifeCycleManager.test.tsx

@@ -1,8 +1,8 @@
 import * as React from "react";
 import { View, Text } from "react-native";
-import { render, waitFor } from "@testing-library/react-native";
-import thunk from "redux-thunk";
-import configureStore from "redux-mock-store";
+import { waitFor } from "@testing-library/react-native";
+import { renderWithProviders } from "@applicaster/zapp-react-native-utils/testUtils";
+import { appStore } from "@applicaster/zapp-react-native-redux/AppStore";
 
 let mocked_items: Record<string, any> = {};
 
@@ -10,6 +10,13 @@ import { appLifeCycleManager } from "../";
 
 const mock_actions = {};
 
+jest.mock("@applicaster/zapp-react-native-redux", () => ({
+  ...jest.requireActual("@applicaster/zapp-react-native-redux"),
+  AppData: {
+    loadAppData: jest.fn(() => () => Promise.resolve()),
+  },
+}));
+
 jest.mock(
   "@applicaster/zapp-react-native-bridge/ZappStorage/SessionStorage",
   () => ({
@@ -19,10 +26,6 @@ jest.mock(
   })
 );
 
-jest.mock("@applicaster/zapp-react-native-redux/AppData", () => ({
-  loadAppData: jest.fn(() => () => Promise.resolve()),
-}));
-
 jest.mock("@applicaster/zapp-react-native-utils/reactHooks/actions", () => ({
   useActions: jest.fn(() => ({ actions: mock_actions })),
 }));
@@ -31,6 +34,9 @@ jest.mock(
   "@applicaster/zapp-react-native-bridge/ZappStorage/LocalStorage",
   () => ({
     localStorage: {
+      ...jest.requireActual(
+        "@applicaster/zapp-react-native-bridge/ZappStorage/LocalStorage"
+      ).localStorage,
       getAllItems: jest.fn(() => Promise.resolve(mocked_items)),
       setItem: jest.fn((key, value) => {
         mocked_items[key] = JSON.stringify(value);
@@ -73,12 +79,8 @@ const appLoader = jest.fn((_dispatch, _getState) => {
   return Promise.resolve();
 });
 
-const store = configureStore([thunk])({});
-const dispatch = store.dispatch;
-
 const state = {
-  rivers: {},
-  plugins: {},
+  plugins: {} as QuickBrickPlugin[],
   appSettings: { runtimeConfigurationUrls: { rivers: "http://rivers.url" } },
 };
 
@@ -100,19 +102,16 @@ describe("appLifeCycleManager", () => {
   it("runs the loaders, then sends quickBrickReady event", async () => {
     const testCallback = jest.fn(() => {});
 
-    render(
-      <DecoratedComponent
-        dispatch={dispatch}
-        {...state}
-        testCallback={testCallback}
-      />
+    renderWithProviders(
+      <DecoratedComponent {...state} testCallback={testCallback} />,
+      state
     );
 
     await waitFor(() => {
       return expect(testCallback).toHaveBeenCalled();
     });
 
-    const actions = store.getActions();
+    const actions = appStore.testStore.getActions();
 
     expect(actions[0]).toMatchObject({ type: "SET_APP_READY" });
 
@@ -126,16 +125,12 @@ describe("appLifeCycleManager", () => {
   it("sends the quickBrickReady event when a loader doesn't resolves", async () => {
     const testCallback = jest.fn(() => {});
 
-    render(
-      <DecoratedComponent
-        dispatch={dispatch}
-        {...state}
-        shouldFail
-        testCallback={testCallback}
-      />
+    renderWithProviders(
+      <DecoratedComponent {...state} shouldFail testCallback={testCallback} />,
+      state
     );
 
-    const actions = store.getActions();
+    const actions = appStore.testStore.getActions();
 
     await waitFor(() => {
       return expect(testCallback).toHaveBeenCalled();

package/App/appLifeCycleManager/index.tsx

@@ -2,7 +2,7 @@ import * as React from "react";
 import * as R from "ramda";
 
 import { sendLaunchEvent } from "@applicaster/zapp-react-native-utils/analyticsUtils";
-import { loadAppData } from "@applicaster/zapp-react-native-redux/AppData";
+import { AppData, useAppDispatch } from "@applicaster/zapp-react-native-redux";
 import {
   setAppLaunched,
   setAppReady,
@@ -13,7 +13,6 @@ import { networkStatusReady } from "../NetworkStatusProvider/networkStatusReady"
 import { updateSessionNumber } from "../SessionCounter/sessionCounter";
 
 import { coreAppLogger } from "../logger";
-import { Dispatch } from "@reduxjs/toolkit";
 import { sessionStorage } from "@applicaster/zapp-react-native-bridge/ZappStorage/SessionStorage";
 import { isEmptyOrNil } from "@applicaster/zapp-react-native-utils/cellUtils";
 import { requiredSessionKeys } from "../../const";
@@ -24,7 +23,6 @@ const logger = coreAppLogger.addSubsystem("AppLifeCycleManager");
 const isAndroid = isAndroidPlatform();
 
 type Props = {
-  dispatch: Dispatch;
   testCallback: () => void;
   plugins: QuickBrickPlugin[];
   appSettings: { runtimeConfigurationUrls: { [key in string]: string } };
@@ -35,6 +33,7 @@ export function appLifeCycleManager(appLoader, QuickBrickManager) {
     // this function is not called until React View is mounted to activity(ie quickBrickReady event sent)
     return function AppLifeCycleManagerRenderer(props: Props) {
       const actionsInitialStateSetters = useActionSetters();
+      const dispatch = useAppDispatch();
       // using useLayoutEffect to call the loader just after the DOM render to mimic componentDidMount timing
 
       async function setUpdateSessionNumber(results: unknown[]) {
@@ -93,7 +92,7 @@ export function appLifeCycleManager(appLoader, QuickBrickManager) {
       }
 
       function makeAppReady() {
-        const { dispatch, testCallback } = props;
+        const { testCallback } = props;
 
         dispatch(setAppReady());
         dispatch(setAppLaunched());
@@ -153,14 +152,14 @@ export function appLifeCycleManager(appLoader, QuickBrickManager) {
 
       const prepareApp = async () => {
         // eslint-disable-next-line unused-imports/no-unused-vars
-        const { dispatch, testCallback, ...state } = props;
+        const { testCallback, ...state } = props;
 
         try {
           const getState = () => state;
 
           const loaders = [
             appLoader(dispatch, getState),
-            dispatch<any>(loadAppData()),
+            dispatch<any>(AppData.loadAppData()),
             networkStatusReady(),
           ];
 

package/App/remoteContextReloader/__tests__/getRemoteContextData.test.js

@@ -1,10 +1,16 @@
-import * as ReduxModule from "@applicaster/zapp-react-native-redux";
 import nock from "nock";
 
 jest.mock("../../AssetCache", () => ({
   cacheAssets: jest.fn((x) => x),
 }));
 
+const mockLoadAppContextData = jest.fn(() => ({}));
+
+jest.mock("@applicaster/zapp-react-native-redux", () => ({
+  ...jest.requireActual("@applicaster/zapp-react-native-redux"),
+  loadAppContextData: mockLoadAppContextData,
+}));
+
 const uuid = "342ee911-03b6-4a16-adde-ece5ef739feb";
 
 const { getRemoteContextData } = require("../getRemoteContextData");
@@ -100,11 +106,12 @@ const failingRuntimeConfigurationUrls = {
   remote_configurations_url: "http://zapp.com/failing.json",
 };
 
-let reduxLoaderSpy;
 const dispatch = jest.fn();
 
 describe("getRemoteContextData", () => {
   beforeEach(() => {
+    mockLoadAppContextData.mockClear();
+
     nock("http://zapp.com").persist().get("/layout.json").reply(200, layout);
 
     nock("http://zapp.com")
@@ -120,20 +127,12 @@ describe("getRemoteContextData", () => {
     nock("http://zapp.com")
       .get("/failing.json")
       .reply(Math.floor(Math.random() * 200 + 400), 0);
-
-    reduxLoaderSpy = jest
-      .spyOn(ReduxModule, "loadAppContextData")
-      .mockImplementation(() => ({}));
-  });
-
-  afterEach(() => {
-    reduxLoaderSpy.mockRestore();
   });
 
   it("returns a map of context data with the result of the matched urls", async () => {
     await getRemoteContextData(dispatch, runtimeConfigurationUrls, plugins);
 
-    return expect(reduxLoaderSpy).toHaveBeenCalledWith(
+    return expect(mockLoadAppContextData).toHaveBeenCalledWith(
       dispatch,
       expect.objectContaining({
         pluginConfigurations,
@@ -147,7 +146,7 @@ describe("getRemoteContextData", () => {
   });
 
   it("skips the context data if it cannot be retrieved", async () => {
-    expect(reduxLoaderSpy).not.toHaveBeenCalled();
+    expect(mockLoadAppContextData).not.toHaveBeenCalled();
 
     return expect(
       getRemoteContextData(dispatch, failingRuntimeConfigurationUrls, plugins)

package/App/remoteContextReloader/getRemoteContextData/getNativeRemoteContextData.ts

@@ -1,12 +1,14 @@
 import * as R from "ramda";
 import isEmpty from "lodash/isEmpty";
 import { Dimensions, NativeModules } from "react-native";
-import { loadAppContextData } from "@applicaster/zapp-react-native-redux";
+import {
+  loadAppContextData,
+  AppData,
+} from "@applicaster/zapp-react-native-redux";
 import { isTablet } from "@applicaster/zapp-react-native-utils/reactHooks";
 import { mapPromises } from "@applicaster/zapp-react-native-utils/arrayUtils";
 import { fetchPluginConfiguration, getPromiseForType } from "../helpers";
 import { cacheAssets } from "../../AssetCache";
-import { actions as appDataActions } from "@applicaster/zapp-react-native-redux/AppData";
 import { logger } from "@applicaster/zapp-react-native-utils/logger";
 import { ACTIVE_LAYOUT_ID_STORAGE_KEY } from "../consts";
 const { AppLoaderBridge } = NativeModules;
@@ -74,7 +76,7 @@ export async function getNativeRemoteContextData(
 
   const apiVersion = layout?.layout?.["api_version"]; // Taken from remote configuration
 
-  dispatch(appDataActions.merge({ layoutVersion: apiVersion || "v1" }));
+  dispatch(AppData.actions.merge({ layoutVersion: apiVersion || "v1" }));
 
   const resolvedPromises = await mapPromises(getPromiseForType, ["cellStyles"]);
 

package/README.md

@@ -42,10 +42,6 @@ Creates a Zapp App with the provided options :
   - `module`: the plugin's callable function / React component
   - `name`: the name of the plugin - should match the `PascalCase`'d identifier of the plugin. If your plugin's identifier is `react-native-article`, the name should be `ReactNativeArticle`
   - `type`: the type of the plugin, as it is defined in the plugin's manifest in Zapp
-- `reduxStoreOptions`: (optional)
-  - `additionalReducers`: map of reducers to load in the redux store, on top of the existing ones. See available reducers' names to avoid name collision which would override your own custom reducers
-  - `additionalMiddlewares`: array of additional middlewares to load - by default, the ZappApp will have the `thunk` middleware, but others can be added
-  - `initialState`: optional initial state for the redux store
 - `pluginConfigurations`: the remote configuration options for plugins, as coming from Zapp
 - `remoteConfigurations`: Zapp's remote configurations
 - `appSettings`: arbitrary app settings which will be stored in the redux store.

package/createZappApp/index.tsx

@@ -12,9 +12,10 @@ import {
   isNotNil,
 } from "@applicaster/zapp-react-native-utils/reactUtils/helpers";
 
+import { createZappReduxStore } from "@applicaster/zapp-react-native-redux/utils/createZappReduxStore";
 import {
-  createZappReduxStore,
   loadAppContextData,
+  AppData,
 } from "@applicaster/zapp-react-native-redux";
 
 import { coreLogger } from "@applicaster/zapp-react-native-utils/logger";
@@ -26,7 +27,6 @@ import { Provider } from "react-redux";
 import { EmptyZappApp } from "../defaults";
 import { mergeUiComponentPlugins } from "../helpers";
 import { isTablet } from "@applicaster/zapp-react-native-utils/reactHooks";
-import { actions as appDataActions } from "@applicaster/zapp-react-native-redux/AppData";
 import { remoteDataLoader } from "../App/appRemoteDataLoader/remoteDataLoader";
 import * as QuickBrickManager from "@applicaster/zapp-react-native-bridge/QuickBrick";
 import { isAndroidPlatform } from "@applicaster/zapp-react-native-utils/reactUtils";
@@ -51,7 +51,6 @@ export function createZappApp(zappAppConfig: ZappAppConfig) {
     remoteConfigurations = {},
     layout = {},
     tabletLayout = {},
-    reduxStoreOptions = {},
     appSettings = {},
     ZappApp = EmptyZappApp,
     presetsMapping = {},
@@ -89,7 +88,7 @@ export function createZappApp(zappAppConfig: ZappAppConfig) {
     injectCorePlugins
   )(plugins);
 
-  const store = createZappReduxStore(reduxStoreOptions);
+  const store = createZappReduxStore();
 
   const appComponents = mergeUiComponentPlugins(components, plugins);
 
@@ -113,7 +112,7 @@ export function createZappApp(zappAppConfig: ZappAppConfig) {
     // Handle case when layout is backed in as part of the environment, dev only
     // TODO: Handle it inside getNativeRemoteContextData
     store.dispatch(
-      appDataActions.merge({
+      AppData.actions.merge({
         layoutVersion: layout?.api_version ? layout.api_version : "v1",
       })
     );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-core",
-  "version": "14.0.0-alpha.9203091422",
+  "version": "14.0.0-alpha.9551591420",
   "description": "Core package for Applicaster's Quick Brick App",
   "main": "index.js",
   "types": "index.d.ts",
@@ -28,13 +28,13 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/applicaster-types": "14.0.0-alpha.9203091422",
-    "@applicaster/quick-brick-core-plugins": "14.0.0-alpha.9203091422",
-    "@applicaster/zapp-pipes-v2-client": "14.0.0-alpha.9203091422",
-    "@applicaster/zapp-react-native-bridge": "14.0.0-alpha.9203091422",
-    "@applicaster/zapp-react-native-redux": "14.0.0-alpha.9203091422",
-    "@applicaster/zapp-react-native-ui-components": "14.0.0-alpha.9203091422",
-    "@applicaster/zapp-react-native-utils": "14.0.0-alpha.9203091422",
+    "@applicaster/applicaster-types": "14.0.0-alpha.9551591420",
+    "@applicaster/quick-brick-core-plugins": "14.0.0-alpha.9551591420",
+    "@applicaster/zapp-pipes-v2-client": "14.0.0-alpha.9551591420",
+    "@applicaster/zapp-react-native-bridge": "14.0.0-alpha.9551591420",
+    "@applicaster/zapp-react-native-redux": "14.0.0-alpha.9551591420",
+    "@applicaster/zapp-react-native-ui-components": "14.0.0-alpha.9551591420",
+    "@applicaster/zapp-react-native-utils": "14.0.0-alpha.9551591420",
     "atob": "^2.1.2",
     "axios": "^0.28.0",
     "btoa": "^1.2.1",
@@ -42,9 +42,6 @@
     "md5": "^2.3.0",
     "promise": "^8.3.0",
     "query-string": "7.1.3",
-    "react-redux": "9.2.0",
-    "redux": "^4.0.4",
-    "reselect": "^4.0.0",
     "url": "^0.11.0",
     "uuid": "3.3.2"
   },
@@ -56,7 +53,6 @@
     "@applicaster/zapp-react-native-tvos-ui-components": "*",
     "@babel/runtime": "*",
     "@react-native-community/netinfo": "*",
-    "immer": "*",
     "react": "*",
     "react-native": "*",
     "react-native-fs": "*",