@applicaster/quick-brick-core 12.0.0-rc.34 → 12.0.0-rc.35

package/App/NavigationProvider/NavigationProvider.tsx

@@ -167,7 +167,7 @@ export function NavigationProvider({ children }: Props) {
     [rivers, homeRiver]
   );
 
-  const getStack = () => [...stateRef?.current?.stack?.mainStack];
+  const getStack = () => [...state?.stack?.mainStack];
 
   const openVideoModal = (
     item: ZappEntry,
@@ -668,7 +668,7 @@ export function NavigationProvider({ children }: Props) {
   const getStackForPathname = React.useCallback((pathname: string):
     | NavigationScreenState
     | undefined => {
-    const stack = getStack();
+    const stack = [...stateRef?.current?.stack?.mainStack];
 
     const currentStack = stack.find(({ route }) => route === pathname);
 

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

@@ -1,13 +1,20 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<RouteManager /> renders correctly 1`] = `
-<WithProvider
-  screenData={
-    Object {
-      "id": "A1234",
-    }
+<RNCSafeAreaProvider
+  onInsetsChange={[Function]}
+  style={
+    Array [
+      Object {
+        "flex": 1,
+      },
+      undefined,
+    ]
   }
-  screenId="A1234"
-  screenType="river"
-/>
+>
+  <View
+    comp="river"
+    testID="river"
+  />
+</RNCSafeAreaProvider>
 `;

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

@@ -1,31 +1,42 @@
 import React from "react";
-import { shallow } from "enzyme";
-import { shallowToJson } from "enzyme-to-json";
 
-import { ScreenResolver } from "@applicaster/zapp-react-native-ui-components/Components/ScreenResolver";
+const {
+  ScreenResolver,
+} = require("@applicaster/zapp-react-native-ui-components/Components/ScreenResolver");
+
+import { renderWithProviders } from "@applicaster/zapp-react-native-utils/testUtils";
 
 jest.mock("@applicaster/zapp-react-native-utils/reactHooks/navigation", () => ({
   useNavigation: jest.fn(() => ({
     screenId: { id: "A1234" },
     currentRoute: "/river/A1234",
     screenData: { id: "A1234" },
+    videoModalState: { mode: "WINDOWED" },
+  })),
+  useRoute: jest.fn(() => ({
+    pathname: "/river/A1234",
+    screenData: { id: "A1234-screenData" },
   })),
 }));
 
 const { RouteManager } = require("../");
 
 describe("<RouteManager />", () => {
-  const wrapper = shallow(<RouteManager />);
+  let wrapper;
+
+  beforeEach(() => {
+    wrapper = renderWithProviders(<RouteManager />);
+  });
 
   it("renders correctly", () => {
-    expect(shallowToJson(wrapper)).toMatchSnapshot();
+    expect(wrapper.toJSON()).toMatchSnapshot();
   });
 
   it("passes the correct props to ScreenResolver", () => {
-    expect(wrapper.find(ScreenResolver).props()).toEqual({
+    expect(wrapper.UNSAFE_getByType(ScreenResolver).props).toEqual({
       screenType: "river",
       screenId: "A1234",
-      screenData: { id: "A1234" },
+      screenData: { id: "A1234-screenData" },
     });
   });
 });

package/App/RouteManager/index.tsx

@@ -4,7 +4,7 @@ import * as R from "ramda";
 import { getPathAttributes } from "@applicaster/zapp-react-native-utils/navigationUtils";
 import { ScreenResolver } from "@applicaster/zapp-react-native-ui-components/Components/ScreenResolver";
 
-import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks/navigation";
+import { useRoute } from "@applicaster/zapp-react-native-utils/reactHooks/navigation";
 
 type Props = any;
 
@@ -14,7 +14,8 @@ type Props = any;
  * @param {Props}: see props above
  */
 export const RouteManager = React.memo(function RouteManager(props: Props) {
-  const { currentRoute: pathname, screenData } = useNavigation();
+  const { pathname, screenData } = useRoute();
+
   const pathAttributes = getPathAttributes({ pathname });
 
   if (!pathAttributes.length) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-core",
-  "version": "12.0.0-rc.34",
+  "version": "12.0.0-rc.35",
   "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-rc.34",
-    "@applicaster/quick-brick-core-plugins": "12.0.0-rc.34",
-    "@applicaster/zapp-pipes-v2-client": "12.0.0-rc.34",
-    "@applicaster/zapp-react-native-bridge": "12.0.0-rc.34",
-    "@applicaster/zapp-react-native-redux": "12.0.0-rc.34",
-    "@applicaster/zapp-react-native-ui-components": "12.0.0-rc.34",
-    "@applicaster/zapp-react-native-utils": "12.0.0-rc.34",
+    "@applicaster/applicaster-types": "12.0.0-rc.35",
+    "@applicaster/quick-brick-core-plugins": "12.0.0-rc.35",
+    "@applicaster/zapp-pipes-v2-client": "12.0.0-rc.35",
+    "@applicaster/zapp-react-native-bridge": "12.0.0-rc.35",
+    "@applicaster/zapp-react-native-redux": "12.0.0-rc.35",
+    "@applicaster/zapp-react-native-ui-components": "12.0.0-rc.35",
+    "@applicaster/zapp-react-native-utils": "12.0.0-rc.35",
     "atob": "^2.1.2",
     "axios": "^0.28.0",
     "btoa": "^1.2.1",