@applicaster/zapp-react-dom-app 16.0.0-rc.2 → 16.0.0-rc.3

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

@@ -64,14 +64,14 @@ describe("withBackToTopActionHOC - backToTopAction", () => {
     });
   });
 
-  it("returns PLATFORM_BACK for startup hook", () => {
+  it("returns PLATFORM_TO_BACKGROUND for startup hook", () => {
     expect.assertions(1);
 
     (useCurrentScreenIsStartupHook as jest.Mock).mockReturnValue(true);
 
     render(<Wrapped />);
 
-    expect(receivedProps.backToTopAction()).toBe("PLATFORM_BACK");
+    expect(receivedProps.backToTopAction()).toBe("PLATFORM_TO_BACKGROUND");
   });
 
   it("returns GO_BACK_FROM_HOOK when isHook", () => {
@@ -94,7 +94,7 @@ describe("withBackToTopActionHOC - backToTopAction", () => {
     expect(receivedProps.backToTopAction()).toBe("GO_HOME");
   });
 
-  it("returns PLATFORM_BACK when root + menu focus + home", () => {
+  it("returns PLATFORM_TO_BACKGROUND when root + menu focus + home", () => {
     expect.assertions(1);
 
     (useCurrentScreenIsRoot as jest.Mock).mockReturnValue(true);
@@ -106,7 +106,7 @@ describe("withBackToTopActionHOC - backToTopAction", () => {
 
     render(<Wrapped />);
 
-    expect(receivedProps.backToTopAction()).toBe("PLATFORM_BACK");
+    expect(receivedProps.backToTopAction()).toBe("PLATFORM_TO_BACKGROUND");
   });
 
   it("returns GO_HOME when root + menu focus + NOT home", () => {

package/App/InteractionManager/hoc/withBackToTopAction.tsx

@@ -38,7 +38,7 @@ export function withBackToTopActionHOC(Component) {
 
     const backToTopAction = React.useCallback((): BackToTopAction => {
       if (isStartUpHook) {
-        return "PLATFORM_BACK";
+        return "PLATFORM_TO_BACKGROUND";
       }
 
       if (isHook) {
@@ -51,7 +51,7 @@ export function withBackToTopActionHOC(Component) {
       }
 
       if (isRoot && focusManager.isFocusOnMenu() && isHome) {
-        return "PLATFORM_BACK";
+        return "PLATFORM_TO_BACKGROUND";
       }
 
       if (isRoot && focusManager.isFocusOnMenu() && !isHome) {

package/App/InteractionManager/index.tsx

@@ -3,11 +3,6 @@ import * as R from "ramda";
 
 import { connectToStore } from "@applicaster/zapp-react-native-redux/utils/connectToStore";
 
-import {
-  QUICK_BRICK_EVENTS,
-  sendQuickBrickEvent,
-} from "@applicaster/zapp-react-native-bridge/QuickBrick";
-
 import { toBooleanWithDefaultFalse } from "@applicaster/zapp-react-native-utils/booleanUtils";
 
 import {
@@ -50,6 +45,8 @@ import {
   isVizioPlatform,
 } from "@applicaster/zapp-react-native-utils/reactUtils";
 
+import { platformToBackground as sendAppToBackground } from "@applicaster/zapp-react-native-utils/appUtils/platform";
+
 import { OnScreenKeyboard } from "@applicaster/zapp-react-dom-ui-components/Components/OnScreenKeyboard";
 import { KeyboardLongPressManager } from "@applicaster/zapp-react-dom-ui-components/Utils/KeyboardLongPressManager";
 import { KeyInputHandler } from "@applicaster/zapp-react-native-utils/appUtils/keyInputHandler/KeyInputHandler";
@@ -242,7 +239,7 @@ class InteractionManagerClass extends React.Component<Props, State> {
   performExit() {
     if (isSamsungPlatform()) {
       this.onConfirmDialogClose();
-      sendQuickBrickEvent(QUICK_BRICK_EVENTS.MOVE_APP_TO_BACKGROUND);
+      sendAppToBackground();
     }
 
     if (isLgPlatform()) {
@@ -256,7 +253,7 @@ class InteractionManagerClass extends React.Component<Props, State> {
   }
 
   handleWebOsBack() {
-    const systemBack = globalAny?.webOS?.platformBack;
+    const systemBack = globalAny?.webOS?.platformToBackground;
 
     if (systemBack) {
       systemBack();
@@ -277,7 +274,7 @@ class InteractionManagerClass extends React.Component<Props, State> {
    * WebOS behavior depends on the SDK version, WebOS 4 would pull up the launcher menu
    * following versions would show a native exit prompt
    */
-  platformBack() {
+  platformToBackground() {
     try {
       // TODO: temporary hack until this code is refactored
       if (isSamsungPlatform() || isVizioPlatform()) {
@@ -294,9 +291,11 @@ class InteractionManagerClass extends React.Component<Props, State> {
         }
       } else if (isLgPlatform()) {
         this.handleWebOsBack();
+      } else {
+        sendAppToBackground();
       }
     } catch (e) {
-      log_warning("Failed to execute platformBack", e);
+      log_warning("Failed to execute platformToBackground", e);
     }
   }
 
@@ -425,10 +424,10 @@ class InteractionManagerClass extends React.Component<Props, State> {
 
     switch (displayState) {
       case DISPLAY_STATES.DEFAULT:
-        if (action === "PLATFORM_BACK") {
+        if (action === "PLATFORM_TO_BACKGROUND") {
           log_info(action);
 
-          this.platformBack();
+          this.platformToBackground();
         }
 
         if (action === "GO_HOME") {
@@ -477,11 +476,11 @@ class InteractionManagerClass extends React.Component<Props, State> {
         } else if (navigator.canGoBack()) {
           navigator.goBack();
         } else if (this.isHomeScreen()) {
-          this.platformBack();
+          this.platformToBackground();
         } else if (navigator.currentRoute.includes("hook")) {
           // If code reaches this block navigator cant go back, it is not home,
           // and this is a login plugin that was pushed on top of the home
-          // Treat it like a home screen and run platformBack()
+          // Treat it like a home screen and run platformToBackground()
           const entryData = navigator?.data?.entry;
           const isHookInHomescreen = entryData?.payload?.home;
 
@@ -491,7 +490,7 @@ class InteractionManagerClass extends React.Component<Props, State> {
               : entryData?.hookPlugin?.module?.isFlowBlocker;
 
           if (isHookInHomescreen && isHookFlowBlocker) {
-            this.platformBack();
+            this.platformToBackground();
           } else {
             navigator.goBack(false, true);
           }
@@ -640,7 +639,7 @@ class InteractionManagerClass extends React.Component<Props, State> {
         return;
       }
 
-      this.platformBack();
+      this.platformToBackground();
     }
 
     if (keyCode(event).matchesAny(...ARROW_KEYS)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-dom-app",
-  "version": "16.0.0-rc.2",
+  "version": "16.0.0-rc.3",
   "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": "16.0.0-rc.2",
-    "@applicaster/zapp-react-native-bridge": "16.0.0-rc.2",
-    "@applicaster/zapp-react-native-redux": "16.0.0-rc.2",
-    "@applicaster/zapp-react-native-ui-components": "16.0.0-rc.2",
-    "@applicaster/zapp-react-native-utils": "16.0.0-rc.2",
+    "@applicaster/zapp-react-dom-ui-components": "16.0.0-rc.3",
+    "@applicaster/zapp-react-native-bridge": "16.0.0-rc.3",
+    "@applicaster/zapp-react-native-redux": "16.0.0-rc.3",
+    "@applicaster/zapp-react-native-ui-components": "16.0.0-rc.3",
+    "@applicaster/zapp-react-native-utils": "16.0.0-rc.3",
     "abortcontroller-polyfill": "^1.7.5",
     "typeface-montserrat": "^0.0.54",
     "video.js": "7.14.3",