@applicaster/zapp-react-dom-app 13.0.0-alpha.2569962250 → 13.0.0-alpha.2614386581

package/App/InteractionManager/index.tsx

@@ -31,7 +31,10 @@ import {
 import { PlayerContentContext } from "@applicaster/zapp-react-dom-ui-components/Contexts";
 
 import { withNavigator } from "@applicaster/zapp-react-native-ui-components/Decorators/Navigator";
-import { getXray } from "@applicaster/zapp-react-native-utils/logger";
+import {
+  getXray,
+  createLogger,
+} from "@applicaster/zapp-react-native-utils/logger";
 
 import {
   confirmationDialogStore,
@@ -51,6 +54,11 @@ import { KeyInputHandler } from "@applicaster/zapp-react-native-utils/appUtils/k
 const { withXray } = getXray();
 const globalAny: any = global;
 
+const { log_debug, log_warning } = createLogger({
+  category: "InteractionManager",
+  subsystem: "zapp-react-dom-app",
+});
+
 const shouldUseOnScreenKeyboard = () =>
   isVizioPlatform() || window.applicaster.useOnScreenKeyboard;
 
@@ -140,13 +148,16 @@ class InteractionManagerClass extends React.Component<Props, State> {
     this.onConfirmDialogOpen = this.onConfirmDialogOpen.bind(this);
     this.onConfirmDialogClose = this.onConfirmDialogClose.bind(this);
 
+    this.handlePhysicalKeyboardDismiss =
+      this.handlePhysicalKeyboardDismiss.bind(this);
+
     this.confirmDialog.setConfirmAction(this.performExit);
     this.confirmDialog.setCancelAction(this.onConfirmDialogClose);
     this.longPressDetector = new KeyboardLongPressManager();
   }
 
   componentDidMount() {
-    window.addEventListener("keydown", this.onKeyDownListener);
+    window.addEventListener("keydown", this.onKeyDownListener, true);
     window.addEventListener("keyup", this.onKeyUp);
     window.addEventListener("mousemove", this.onMouseMoveListener);
 
@@ -181,6 +192,11 @@ class InteractionManagerClass extends React.Component<Props, State> {
       "onLongPressRelease",
       this.handleLongPressRelease.bind(this)
     );
+
+    document.addEventListener(
+      "keyboardDismissedByPhysicalKeypress",
+      this.handlePhysicalKeyboardDismiss
+    );
   }
 
   componentWillUnmount() {
@@ -209,6 +225,11 @@ class InteractionManagerClass extends React.Component<Props, State> {
       "onLongPressRelease",
       this.handleLongPressRelease
     );
+
+    document.removeEventListener(
+      "keyboardDismissedByPhysicalKeypress",
+      this.handlePhysicalKeyboardDismiss
+    );
   }
 
   performExit() {
@@ -270,8 +291,7 @@ class InteractionManagerClass extends React.Component<Props, State> {
         this.handleWebOsBack();
       }
     } catch (e) {
-      // eslint-disable-next-line no-console
-      console.warn("Failed to execute platformBack", e);
+      log_warning("Failed to execute platformBack", e);
     }
   }
 
@@ -365,23 +385,103 @@ class InteractionManagerClass extends React.Component<Props, State> {
     }
   }
 
