@applicaster/quick-brick-core 14.0.0-rc.9 → 15.0.0-rc.1

package/App/ThemeManager/index.tsx

@@ -8,6 +8,7 @@ import {
   mapKeys,
   partitionByKeys,
 } from "@applicaster/zapp-react-native-utils/objectUtils";
+import { getLocalizations } from "@applicaster/zapp-react-native-utils/appUtils/localizationsHelper";
 
 type Props = {
   children: React.ReactNode;
@@ -23,7 +24,14 @@ function populateTheme(plugin) {
     return null;
   }
 
-  return [id, getProps(plugin?.configuration || {})];
+  const themeLocalizations =
+    getLocalizations({
+      localizations: plugin?.configuration?.localizations,
+    }) || {};
+
+  const themeProps = getProps(plugin?.configuration || {});
+
+  return [id, { ...themeProps, ...themeLocalizations }];
 }
 
 const TABLET_PREFIX = "tablet_";

package/App/__tests__/createQuickBrickApp.test.js

@@ -1,6 +1,6 @@
 /* eslint-disable indent */
 import * as React from "react";
-import ReactTestRenderer from "react-test-renderer";
+import { render } from "@testing-library/react-native";
 import { Provider } from "react-redux";
 import thunk from "redux-thunk";
 import configureStore from "redux-mock-store";
@@ -42,9 +42,12 @@ jest.mock("../AppStateDecorator", () => ({
   withAppManager: (Comp) => Comp,
 }));
 
