@applicaster/quick-brick-core 16.0.0-rc.100 → 16.0.0-rc.102

package/App/NavigationProvider/NavigationProvider.tsx

@@ -353,10 +353,7 @@ export function NavigationProvider({ children }: Props) {
           state: firstRoute.state,
         };
 
-        if (
-          stateForBack?.state?.entry &&
-          "home" in stateForBack?.state?.entry
-        ) {
+        if (stateForBack?.state?.entry?.home) {
           goHome();
         } else {
           dispatch(back(stateForBack));

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

@@ -410,6 +410,62 @@ describe("<NavigationProvider />", () => {
       });
     });
 
+    describe("when backToTop is requested from a non-home tab", () => {
+      const listenRiver = {
+        id: "LISTEN",
+        home: false,
+        navigations: [],
+        ui_components: [],
+      };
+
+      beforeEach(() => {
+        wrapper = renderContextConsumer({
+          ...store,
+          rivers: { ...rivers, LISTEN: listenRiver },
+        });
+
+        act(() => {
+          getNavigatorValues(wrapper).navigator.replace(listenRiver);
+        });
+      });
+
+      it("returns to the tab root from the second level", () => {
+        act(() => {
+          getNavigatorValues(wrapper).navigator.push(rivers.A1234);
+        });
+
+        act(() => {
+          getNavigatorValues(wrapper).navigator.goBack(false, false, true);
+        });
+
+        const { navigator, state } = getNavigatorValues(wrapper);
+
+        expect(navigator.currentRoute).toEqual("/river/LISTEN");
+        expect(navigator.activeRiver).toEqual(listenRiver);
+        expect(state.stack.mainStack).toHaveLength(1);
+      });
+
+      it("returns to the tab root from the third level", () => {
+        act(() => {
+          getNavigatorValues(wrapper).navigator.push(rivers.A1234);
+        });
+
+        act(() => {
+          getNavigatorValues(wrapper).navigator.push(rivers.C0987);
+        });
+
+        act(() => {
+          getNavigatorValues(wrapper).navigator.goBack(false, false, true);
+        });
+
+        const { navigator, state } = getNavigatorValues(wrapper);
+
+        expect(navigator.currentRoute).toEqual("/river/LISTEN");
+        expect(navigator.activeRiver).toEqual(listenRiver);
+        expect(state.stack.mainStack).toHaveLength(1);
+      });
+    });
+
     describe("when there is a previous route and there are hooks", () => {
       beforeEach(() => {
         wrapper = renderContextConsumer();

package/package.json

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