-  onKeyDown(event) {
+  /**
+     When pressing escape or the Native "Back" button:
+     if on the transport controls: we show the player
+     if on the player : we show the UI
+     if on the UI : we exit the app
+     note: backspace affects the keyboard input, so it behaves differently
+     */
+  onBackPress(event) {
     const { displayState, setDisplayState, navigator } = this.props;
+    const { isDialogVisible } = confirmationDialogStore.getState();
     const { isKeyboardVisible } = this.state;
 
-    const { isDialogVisible } = confirmationDialogStore.getState();
+    log_debug("onBackPress", {
+      eventCode: event.code,
+      displayState,
+      isDialogVisible,
+      isKeyboardVisible,
+    });
 
     if (isKeyboardVisible && shouldUseOnScreenKeyboard()) {
-      if (keyCode(event).matchesAny("Escape", "Back")) {
-        this.handleKeyboardDismiss();
-      }
-
+      this.handleKeyboardDismiss();
       event.preventDefault();
       event.stopPropagation();
 
       return;
     }
 
+    switch (displayState) {
+      case DISPLAY_STATES.DEFAULT:
+      case DISPLAY_STATES.PLAYER:
+        if (isDialogVisible) {
+          this.onConfirmDialogClose();
+        } else if (navigator.canGoBack()) {
+          navigator.goBack();
+        } else if (this.isHomeScreen()) {
+          this.platformBack();
+        } 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()
+          const entryData = navigator?.data?.entry;
+          const isHookInHomescreen = entryData?.payload?.home;
+
+          const isHookFlowBlocker =
+            typeof entryData?.hookPlugin?.module?.isFlowBlocker === "function"
+              ? entryData?.hookPlugin?.module?.isFlowBlocker()
+              : entryData?.hookPlugin?.module?.isFlowBlocker;
+
+          if (isHookInHomescreen && isHookFlowBlocker) {
+            this.platformBack();
+          } else {
+            navigator.goBack(false, true);
+          }
+        } else {
+          this.goToHome();
+        }
+
+        break;
+      case DISPLAY_STATES.HUD:
+        // IF transport controls are open, close them instead of closing player
+        setDisplayState(DISPLAY_STATES.PLAYER);
+        break;
+      default:
+        setDisplayState(DISPLAY_STATES.PLAYER);
+        break;
+    }
+  }
+
+  onBackspacePress(event) {
+    const isInputFocused =
+      document.activeElement instanceof HTMLInputElement ||
+      document.activeElement instanceof HTMLTextAreaElement;
+
+    // Don't handle backspace if input is focused
+    if (isInputFocused) {
+      return;
+    }
+
+    this.onBackPress(event);
+  }
+
+  onKeyDown(event) {
+    const { displayState, setDisplayState, navigator } = this.props;
+    const { isDialogVisible } = confirmationDialogStore.getState();
+
+    if (keyCode(event).matches("Backspace")) {
+      this.onBackspacePress(event);
+
+      return;
+    }
+
+    if (keyCode(event).matchesAny(KEYS.Back, KEYS.Escape, KEYS.EscapeDevice)) {
+      this.onBackPress(event);
+
+      return;
+    }
+
     if (this.keySupportsLongPress(event)) {
       this.longPressDetector.monitorKeyPress(event.code, event);
     }
@@ -447,68 +547,6 @@ class InteractionManagerClass extends React.Component<Props, State> {
       }
     }
 
