@applicaster/zapp-react-native-utils 14.0.0-alpha.7900711229 → 14.0.0-alpha.8419134002

package/reactHooks/navigation/useIsScreenActive.ts

@@ -1,3 +1,4 @@
+import { ROUTE_TYPES } from "@applicaster/zapp-react-native-utils/navigationUtils/routeTypes";
 import { useNavigation } from "./useNavigation";
 import { usePathname } from "./usePathname";
 
@@ -6,11 +7,14 @@ export const useIsScreenActive = () => {
   const pathname = usePathname();
   const { currentRoute, videoModalState } = useNavigation();
 
-  if (
-    videoModalState.visible &&
-    ["FULLSCREEN", "MAXIMIZED", "PIP"].includes(videoModalState.mode)
-  ) {
-    return false;
+  if (videoModalState.visible) {
+    if (pathname.includes(ROUTE_TYPES.VIDEO_MODAL)) {
+      return true;
+    }
+
+    if (["FULLSCREEN", "MAXIMIZED", "PIP"].includes(videoModalState.mode)) {
+      return false;
+    }
   }
 
   return pathname === currentRoute;

package/reactHooks/navigation/useRoute.ts

@@ -28,19 +28,14 @@ const isHookPathname = (pathname: string) => /^\/hooks\//.test(pathname);
 
 type VariousScreenData = LegacyNavigationScreenData | ZappRiver | ZappEntry;
 
-export const useRoute = (
-  useLegacy = true
-): {
+export const useRoute = (): {
   screenData: VariousScreenData;
   pathname: string;
 } => {
   const pathname = usePathname() || "";
   const navigator = useNavigation();
-  const screenContext = useContext(ScreenDataContext);
 
-  const screenDataContext = useLegacy
-    ? legacyScreenData(screenContext)
-    : screenContext;
+  const screenDataContext = legacyScreenData(useContext(ScreenDataContext));
 
   const { plugins, contentTypes, rivers } = usePickFromState([
     "plugins",

package/reactHooks/screen/useScreenContext.ts

@@ -2,7 +2,7 @@ import { useContext, useMemo } from "react";
 
 import { useModalNavigationContext } from "@applicaster/zapp-react-native-ui-components/Contexts/ModalNavigationContext";
 import { useNestedNavigationContext } from "@applicaster/zapp-react-native-ui-components/Contexts/NestedNavigationContext";
-import { useNavigation } from "../navigation/useNavigation";
+import { useNavigation } from "../navigation";
 
 import { ScreenContext } from "@applicaster/zapp-react-native-ui-components/Contexts/ScreenContext";
 import { ScreenDataContext } from "@applicaster/zapp-react-native-ui-components/Contexts/ScreenDataContext";

package/reactHooks/state/__tests__/ZStoreProvider.test.tsx

@@ -1,7 +1,8 @@
+/* eslint-disable no-console */
 import React from "react";
 import { render, screen } from "@testing-library/react-native";
 import { Text } from "react-native";
-import { ZStoreProvider, useZStore } from "../ZStoreProvider";
+import { useZStore, ZStoreProvider } from "../ZStoreProvider";
 import { useStore } from "zustand";
 
 interface TestState {

package/riverComponetsMeasurementProvider/index.tsx

@@ -3,7 +3,7 @@ import { NativeModules, StyleSheet, View } from "react-native";
 import { getXray } from "@applicaster/zapp-react-native-utils/logger";
 
 import { isApplePlatform, isWeb } from "../reactUtils";
-import { useRivers } from "../reactHooks/state";
+import { useRivers } from "../reactHooks";
 
 const layoutReducer = (state, { payload }) => {
   return state.map((item, index, _state) => ({

package/services/js2native.ts

@@ -496,6 +496,7 @@ async function removeStorageListenerHandler(payload: { listenerId?: string }) {
 function log({ level, messages }) {
   try {
     const parsedMessages = parseJsonIfNeeded(messages);
+    // eslint-disable-next-line no-console
     const logFn = console[level] || console.log;
 
     if (Array.isArray(parsedMessages)) {

package/time/BackgroundTimer.ts

@@ -13,13 +13,15 @@ class BackgroundTimer {
 
     const EventEmitter = platformSelect({
       android: DeviceEventEmitter,
-      ios: undefined,
+      android_tv: DeviceEventEmitter,
+      amazon: DeviceEventEmitter, // probably does not exist and uses android_tv
       default: undefined,
     });
 
     EventEmitter?.addListener("BackgroundTimer.timer.fired", (id: number) => {
-      if (this.callbacks[id]) {
-        const callback = this.callbacks[id];
+      const callback = this.callbacks[id];
+
+      if (callback) {
         delete this.callbacks[id];
         callback();
       }

package/utils/index.ts

@@ -13,4 +13,8 @@ export {
   has,
   flatMap,
   difference,
+  take,
+  map,
+  trim,
+  toString,
 } from "lodash";

package/actionsExecutor/ScreenActions.ts

@@ -1,163 +0,0 @@
-// import { localStorage } from "@applicaster/zapp-react-native-bridge/ZappStorage/LocalStorage";
-
-import { log_error, log_info } from "./ActionExecutorContext";
-import { ActionResult } from "./ActionExecutor";
-import { get } from "lodash";
-
-import { onMaxTagsReached } from "./StorageActions";
-import { ScreenMultiSelectProvider } from "../storage/ScreenStateMultiSelectProvider";
-import { ScreenSingleValueProvider } from "../storage/ScreenSingleValueProvider";
-
-export const screenSetVariable = async (
-  screenRoute: string,
-  screenStateStore: ScreenStateStore,
-  context: Record<string, any>,
-  action: ActionType
-): Promise<ActionResult> => {
-  if (!context) {
-    log_error("handleAction: screenSetVariable action missing context");
-
-    return ActionResult.Error;
-  }
-
-  const entry = context?.entry as ZappEntry;
-
-  if (!entry) {
-    log_error(
-      "handleAction: screenSetVariable action missing entry. Entry is required to get the value."
-    );
-
-    return ActionResult.Error;
-  }
-
-  const tag = action.options?.selector
-    ? get(entry, action.options.selector)
-    : (entry.extensions?.tag ?? entry.id);
-
-  const keyNamespace = action.options?.key;
-
-  if (!keyNamespace) {
-    log_error("handleAction: screenSetVariable action missing key namespace", {
-      keyNamespace,
-    });
-
-    return ActionResult.Error;
-  }
-
-  if (!tag) {
-    log_error(
-      "handleAction: screenSetVariable action could not determine tag",
-      { selector: action.options?.selector, value: action.options?.value }
-    );
-
-    return ActionResult.Error;
-  }
-
-  try {
-    const singleValueProvider = ScreenSingleValueProvider.getProvider(
-      keyNamespace,
-      screenRoute,
-      screenStateStore
-    );
-
-    const currentValue = await singleValueProvider.getValueAsync();
-
-    log_info(
-      `handleAction: screenSetVariable setting value: ${tag} for keyNamespace: ${keyNamespace}, previous value: ${currentValue}`
-    );
-
-    await singleValueProvider.setValue(String(tag));
-
-    log_info(
-      `handleAction: screenSetVariable successfully set value: ${tag} for keyNamespace: ${keyNamespace}`
-    );
-
-    return ActionResult.Success;
-  } catch (error) {
-    log_error("handleAction: screenSetVariable failed to set value", {
-      keyNamespace,
-      tag,
-      error,
-    });
-
-    return ActionResult.Error;
-  }
-};
-
-export const screenToggleFlag = async (
-  screenRoute: string,
-  screenStateStore: ScreenStateStore,
-  context: Record<string, any>,
-  action: ActionType
-) => {
-  if (!context) {
-    log_error("handleAction: screenToggleFlag action missing context");
-
-    return ActionResult.Error;
-  }
-
-  const entry = context?.entry as ZappEntry;
-
-  if (!entry) {
-    log_error(
-      "handleAction: screenToggleFlag action missing entry. Entry is required to get the tag."
-    );
-
-    return ActionResult.Error;
-  }
-
-  const tag = action.options?.selector
-    ? get(entry, action.options.selector)
-    : (entry.extensions?.tag ?? entry.id);
-
-  const keyNamespace = action.options?.key;
-
-  if (keyNamespace && tag) {
-    const multiSelectProvider = ScreenMultiSelectProvider.getProvider(
-      keyNamespace,
-      screenRoute,
-      screenStateStore
-    );
-
-    const selectedItems = await multiSelectProvider.getSelectedAsync();
-    const isTagInSelectedItems = selectedItems.includes(tag);
-
-    log_info(
-      `handleAction: screenToggleFlag event will ${
-        isTagInSelectedItems ? "remove" : "add"
-      } tag: ${tag} for keyNamespace: ${keyNamespace}, current selectedItems: ${selectedItems}`
-    );
-
-    if (selectedItems.includes(tag)) {
-      await multiSelectProvider.removeItem(tag);
-    } else {
-      const maxItems = action.options?.max_items;
-
-      if (maxItems && selectedItems.length >= maxItems) {
-        log_info(
-          `handleAction: screenToggleFlag event reached max items limit: ${maxItems}, cannot add tag: ${tag}`
-        );
-
-        await onMaxTagsReached({
-          selectedItems,
-          maxItems,
-          tag,
-          keyNamespace,
-        });
-
-        return ActionResult.Cancel;
-      }
-
-      await multiSelectProvider.addItem(tag);
-    }
-  } else {
-    log_error(
-      "handleAction: screenToggleFlag event missing keyNamespace or tag",
-      { keyNamespace, tag }
-    );
-
-    return ActionResult.Error;
-  }
-
-  return ActionResult.Success;
-};

package/actionsExecutor/StorageActions.ts

@@ -1,110 +0,0 @@
-import { ActionResult } from "./ActionExecutor";
-import { get } from "lodash";
-import { StorageMultiSelectProvider } from "@applicaster/zapp-react-native-utils/storage/StorageMultiSelectProvider";
-import { log_error, log_info } from "./ActionExecutorContext";
-import { postEvent } from "../reactHooks/useSubscriberFor";
-import { TOGGLE_FLAG_MAX_ITEMS_REACHED_EVENT } from "./consts";
-import { StorageType } from "../appUtils/contextKeysManager/consts";
-
-// send all data just in case (like for message string formatting)
-// Type is not exported for now
-type MaxTagsReachedEvent = {
-  selectedItems: string[];
-  maxItems: number;
-  tag: string;
-  keyNamespace: string;
-};
-
-export async function onMaxTagsReached(data: MaxTagsReachedEvent) {
-  postEvent(TOGGLE_FLAG_MAX_ITEMS_REACHED_EVENT, [data]);
-}
-
-export async function storageToggleFlag(
-  context: Record<string, any>,
-  action: ActionType,
-  storageType: StorageType
-) {
-  if (!context) {
-    log_error("handleAction: localStorageToggleFlag action missing context");
-
-    return ActionResult.Error;
-  }
-
-  const entry = context?.entry as ZappEntry;
-
-  if (!entry) {
-    log_error(
-      "handleAction: localStorageToggleFlag action missing entry. Entry is required to get the tag."
-    );
-
-    return ActionResult.Error;
-  }
-
-  const tag = action.options?.selector
-    ? get(entry, action.options.selector)
-    : (entry.extensions?.tag ?? entry.id);
-
-  const keyNamespace = action.options?.key;
-
-  if (keyNamespace && tag) {
-    const multiSelectProvider = StorageMultiSelectProvider.getProvider(
-      keyNamespace,
-      storageType
-    );
-
-    const selectedItems = await multiSelectProvider.getSelectedAsync();
-    const isTagInSelectedItems = selectedItems.includes(tag);
-
-    log_info(
-      `handleAction: localStorageToggleFlag event will ${
-        isTagInSelectedItems ? "remove" : "add"
-      } tag: ${tag} for keyNamespace: ${keyNamespace}, current selectedItems: ${selectedItems}`
-    );
-
-    if (selectedItems.includes(tag)) {
-      await multiSelectProvider.removeItem(tag);
-    } else {
-      const maxItems = action.options?.max_items;
-
-      if (maxItems && selectedItems.length >= maxItems) {
-        log_info(
-          `handleAction: localStorageToggleFlag event reached max items limit: ${maxItems}, cannot add tag: ${tag}`
-        );
-
-        await onMaxTagsReached({
-          selectedItems,
-          maxItems,
-          tag,
-          keyNamespace,
-        });
-
-        return ActionResult.Cancel;
-      }
-
-      await multiSelectProvider.addItem(tag);
-    }
-  } else {
-    log_error(
-      "handleAction: localStorageToggleFlag event missing keyNamespace or tag",
-      { keyNamespace, tag }
-    );
-
-    return ActionResult.Error;
-  }
-
-  return ActionResult.Success;
-}
-
-export async function sessionStorageToggleFlag(
-  context: Record<string, any>,
-  action: ActionType
-) {
-  return storageToggleFlag(context, action, StorageType.session);
-}
-
-export async function localStorageToggleFlag(
-  context: Record<string, any>,
-  action: ActionType
-) {
-  return storageToggleFlag(context, action, StorageType.local);
-}

package/actionsExecutor/feedDecorator.ts

@@ -1,171 +0,0 @@
-import * as R from "ramda";
-import { getNamespaceAndKey } from "../appUtils/contextKeysManager/utils";
-import { createLogger } from "../logger";
-
-const { log_error, log_verbose } = createLogger({
-  subsystem: "FeedDecorator",
-  category: "General",
-});
-
-function getScope(scope) {
-  if (scope === "screen") {
-    return scope;
-  } else if (!scope || scope === "ctx") {
-    return "ctx";
-  } else {
-    log_verbose(
-      `decorateFeed: Unsupported scope "${scope}" provided in preference_editor_options. Defaulting to "ctx".`
-    );
-
-    return "ctx";
-  }
-}
-
-function makeMultiSelect(feed: ZappFeed, key, decoratedFeed) {
-  const scope = getScope(
-    decoratedFeed.extensions?.preference_editor_options?.scope
-  );
-
-  const behavior = {
-    ...feed.extensions?.["behavior"],
-    select_mode: "multi",
-    current_selection: `@{${scope}/${key}}`,
-  };
-
-  if (!feed.extensions) {
-    decoratedFeed.extensions = {
-      behavior,
-    };
-  } else {
-    decoratedFeed.extensions.behavior = behavior;
-  }
-
-  const actionType =
-    decoratedFeed.extensions?.preference_editor_options?.scope === "screen"
-      ? "screenToggleFlag"
-      : decoratedFeed.extensions?.preference_editor_options?.scope === "session"
-        ? "sessionStorageToggleFlag"
-        : "localStorageToggleFlag";
-
-  decoratedFeed.entry?.forEach((entry: ZappEntry) => {
-    entry.type.value = "action";
-    entry.id = entry.extensions?.tag || entry.id;
-
-    entry.extensions = {
-      ...(entry.extensions || {}),
-      tap_actions: {
-        actions: [
-          {
-            type: actionType,
-            options: {
-              key,
-            },
-          },
-        ],
-      },
-    };
-  });
-
-  return decoratedFeed;
-}
-
-function makeSingleSelect(feed: ZappFeed, key, decoratedFeed) {
-  const scope = getScope(
-    decoratedFeed.extensions?.preference_editor_options?.scope
-  );
-
-  const behavior = {
-    ...feed.extensions?.["behavior"],
-    select_mode: "single",
-    current_selection: `@{${scope}/${key}}`,
-  };
-
-  if (!feed.extensions) {
-    decoratedFeed.extensions = {
-      behavior,
-    };
-  } else {
-    decoratedFeed.extensions.behavior = behavior;
-  }
-
-  const localStorageProducer = (entry: ZappFeed) => {
-    entry.id = entry.extensions?.tag || entry.id;
-    const { key: keyName, namespace } = getNamespaceAndKey(key);
-
-    const action =
-      decoratedFeed.extensions?.preference_editor_options?.scope === "session"
-        ? "sessionStorageSet"
-        : "localStorageSet";
-
-    return {
-      type: action,
-      options: {
-        content: {
-          [namespace]: {
-            [keyName]: entry.id,
-          },
-        },
-      },
-    };
-  };
-
-  const screenStateProducer = (entry: ZappFeed) => {
-    entry.id = entry.extensions?.tag || entry.id;
-
-    return {
-      type: "screenSetVariable",
-      options: {
-        key,
-        value: entry.id,
-      },
-    };
-  };
-
-  const producer =
-    decoratedFeed.extensions?.preference_editor_options?.scope === "screen"
-      ? screenStateProducer
-      : localStorageProducer;
-
-  decoratedFeed.entry?.forEach((entry: ZappEntry) => {
-    entry.type.value = "action";
-
-    entry.extensions = {
-      ...(entry.extensions || {}),
-      tap_actions: {
-        actions: [producer(entry)],
-      },
-    };
-  });
-
-  return decoratedFeed;
-}
-
-export const decorateFeed = (feed: ZappFeed) => {
-  if (!(feed.extensions?.["role"] === "preference_editor")) {
-    return feed;
-  }
-
-  const key = feed.extensions?.["preference_editor_options"]?.["key"];
-
-  if (!key) {
-    log_error(
-      `decorateFeed: No 'key' provided in feed titled "${feed.title}" with id "${feed.id}" in preference_editor_options. The preference_editor role requires a key for local storage.`
-    );
-
-    throw new Error(
-      "decorateFeed: No 'key' provided in feed preference_editor_options"
-    );
-  }
-
-  const decoratedFeed = R.clone(feed);
-
-  const isSingleSelect =
-    (feed.extensions?.["preference_editor_options"]?.select_mode ||
-      feed.extensions?.["behavior"]?.select_mode) === "single";
-
-  if (isSingleSelect) {
-    return makeSingleSelect(feed, key, decoratedFeed);
-  } else {
-    return makeMultiSelect(feed, key, decoratedFeed);
-  }
-};

package/actionsExecutor/screenResolver.ts

@@ -1,11 +0,0 @@
-import { useMemo } from "react";
-import { ScreenStateResolver } from "../appUtils/contextKeysManager/contextResolver";
-import { useScreenStateStore } from "../reactHooks/navigation/useScreenStateStore";
-
-export const useScreenResolvers = () => {
-  const screenStateStore = useScreenStateStore();
-
-  return useMemo(() => {
-    return { screen: new ScreenStateResolver(screenStateStore) };
-  }, [screenStateStore]);
-};

package/reactHooks/navigation/useScreenStateStore.ts

@@ -1,11 +0,0 @@
-import { useRoute } from "./useRoute";
-import { useMemo } from "react";
-
-export const useScreenStateStore = () => {
-  const route = useRoute(false);
-
-  return useMemo(
-    () => route.screenData["screenStateStore"],
-    [route.screenData["screenStateStore"]]
-  );
-};