@applicaster/zapp-react-dom-app 15.0.0-rc.4 → 15.0.0-rc.40

package/App/InteractionManager/hoc/__tests__/withBacktoTopActionHOC.test.tsx

@@ -157,4 +157,27 @@ describe("withBackToTopActionHOC", () => {
     render(<Wrapped />);
     expect(receivedProps.backToTopAction()).toBe("GO_BACK");
   });
+
+  it("returns FORCE_GO_BACK in hook case", () => {
+    expect.assertions(1);
+
+    (useCurrentScreenIsRoot as jest.Mock).mockReturnValue(false);
+    (useCurrentScreenIsHome as jest.Mock).mockReturnValue(false);
+    (useCurrentScreenIsTabs as jest.Mock).mockReturnValue(false);
+
+    (useNavigation as jest.Mock).mockReturnValue({
+      startUpHooks: [],
+      currentRoute: "/hooks/some_route",
+    });
+
+    (focusManager.isFocusOnMenu as jest.Mock).mockReturnValue(false);
+    (focusManager.isFocusOnContent as jest.Mock).mockReturnValue(false);
+
+    (focusManager.isTabsScreenContentFocused as jest.Mock).mockReturnValue(
+      false
+    );
+
+    render(<Wrapped />);
+    expect(receivedProps.backToTopAction()).toBe("FORCE_GO_BACK");
+  });
 });

package/App/InteractionManager/hoc/withBackToTopAction.tsx

@@ -17,6 +17,7 @@ export type BACK_TO_TOP_ACTION =
   | "GO_HOME"
   | "GO_BACK"
   | "FOCUS_ON_SELECTED_TOP_MENU_ITEM"
+  | "FORCE_GO_BACK"
   | "FOCUS_ON_SELECTED_TAB_ITEM";
 
 export type BackToTopAction = () => BACK_TO_TOP_ACTION;
@@ -31,6 +32,8 @@ export function withBackToTopActionHOC(Component) {
 
     const isStartUpHook = isFilledArray(navigator.startUpHooks);
 
+    const isHook = navigator.currentRoute?.includes("hook");
+
     const emitFocusOnSelectedTab = useSubscriberFor(
       QBUIComponentEvents.focusOnSelectedTab
     );
@@ -60,9 +63,13 @@ export function withBackToTopActionHOC(Component) {
         return "FOCUS_ON_SELECTED_TOP_MENU_ITEM";
       }
 
+      if (isHook) {
+        return "FORCE_GO_BACK";
+      }
+
       // default
       return "GO_BACK";
-    }, [isHome, isRoot, isTabsScreen, isStartUpHook]);
+    }, [isHome, isRoot, isTabsScreen, isStartUpHook, isHook]);
 
     return (
       <Component

package/App/InteractionManager/index.tsx

@@ -461,6 +461,15 @@ class InteractionManagerClass extends React.Component<Props, State> {
           }
         }
 
+        if (action === "FORCE_GO_BACK") {
+          log_info(action);
+
+          const fallbackToHome = false;
+          const fromHook = true;
+
+          navigator.goBack(fallbackToHome, fromHook);
+        }
+
         break;
       case DISPLAY_STATES.PLAYER:
         if (isDialogVisible) {
@@ -515,8 +524,16 @@ class InteractionManagerClass extends React.Component<Props, State> {
   }
 
   onKeyDown(event) {
-    const { displayState, setDisplayState, navigator } = this.props;
+    const { displayState, setDisplayState, navigator, xray } = this.props;
     const { isDialogVisible } = confirmationDialogStore.getState();
+    const { isKeyboardVisible } = this.state;
+
+    if (
+      xray?.isPromptEnabled ||
+      (isKeyboardVisible && shouldUseOnScreenKeyboard())
+    ) {
+      return;
+    }
 
     if (keyCode(event).matches("Backspace")) {
       this.onBackspacePress(event);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-dom-app",
-  "version": "15.0.0-rc.4",
+  "version": "15.0.0-rc.40",
   "description": "Zapp App Component for Applicaster's Quick Brick React Native App",
   "main": "index.js",
   "scripts": {
@@ -22,11 +22,11 @@
   },
   "homepage": "https://github.com/applicaster/zapp-react-dom-app#readme",
   "dependencies": {
-    "@applicaster/zapp-react-dom-ui-components": "15.0.0-rc.4",
-    "@applicaster/zapp-react-native-bridge": "15.0.0-rc.4",
-    "@applicaster/zapp-react-native-redux": "15.0.0-rc.4",
-    "@applicaster/zapp-react-native-ui-components": "15.0.0-rc.4",
-    "@applicaster/zapp-react-native-utils": "15.0.0-rc.4",
+    "@applicaster/zapp-react-dom-ui-components": "15.0.0-rc.40",
+    "@applicaster/zapp-react-native-bridge": "15.0.0-rc.40",
+    "@applicaster/zapp-react-native-redux": "15.0.0-rc.40",
+    "@applicaster/zapp-react-native-ui-components": "15.0.0-rc.40",
+    "@applicaster/zapp-react-native-utils": "15.0.0-rc.40",
     "abortcontroller-polyfill": "^1.7.5",
     "typeface-montserrat": "^0.0.54",
     "video.js": "7.14.3",