-jest.mock("@applicaster/zapp-react-native-utils/reactHooks", () => ({
-  useDimensions: jest.fn(() => ({ width: 375, height: 800 })),
-}));
+jest.mock(
+  "@applicaster/zapp-react-native-utils/reactHooks/layout/useDimensions",
+  () => ({
+    useDimensions: jest.fn(() => ({ width: 375, height: 800 })),
+  })
+);
 
 jest.mock("react-native", () => {
   const RNMock = jest.genMockFromModule("react-native");
@@ -172,13 +175,13 @@ describe("createQuickBrickApp", () => {
   it("returns a react component and it renders correctly", () => {
     const QuickBrickApp = createQuickBrickApp(options);
 
-    const wrapper = ReactTestRenderer.create(
+    const { toJSON } = render(
       <Provider store={store}>
         <QuickBrickApp store={store} />
       </Provider>
     );
 
-    expect(wrapper.toJSON()).toMatchSnapshot();
+    expect(toJSON()).toMatchSnapshot();
   });
 
   describe("with no InteractionManager", () => {
@@ -187,13 +190,13 @@ describe("createQuickBrickApp", () => {
       const { InteractionManager, ...otherOptions } = options;
       const QuickBrickApp = createQuickBrickApp(otherOptions);
 
-      const wrapper = ReactTestRenderer.create(
+      const { toJSON } = render(
         <Provider store={store}>
           <QuickBrickApp store={store} />
         </Provider>
       );
 
-      expect(wrapper.toJSON()).toMatchSnapshot();
+      expect(toJSON()).toMatchSnapshot();
     });
   });
 
@@ -203,13 +206,13 @@ describe("createQuickBrickApp", () => {
       const { ContextProviders, ...otherOptions } = options;
       const QuickBrickApp = createQuickBrickApp(otherOptions);
 
-      const wrapper = ReactTestRenderer.create(
+      const { toJSON } = render(
         <Provider store={store}>
           <QuickBrickApp store={store} />
         </Provider>
       );
 
-      expect(wrapper.toJSON()).toMatchSnapshot();
+      expect(toJSON()).toMatchSnapshot();
     });
   });
 });

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,10 +10,22 @@ import { appLifeCycleManager } from "../";
 
 const mock_actions = {};
 
-jest.mock("@applicaster/zapp-react-native-redux/AppData", () => ({
-  loadAppData: jest.fn(() => () => Promise.resolve()),
+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",
+  () => ({
+    sessionStorage: {
+      getAllItems: jest.fn(() => Promise.resolve(mocked_items)),
+    },
+  })
+);
+
 jest.mock("@applicaster/zapp-react-native-utils/reactHooks/actions", () => ({
   useActions: jest.fn(() => ({ actions: mock_actions })),
 }));
@@ -22,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);
@@ -64,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" } },
 };
 
@@ -91,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" });
 
@@ -117,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/components/ZappAppWrapper.ts

@@ -0,0 +1,3 @@
+import { GestureHandlerRootView } from "react-native-gesture-handler";
+
+export const ZappAppWrapper = GestureHandlerRootView;

package/App/components/ZappAppWrapper.web.ts

@@ -0,0 +1,3 @@
+import { View } from "react-native";
+
+export const ZappAppWrapper = View;

package/App/index.tsx

@@ -31,6 +31,7 @@ import { withActionExecutor } from "@applicaster/zapp-react-native-utils/actions
 import { withScreenDataContextProvider } from "@applicaster/zapp-react-native-ui-components/Contexts/ScreenDataContext";
 import { LogicAggregatorContainer } from "./LogicAggregatorContainer";
 import { LoadingOverlay } from "./LoadingOverlay";
+import { ZappAppWrapper } from "./components/ZappAppWrapper";
 
 interface AppOptions {
   Layout: React.ComponentType;
@@ -59,28 +60,33 @@ const App = ({
     } = props;
 
     return (
-      <ThemeManager plugins={plugins}>
-        <SafeAreaProvider initialMetrics={initialWindowMetrics}>
-          <AppContainer styles={styles}>
-            <ErrorBoundary>
-              <URLSchemeListener>
-                <SplashLoader>
-                  <OfflineHandler>
-                    <Layout>
-                      <RouteManager />
-                    </Layout>
-                  </OfflineHandler>
-                </SplashLoader>
-                <ModalProvider />
-              </URLSchemeListener>
-              <LoadingOverlay />
-            </ErrorBoundary>
-            <LogicAggregatorContainer
-              components={[InteractionManager, ApplyScreenHooks]}
-            />
-          </AppContainer>
-        </SafeAreaProvider>
-      </ThemeManager>
+      <ZappAppWrapper>
+        <ThemeManager plugins={plugins}>
+          <SafeAreaProvider initialMetrics={initialWindowMetrics}>
+            <AppContainer styles={styles}>
+              <ErrorBoundary>
+                <URLSchemeListener>
+                  <SplashLoader>
+                    <OfflineHandler>
+                      <Layout>
+                        <RouteManager />
+                      </Layout>
+                    </OfflineHandler>
+                  </SplashLoader>
+                  <ModalProvider />
+                </URLSchemeListener>
+                <LoadingOverlay />
+              </ErrorBoundary>
+              <LogicAggregatorContainer
+                components={React.useMemo(
+                  () => [InteractionManager, ApplyScreenHooks],
+                  [InteractionManager, ApplyScreenHooks]
+                )}
+              />
+            </AppContainer>
+          </SafeAreaProvider>
+        </ThemeManager>
+      </ZappAppWrapper>
     );
   });
 

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/const/index.ts

@@ -38,3 +38,9 @@ export const requiredSessionKeys = [
 export const QUICK_BRICK_NAVBAR = "quick-brick-navbar";
 
 export const QUICK_BRICK_CONTENT = "quick-brick-content";
+
+export const QUICK_BRICK_NAVBAR_SECTIONS = {
+  right: "nav-bar-right",
+  menu: "navbar-items",
+  left: "nav-bar-left",
+};

package/createZappApp/__tests__/createZappApp.test.js

@@ -75,6 +75,17 @@ jest.mock("@applicaster/zapp-react-native-bridge/QuickBrick", () => ({
   getLegacyInitialProps: jest.fn(() => ({ initialProps: {} })),
 }));
 
+jest.mock(
+  "@applicaster/zapp-react-native-ui-components/Components/River",
+  () => {
+    const View = require("react-native").View;
+
+    return {
+      River: jest.fn(() => <View testID="mock-river" />),
+    };
+  }
+);
+
 describe("createZappApp", () => {
   it("renders the provided React App", () => {
     const ZappApp = createZappApp({ App });

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/index.d.ts

@@ -45,7 +45,6 @@ declare type NavigationReducerActionTypes =
   | "SET_NAV_BAR_TITLE"
   | "SET_NAV_BAR_SUMMARY"
   | "SET_BOTTOM_BAR_VISIBILITY"
-  | "SET_LOCATION"
   | "OPEN_VIDEO_MODAL"
   | "CLOSE_VIDEO_MODAL"
   | "MINIMISE_VIDEO_MODAL"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-core",
-  "version": "14.0.0-rc.9",
+  "version": "15.0.0-rc.1",
   "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-rc.9",
-    "@applicaster/quick-brick-core-plugins": "14.0.0-rc.9",
-    "@applicaster/zapp-pipes-v2-client": "14.0.0-rc.9",
-    "@applicaster/zapp-react-native-bridge": "14.0.0-rc.9",
-    "@applicaster/zapp-react-native-redux": "14.0.0-rc.9",
-    "@applicaster/zapp-react-native-ui-components": "14.0.0-rc.9",
-    "@applicaster/zapp-react-native-utils": "14.0.0-rc.9",
+    "@applicaster/applicaster-types": "15.0.0-rc.1",
+    "@applicaster/quick-brick-core-plugins": "15.0.0-rc.1",
+    "@applicaster/zapp-pipes-v2-client": "15.0.0-rc.1",
+    "@applicaster/zapp-react-native-bridge": "15.0.0-rc.1",
+    "@applicaster/zapp-react-native-redux": "15.0.0-rc.1",
+    "@applicaster/zapp-react-native-ui-components": "15.0.0-rc.1",
+    "@applicaster/zapp-react-native-utils": "15.0.0-rc.1",
     "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": "^7.2.1",
-    "redux": "^4.0.4",
-    "reselect": "^4.0.0",
     "url": "^0.11.0",
     "uuid": "3.3.2"
   },
@@ -56,23 +53,14 @@
     "@applicaster/zapp-react-native-tvos-ui-components": "*",
     "@babel/runtime": "*",
     "@react-native-community/netinfo": "*",
-    "immer": "*",
     "react": "*",
     "react-native": "*",
     "react-native-fs": "*",
-    "react-native-gesture-handler": "*",
     "react-native-linear-gradient": "*",
-    "react-native-safe-area-context": "*",
     "react-native-svg": "*",
-    "react-native-web": "*",
     "react-native-webview": "*",
     "uglify-js": "*",
     "validate-color": "*",
     "zustand": "*"
-  },
-  "devDependencies": {
-    "nock": "^10.0.0",
-    "redux-mock-store": "^1.5.3"
-  },
-  "gitHead": "a473487564142c55cdb50f02505cf0b60fe75658"
+  }
 }

package/renderZappApp/index.js

@@ -19,7 +19,7 @@
  * @param {React.ComponentType<any>} App component to start
  */
 export function renderZappApp(options) {
-  const { App, AppRegistry, appMountId } = options;
+  const { App, AppRegistry, appMountId, mode } = options;
 
   if (!App) {
     throw new Error("No App Component provided, nothing to render");
@@ -37,6 +37,7 @@ export function renderZappApp(options) {
     if (appMountId) {
       AppRegistry.runApplication("QuickBrickApp", {
         rootTag: document.getElementById(appMountId),
+        mode,
       });
     }
   }