@applicaster/quick-brick-core 14.0.0-alpha.2523527255 → 14.0.0-alpha.2893452677

package/App/ModalProvider/ModalChildrenWrapper/index.tsx

@@ -1,13 +1,8 @@
 import React, { ReactChild } from "react";
-import { StyleSheet, ViewProps } from "react-native";
-import { GestureHandlerRootView } from "react-native-gesture-handler";
+import { View, StyleSheet, ViewProps } from "react-native";
 
 type Props = ViewProps & { children: ReactChild };
 
 export function ModalChildrenWrapper({ children }: Props) {
-  return (
-    <GestureHandlerRootView style={StyleSheet.absoluteFill}>
-      {children}
-    </GestureHandlerRootView>
-  );
+  return <View style={StyleSheet.absoluteFill}>{children}</View>;
 }

package/App/NavigationProvider/NavigationProvider.tsx

@@ -7,6 +7,7 @@ import {
   getTargetRoute,
   usesVideoModal,
 } from "@applicaster/zapp-react-native-utils/navigationUtils";
+import { last } from "@applicaster/zapp-react-native-utils/utils";
 import {
   allowedOrientationsForScreen,
   useGetScreenOrientation,
@@ -121,8 +122,20 @@ export function NavigationProvider({ children }: Props) {
     NavigationReducerState
   >(reducer, initialState, (x) => x);
 
+  const topStackRoute = last(state?.stack?.mainStack);
+
+  /** TODO: temporary variable, before we remove need for a "current".
+   There is no current as we are using stack navigator. Route data should be contextualised per screen
+   There are some cases to use a route data from top of the stack but it should be separate method.
+   */
+
+  const currentLocation = {
+    ...topStackRoute,
+    route: topStackRoute?.route || "/", // Fallback for initial state.
+  };
+
   const stateRef = React.useRef<NavigationReducerState>(state);
-  const pathname = state?.location?.pathname;
+  const pathname = currentLocation?.route; // TODO: remove. Pathname is part of the route, not a global.
   const pathnameRef = React.useRef(pathname);
 
   const { context } = React.useContext(ZappPipesEntryContext.Context);
@@ -146,6 +159,8 @@ export function NavigationProvider({ children }: Props) {
     }
   }, [pathname]);
 
