@applicaster/zapp-react-native-utils 15.0.0-alpha.4515904047 → 15.0.0-alpha.5740530237

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-utils",
-  "version": "15.0.0-alpha.4515904047",
+  "version": "15.0.0-alpha.5740530237",
   "description": "Applicaster Zapp React Native utilities package",
   "main": "index.js",
   "types": "index.d.ts",
@@ -27,7 +27,7 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/applicaster-types": "15.0.0-alpha.4515904047",
+    "@applicaster/applicaster-types": "15.0.0-alpha.5740530237",
     "buffer": "^5.2.1",
     "camelize": "^1.0.0",
     "dayjs": "^1.11.10",

package/reactHooks/feed/useFeedLoader.tsx

@@ -37,15 +37,6 @@ export const useFeedLoader = ({
   mapping,
   pipesOptions = {},
 }: Props): FeedLoaderResponse => {
-  useEffect(() => {
-    if (!feedUrl) {
-      logger.warning({
-        message: "Required parameter feedUrl is missing",
-        data: { feedUrl },
-      });
-    }
-  }, []);
-
   const isInitialRender = useIsInitialRender();
 
   const callableFeedUrl = useInflatedUrl({ feedUrl, mapping });

package/reactHooks/feed/useInflatedUrl.ts

@@ -18,6 +18,7 @@ import {
 } from "@applicaster/zapp-pipes-v2-client";
 import { appStore } from "@applicaster/zapp-react-native-redux/AppStore";
 import { ENDPOINT_TAGS } from "../../types";
+import { isNilOrEmpty } from "../../reactUtils/helpers";
 
 /**
  * will match any occurrence in a string of one or more word characters
@@ -75,15 +76,19 @@ export const getInflatedDataSourceUrl: GetInflatedDataSourceUrl = ({
    * https://foo.com/shows/A1234
    */
 
-  if (!source) {
-    // eslint-disable-next-line no-console
-    console.error("source is empty", {
-      source,
-      contexts,
-      mapping,
-    });
+  if (!isNilOrEmpty(mapping)) {
+    if (!source) {
+      if (__DEV__) {
+        // eslint-disable-next-line no-console
+        throw new Error(
+          "getInflatedDataSourceUrl: source is empty while mapping is provided"
+        );
+      }
 
-    return null;
+      return null;
+    }
+  } else {
+    return source || null;
   }
 
   // Hack because in tv we expect to get key names instead of values from the fake entry
@@ -193,28 +198,17 @@ export function useInflatedUrl({
 
   const url = useMemo(
     () =>
-      mapping
-        ? getInflatedDataSourceUrl({
-            source: feedUrl,
-            contexts: {
-              entry: entryContext,
-              screen: screenContext,
-              search: getSearchContext(searchContext, mapping),
-            },
-            mapping,
-          })
-        : feedUrl,
-    [feedUrl, mapping]
+      getInflatedDataSourceUrl({
+        source: feedUrl,
+        contexts: {
+          entry: entryContext,
+          screen: screenContext,
+          search: getSearchContext(searchContext, mapping),
+        },
+        mapping,
+      }),
+    [entryContext, feedUrl, mapping, screenContext, searchContext]
   );
 
-  if (!feedUrl) {
-    logger.warning({
-      message: "Required parameter feedUrl is missing",
-      data: { feedUrl },
-    });
-
-    return null;
-  }
-
   return url;
 }

package/zappFrameworkUtils/HookCallback/callbackNavigationAction.ts

@@ -15,7 +15,7 @@ export enum ResultType {
 }
 
 export type CallbackResult = hookCallbackArgs & {
-  options: {
+  options?: {
     resultType?: ResultType;
   };
 };
@@ -36,7 +36,7 @@ type General = Record<string, unknown>;
 
 const LogPrefix = "useCallbackNavigationAction:";
 
-const { log_info, log_verbose, log_error } = createLogger({
+const { log_info, log_verbose, log_debug } = createLogger({
   subsystem: "hook-navigation-callback",
 });
 
@@ -58,21 +58,23 @@ const legacyMappingKeys = {
   },
 };
 
-const isNonEmptyString = (v: unknown): v is string =>
-  typeof v === "string" && v.trim().length > 0;
-
 const NAV_ACTIONS = Object.values(NavigationCallbackOptions) as string[];
 
 const isNavAction = (v: unknown): v is NavigationCallbackOptions =>
-  typeof v === "string" && NAV_ACTIONS.includes(v.trim());
+  typeof v === "string" && NAV_ACTIONS.includes(v);
 
 export const getNavigationKeys = (
   item?: ZappUIComponent | ZappRiver,
-  resultType: ResultType = null
+  resultType: ResultType | null = null
 ): NavKeys => {
   const general = (item?.general ?? {}) as General;
-  const pluginIdentifier = item?.type ?? "";
-  const legacy = legacyMappingKeys[pluginIdentifier] ?? {};
+
+  const pluginIdentifier = (item as any).identifier ?? item?.type ?? "";
+
+  const legacy =
+    legacyMappingKeys[`${pluginIdentifier}.${resultType}`] ??
+    legacyMappingKeys[pluginIdentifier] ??
+    {};
 
   const actionKey = resultType
     ? `${resultType}_${CALLBACK_NAVIGATION_KEY}`
@@ -82,29 +84,27 @@ export const getNavigationKeys = (
     (general as General)[actionKey] ??
     (legacy.actionType ? (general as General)[legacy.actionType] : undefined);
 
-  let action: NavigationCallbackOptions | null = null;
-
-  if (isNonEmptyString(rawAction)) {
-    const trimmed = rawAction.trim();
-    action = isNavAction(trimmed) ? trimmed : null;
-  }
+  const action: NavigationCallbackOptions | null = isNavAction(rawAction)
+    ? rawAction
+    : null;
 
   if (!action) return null;
 
   let targetScreenId: string | null = null;
 
   if (action === NavigationCallbackOptions.GO_TO_SCREEN) {
+    const screenKey = resultType
+      ? `${resultType}_${CALLBACK_NAVIGATION_GO_TO_SCREEN_KEY}`
+      : CALLBACK_NAVIGATION_GO_TO_SCREEN_KEY;
+
     const screenId: string | null =
-      ((general as General)[CALLBACK_NAVIGATION_GO_TO_SCREEN_KEY] as string) ??
+      ((general as General)[screenKey] as string) ??
       (legacy.targetScreen
         ? ((general as General)[legacy.targetScreen] as string)
         : undefined);
 
     if (screenId) {
-      const trimmedTargetScreenId = screenId.trim();
-
-      targetScreenId =
-        trimmedTargetScreenId.length > 0 ? trimmedTargetScreenId : null;
+      targetScreenId = screenId.length > 0 ? screenId : null;
     }
   }
 
@@ -113,10 +113,12 @@ export const getNavigationKeys = (
 
 export const useCallbackNavigationAction = (
   item?: ZappUIComponent | ZappRiver
-): ((args: CallbackResult) => void | undefined) => {
+): ((
+  args: CallbackResult,
+  hookCallback?: hookCallback
+) => void | undefined) => {
   const navigation = useNavigation();
   const rivers = useRivers();
-  const enabled = Boolean(item?.general?.[CALLBACK_NAVIGATION_KEY]);
   const screenContext = useScreenContext();
 
   const overrideCallbackFromComponent = useMemo(() => {
@@ -131,23 +133,36 @@ export const useCallbackNavigationAction = (
   }
 
   const callbackAction = useCallback<hookCallback>(
-    (args: CallbackResult) => {
+    (args: CallbackResult, hookCallback: hookCallback = null) => {
       if (!args.success) {
-        log_error(`${LogPrefix} callback called with no success`);
+        log_debug(
+          `${LogPrefix} callback called with no success, use original callback`
+        );
+
+        hookCallback?.(args);
 
         return;
       }
 
       if (args.cancelled) {
-        log_error(`${LogPrefix} callback called but cancelled`);
+        log_debug(
+          `${LogPrefix} callback called but cancelled, use original callback`
+        );
+
+        hookCallback?.(args);
+
+        return;
+      }
+
+      const data = getNavigationKeys(item, args.options?.resultType ?? null);
+
+      if (!data) {
+        hookCallback?.(args);
 
         return;
       }
 
-      const data = getNavigationKeys(item, args.options?.resultType ?? null) ?? {
-        action: NavigationCallbackOptions.DEFAULT,
-        targetScreenId: null,
-      };
+      hookCallback?.({ ...args, success: false, cancelled: true });
 
       switch (data.action) {
         case NavigationCallbackOptions.GO_BACK: {
@@ -198,5 +213,5 @@ export const useCallbackNavigationAction = (
     [item, navigation, rivers]
   );
 
-  return enabled ? overrideCallbackFromComponent || callbackAction : undefined;
+  return overrideCallbackFromComponent || callbackAction;
 };

package/zappFrameworkUtils/HookCallback/useCallbackActions.ts

@@ -12,13 +12,7 @@ export const useCallbackActions = (
 
   return useCallback(
     async (data: CallbackResult) => {
-      if (navigationAction && data.success) {
-        hookCallback?.({ ...data, success: false, cancelled: true });
-
-        navigationAction(data);
-      } else {
-        hookCallback?.(data);
-      }
+      navigationAction(data, hookCallback);
     },
     [navigationAction, hookCallback]
   );