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

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

@@ -8,12 +8,12 @@ import {
   useCurrentScreenIsHome,
   useCurrentScreenIsRoot,
   useCurrentScreenIsTabs,
-  useIsStandaloneFullscreen,
 } from "../hooks";
 
 import {
   useCurrentScreenIsHook,
   useCurrentScreenIsStartupHook,
+  useIsStandaloneFullscreen,
 } from "@applicaster/zapp-react-native-utils/reactHooks/screen";
 
 jest.mock("@applicaster/zapp-react-native-utils/appUtils", () => ({

package/App/InteractionManager/hoc/hooks/index.ts

@@ -4,7 +4,6 @@ import {
   useRivers,
 } from "@applicaster/zapp-react-native-utils/reactHooks/state";
 import { last } from "@applicaster/zapp-react-native-utils/utils";
-import { toBooleanWithDefaultFalse } from "@applicaster/zapp-react-native-utils/booleanUtils";
 
 export const useCurrentScreenIsHome = (): boolean => {
   const navigator = useNavigation();
@@ -33,12 +32,3 @@ export const useCurrentScreenIsTabs = (): boolean => {
 
   return river?.type === "tabs_screen";
 };
-
-export const useIsStandaloneFullscreen = (): boolean => {
-  const navigator = useNavigation();
-
-  return toBooleanWithDefaultFalse(
-    !navigator?.canGoBack() &&
-      navigator?.screenData?.general?.allow_screen_plugin_presentation
-  );
-};

package/App/InteractionManager/hoc/withBackToTopAction.tsx

@@ -8,12 +8,12 @@ import {
   useCurrentScreenIsHome,
   useCurrentScreenIsRoot,
   useCurrentScreenIsTabs,
-  useIsStandaloneFullscreen,
 } from "./hooks";
 
 import {
   useCurrentScreenIsHook,
   useCurrentScreenIsStartupHook,
+  useIsStandaloneFullscreen,
 } from "@applicaster/zapp-react-native-utils/reactHooks/screen";
 
 export function withBackToTopActionHOC(Component) {
@@ -45,7 +45,7 @@ export function withBackToTopActionHOC(Component) {
         return "GO_BACK_FROM_HOOK";
       }
 
-      // Handling case where is not top menu visible
+      // Handle the case where the top menu is not visible
       if (isStandaloneFullscreen) {
         return "GO_HOME";
       }

package/App/InteractionManager/index.tsx

@@ -569,7 +569,7 @@ class InteractionManagerClass extends React.Component<Props, State> {
         const { playing } = playerManager.getState() || {};
 
         if (!playing) {
-          return playerManager.togglePlayPause();
+          return playerManager.getInstanceController()?.togglePlayPause();
         }
       }
 

package/App/Layout/index.tsx

@@ -1,7 +1,8 @@
 import * as React from "react";
 import { createPortal } from "react-dom";
 
-import { Background } from "@applicaster/zapp-react-dom-ui-components/Components/Background";
+import { BackgroundImage } from "@applicaster/zapp-react-native-ui-components/Components/BackgroundImage";
+
 import { ConfirmDialog } from "@applicaster/zapp-react-dom-ui-components/Components/ConfirmDialog";
 import { NavWrapper } from "@applicaster/zapp-react-dom-ui-components/Components/NavWrapper";
 import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks/navigation";
@@ -25,7 +26,7 @@ export function Layout({ children }: Props) {
   return (
     <>
       <LayoutComponent
-        Components={{ Background, NavBar: NavWrapper }}
+        Components={{ Background: BackgroundImage, NavBar: NavWrapper }}
         ComponentsExtraProps={ComponentsExtraProps}
       >
         {children}

package/App/Loader/utils/const.js

@@ -64,6 +64,7 @@ export const PLATFORMS = {
   android: "Android",
   mobile: "Mobile",
   vizio: "VIZIO",
+  vidaa: "VIDAA",
   smartcast: "SmartCast",
   conjure: "Conjure",
 };

package/App/Loader/utils/platform.js

@@ -13,7 +13,7 @@ import {
 
 /**
  * @typedef {"tv" | "web" | "other"} DeviceType
- * @typedef {"samsung_tv" | "lg_tv" | unknown} CustomPlatformTypes
+ * @typedef {"samsung_tv" | "lg_tv" | "vidaa" | unknown} CustomPlatformTypes
  */
 
 /**
@@ -75,6 +75,16 @@ export const isVizioPlatform = () => {
   );
 };
 
+/**
+ * Checks if the platform is Vida.
+ * @returns {boolean} True if the platform is Vida, false otherwise.
+ */
+export const isVidaaPlatform = () => {
+  const userAgent = getUserAgent();
+
+  return userAgent.includes(PLATFORMS.vidaa);
+};
+
 /**
  * Checks if the Vizio APIs are available.
  * @returns {boolean} True if the Vizio APIs are available, false otherwise.
@@ -99,6 +109,10 @@ export const getDeviceType = () => {
       return isSamsungPlatform() ? "tv" : "web";
     case "lg_tv":
       return isLgPlatform() ? "tv" : "web";
+    case "vizio":
+      return isVizioPlatform() ? "tv" : "web";
+    case "vidaa":
+      return isVidaaPlatform() ? "tv" : "web";
     default:
       return "other";
   }

package/Polyfills/AppLoaderBridge/utils/enums.ts

@@ -9,4 +9,5 @@ export enum STORE_PLATFORM {
   lg = "lg_content_store",
   samsung = "samsung_app_store",
   vizio = "vizio_app_store",
+  vidaa = "vidaa_app_store",
 }

package/Polyfills/Storage/__tests__/StorageMocks.js

@@ -26,7 +26,7 @@ export function StorageMock() {
 
     delete this[key];
 
-    return true;
+    // Return undefined like the real API; a truthy return would re-mask the bug.
   };
 
   storage.getItem = (key) => {

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

@@ -0,0 +1,104 @@
+import { getContextResolverBridge } from "../";
+
+function createStorageMock(initial = {}) {
+  const data = { ...initial };
+
+  return {
+    getItem: (key) => (key in data ? data[key] : null),
+    setItem: (key, value) => {
+      data[key] = value;
+    },
+  };
+}
+
+describe("ContextResolverBridge polyfill", () => {
+  let bridge;
+
+  beforeEach(() => {
+    global.window = {
+      sessionStorage: createStorageMock(),
+      localStorage: createStorageMock(),
+    };
+
+    bridge = getContextResolverBridge();
+  });
+
+  it("resolves a key from session storage using the web namespace separator", () => {
+    // the namespace itself contains dots, so the key must be split on the last dot
+    window.sessionStorage.setItem("applicaster.v2_::_appVersion", "1.0.0");
+
+    const result = bridge.resolveContextKeys({
+      "applicaster.v2.appVersion": false,
+    });
+
+    expect(result).toEqual({ "applicaster.v2.appVersion": "1.0.0" });
+  });
+
+  it("falls back to local storage when the key is missing in session storage", () => {
+    window.localStorage.setItem("applicaster.v2_::_appVersion", "1.0.0");
+
+    const result = bridge.resolveContextKeys({
+      "applicaster.v2.appVersion": false,
+    });
+
+    expect(result).toEqual({ "applicaster.v2.appVersion": "1.0.0" });
+  });
+
+  it("prefers the session storage value when the key exists in both", () => {
+    window.sessionStorage.setItem("applicaster.v2_::_appVersion", "session");
+    window.localStorage.setItem("applicaster.v2_::_appVersion", "local");
+
+    const result = bridge.resolveContextKeys({
+      "applicaster.v2.appVersion": false,
+    });
+
+    expect(result).toEqual({ "applicaster.v2.appVersion": "session" });
+  });
+
+  it("returns null for keys that are missing from both storages", () => {
+    const result = bridge.resolveContextKeys({
+      "applicaster.v2.missing": false,
+    });
+
+    expect(result).toEqual({ "applicaster.v2.missing": null });
+  });
+
+  it("JSON-parses stored values just like the async storage path", () => {
+    window.sessionStorage.setItem(
+      "applicaster.v2_::_profile",
+      JSON.stringify({ name: "Ada" })
+    );
+
+    window.localStorage.setItem("applicaster.v2_::_count", "42");
+
+    const result = bridge.resolveContextKeys({
+      "applicaster.v2.profile": false,
+      "applicaster.v2.count": true,
+    });
+
+    expect(result).toEqual({
+      "applicaster.v2.profile": { name: "Ada" },
+      "applicaster.v2.count": 42,
+    });
+  });
+
+  it("resolves multiple keys synchronously in a single call", () => {
+    window.sessionStorage.setItem("applicaster.v2_::_a", "valueA");
+    window.localStorage.setItem("applicaster.v2_::_b", "valueB");
+
+    const result = bridge.resolveContextKeys({
+      "applicaster.v2.a": false,
+      "applicaster.v2.b": false,
+      "applicaster.v2.c": false,
+    });
+
+    // returned object is not a promise - reads happen synchronously
+    expect(result).not.toBeInstanceOf(Promise);
+
+    expect(result).toEqual({
+      "applicaster.v2.a": "valueA",
+      "applicaster.v2.b": "valueB",
+      "applicaster.v2.c": null,
+    });
+  });
+});

package/Polyfills/Storage/index.js

@@ -155,7 +155,11 @@ export function getStorageModule(type) {
   function removeItem(key, namespace = DEFAULT_NAMESPACE) {
     const keyName = applyNamespaceToKeyName(key, namespace);
 
-    return tryAndResolve(() => Storage.callMethod("removeItem", keyName));
+    return tryAndResolve(() => {
+      Storage.callMethod("removeItem", keyName);
+
+      return true;
+    });
   }
 
   /**
@@ -200,3 +204,74 @@ export function getStorageModule(type) {
     removeItem,
   };
 }
+
+const STORAGE_READ_ORDER = ["sessionStorage", "localStorage"];
+
+/**
+ * Splits a normalized context key ("<namespace>.<key>") back into its
+ * namespace and key parts. Mirrors getNamespaceAndKey in the context keys
+ * manager: the key is everything after the last dot, since the namespace
+ * itself may contain dots (e.g. "applicaster.v2").
+ * @param {String} namespacedKey
+ * @returns {{ namespace: String, key: String }}
+ */
+function splitNamespacedKey(namespacedKey) {
+  const lastDotIndex = namespacedKey.lastIndexOf(".");
+
+  if (lastDotIndex === -1) {
+    return { namespace: DEFAULT_NAMESPACE, key: namespacedKey };
+  }
+
+  return {
+    namespace: namespacedKey.slice(0, lastDotIndex),
+    key: namespacedKey.slice(lastDotIndex + 1),
+  };
+}
+
+/**
+ * Synchronously reads a single context key from session storage, then local
+ * storage (matching the native ContextResolverBridge resolution order), and
+ * returns the parsed value, or null when the key is absent from both.
+ * @param {String} namespacedKey
+ * @returns {Any|null}
+ */
+function resolveContextKey(namespacedKey) {
+  const { namespace, key } = splitNamespacedKey(namespacedKey);
+  const storageKey = applyNamespaceToKeyName(key, namespace);
+
+  for (const type of STORAGE_READ_ORDER) {
+    const storage = window[type];
+    const value = storage ? storage.getItem(storageKey) : null;
+
+    if (value != null) {
+      return parseJsonIfNeeded(value);
+    }
+  }
+
+  return null;
+}
+
+/**
+ * Web polyfill for the native NativeModules.ContextResolverBridge module.
+ * Unlike the per-key async storage path, it resolves every requested key in a
+ * single synchronous pass over window.sessionStorage / window.localStorage.
+ * @returns {Object} bridge
+ * @returns {Function} bridge.resolveContextKeys: resolves a batch of keys
+ */
+export function getContextResolverBridge() {
+  return {
+    /**
+     * @param {Object} keys map of normalized key -> required flag
+     * @returns {Object} map of normalized key -> resolved value (or null)
+     */
+    resolveContextKeys(keys) {
+      const result = {};
+
+      for (const namespacedKey of Object.keys(keys || {})) {
+        result[namespacedKey] = resolveContextKey(namespacedKey);
+      }
+
+      return result;
+    },
+  };
+}

package/Polyfills/index.js

@@ -1,4 +1,4 @@
-import { getStorageModule } from "./Storage";
+import { getStorageModule, getContextResolverBridge } from "./Storage";
 import { DeviceEventEmitter } from "./DeviceEventEmitter";
 import { isSamsungPlatform, isLgPlatform } from "../App/Loader/utils/platform";
 
@@ -15,6 +15,7 @@ import "@webcomponents/webcomponentsjs";
 const PLATFORM_KEYS = {
   samsung: "samsung_tv",
   lg: "lg_tv",
+  vidaa: "vidaa",
   web: "web",
 };
 
@@ -23,6 +24,7 @@ const PLATFORM_KEYS = {
 export function registerNativeModulesPolyfills(NativeModules) {
   NativeModules.LocalStorage = getStorageModule("localStorage");
   NativeModules.SessionStorage = getStorageModule("sessionStorage");
+  NativeModules.ContextResolverBridge = getContextResolverBridge();
   NativeModules.AnalyticsBridge = require("./AnalyticsBridge").AnalyticsBridge;
   NativeModules.AppLoaderBridge = require("./AppLoaderBridge").AppLoaderBridge;
 

package/package.json

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