@applicaster/quick-brick-core 12.0.0-alpha.9834532023 → 12.0.0-alpha.9903765553

package/App/NavigationProvider/NavigationProvider.tsx

@@ -64,6 +64,8 @@ import { ZappPipesEntryContext } from "@applicaster/zapp-react-native-ui-compone
 import { PlayNextState } from "@applicaster/zapp-react-native-utils/appUtils/playerManager/OverlayObserver/OverlaysObserver";
 import { inflateUrl } from "@applicaster/zapp-react-native-ui-components/Components/LinkHandler/LinkHandler";
 import { useModalStore } from "@applicaster/zapp-react-native-utils/modalState";
+import { useSubscriberFor } from "@applicaster/zapp-react-native-utils/reactHooks/useSubscriberFor";
+import { QBUIComponentEvents } from "@applicaster/zapp-react-native-ui-components/events";
 
 const logger = coreAppLogger.addSubsystem("Navigator");
 
@@ -130,6 +132,10 @@ export function NavigationProvider({ children }: Props) {
 
   const online = useConnectionInfo(true);
 
+  const replaceEvent = useSubscriberFor(
+    QBUIComponentEvents.navigatorReplaceItem
+  );
+
   React.useEffect(() => {
     stateRef.current = state;
     pathnameRef.current = pathname;
@@ -259,6 +265,7 @@ export function NavigationProvider({ children }: Props) {
       item?.id !==
         legacyScreenData(state?.location?.state as NavigationScreenData)?.id
     ) {
+      replaceEvent();
       navigateTo(item, ACTIONS.REPLACE, options);
     }
   };
@@ -665,15 +672,15 @@ export function NavigationProvider({ children }: Props) {
 
   // 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.
-  const getStackForPathname = React.useCallback((pathname: string):
-    | NavigationScreenState
-    | undefined => {
-    const stack = [...stateRef?.current?.stack?.mainStack];
+  const getStackForPathname = (
+    pathname: string
+  ): NavigationScreenState | undefined => {
+    const stack = [...state?.stack?.mainStack];
 
     const currentStack = stack.find(({ route }) => route === pathname);
 
     return currentStack;
-  }, []);
+  };
 
   const navigator: QuickBrickAppNavigator = React.useMemo(
     () => ({
@@ -717,6 +724,7 @@ export function NavigationProvider({ children }: Props) {
       replaceTop,
       getStack,
       getStackForPathname,
+      mainStack: state.stack.mainStack,
     }),
     [rivers, plugins, JSON.stringify(state), appLaunched, startUpHooks]
   );

package/App/NavigationProvider/__tests__/navigationProvider.test.tsx

@@ -5,6 +5,9 @@ import { createStore } from "redux";
 import { Provider } from "react-redux";
 
 import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks/navigation";
+import { getByTestId } from "@applicaster/zapp-react-native-utils/testUtils/getByTestId";
+// @TODO @szhigunov to complete the migration to @testing-library/react-native
+// import { act, waitFor } from "@testing-library/react-native";
 
 const rivers = {
   A1234: {
@@ -151,37 +154,58 @@ const failingHook = {
   name: "failing hook",
 };
 
+// const store = {
+//   rivers,
+//   plugins: [hookPlugin, hookPlugin2, failingHook],
+// };
+
+const store = createStore(() => ({
+  appData: { layoutVersion: "v1" },
+  contentTypes: null,
+  rivers,
+  plugins: [hookPlugin, hookPlugin2, failingHook],
+  appState: { appLaunched: true },
+}));
+
 const ContextConsumer = () => {
   const { state, ...navigator } = useNavigation();
 
-  const renderHook = () => {
-    if (navigator.currentRoute.includes("/hooks/")) {
-      const { hookPlugin, payload, callback } = navigator.screenData;
-      const Component = hookPlugin.module.Component;
+  let renderHook;
 
-      return <Component payload={payload} callback={callback} />;
-    }
+  if (navigator.currentRoute.includes("/hooks/")) {
+    const { hookPlugin, payload, callback } = navigator.screenData;
+    const Component = hookPlugin.module.Component;
 
-    return null;
-  };
+    renderHook = <Component payload={payload} callback={callback} />;
+  }
+
+  renderHook = null;
+
+  const WrapperView: any = "View";
 
   return (
-    <View navigator={navigator} state={state}>
-      {renderHook()}
-    </View>
+    <WrapperView testID="WrapperView" navigator={navigator} state={state}>
+      {renderHook}
+    </WrapperView>
   );
 };
 
-const store = createStore(() => ({
-  appData: { layoutVersion: "v1" },
-  contentTypes: null,
-  rivers,
-  plugins: [hookPlugin, hookPlugin2, failingHook],
-  appState: { appLaunched: true },
-}));
-
 const consoleSpy = jest.spyOn(console, "error").mockImplementation(() => {});
 
+// const renderContextConsumer = (_store = store) => {
+//   return renderWithProviders(<ContextConsumer />, _store);
+// };
+
+const renderContextConsumer = (_store = store) => {
+  return create(
+    <Provider store={store}>
+      <NavigationProvider>
+        <ContextConsumer />
+      </NavigationProvider>
+    </Provider>
+  );
+};
+
 afterAll(() => {
   consoleSpy.mockReset();
 });
@@ -189,86 +213,39 @@ afterAll(() => {
 describe("<NavigationProvider />", () => {
   let wrapper;
 
-  it("renders correctly", () => {
+  it("navigator contains expected properties", () => {
     act(() => {
-      wrapper = create(
-        <Provider store={store}>
-          <NavigationProvider>
-            <ContextConsumer />
-          </NavigationProvider>
-        </Provider>
-      );
+      wrapper = renderContextConsumer();
     });
 
-    expect(wrapper.toJSON()).toMatchSnapshot();
-  });
+    const view = getByTestId(wrapper, "WrapperView");
 
-  describe("navigator Properties", () => {
-    act(() => {
-      wrapper = create(
-        <Provider store={store}>
-          <NavigationProvider>
-            <ContextConsumer />
-          </NavigationProvider>
-        </Provider>
-      );
-    });
-
-    const view = wrapper.root.findByType(View);
     const { navigator } = view.props;
+    expect(navigator.activeRiver).toEqual(rivers.B4567);
+    expect(navigator.currentRoute).toEqual("/river/B4567");
+    expect(navigator.previousAction).toEqual("REPLACE");
 
-    it("exposes the active river", () => {
-      expect(navigator.activeRiver).toEqual(rivers.B4567);
-    });
-
-    it("exposes the currentRoute", () => {
-      expect(navigator.currentRoute).toEqual("/river/B4567");
+    expect(navigator.screenData).toEqual({
+      ...rivers.B4567,
+      targetScreen: rivers.B4567,
     });
 
-    it("exposes the previous action", () => {
-      expect(navigator.previousAction).toEqual("REPLACE");
-    });
-
-    it("exposes the screen data", () => {
-      expect(navigator.screenData).toEqual(rivers.B4567);
-    });
-
-    it("exposes a routeData function", () => {
-      const consoleSpy = jest
-        .spyOn(console, "warn")
-        .mockImplementation(jest.fn());
-
-      expect(navigator.routeData()).toEqual(rivers.B4567);
-      consoleSpy.mockRestore();
-    });
-
-    it("warns in the console when calling navigator.routeData()", () => {
-      const consoleSpy = jest
-        .spyOn(console, "warn")
-        .mockImplementation(jest.fn());
-
-      navigator.routeData();
-      expect(consoleSpy.mock.calls).toMatchSnapshot();
-
-      consoleSpy.mockRestore();
+    expect(navigator.routeData()).toEqual({
+      ...rivers.B4567,
+      targetScreen: rivers.B4567,
     });
   });
 
   describe("pushing a new route", () => {
     act(() => {
-      wrapper = create(
-        <Provider store={store}>
-          <NavigationProvider>
-            <ContextConsumer />
-          </NavigationProvider>
-        </Provider>
-      );
+      wrapper = renderContextConsumer();
     });
 
-    const view = wrapper.root.findByType(View);
+    it("sets the data to that route", async () => {
+      const view = getByTestId(wrapper, "WrapperView");
 
-    it("sets the data to that route", () => {
       act(() => view.props.navigator.push(rivers.A1234));
+
       expect(view.props.navigator).toHaveProperty("activeRiver", rivers.A1234);
 
       expect(view.props.navigator).toHaveProperty(
@@ -276,23 +253,21 @@ describe("<NavigationProvider />", () => {
         "/river/B4567/river/A1234"
       );
 
-      expect(view.props.navigator.screenData).toEqual(rivers.A1234);
-      expect(view.props.state.stack.mainStack).toBeArrayOfSize(2);
+      expect(view.props.navigator.screenData).toEqual({
+        ...rivers.A1234,
+        targetScreen: rivers.A1234,
+      });
+
+      expect(view.props.state.stack.mainStack).toHaveLength(2);
     });
   });
 
   describe("replacing a current route", () => {
     act(() => {
-      wrapper = create(
-        <Provider store={store}>
-          <NavigationProvider>
-            <ContextConsumer />
-          </NavigationProvider>
-        </Provider>
-      );
+      wrapper = renderContextConsumer();
     });
 
-    const view = wrapper.root.findByType(View);
+    const view = getByTestId(wrapper, "WrapperView");
 
     it("sets the data to that route", () => {
       act(() => view.props.navigator.replace(rivers.A1234));
@@ -303,24 +278,22 @@ describe("<NavigationProvider />", () => {
         "/river/A1234"
       );
 
-      expect(view.props.navigator.screenData).toEqual(rivers.A1234);
-      expect(view.props.state.stack.mainStack).toBeArrayOfSize(1);
+      expect(view.props.navigator.screenData).toEqual({
+        ...rivers.A1234,
+        targetScreen: rivers.A1234,
+      });
+
+      expect(view.props.state.stack.mainStack).toHaveLength(1);
     });
   });
 
   describe("going back", () => {
     describe("when there is no previous route", () => {
       act(() => {
-        wrapper = create(
-          <Provider store={store}>
-            <NavigationProvider>
-              <ContextConsumer />
-            </NavigationProvider>
-          </Provider>
-        );
+        wrapper = renderContextConsumer();
       });
 
-      const view = wrapper.root.findByType(View);
+      const view = getByTestId(wrapper, "WrapperView");
 
       it("returns false when calling canGoBack", () => {
         let result;
@@ -345,23 +318,21 @@ describe("<NavigationProvider />", () => {
           "/river/B4567"
         );
 
-        expect(view.props.navigator.screenData).toEqual(rivers.B4567);
-        expect(view.props.state.stack.mainStack).toBeArrayOfSize(1);
+        expect(view.props.navigator.screenData).toEqual({
+          ...rivers.B4567,
+          targetScreen: rivers.B4567,
+        });
+
+        expect(view.props.state.stack.mainStack).toHaveLength(1);
       });
     });
 
     describe("when there is one route and we're going in a hook", () => {
       act(() => {
-        wrapper = create(
-          <Provider store={store}>
-            <NavigationProvider>
-              <ContextConsumer />
-            </NavigationProvider>
-          </Provider>
-        );
+        wrapper = renderContextConsumer();
       });
 
-      const view = wrapper.root.findByType(View);
+      const view = getByTestId(wrapper, "WrapperView");
       act(() => view.props.navigator.replace(rivers.A1234));
 
       it("returns true when calling goBack()", () => {
@@ -387,25 +358,20 @@ describe("<NavigationProvider />", () => {
         );
 
         expect(view.props.navigator.screenData).toEqual(rivers.A1234);
-        expect(view.props.state.stack.mainStack).toBeArrayOfSize(1);
+        expect(view.props.state.stack.mainStack).toHaveLength(1);
       });
     });
 
     describe("when there is a previous route", () => {
       act(() => {
-        wrapper = create(
-          <Provider store={store}>
-            <NavigationProvider>
-              <ContextConsumer />
-            </NavigationProvider>
-          </Provider>
-        );
+        wrapper = renderContextConsumer();
       });
 
-      const view = wrapper.root.findByType(View);
+      const view = getByTestId(wrapper, "WrapperView");
 
       act(() => view.props.navigator.push(rivers.A1234));
-      act(() => view.props.navigator.push(rivers.B4567));
+
+      act(() => view.props.navigator.push({ ...rivers.B4567, id: "B4567-1" }));
 
       it("returns true when calling canGoBack", () => {
         let result;
@@ -414,11 +380,27 @@ describe("<NavigationProvider />", () => {
           result = view.props.navigator.canGoBack();
         });
 
-        expect(result).toBe(true);
+        expect(result).toBeTruthy();
+      });
+
+      it("returns true when calling canGoBack(false, pathname)", () => {
+        let result;
+
+        act(() => {
+          result = view.props.navigator.canGoBack(false, "B4567-1");
+        });
+
+        expect(result).toBeTruthy();
+
+        act(() => {
+          result = view.props.navigator.canGoBack(false, "A1234");
+        });
+
+        expect(result).toBeTruthy();
       });
 
       it("returns to the previous route", () => {
-        expect(view.props.state.stack.mainStack).toBeArrayOfSize(3);
+        expect(view.props.state.stack.mainStack).toHaveLength(3);
 
         act(() => view.props.navigator.goBack());
 
@@ -432,141 +414,71 @@ describe("<NavigationProvider />", () => {
           "/river/B4567/river/A1234"
         );
 
-        expect(view.props.navigator.screenData).toEqual(rivers.A1234);
-        expect(view.props.state.stack.mainStack).toBeArrayOfSize(2);
+        expect(view.props.navigator.screenData).toEqual({
+          ...rivers.A1234,
+          targetScreen: rivers.A1234,
+        });
+
+        expect(view.props.state.stack.mainStack).toHaveLength(2);
       });
     });
 
     describe("when there is a previous route and there are hooks", () => {
       act(() => {
-        wrapper = create(
-          <Provider store={store}>
-            <NavigationProvider>
-              <ContextConsumer />
-            </NavigationProvider>
-          </Provider>
-        );
+        wrapper = renderContextConsumer();
       });
 
-      const view = wrapper.root.findByType(View);
+      const view = getByTestId(wrapper, "WrapperView");
       act(() => view.props.navigator.push(rivers.A1234));
       act(() => view.props.navigator.push(rivers.C0987));
 
       it("returns to the previous entry in the stack which is not a hook", () => {
-        expect(view.props.state.stack.mainStack).toBeArrayOfSize(5);
+        expect(view.props.state.stack.mainStack).toHaveLength(3);
 
         expect(view.props.navigator).toHaveProperty(
           "currentRoute",
           "/river/B4567/river/A1234/river/C0987"
         );
 
-        expect(view.props.navigator.screenData).toEqual(rivers.C0987);
+        expect(view.props.navigator.screenData).toMatchObject({
+          ...rivers.C0987,
+          targetScreen: rivers.C0987,
+        });
 
         act(() => view.props.navigator.goBack());
 
-        expect(view.props.state.stack.mainStack).toBeArrayOfSize(2);
+        expect(view.props.state.stack.mainStack).toHaveLength(2);
 
         expect(view.props.navigator).toHaveProperty(
           "currentRoute",
           "/river/B4567/river/A1234"
         );
 
-        expect(view.props.navigator.screenData).toEqual(rivers.A1234);
+        expect(view.props.navigator.screenData).toMatchObject({
+          ...rivers.A1234,
+          targetScreen: rivers.A1234,
+        });
       });
     });
   });
 
-  describe("when changing navBar visibility", () => {
-    act(() => {
-      wrapper = create(
-        <Provider store={store}>
-          <NavigationProvider>
-            <ContextConsumer />
-          </NavigationProvider>
-        </Provider>
-      );
-    });
-
-    const view = wrapper.root.findByType(View);
-
-    it("updates the navbar visibility attribute", () => {
-      act(() => view.props.navigator.hideNavBar());
-      expect(view.props.state.options.navBar.visible).toBe(false);
-      expect(view.props.navigator.isNavBarVisible).toBe(false);
-    });
-  });
-
-  describe("set the navbar title", () => {
-    act(() => {
-      wrapper = create(
-        <Provider store={store}>
-          <NavigationProvider>
-            <ContextConsumer />
-          </NavigationProvider>
-        </Provider>
-      );
-    });
-
-    const view = wrapper.root.findByType(View);
-
-    it("updates the navbar title attribute", () => {
-      const screenTitle = "Screen Title";
-      act(() => view.props.navigator.setScreenTitle(screenTitle));
-      expect(view.props.state.options.navBar.title).toBe(screenTitle);
-      expect(view.props.navigator.screenTitle).toBe(screenTitle);
-    });
-  });
-
-  describe("set the navbar summary", () => {
-    act(() => {
-      wrapper = create(
-        <Provider store={store}>
-          <NavigationProvider>
-            <ContextConsumer />
-          </NavigationProvider>
-        </Provider>
-      );
-    });
-
-    const view = wrapper.root.findByType(View);
-
-    it("updates the navbar summary attribute", () => {
-      const screenSummary = "Screen Summary";
-      act(() => view.props.navigator.setScreenSummary(screenSummary));
-      expect(view.props.state.options.navBar.summary).toBe(screenSummary);
-      expect(view.props.navigator.screenSummary).toBe(screenSummary);
-    });
-  });
-
-  describe.only("modal feature", () => {
+  describe("modal feature", () => {
     it("sets the modalState when opening a modal", () => {
       act(() => {
-        wrapper = create(
-          <Provider store={store}>
-            <NavigationProvider>
-              <ContextConsumer />
-            </NavigationProvider>
-          </Provider>
-        );
+        wrapper = renderContextConsumer();
       });
 
-      const view = wrapper.root.findByType(View);
+      const view = getByTestId(wrapper, "WrapperView");
       act(() => view.props.navigator.openModal({ item: rivers.A1234 }));
       expect(view.props.navigator.get).toMatchSnapshot();
     });
 
     it("removes the visible flag when dismissing a modal", () => {
       act(() => {
-        wrapper = create(
-          <Provider store={store}>
-            <NavigationProvider>
-              <ContextConsumer />
-            </NavigationProvider>
-          </Provider>
-        );
+        wrapper = renderContextConsumer();
       });
 
-      const view = wrapper.root.findByType(View);
+      const view = getByTestId(wrapper, "WrapperView");
       act(() => view.props.navigator.openModal({ item: rivers.A1234 }));
       expect(view.props.navigator.getModalState()).toMatchSnapshot();
       act(() => view.props.navigator.dismissModal());
@@ -576,16 +488,10 @@ describe("<NavigationProvider />", () => {
 
     it("should reset state to initial when dismissing a modal ( closeModalBottomSheet ) opened by openModalBottomSheet", () => {
       act(() => {
-        wrapper = create(
-          <Provider store={store}>
-            <NavigationProvider>
-              <ContextConsumer />
-            </NavigationProvider>
-          </Provider>
-        );
+        wrapper = renderContextConsumer();
       });
 
-      const view = wrapper.root.findByType(View);
+      const view = getByTestId(wrapper, "WrapperView");
 
       act(() =>
         view.props.navigator.openModalBottomSheet({

package/App/RouteManager/__tests__/__snapshots__/routeManager.test.js.snap

@@ -13,7 +13,6 @@ exports[`<RouteManager /> renders correctly 1`] = `
   }
 >
   <View
-    comp="river"
     testID="river"
   />
 </RNCSafeAreaProvider>

package/App/__tests__/createQuickBrickApp.test.js

@@ -15,6 +15,11 @@ jest.mock(
 // This is meant to silence errors with react-native-gesture-handler
 jest.mock("../ModalProvider/ModalBottomSheet", () => () => null);
 
+jest.mock(
+  "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation",
+  () => () => null
+);
+
 jest.mock("react-native-safe-area-context", () => ({
   SafeAreaProvider: jest.fn(
     () =>

package/const/index.ts

@@ -34,3 +34,7 @@ export const requiredSessionKeys = [
   "userAgent",
   "version_name",
 ];
+
+export const QUICK_BRICK_NAVBAR = "quick-brick-navbar";
+
+export const QUICK_BRICK_CONTENT = "quick-brick-content";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-core",
-  "version": "12.0.0-alpha.9834532023",
+  "version": "12.0.0-alpha.9903765553",
   "description": "Core package for Applicaster's Quick Brick App",
   "main": "index.js",
   "types": "index.d.ts",
@@ -30,13 +30,13 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/applicaster-types": "12.0.0-alpha.9834532023",
-    "@applicaster/quick-brick-core-plugins": "12.0.0-alpha.9834532023",
-    "@applicaster/zapp-pipes-v2-client": "12.0.0-alpha.9834532023",
-    "@applicaster/zapp-react-native-bridge": "12.0.0-alpha.9834532023",
-    "@applicaster/zapp-react-native-redux": "12.0.0-alpha.9834532023",
-    "@applicaster/zapp-react-native-ui-components": "12.0.0-alpha.9834532023",
-    "@applicaster/zapp-react-native-utils": "12.0.0-alpha.9834532023",
+    "@applicaster/applicaster-types": "12.0.0-alpha.9903765553",
+    "@applicaster/quick-brick-core-plugins": "12.0.0-alpha.9903765553",
+    "@applicaster/zapp-pipes-v2-client": "12.0.0-alpha.9903765553",
+    "@applicaster/zapp-react-native-bridge": "12.0.0-alpha.9903765553",
+    "@applicaster/zapp-react-native-redux": "12.0.0-alpha.9903765553",
+    "@applicaster/zapp-react-native-ui-components": "12.0.0-alpha.9903765553",
+    "@applicaster/zapp-react-native-utils": "12.0.0-alpha.9903765553",
     "atob": "^2.1.2",
     "axios": "^0.28.0",
     "btoa": "^1.2.1",