@applicaster/quick-brick-core 15.1.15 → 15.1.16-alpha.1335343245

package/App/NavigationProvider/NavigationProvider.tsx

@@ -246,6 +246,10 @@ export function NavigationProvider({ children }: Props) {
     playNextOverlayState.current = state;
   };
 
+  // The play-next overlay owns remote focus while it is visible, so key
+  // handling (InteractionManager) needs to be able to ask for it.
+  const getPlayNextOverlay = () => playNextOverlayState.current ?? null;
+
   const setNestedScreenContent = (entry: ZappEntry, screenId: string) => {
     const screen = rivers[screenId];
     const parent = findParent(context, navigator.currentRoute);
@@ -352,10 +356,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));
@@ -790,6 +791,7 @@ export function NavigationProvider({ children }: Props) {
       replace: replaceItem,
       setNestedScreenContent,
       setPlayNextOverlay,
+      getPlayNextOverlay,
       goHome,
       canGoBack,
       goBack,

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

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

package/package.json

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