feat: refactor embedded click handling and introduce action prefix utilities

lposen · lposen · commit 383e30871ac5 · 2025-10-08T21:36:10.000-07:00
diff --git a/android/src/main/java/com/iterable/reactnative/RNIterableAPIModuleImpl.java b/android/src/main/java/com/iterable/reactnative/RNIterableAPIModuleImpl.java
@@ -32,6 +32,7 @@
 import com.iterable.iterableapi.IterableEmbeddedManager;
 import com.iterable.iterableapi.IterableEmbeddedMessage;
 import com.iterable.iterableapi.IterableEmbeddedSession;
+import com.iterable.iterableapi.IterableEmbeddedUpdateHandler;
 import com.iterable.iterableapi.IterableHelper;
 import com.iterable.iterableapi.IterableInAppCloseAction;
 import com.iterable.iterableapi.IterableInAppHandler;
@@ -43,8 +44,6 @@
 import com.iterable.iterableapi.IterableUrlHandler;
 import com.iterable.iterableapi.RNIterableInternal;
 
-import com.iterable.iterableapi.IterableEmbeddedUpdateHandler;
-
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -730,15 +729,6 @@ public void pauseEmbeddedImpression(String messageId) {
         IterableApi.getInstance().getEmbeddedManager().getEmbeddedSessionManager().pauseImpression(messageId);
     }
 