-    /**
-     When pressing backspace or the Native "Back" button:
-     if on the transport controls: we show the player
-     if on the player : we show the UI
-     if on the UI : we exit the app
-     */
-
-    // if (keyCode(event).matchesAny(KEYS.Escape)) {
-    //   console.log("debug_2", "ESCAPE");
-
-    //   confirmationDialogStore.getState().toggleDialog();
-    // }
-
-    if (
-      keyCode(event).matchesAny(
-        KEYS.Back,
-        KEYS.Escape,
-        KEYS.EscapeDevice,
-        KEYS.Backspace
-      )
-    ) {
-      switch (displayState) {
-        case DISPLAY_STATES.DEFAULT:
-        case DISPLAY_STATES.PLAYER:
-          if (isDialogVisible) {
-            this.onConfirmDialogClose();
-          } else if (navigator.canGoBack()) {
-            navigator.goBack();
-          } else if (this.isHomeScreen()) {
-            this.platformBack();
-          } 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()
-            const entryData = navigator?.data?.entry;
-            const isHookInHomescreen = entryData?.payload?.home;
-
-            const isHookFlowBlocker =
-              typeof entryData?.hookPlugin?.module?.isFlowBlocker === "function"
-                ? entryData?.hookPlugin?.module?.isFlowBlocker()
-                : entryData?.hookPlugin?.module?.isFlowBlocker;
-
-            if (isHookInHomescreen && isHookFlowBlocker) {
-              this.platformBack();
-            } else {
-              navigator.goBack(false, true);
-            }
-          } else {
-            this.goToHome();
-          }
-
-          break;
-        case DISPLAY_STATES.HUD:
-          // IF transport controls are open, close them instead of closing player
-          setDisplayState(DISPLAY_STATES.PLAYER);
-          break;
-        default:
-          setDisplayState(DISPLAY_STATES.PLAYER);
-          break;
-      }
-    }
-
     if (
       keyCode(event).matches(KEYS.Enter) ||
       (__DEV__ && keyCode(event).matches(KEYS.X))
@@ -516,6 +554,7 @@ class InteractionManagerClass extends React.Component<Props, State> {
       if (displayState === DISPLAY_STATES.PLAYER) {
         setDisplayState(DISPLAY_STATES.HUD);
       } else {
+        focusManager.pressIn();
         focusManager.press();
       }
 
@@ -532,10 +571,7 @@ class InteractionManagerClass extends React.Component<Props, State> {
       this.platformBack();
     }
 
-    if (
-      keyCode(event).matchesAny(...ARROW_KEYS) &&
-      !this.state.isKeyboardVisible
-    ) {
+    if (keyCode(event).matchesAny(...ARROW_KEYS)) {
       if (displayState === DISPLAY_STATES.PLAYER) {
         setDisplayState(DISPLAY_STATES.HUD);
       }
@@ -548,11 +584,11 @@ class InteractionManagerClass extends React.Component<Props, State> {
         focusManager.moveFocus(direction);
       }
 
-      // if (!isDialogVisible) {
-      //   // run focus recovery on user interaction attempt
-      //   // probably we failed to set initial focus for some reason
-      //   focusManager.recoverFocus();
-      // }
+      if (!isDialogVisible) {
+        // run focus recovery on user interaction attempt
+        // probably we failed to set initial focus for some reason
+        focusManager.recoverFocus();
+      }
 
       if (
         displayState === DISPLAY_STATES.PLAYER ||
@@ -658,7 +694,7 @@ class InteractionManagerClass extends React.Component<Props, State> {
     }
   }
 
-  handleKeyboardDismiss = () => {
+  handleKeyboardDismiss() {
     this.isDismissing = true;
 
     this.setState(
@@ -669,9 +705,10 @@ class InteractionManagerClass extends React.Component<Props, State> {
       },
       () => {
         this.isDismissing = false;
+        focusManager.recoverFocus();
       }
     );
-  };
+  }
 
   handleKeyboardInput = (value: string) => {
     const { activeInputRef } = this.state;
@@ -767,6 +804,35 @@ class InteractionManagerClass extends React.Component<Props, State> {
     ].includes(event.code);
   }
 
+  handlePhysicalKeyboardDismiss(event: CustomEvent) {
+    const { value, position, inputElement } = event.detail;
+
+    this.isDismissing = true;
+
+    this.setState(
+      {
+        isKeyboardVisible: false,
+        keyboardInput: "",
+        activeInputRef: null,
+      },
+      () => {
+        if (inputElement) {
+          inputElement.value = value;
+          inputElement.focus();
+          inputElement.setSelectionRange(position, position);
+
+          const keyboardEvent = new CustomEvent("keyboardUpdate", {
+            detail: { value },
+          });
+
+          document.dispatchEvent(keyboardEvent);
+        }
+
+        this.isDismissing = false;
+      }
+    );
+  }
+
   render() {
     return (
       (shouldUseOnScreenKeyboard() && this.state.isKeyboardVisible && (

package/App/Loader/loadLocale.js

@@ -3,11 +3,6 @@ import { platformSelect } from "@applicaster/zapp-react-native-utils/reactUtils"
 import { QuickBrickCommunicationModule } from "../../Polyfills/QuickBrickCommunicationModule";
 import { loadLocaleImpl, getLanguageCode } from "./utils";
 
-type Locale = {
-  language: string;
-  country: string;
-};
-
 async function getBrowserLocale() {
   return navigator.language;
 }
@@ -19,7 +14,7 @@ async function getSamsungLocale() {
     }
 
     try {
-      tizen.systeminfo.getPropertyValue("LOCALE", (locale: Locale) => {
+      tizen.systeminfo.getPropertyValue("LOCALE", (locale) => {
         resolve(locale.language);
       });
     } catch (e) {

package/Polyfills/Storage/__tests__/__snapshots__/storage.test.js.snap

@@ -31,31 +31,3 @@ exports[`storageObject when the requested storage exists getAllItems returns all
   "otherKey": "otherValue",
 }
 `;
-
-exports[`storageObject when the requested storage exists getItem gets properties from the storage 1`] = `"bar"`;
-
-exports[`storageObject when the requested storage exists getItem gets properties from the storage 2`] = `"bar"`;
-
-exports[`storageObject when the requested storage exists getItem gets properties from the storage 3`] = `"bar"`;
-
-exports[`storageObject when the requested storage exists getItem gets properties from the storage 4`] = `"bar"`;
-
-exports[`storageObject when the requested storage exists getItem gets properties from the storage with a namespace 1`] = `"baz"`;
-
-exports[`storageObject when the requested storage exists getItem gets properties from the storage with a namespace 2`] = `"baz"`;
-
-exports[`storageObject when the requested storage exists getItem rejects if the property cannot be retrieved 1`] = `[Error: Could not retrieve item applicaster.v2_::_fail_key]`;
-
-exports[`storageObject when the requested storage exists getItem rejects if the property cannot be retrieved 2`] = `[Error: Could not retrieve item applicaster.v2_::_fail_key]`;
-
-exports[`storageObject when the requested storage exists removeItem removes an item 1`] = `true`;
-
-exports[`storageObject when the requested storage exists removeItem removes an item 2`] = `true`;
-
-exports[`storageObject when the requested storage exists removeItem removes an item 3`] = `true`;
-
-exports[`storageObject when the requested storage exists removeItem removes an item 4`] = `true`;
-
-exports[`storageObject when the requested storage exists setItem will reject a promise if it the setting of the data fails 1`] = `[Error: Could not set item applicaster.v2_::_fail_key]`;
-
-exports[`storageObject when the requested storage exists setItem will reject a promise if it the setting of the data fails 2`] = `[Error: Could not set item applicaster.v2_::_fail_key]`;

package/Polyfills/Storage/__tests__/storage.test.js

@@ -4,7 +4,8 @@ import {
   applyNamespaceToKeyName,
   STORAGE_TYPES,
   DEFAULT_NAMESPACE,
-} from "../index";
+} from "../";
+
 import { StorageMock } from "./StorageMocks";
 
 import * as functionUtils from "@applicaster/zapp-react-native-utils/functionUtils";
@@ -26,14 +27,7 @@ function clearStorage() {
   R.forEach((storage) => global.window[storage].clear(), STORAGE_TYPES);
 }
 
-async function testStorage(expectations) {
-  await Promise.all(
-    R.map((storage) => {
-      const Storage = getStorageModule(storage);
-      expectations(Storage);
-    }, STORAGE_TYPES)
-  );
-}
+const storages = R.map((storage) => getStorageModule(storage), STORAGE_TYPES);
 
 describe("storageObject", () => {
   beforeEach(resetMocks);
@@ -48,143 +42,119 @@ describe("storageObject", () => {
 
     beforeEach(clearStorage);
 
-    it("returns an object with 3 methods", () => {
-      expect.assertions(6);
-
-      testStorage((Storage) => {
-        expect(Storage).toHaveProperty("setItem");
-        expect(Storage).toHaveProperty("getItem");
-        expect(Storage).toHaveProperty("getAllItems");
-      });
+    it.each(storages)("returns an object with 3 methods", (storage) => {
+      expect(storage).toHaveProperty("setItem");
+      expect(storage).toHaveProperty("getItem");
+      expect(storage).toHaveProperty("getAllItems");
     });
 
     describe("setItem", () => {
       beforeEach(clearStorage);
 
-      it("sets a property in the storage", async () => {
-        expect.assertions(4);
+      it.each(storages)("sets a property in the storage", async (storage) => {
+        const result = await storage.setItem(key, value, null);
 
-        await testStorage(async (Storage) => {
-          const result = await Storage.setItem(key, value, null);
+        const keyWithDefaultNameSpace = applyNamespaceToKeyName(
+          key,
+          DEFAULT_NAMESPACE
+        );
 
-          const keyWithDefaultNameSpace = applyNamespaceToKeyName(
-            key,
-            DEFAULT_NAMESPACE
-          );
+        expect(result).toBe(true);
 
-          expect(result).toBe(true);
-          expect(Storage[keyWithDefaultNameSpace]).toEqual(value);
-        });
+        expect(storage.getItem(keyWithDefaultNameSpace)).resolves.toEqual(
+          value
+        );
       });
 
-      it("sets a property in the storage with a namespace", async () => {
-        expect.assertions(4);
-
-        await testStorage(async (Storage) => {
-          const result = await Storage.setItem(key, namespaceValue, namespace);
+      it.each(storages)(
+        "sets a property in the storage with a namespace",
+        async (storage) => {
+          const result = await storage.setItem(key, namespaceValue, namespace);
 
           expect(result).toBe(true);
-          expect(Storage[keyName]).toEqual(namespaceValue);
-        });
-      });
 
-      it("will reject a promise if it the setting of the data fails", async () => {
-        expect.assertions(2);
+          expect(storage.getItem(keyName)).resolves.toEqual(namespaceValue);
+        }
+      );
 
-        await testStorage(async (Storage) => {
-          await expect(
-            Storage.setItem(failKey, value)
-          ).rejects.toMatchSnapshot();
-        });
-      });
+      it.each(storages)(
+        "will reject a promise if it the setting of the data fails",
+        async (storage) => {
+          await expect(storage.setItem(failKey, value)).rejects.toThrow(
+            "Could not set item applicaster.v2_::_fail_key"
+          );
+        }
+      );
     });
 
     describe("getItem", () => {
       beforeEach(async () => {
         clearStorage();
 
-        await testStorage(async (Storage) => {
+        storages.forEach((Storage) => {
           Storage.setItem(key, value, null);
           Storage.setItem(key, namespaceValue, namespace);
         });
       });
 
-      it("gets properties from the storage", async () => {
-        expect.assertions(8);
-
-        await testStorage(async (Storage) => {
-          await expect(Storage.getItem(key)).resolves.toEqual(value);
-          await expect(Storage.getItem(key)).resolves.toMatchSnapshot();
-          await expect(Storage.getItem(key, null)).resolves.toEqual(value);
-          await expect(Storage.getItem(key, null)).resolves.toMatchSnapshot();
-        });
+      it.each(storages)("gets properties from the storage", async (storage) => {
+        const result = await storage.getItem(key);
+        const resultWithNull = await storage.getItem(key, null);
+        expect(result).toEqual(value);
+        expect(resultWithNull).toEqual(value);
       });
 
-      it("gets properties from the storage with a namespace", async () => {
-        expect.assertions(4);
-
-        await testStorage(async (Storage) => {
-          await expect(Storage.getItem(key, namespace)).resolves.toEqual(
-            namespaceValue
+      it.each(storages)(
+        "gets properties from the storage with a namespace",
+        (storage) => {
+          expect(storage.getItem(key, namespace)).resolves.toEqual(
+            "namespaceValue"
           );
+        }
+      );
 
-          await expect(
-            Storage.getItem(key, namespace)
-          ).resolves.toMatchSnapshot();
-        });
-      });
-
-      it("rejects if the property cannot be retrieved", async () => {
-        expect.assertions(2);
-
-        await testStorage(async (Storage) => {
-          await expect(Storage.getItem(failKey)).rejects.toMatchSnapshot();
-        });
-      });
+      it.each(storages)(
+        "rejects if the property cannot be retrieved",
+        async (storage) => {
+          await expect(storage.getItem(failKey)).rejects.toThrow(
+            "Could not retrieve item applicaster.v2_::_fail_key"
+          );
+        }
+      );
     });
 
     describe("getAllItems", () => {
       beforeEach(async () => {
         clearStorage();
 
-        await testStorage(async (Storage) => {
-          await Storage.setItem(key, value);
-          await Storage.setItem(key, namespaceValue, namespace);
-          await Storage.setItem("otherKey", "otherValue");
-          await Storage.setItem("otherKey", "otherValue", namespace);
+        storages.forEach((Storage) => {
+          Storage.setItem(key, value);
+          Storage.setItem(key, namespaceValue, namespace);
+          Storage.setItem("otherKey", "otherValue");
+          Storage.setItem("otherKey", "otherValue", namespace);
         });
       });
 
-      it("returns all keys", async () => {
-        expect.assertions(2);
-
-        await testStorage(async (Storage) => {
-          await expect(Storage.getAllItems()).resolves.toMatchSnapshot();
-        });
+      it.each(storages)("returns all keys", async (Storage) => {
+        const res = await Storage.getAllItems();
+        expect(res).toMatchSnapshot();
       });
 
-      it("returns all keys in the namespace if provided", async () => {
-        expect.assertions(2);
-
-        await testStorage(async (Storage) => {
+      it.each(storages)(
+        "returns all keys in the namespace if provided",
+        async (Storage) => {
           await expect(
             Storage.getAllItems(namespace)
           ).resolves.toMatchSnapshot();
-        });
-      });
+        }
+      );
     });
 
     describe("removeItem", () => {
-      it("removes an item", async () => {
-        expect.assertions(4);
-
-        await testStorage(async (Storage) => {
-          await expect(Storage.removeItem(key)).resolves.toMatchSnapshot();
+      it.each(storages)("removes an item", async (Storage) => {
+        await expect(Storage.removeItem(key)).resolves.toBeTruthy();
 
-          await expect(
-            Storage.removeItem(key, namespace)
-          ).resolves.toMatchSnapshot();
-        });
+        await expect(Storage.removeItem(key, namespace)).resolves.toBeTruthy();
       });
     });
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-dom-app",
-  "version": "13.0.0-alpha.2569962250",
+  "version": "13.0.0-alpha.2614386581",
   "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": "13.0.0-alpha.2569962250",
-    "@applicaster/zapp-react-native-bridge": "13.0.0-alpha.2569962250",
-    "@applicaster/zapp-react-native-redux": "13.0.0-alpha.2569962250",
-    "@applicaster/zapp-react-native-ui-components": "13.0.0-alpha.2569962250",
-    "@applicaster/zapp-react-native-utils": "13.0.0-alpha.2569962250",
+    "@applicaster/zapp-react-dom-ui-components": "13.0.0-alpha.2614386581",
+    "@applicaster/zapp-react-native-bridge": "13.0.0-alpha.2614386581",
+    "@applicaster/zapp-react-native-redux": "13.0.0-alpha.2614386581",
+    "@applicaster/zapp-react-native-ui-components": "13.0.0-alpha.2614386581",
+    "@applicaster/zapp-react-native-utils": "13.0.0-alpha.2614386581",
     "abortcontroller-polyfill": "^1.7.5",
     "react-router-dom": "^5.1.2",
     "typeface-montserrat": "^0.0.54",
@@ -37,15 +37,14 @@
   "peerDependencies": {
     "@applicaster/zapp-pipes-v2-client": "*",
     "@react-native-community/netinfo": "*",
-    "@types/node": "*",
     "core-js": "3.29.1",
     "immer": "*",
-    "react": "17.0.2",
-    "react-dom": "17.0.2",
+    "react": "*",
+    "react-dom": "*",
     "react-native": "*",
     "react-native-safe-area-context": "*",
     "react-native-svg": "*",
-    "react-native-web": "0.18.11",
+    "react-native-web": "*",
     "uglify-js": "*",
     "validate-color": "*",
     "zustand": "*"