+  // TODO remove.
+  // There is no concept of active river. Multiple rivers can be rendered at the same time.
   const activeRiver = React.useMemo(
     () => activeRiverSelector({ pathname, rivers }),
     [pathname, rivers]
@@ -186,6 +201,7 @@ export function NavigationProvider({ children }: Props) {
   // TODO: Move in proper place
   const modalPresenterScreenOrientation = useGetScreenOrientation(activeRiver);
 
+  // TODO: Move modal state to separate store
   const closeVideoModal = () => {
     if (navigator.modalData) {
       allowedOrientationsForScreen(modalPresenterScreenOrientation);
@@ -213,13 +229,15 @@ export function NavigationProvider({ children }: Props) {
   const isVideoModalDocked = () =>
     state?.options.videoModal.mode === "MINIMIZED";
 
+  // TODO: Remove as it's using a concept of "current" route.
+  // Route is contextualised and shouldn't be used this way.
   const routeData = () => {
     // eslint-disable-next-line no-console
     console.warn(`you are retrieving screen data from navigator.routeData()
     This function will be removed in a later version of quick brick.
     You can retrieve this data from navigator.screenData`);
 
-    return legacyScreenData(state?.location?.state as NavigationScreenData);
+    return legacyScreenData(currentLocation?.state as NavigationScreenData);
   };
 
   // TODO: remove it by refactoring back buttons handlers
@@ -262,7 +280,7 @@ export function NavigationProvider({ children }: Props) {
     if (
       targetRoute !== pathnameRef.current ||
       item?.id !==
-        legacyScreenData(state?.location?.state as NavigationScreenData)?.id
+        legacyScreenData(currentLocation?.state as NavigationScreenData)?.id
     ) {
       replaceEvent();
       navigateTo(item, ACTIONS.REPLACE, options);
@@ -688,7 +706,8 @@ export function NavigationProvider({ children }: Props) {
     }
   }, [state?.options?.videoModal?.previousMode]);
 
-  const getNestedEntry = () => state?.location?.state?.nested?.entry ?? null;
+  // TODO: remove. This shouldn't be part of navigator
+  const getNestedEntry = () => currentLocation?.state?.nested?.entry ?? null;
 
   // It will only work for the regular stack and pathname, It won't work for modals
   // TODO: integrate video/hook and regular modal into stack.
@@ -706,7 +725,7 @@ export function NavigationProvider({ children }: Props) {
     () => ({
       activeRiver,
       getPathname: () => pathnameRef.current, // hack use to fix issue causing broken navigation as currentRoute is unreliable
-      currentRoute: pathname,
+      currentRoute: pathname, // TODO: remove. Current route shouldn't be needed
       previousAction: lastEntrySelector(state)
         ?.action as QuickBrickNavigationActionType,
       push: pushItem,
@@ -716,14 +735,15 @@ export function NavigationProvider({ children }: Props) {
       goHome,
       canGoBack,
       goBack,
-      routeData,
+      routeData, // TODO: remove
       screenData: legacyScreenData(
-        state?.location?.state as NavigationScreenData,
+        // TODO: remove
+        currentLocation?.state as NavigationScreenData,
         plugins
       ),
-      data: state?.location?.state as NavigationScreenData,
+      data: currentLocation?.state as NavigationScreenData,
       getNestedEntry,
-      key: state?.location?.key,
+      key: currentLocation?.key, // TODO: remove
       modalData: state.stack.modal?.state ?? null,
       openModal,
       dismissModal,

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,31 +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",
-        },
-        "screenStateStore": [Function],
-      },
-    },
     "options": {
       "videoModal": {
         "item": null,
@@ -80,7 +54,6 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
               "supports_offline": false,
               "type": "general_content",
             },
-            "screenStateStore": undefined,
           },
         },
       ],
@@ -88,37 +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",
-        },
-        "screenStateStore": [Function],
-      },
-    },
     "options": {
       "videoModal": {
         "item": null,
@@ -152,7 +94,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 +125,6 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
               "supports_offline": false,
               "type": "general_content",
             },
-            "screenStateStore": undefined,
           },
         },
       ],
@@ -192,37 +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",
-        },
-        "screenStateStore": [Function],
-      },
-    },
     "options": {
       "videoModal": {
         "item": null,
@@ -256,7 +165,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 +196,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 +227,6 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
               "supports_offline": false,
               "type": "general_content",
             },
-            "screenStateStore": undefined,
           },
         },
       ],
@@ -328,38 +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",
-        },
-        "screenStateStore": undefined,
-      },
-    },
     "options": {
       "videoModal": {
         "item": null,
@@ -393,7 +267,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 +298,6 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
               "supports_offline": false,
               "type": "general_content",
             },
-            "screenStateStore": undefined,
           },
         },
       ],
