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

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

@@ -13,7 +13,6 @@ exports[`ACTIONS matches snapshot 1`] = `
   "PUSH": "PUSH",
   "REPLACE": "REPLACE",
   "REPLACE_TOP": "REPLACE_TOP",
-  "SET_LOCATION": "SET_LOCATION",
   "SET_NESTED_CONTENT": "SET_NESTED_CONTENT",
   "SET_VIDEO_MODAL_ITEM": "SET_VIDEO_MODAL_ITEM",
 }
@@ -22,30 +21,6 @@ exports[`ACTIONS matches snapshot 1`] = `
 exports[`reducer when a back action is dispatched push, back, push, back does what it's supposed to do 1`] = `
 {
   "state1": {
-    "location": {
-      "key": "mocked-uuid",
-      "pathname": "/river/A1234",
-      "state": {
-        "entry": undefined,
-        "options": undefined,
-        "screen": {
-          "home": true,
-          "home_offline": true,
-          "hooks": {
-            "preload_plugins": [],
-          },
-          "id": "A1234",
-          "name": "Home",
-          "navigations": [
-            {
-              "id": "nav_id",
-            },
-          ],
-          "supports_offline": false,
-          "type": "general_content",
-        },
-      },
-    },
     "options": {
       "videoModal": {
         "item": null,
@@ -86,36 +61,6 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
     },
   },
   "state2": {
-    "location": {
-      "key": "mocked-uuid",
-      "pathname": "/river/A1234/river/B7890",
-      "state": {
-        "entry": {
-          "id": "C0987",
-          "title": "Entry",
-          "type": {
-            "value": "feed",
-          },
-        },
-        "options": undefined,
-        "screen": {
-          "home": false,
-          "home_offline": false,
-          "hooks": {
-            "preload_plugins": [],
-          },
-          "id": "B5678",
-          "name": "Screen name",
-          "navigations": [
-            {
-              "id": "nav_id",
-            },
-          ],
-          "supports_offline": false,
-          "type": "general_content",
-        },
-      },
-    },
     "options": {
       "videoModal": {
         "item": null,
@@ -187,36 +132,6 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
     },
   },
   "state3": {
-    "location": {
-      "key": "mocked-uuid",
-      "pathname": "/river/A1234/river/B7890/river/C0987",
-      "state": {
-        "entry": {
-          "id": "D1234",
-          "title": "Entry 2",
-          "type": {
-            "value": "video",
-          },
-        },
-        "options": undefined,
-        "screen": {
-          "home": false,
-          "home_offline": false,
-          "hooks": {
-            "preload_plugins": [],
-          },
-          "id": "C9090",
-          "name": "Screen 2 name",
-          "navigations": [
-            {
-              "id": "nav_id",
-            },
-          ],
-          "supports_offline": false,
-          "type": "general_content",
-        },
-      },
-    },
     "options": {
       "videoModal": {
         "item": null,
@@ -319,37 +234,6 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
     },
   },
   "state4": {
-    "location": {
-      "action": "PUSH",
-      "key": "mocked-uuid",
-      "pathname": "/river/A1234/river/B7890",
-      "state": {
-        "entry": {
-          "id": "C0987",
-          "title": "Entry",
-          "type": {
-            "value": "feed",
-          },
-        },
-        "options": undefined,
-        "screen": {
-          "home": false,
-          "home_offline": false,
-          "hooks": {
-            "preload_plugins": [],
-          },
-          "id": "B5678",
-          "name": "Screen name",
-          "navigations": [
-            {
-              "id": "nav_id",
-            },
-          ],
-          "supports_offline": false,
-          "type": "general_content",
-        },
-      },
-    },
     "options": {
       "videoModal": {
         "item": null,
@@ -421,36 +305,6 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
     },
   },
   "state5": {
-    "location": {
-      "key": "mocked-uuid",
-      "pathname": "/river/A1234/river/B7890/river/D5678",
-      "state": {
-        "entry": {
-          "id": "C0987",
-          "title": "Entry",
-          "type": {
-            "value": "feed",
-          },
-        },
-        "options": undefined,
-        "screen": {
-          "home": false,
-          "home_offline": false,
-          "hooks": {
-            "preload_plugins": [],
-          },
-          "id": "B5678",
-          "name": "Screen name",
-          "navigations": [
-            {
-              "id": "nav_id",
-            },
-          ],
-          "supports_offline": false,
-          "type": "general_content",
-        },
-      },
-    },
     "options": {
       "videoModal": {
         "item": null,
@@ -553,37 +407,6 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
     },
   },
   "state6": {
-    "location": {
-      "action": "PUSH",
-      "key": "mocked-uuid",
-      "pathname": "/river/A1234/river/B7890",
-      "state": {
-        "entry": {
-          "id": "C0987",
-          "title": "Entry",
-          "type": {
-            "value": "feed",
-          },
-        },
-        "options": undefined,
-        "screen": {
-          "home": false,
-          "home_offline": false,
-          "hooks": {
-            "preload_plugins": [],
-          },
-          "id": "B5678",
-          "name": "Screen name",
-          "navigations": [
-            {
-              "id": "nav_id",
-            },
-          ],
-          "supports_offline": false,
-          "type": "general_content",
-        },
-      },
-    },
     "options": {
       "videoModal": {
         "item": null,

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

@@ -1,9 +1,9 @@
 import reducer, {
   ACTIONS,
-  push,
-  replace,
   back,
   initialState,
+  push,
+  replace,
 } from "../reducer";
 
 jest.mock("uuid");
@@ -181,24 +181,6 @@ describe("reducer", () => {
       expect(newState.options.navBar).toEqual(initialState.options.navBar);
       expect(newState2.options.navBar).toEqual(initialState.options.navBar);
     });
-
-    it("updates the location properties of the state", () => {
-      expect(newState).toHaveProperty("location");
-      expect(newState.location).toHaveProperty("pathname", route);
-
-      expect(newState.location).toHaveProperty("state", { screen: homeScreen });
-
-      expect(newState2).toHaveProperty("location");
-      expect(newState2.location).toHaveProperty("pathname", route2);
-
-      expect(newState2.location).toHaveProperty(
-        "state",
-        expect.objectContaining({
-          screen,
-          entry,
-        })
-      );
-    });
   });
 
   describe("when a replace action is dispatched", () => {
@@ -245,24 +227,6 @@ describe("reducer", () => {
       expect(newState.options.navBar).toEqual(initialState.options.navBar);
       expect(newState2.options.navBar).toEqual(initialState.options.navBar);
     });
-
-    it("updates the location properties of the state", () => {
-      expect(newState).toHaveProperty("location");
-      expect(newState.location).toHaveProperty("pathname", route);
-
-      expect(newState.location).toHaveProperty("state", {
-        screen: homeScreen,
-        entry: undefined,
-      });
-
-      expect(newState2).toHaveProperty("location");
-      expect(newState2.location).toHaveProperty("pathname", route2);
-
-      expect(newState2.location).toHaveProperty("state", {
-        screen,
-        entry,
-      });
-    });
   });
 
   describe("when a back action is dispatched", () => {
@@ -300,30 +264,6 @@ describe("reducer", () => {
         expect(newState2.options.navBar).toEqual(initialState.options.navBar);
         expect(finalState.options.navBar).toEqual(initialState.options.navBar);
       });
-
-      it("updates the location properties of the state", () => {
-        expect(newState).toHaveProperty("location");
-        expect(newState.location).toHaveProperty("pathname", route);
-
-        expect(newState.location).toHaveProperty("state", {
-          screen: homeScreen,
-        });
-
-        expect(newState2).toHaveProperty("location");
-        expect(newState2.location).toHaveProperty("pathname", route2);
-
-        expect(newState2.location).toHaveProperty("state", {
-          screen,
-          entry,
-        });
-
-        expect(finalState).toHaveProperty("location");
-        expect(finalState.location).toHaveProperty("pathname", route);
-
-        expect(finalState.location).toHaveProperty("state", {
-          screen: homeScreen,
-        });
-      });
     });
 
     describe("push, back, push, back", () => {
@@ -382,14 +322,6 @@ describe("reducer", () => {
           entry: undefined,
         });
 
-        expect(finalState).toHaveProperty("location");
-        expect(finalState.location).toHaveProperty("pathname", route);
-
-        expect(finalState.location).toHaveProperty("state", {
-          screen: homeScreen,
-          entry: undefined,
-        });
-
         expect(finalState).toEqual(newState);
       });
     });

package/App/NavigationProvider/navigator/reducer.ts

@@ -1,6 +1,8 @@
 import * as R from "ramda";
 import { v4 } from "uuid";
 
+import { last } from "@applicaster/zapp-react-native-utils/utils";
+
 import {
   firstStackEntriesSelector,
   previousStackEntriesSelector,
@@ -18,7 +20,6 @@ export const initialState: NavigationReducerState = {
     mainStack: [],
     modal: null,
   },
-  location: { key: "", pathname: "/", state: null },
   options: {
     videoModal: {
       visible: false,
@@ -38,7 +39,6 @@ export enum ACTIONS {
   BACK_PLAYER_NESTED_CONTENT = "BACK_PLAYER_NESTED_CONTENT",
   REPLACE_TOP = "REPLACE_TOP",
   SET_NESTED_CONTENT = "SET_NESTED_CONTENT",
-  SET_LOCATION = "SET_LOCATION",
   OPEN_VIDEO_MODAL = "OPEN_VIDEO_MODAL",
   CLOSE_VIDEO_MODAL = "CLOSE_VIDEO_MODAL",
   MINIMISE_VIDEO_MODAL = "MINIMISE_VIDEO_MODAL",
@@ -174,9 +174,9 @@ function backPlayerNestedContent(state) {
   return findPlayableAndTruncate(currentState);
 }
 
-function addNestedContent(stack, payload, locationState: LocationReducerState) {
-  const locationKey = locationState.key;
-  const stackIndex = R.findIndex(R.propEq("key", locationKey))(stack);
+function addNestedContent(stack, payload, targetStackEntry) {
+  const targetStackKey = targetStackEntry.key;
+  const stackIndex = R.findIndex(R.propEq("key", targetStackKey))(stack);
 
   return R.adjust(
     stackIndex,
@@ -190,7 +190,7 @@ function addNestedContent(stack, payload, locationState: LocationReducerState) {
 
 function navigationStackReducer(
   state: NavigationStackReducerState = initialState.stack,
-  { type = "", payload, meta }: ReducerAction = { type: "" }
+  { type = "", payload }: ReducerAction = { type: "" }
 ) {
   switch (type) {
     case ACTIONS.SET_NESTED_CONTENT:
@@ -199,7 +199,7 @@ function navigationStackReducer(
         mainStack: addNestedContent(
           state.mainStack,
           navigationEntry(ACTIONS.REPLACE, payload as AnyRecord),
-          meta as LocationReducerState
+          last(state.mainStack)
         ),
       };
     case ACTIONS.PUSH:
@@ -268,47 +268,6 @@ function navigationStackReducer(
   }
 }
 
-function locationReducer(
-  state = initialState.location,
-  { type, payload, meta = {} }
-) {
-  const { route, key, screen, entry, options } = payload;
-
-  switch (type) {
-    case ACTIONS.BACK:
-      // eslint-disable-next-line no-case-declarations
-      const previousEntry = R.compose(
-        R.last,
-        payload.route ? firstStackEntriesSelector : previousStackEntriesSelector
-      )(meta);
-
-      if (previousEntry) {
-        const { state, key, action } = previousEntry;
-
-        return { pathname: previousEntry.route, state, key, action };
-      }
-
-      return state;
-
-    case ACTIONS.PUSH:
-    case ACTIONS.REPLACE:
-    case ACTIONS.REPLACE_TOP:
-    case ACTIONS.BACK_PLAYER_NESTED_CONTENT:
-      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 as AnyRecord
-      );
-
-      return R.assocPath(["state", "nested"], nestedEntry.state, state);
-    default:
-      return state;
-  }
-}
-
 /* Video Modal reducer */
 export const setVideoModalOpen = (item, options, screen) => ({
   type: ACTIONS.OPEN_VIDEO_MODAL,
@@ -354,43 +313,28 @@ export const videoModalReducer = (
   switch (type) {
     case ACTIONS.OPEN_VIDEO_MODAL: {
       const { item, options } = payload;
+      const mode = options?.mode || MAXIMIZED;
 
-      const mode = R.pathOr(MAXIMIZED, ["mode"], options);
-
-      return R.compose(
-        R.set(R.lensProp("mode"), mode),
-        R.set(R.lensProp("visible"), true),
-        R.over(
-          R.lensProp("item"),
-          R.unless(R.tryCatch(R.propEq("id", item?.id), R.F), () => item)
-        )
-      )(state);
+      return {
+        ...state,
+        visible: true,
+        mode,
+        item: state.item?.id !== item?.id ? item : state.item,
+      };
     }
 
     case ACTIONS.SET_VIDEO_MODAL_ITEM:
-      return R.set(R.lensProp("item"), payload)(state);
+      return { ...state, item: payload };
     case ACTIONS.CLOSE_VIDEO_MODAL:
       return initialState.options.videoModal;
     case ACTIONS.FULLSCREEN_VIDEO_MODAL:
-      return R.compose(
-        R.set(R.lensProp("mode"), FULLSCREEN),
-        R.set(R.lensProp("previousMode"), state.mode)
-      )(state);
+      return { ...state, mode: FULLSCREEN, previousMode: state.mode };
     case ACTIONS.MINIMISE_VIDEO_MODAL:
-      return R.compose(
-        R.set(R.lensProp("mode"), MINIMIZED),
-        R.set(R.lensProp("previousMode"), state.mode)
-      )(state);
+      return { ...state, mode: MINIMIZED, previousMode: state.mode };
     case ACTIONS.MAXIMISE_VIDEO_MODAL:
-      return R.compose(
-        R.set(R.lensProp("mode"), MAXIMIZED),
-        R.set(R.lensProp("previousMode"), state.mode)
-      )(state);
+      return { ...state, mode: MAXIMIZED, previousMode: state.mode };
     case ACTIONS.PIP:
-      return R.compose(
-        R.set(R.lensProp("mode"), PIP),
-        R.set(R.lensProp("previousMode"), state.mode)
-      )(state);
+      return { ...state, mode: PIP, previousMode: state.mode };
   }
 };
 
@@ -406,34 +350,19 @@ export default function navigationReducer(
     case ACTIONS.REPLACE_TOP:
     case ACTIONS.BACK:
     case ACTIONS.BACK_PLAYER_NESTED_CONTENT:
-      return R.evolve(
-        {
-          stack: applyReducer(navigationStackReducer, { type, payload }),
-          location: applyReducer(locationReducer, {
-            type,
-            payload,
-            meta: state,
-          }),
-        },
-        state
-      );
+      return {
+        ...state,
+        stack: navigationStackReducer(state.stack, { type, payload }),
+      };
 
     case ACTIONS.SET_NESTED_CONTENT:
-      return R.evolve(
-        {
-          stack: applyReducer(navigationStackReducer, {
-            type,
-            payload,
-            meta: state.location,
-          }),
-          location: applyReducer(locationReducer, {
-            type,
-            payload,
-            meta: state.stack,
-          }),
-        },
-        state
-      );
+      return {
+        ...state,
+        stack: navigationStackReducer(state.stack, {
+          type,
+          payload,
+        }),
+      };
 
     case ACTIONS.OPEN_VIDEO_MODAL:
     case ACTIONS.CLOSE_VIDEO_MODAL:

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/NetworkStatusProvider/__tests__/NetworkStatusProvider.test.tsx

@@ -1,15 +1,11 @@
 import * as React from "react";
 import * as R from "ramda";
 import { renderHook, act } from "@testing-library/react-hooks";
-import configureStore from "redux-mock-store";
-import thunk from "redux-thunk";
 import { NetworkStatusContext } from "@applicaster/zapp-react-native-ui-components/Contexts/NetworkStatusContext";
 import { NetworkStatusProvider } from "../NetworkStatusProvider";
-import { Provider } from "react-redux";
+import { WrappedWithProviders } from "@applicaster/zapp-react-native-utils/testUtils";
 import NetInfo from "@react-native-community/netinfo";
 
-const mockStore = configureStore([thunk]);
-
 const NetInfoMock = {
   type: "cellular",
   details: {
@@ -24,9 +20,9 @@ const NetInfoMock = {
 const getWrapper = (store) => ({
   // eslint-disable-next-line react/prop-types,react/display-name
   wrapper: ({ children }) => (
-    <Provider store={store}>
+    <WrappedWithProviders store={store}>
       <NetworkStatusProvider>{children}</NetworkStatusProvider>
-    </Provider>
+    </WrappedWithProviders>
   ),
 });
 
@@ -41,9 +37,9 @@ const useNetInfoMock = () => {
 
 describe("NetworkStatusProvider", function () {
   it("should return netInfoData", function () {
-    const store = mockStore({
+    const store = {
       plugins: [{}],
-    });
+    };
 
     // @ts-ignore
     jest.spyOn(NetInfo, "useNetInfo").mockImplementation(useNetInfoMock);
@@ -59,9 +55,9 @@ describe("NetworkStatusProvider", function () {
   it("should call onConnectionLost callback when connection type changes to none", function () {
     const onConnectionLost = jest.fn();
 
-    const store = mockStore({
+    const store = {
       plugins: [{ module: { networkHooks: { onConnectionLost } } }],
-    });
+    };
 
     // @ts-ignore
     jest.spyOn(NetInfo, "useNetInfo").mockImplementation(useNetInfoMock);
@@ -86,9 +82,9 @@ describe("NetworkStatusProvider", function () {
   it("should call onConnectionRestored callback when connection type switches from none", function () {
     const onConnectionRestored = jest.fn();
 
-    const store = mockStore({
+    const store = {
       plugins: [{ module: { networkHooks: { onConnectionRestored } } }],
-    });
+    };
 
     // @ts-ignore
     jest.spyOn(NetInfo, "useNetInfo").mockImplementation(useNetInfoMock);
@@ -123,9 +119,9 @@ describe("NetworkStatusProvider", function () {
   it("should call onConnectionTypeChanged callback when connection type changes", function () {
     const onConnectionTypeChanged = jest.fn();
 
-    const store = mockStore({
+    const store = {
       plugins: [{ module: { networkHooks: { onConnectionTypeChanged } } }],
-    });
+    };
 
     // @ts-ignore
     jest.spyOn(NetInfo, "useNetInfo").mockImplementation(useNetInfoMock);

package/App/RouterDecorator/__tests__/routerDecorator.test.js

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { View } from "react-native";
-import ReactTestRenderer from "react-test-renderer";
+import { render } from "@testing-library/react-native";
 
 import { createRouterDecorator } from "../index";
 
@@ -26,7 +26,7 @@ describe("routerDecorator", () => {
     const decorator = createRouterDecorator(Router);
     const DecoratedComp = decorator(SomeComp);
 
-    const wrapper = ReactTestRenderer.create(<DecoratedComp foo="bar" />);
-    expect(wrapper.toJSON()).toMatchSnapshot();
+    const { toJSON } = render(<DecoratedComp foo="bar" />);
+    expect(toJSON()).toMatchSnapshot();
   });
 });

package/App/StoreConnector/__tests__/storeConnector.test.js

@@ -1,11 +1,9 @@
 import * as React from "react";
 import * as ReactIs from "react-is";
 import { View, Text } from "react-native";
-import { render } from "@testing-library/react-native";
-import configureStore from "redux-mock-store";
+import { renderWithProviders } from "@applicaster/zapp-react-native-utils/testUtils";
 
 import { storeConnector } from "../index";
-import { Provider } from "react-redux";
 
 const styles = { foo: "bar" };
 const components = { grid: jest.fn() };
@@ -18,12 +16,12 @@ const Component = (props) => (
   </View>
 );
 
-const store = configureStore()({
+const store = {
   styles,
   components,
   rivers,
   appSettings,
-});
+};
 
 describe("storeConnector", () => {
   it("returns a Component", () => {
@@ -41,10 +39,9 @@ describe("storeConnector", () => {
   it("passes the props to the component", () => {
     const WrappedComponent = storeConnector(Component);
 
-    const { getByText, getByTestId } = render(
-      <Provider store={store}>
-        <WrappedComponent />
-      </Provider>
+    const { getByText, getByTestId } = renderWithProviders(
+      <WrappedComponent />,
+      store
     );
 
     expect(getByText("I'm a component")).toBeTruthy();

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",