-    public void handleEmbeddedClick(ReadableMap messageMap, String buttonId, String clickedUrl) {
-        IterableEmbeddedMessage message = Serialization.embeddedMessageFromReadableMap(messageMap);
-        if (message != null) {
-            IterableApi.getInstance().getEmbeddedManager().handleEmbeddedClick(message, buttonId, clickedUrl);
-        } else {
-            IterableLogger.e(TAG, "Failed to convert message map to IterableEmbeddedMessage");
-        }
-    }
-
     public void trackEmbeddedClick(ReadableMap messageMap, String buttonId, String clickedUrl) {
         IterableLogger.d(TAG, "trackEmbeddedClick: buttonId: " + buttonId + " clickedUrl: " + clickedUrl);
         IterableEmbeddedMessage message = Serialization.embeddedMessageFromReadableMap(messageMap);
diff --git a/android/src/newarch/java/com/RNIterableAPIModule.java b/android/src/newarch/java/com/RNIterableAPIModule.java
@@ -260,11 +260,6 @@ public void pauseEmbeddedImpression(String messageId) {
     moduleImpl.pauseEmbeddedImpression(messageId);
   }
 
-  @Override
-  public void handleEmbeddedClick(ReadableMap message, String buttonId, String clickedUrl) {
-    moduleImpl.handleEmbeddedClick(message, buttonId, clickedUrl);
-  }
-
   @Override
   public void trackEmbeddedClick(ReadableMap message, String buttonId, String clickedUrl) {
     moduleImpl.trackEmbeddedClick(message, buttonId, clickedUrl);
diff --git a/android/src/oldarch/java/com/RNIterableAPIModule.java b/android/src/oldarch/java/com/RNIterableAPIModule.java
@@ -11,7 +11,6 @@
 import com.facebook.react.bridge.ReadableMap;
 import com.iterable.iterableapi.IterableEmbeddedMessage;
 import com.iterable.iterableapi.IterableEmbeddedManager;
-
 import com.iterable.iterableapi.IterableEmbeddedUpdateHandler;
 
 
@@ -268,11 +267,6 @@ public void pauseEmbeddedImpression(String messageId) {
       moduleImpl.pauseEmbeddedImpression(messageId);
     }
 
-    @ReactMethod
-    public void handleEmbeddedClick(ReadableMap message, String buttonId, String clickedUrl) {
-      moduleImpl.handleEmbeddedClick(message, buttonId, clickedUrl);
-    }
-
     @ReactMethod
     public void trackEmbeddedClick(ReadableMap message, String buttonId, String clickedUrl) {
       moduleImpl.trackEmbeddedClick(message, buttonId, clickedUrl);
diff --git a/src/api/NativeRNIterableAPI.ts b/src/api/NativeRNIterableAPI.ts
@@ -165,12 +165,6 @@ export interface Spec extends TurboModule {
 
   pauseEmbeddedImpression(messageId: string): void;
 
-  handleEmbeddedClick(
-    message: EmbeddedMessage,
-    buttonId: string | null,
-    clickedUrl: string | null
-  ): void;
-
   trackEmbeddedClick(
     message: EmbeddedMessage,
     buttonId: string | null,
diff --git a/src/core/classes/Iterable.ts b/src/core/classes/Iterable.ts
@@ -207,7 +207,7 @@ export class Iterable {
     Iterable.logger = logger;
     Iterable.inAppManager = new IterableInAppManager(logger);
     Iterable.authManager = new IterableAuthManager(logger);
-    Iterable.embeddedManager = new IterableEmbeddedManager(logger);
+    Iterable.embeddedManager = new IterableEmbeddedManager(logger, config);
     IterableApi.setLogger(logger);
 
     this.setupEventHandlers();
diff --git a/src/core/classes/IterableApi.ts b/src/core/classes/IterableApi.ts
@@ -576,20 +576,6 @@ export class IterableApi {
     return RNIterableAPI.pauseEmbeddedImpression(messageId);
   }
 
-  static handleEmbeddedClick(
-    message: IterableEmbeddedMessage,
-    buttonId: string | null,
-    clickedUrl: string | null
-  ) {
-    IterableApi.logger.log(
-      'handleEmbeddedClick: ',
-      message,
-      buttonId,
-      clickedUrl
-    );
-    return RNIterableAPI.handleEmbeddedClick(message, buttonId, clickedUrl);
-  }
-
   // ---- End EMBEDDED ---- //
 
   // ====================================================== //
diff --git a/src/core/constants/defaults.ts b/src/core/constants/defaults.ts
@@ -9,5 +9,6 @@ export const defaultLogger = new IterableLogger(defaultConfig);
 export const defaultInAppManager = new IterableInAppManager(defaultLogger);
 export const defaultAuthManager = new IterableAuthManager(defaultLogger);
 export const defaultEmbeddedManager = new IterableEmbeddedManager(
-  defaultLogger
+  defaultLogger,
+  defaultConfig
 );
diff --git a/src/core/enums/IterableCustomActionPrefix.ts b/src/core/enums/IterableCustomActionPrefix.ts
@@ -0,0 +1,4 @@
+export enum IterableCustomActionPrefix {
+  Action = 'action://',
+  Itbl = 'itbl://',
+}
diff --git a/src/core/utils/getActionPrefix.ts b/src/core/utils/getActionPrefix.ts
@@ -0,0 +1,14 @@
+import { IterableCustomActionPrefix } from '../enums/IterableCustomActionPrefix';
+
+export const getActionPrefix = (
+  str?: string | null
+): IterableCustomActionPrefix | null => {
+  if (!str) return null;
+  if (str.startsWith(IterableCustomActionPrefix.Action)) {
+    return IterableCustomActionPrefix.Action;
+  }
+  if (str.startsWith(IterableCustomActionPrefix.Itbl)) {
+    return IterableCustomActionPrefix.Itbl;
+  }
+  return null;
+};
diff --git a/src/core/utils/isIterableAction.ts b/src/core/utils/isIterableAction.ts
@@ -1,2 +1,5 @@
+import { IterableCustomActionPrefix } from '../enums/IterableCustomActionPrefix';
+
 export const isIterableAction = (str: string = '') =>
-  str.slice(0, 9) === 'action://';
+  str.startsWith(IterableCustomActionPrefix.Action) ||
+  str.startsWith(IterableCustomActionPrefix.Itbl);
diff --git a/src/embedded/classes/IterableEmbeddedManager.ts b/src/embedded/classes/IterableEmbeddedManager.ts
@@ -1,45 +1,63 @@
+import { IterableAction } from '../../core/classes/IterableAction';
+import { IterableActionContext } from '../../core/classes/IterableActionContext';
 import { IterableApi } from '../../core/classes/IterableApi';
+import type { IterableConfig } from '../../core/classes/IterableConfig';
 import type { IterableLogger } from '../../core/classes/IterableLogger';
-import { defaultLogger } from '../../core/constants/defaults';
+import { defaultConfig, defaultLogger } from '../../core/constants/defaults';
+import { IterableActionSource } from '../../core/enums/IterableActionSource';
+import { getActionPrefix } from '../../core/utils/getActionPrefix';
 import type { IterableEmbeddedMessage } from './IterableEmbeddedMessage';
 import { IterableEmbeddedSessionManager } from './IterableEmbeddedSessionManager';
 
 export class IterableEmbeddedManager {
-  static logger: IterableLogger = defaultLogger;
+  logger: IterableLogger = defaultLogger;
+  config: IterableConfig = defaultConfig;
 
   sessionManager: IterableEmbeddedSessionManager =
     new IterableEmbeddedSessionManager(defaultLogger);
 
-  constructor(logger: IterableLogger) {
-    IterableEmbeddedManager.logger = logger;
+  constructor(logger: IterableLogger, config: IterableConfig) {
+    this.logger = logger;
+    this.config = config;
     this.sessionManager = new IterableEmbeddedSessionManager(logger);
   }
 
   syncMessages() {
+    this.logger.log('IterableEmbeddedManager.syncMessages');
     return IterableApi.syncEmbeddedMessages();
   }
 
   getMessages(placementIds?: number[] | null) {
+    this.logger.log('IterableEmbeddedManager.getMessages', placementIds);
     return IterableApi.getEmbeddedMessages(placementIds ?? null);
   }
 
   getPlacementIds() {
+    this.logger.log('IterableEmbeddedManager.getPlacementIds');
     return IterableApi.getEmbeddedPlacementIds();
   }
 
   startSession() {
+    this.logger.log('IterableEmbeddedManager.startSession');
     IterableApi.startEmbeddedSession();
   }
 
   endSession() {
+    this.logger.log('IterableEmbeddedManager.endSession');
     IterableApi.endEmbeddedSession();
   }
 
   startImpression(messageId: string, placementId: number) {
+    this.logger.log(
+      'IterableEmbeddedManager.startImpression',
+      messageId,
+      placementId
+    );
     IterableApi.startEmbeddedImpression(messageId, placementId);
   }
 
   pauseImpression(messageId: string) {
+    this.logger.log('IterableEmbeddedManager.pauseImpression', messageId);
     IterableApi.pauseEmbeddedImpression(messageId);
   }
 
@@ -48,14 +66,54 @@ export class IterableEmbeddedManager {
     buttonId: string | null,
     clickedUrl: string | null
   ) {
-    IterableApi.handleEmbeddedClick(message, buttonId, clickedUrl);
+    this.logger.log(
+      'IterableEmbeddedManager.handleClick',
+      message,
+      buttonId,
+      clickedUrl
+    );
+
+    if (!clickedUrl) {
+      this.logger.log(
+        'IterableEmbeddedManager.handleClick:',
+        'A url or action is required to handle an embedded click',
+        clickedUrl
+      );
+      return;
+    }
+
+    const actionPrefix = getActionPrefix(clickedUrl);
+    const source = IterableActionSource.embedded;
+
+    this.trackClick(message, buttonId, clickedUrl);
+
+    if (actionPrefix) {
+      const actionName = clickedUrl?.replace(actionPrefix, '');
+      const action = new IterableAction(actionName, '', '');
+      const context = new IterableActionContext(action, source);
+      if (this.config.customActionHandler) {
+        this.config.customActionHandler(action, context);
+      }
+    } else {
+      const action = new IterableAction('openUrl', clickedUrl, '');
+      const context = new IterableActionContext(action, source);
+      if (this.config.urlHandler) {
+        this.config.urlHandler(clickedUrl, context);
+      }
+    }
   }
 
   trackClick(
     message: IterableEmbeddedMessage,
     buttonId: string | null,
     clickedUrl: string | null
   ) {
+    this.logger.log(
+      'IterableEmbeddedManager.trackClick',
+      message,
+      buttonId,
+      clickedUrl
+    );
     IterableApi.trackEmbeddedClick(message, buttonId, clickedUrl);
   }
 }
diff --git a/src/embedded/components/IterableEmbeddedBanner/IterableEmbeddedBanner.tsx b/src/embedded/components/IterableEmbeddedBanner/IterableEmbeddedBanner.tsx
@@ -8,13 +8,14 @@ import {
   type ViewStyle,
 } from 'react-native';
 
+import { Iterable } from '../../../core/classes/Iterable';
 import type { IterableEmbeddedMessageElementsButton } from '../../classes/IterableEmbeddedMessageElementsButton';
 import { IterableEmbeddedViewType } from '../../enums';
 import type { IterableEmbeddedComponentProps } from '../IterableEmbeddedViewProps';
 import { getMedia } from '../utils/getMedia';
 import { getStyles } from '../utils/getStyles';
+import { getUrlFromButton } from '../utils/getUrlFromButton';
 import { styles } from './IterableEmbeddedBanner.styles';
-import { runButtonClick } from '../utils/runButtonClick';
 
 /**
  * TODO: figure out how default action works.
@@ -34,7 +35,11 @@ export const IterableEmbeddedBanner = ({
   const handleButtonClick = useCallback(
     (button: IterableEmbeddedMessageElementsButton) => {
       onButtonClick(button);
-      runButtonClick(button, message);
+      Iterable.embeddedManager.handleClick(
+        message,
+        button.id,
+        getUrlFromButton(button) ?? null
+      );
     },
     [onButtonClick, message]
   );
diff --git a/src/embedded/components/IterableEmbeddedCard/IterableEmbeddedCard.tsx b/src/embedded/components/IterableEmbeddedCard/IterableEmbeddedCard.tsx
@@ -1,3 +1,4 @@
+import { useCallback, useMemo } from 'react';
 import {
   Image,
   Text,
@@ -6,15 +7,15 @@ import {
   type TextStyle,
   type ViewStyle,
 } from 'react-native';
-import { useCallback, useMemo } from 'react';
 
-import type { IterableEmbeddedComponentProps } from '../IterableEmbeddedViewProps';
+import { Iterable } from '../../../core/classes/Iterable';
+import type { IterableEmbeddedMessageElementsButton } from '../../classes/IterableEmbeddedMessageElementsButton';
 import { IterableEmbeddedViewType } from '../../enums';
-import { getStyles } from '../utils/getStyles';
+import type { IterableEmbeddedComponentProps } from '../IterableEmbeddedViewProps';
 import { getMedia } from '../utils/getMedia';
+import { getStyles } from '../utils/getStyles';
+import { getUrlFromButton } from '../utils/getUrlFromButton';
 import { styles } from './IterableEmbeddedCard.styles';
-import type { IterableEmbeddedMessageElementsButton } from '../../classes/IterableEmbeddedMessageElementsButton';
-import { runButtonClick } from '../utils/runButtonClick';
 
 export const IterableEmbeddedCard = ({
   config,
@@ -30,7 +31,11 @@ export const IterableEmbeddedCard = ({
   const handleButtonClick = useCallback(
     (button: IterableEmbeddedMessageElementsButton) => {
       onButtonClick(button);
-      runButtonClick(button, message);
+      Iterable.embeddedManager.handleClick(
+        message,
+        button.id,
+        getUrlFromButton(button) ?? null
+      );
     },
     [onButtonClick, message]
   );
diff --git a/src/embedded/components/IterableEmbeddedNotification/IterableEmbeddedNotification.tsx b/src/embedded/components/IterableEmbeddedNotification/IterableEmbeddedNotification.tsx
@@ -7,11 +7,12 @@ import {
 } from 'react-native';
 
 import { useCallback, useMemo } from 'react';
+import { Iterable } from '../../../core/classes/Iterable';
 import type { IterableEmbeddedMessageElementsButton } from '../../classes/IterableEmbeddedMessageElementsButton';
 import { IterableEmbeddedViewType } from '../../enums';
 import type { IterableEmbeddedComponentProps } from '../IterableEmbeddedViewProps';
 import { getStyles } from '../utils/getStyles';
-import { runButtonClick } from '../utils/runButtonClick';
+import { getUrlFromButton } from '../utils/getUrlFromButton';
 import { styles } from './IterableEmbeddedNotification.styles';
 
 export const IterableEmbeddedNotification = ({
@@ -26,7 +27,11 @@ export const IterableEmbeddedNotification = ({
   const handleButtonClick = useCallback(
     (button: IterableEmbeddedMessageElementsButton) => {
       onButtonClick(button);
-      runButtonClick(button, message);
+      Iterable.embeddedManager.handleClick(
+        message,
+        button.id,
+        getUrlFromButton(button) ?? null
+      );
     },
     [onButtonClick, message]
   );
diff --git a/src/embedded/components/utils/getUrlFromButton.ts b/src/embedded/components/utils/getUrlFromButton.ts
@@ -0,0 +1,8 @@
+import type { IterableEmbeddedMessageElementsButton } from '../../classes/IterableEmbeddedMessageElementsButton';
+
+export const getUrlFromButton = (
+  button: IterableEmbeddedMessageElementsButton
+) => {
+  const { data, type: actionType } = button.action ?? {};
+  return data && data?.length > 0 ? data : actionType;
+};
diff --git a/src/embedded/components/utils/runButtonClick.ts b/src/embedded/components/utils/runButtonClick.ts