@@ -433,37 +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",
-        },
-        "screenStateStore": [Function],
-      },
-    },
     "options": {
       "videoModal": {
         "item": null,
@@ -497,7 +338,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 +369,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 +400,6 @@ exports[`reducer when a back action is dispatched push, back, push, back does wh
               "supports_offline": false,
               "type": "general_content",
             },
-            "screenStateStore": undefined,
           },
         },
       ],
@@ -569,38 +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",
-        },
-        "screenStateStore": undefined,
-      },
-    },
     "options": {
       "videoModal": {
         "item": null,
@@ -634,7 +440,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 +471,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/__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,11 +1,12 @@
 import * as R from "ramda";
 import { v4 } from "uuid";
 
+import { last } from "@applicaster/zapp-react-native-utils/utils";
+
 import {
   firstStackEntriesSelector,
   previousStackEntriesSelector,
 } from "./selectors";
-import { create, StoreApi, UseBoundStore } from "zustand";
 
 /* initial state */
 
@@ -19,7 +20,6 @@ export const initialState: NavigationReducerState = {
     mainStack: [],
     modal: null,
   },
-  location: { key: "", pathname: "/", state: null },
   options: {
     videoModal: {
       visible: false,
@@ -39,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",
@@ -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) {
@@ -175,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,
@@ -191,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:
@@ -200,7 +199,7 @@ function navigationStackReducer(
         mainStack: addNestedContent(
           state.mainStack,
           navigationEntry(ACTIONS.REPLACE, payload as AnyRecord),
-          meta as LocationReducerState
+          last(state.mainStack)
         ),
       };
     case ACTIONS.PUSH:
@@ -269,70 +268,6 @@ function navigationStackReducer(
   }
 }
 
-function locationReducer(
-  state = initialState.location,
-  { type, payload, meta = {} }
-) {
-  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
-      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, screenStateStore },
-        key,
-      };
-
-    case ACTIONS.SET_NESTED_CONTENT:
-      // eslint-disable-next-line no-case-declarations
-      const nestedEntry = navigationEntry(ACTIONS.REPLACE, {
-        ...payload,
-        screenStateStore,
-      } 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,
@@ -378,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 };
   }
 };
 
@@ -429,51 +349,20 @@ 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,
+    case ACTIONS.BACK_PLAYER_NESTED_CONTENT:
+      return {
+        ...state,
+        stack: navigationStackReducer(state.stack, { type, payload }),
       };
 
-      const stack = applyReducer(navigationStackReducer, actionWithStore);
-      const location = applyReducer(locationReducer, actionWithStore);
-
-      return R.evolve({ stack, location }, state);
-    }
-
     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/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/__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";
@@ -175,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", () => {
@@ -190,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();
     });
   });
 
@@ -206,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/index.tsx

@@ -1,6 +1,8 @@
 import * as React from "react";
 import * as R from "ramda";
 
+import { GestureHandlerRootView } from "react-native-gesture-handler";
+
 import {
   initialWindowMetrics,
   SafeAreaProvider,
@@ -59,31 +61,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={React.useMemo(
-                () => [InteractionManager, ApplyScreenHooks],
-                [InteractionManager, ApplyScreenHooks]
-              )}
-            />
-          </AppContainer>
-        </SafeAreaProvider>
-      </ThemeManager>
+      <GestureHandlerRootView>
+        <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>
+      </GestureHandlerRootView>
     );
   });
 

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/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-alpha.2523527255",
+  "version": "14.0.0-alpha.2893452677",
   "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.2523527255",
-    "@applicaster/quick-brick-core-plugins": "14.0.0-alpha.2523527255",
-    "@applicaster/zapp-pipes-v2-client": "14.0.0-alpha.2523527255",
-    "@applicaster/zapp-react-native-bridge": "14.0.0-alpha.2523527255",
-    "@applicaster/zapp-react-native-redux": "14.0.0-alpha.2523527255",
-    "@applicaster/zapp-react-native-ui-components": "14.0.0-alpha.2523527255",
-    "@applicaster/zapp-react-native-utils": "14.0.0-alpha.2523527255",
+    "@applicaster/applicaster-types": "14.0.0-alpha.2893452677",
+    "@applicaster/quick-brick-core-plugins": "14.0.0-alpha.2893452677",
+    "@applicaster/zapp-pipes-v2-client": "14.0.0-alpha.2893452677",
+    "@applicaster/zapp-react-native-bridge": "14.0.0-alpha.2893452677",
+    "@applicaster/zapp-react-native-redux": "14.0.0-alpha.2893452677",
+    "@applicaster/zapp-react-native-ui-components": "14.0.0-alpha.2893452677",
+    "@applicaster/zapp-react-native-utils": "14.0.0-alpha.2893452677",
     "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": "*",