@loyalytics/swan-react-native-sdk 2.5.1-beta.3 → 2.5.1-beta.5

package/lib/module/index.js

@@ -146,6 +146,7 @@ export function _resetClickDedup() {
 export default class SwanSDK {
   listeners = {};
   coldStartCheckDone = false;
+  pendingNotificationPayload = null;
   SDK_VERSION = PACKAGE_VERSION;
   isProduction = 'STAGE';
   appId = '';
@@ -620,6 +621,15 @@ export default class SwanSDK {
       this.coldStartCheckDone = true;
       // Defer to next microtask so the listener is fully registered before events emit
       Promise.resolve().then(() => {
+        // Deliver buffered standard/image push notification (one-shot APIs like
+        // getInitialNotification() can't be re-read — data was buffered in emitNotificationOpened).
+        // Skip carousel notifications — checkPendingCarouselClick() handles those with per-item routes.
+        const payload = this.pendingNotificationPayload;
+        this.pendingNotificationPayload = null;
+        if (payload && payload.notificationType !== 'carousel') {
+          this.emitNotificationOpened(payload);
+        }
+        // Check for pending carousel click (native side holds data until consumed)
         this.checkPendingCarouselClick();
       });
     }
@@ -649,6 +659,15 @@ export default class SwanSDK {
    * @internal - Used by module-level notification handlers
    */
   emitNotificationOpened(payload) {
+    const listeners = this.listeners[SwanSDK.EVENTS.NOTIFICATION_OPENED];
+    if ((!listeners || listeners.length === 0) && !this.coldStartCheckDone) {
+      // Cold start: buffer for delivery when first listener registers.
+      // One-shot APIs like getInitialNotification() won't have this data later.
+      Logger.log('[SwanSDK] Buffering notification payload for deferred delivery');
+      this.pendingNotificationPayload = payload;
+      return;
+    }
+    this.pendingNotificationPayload = null;
     this.emit(SwanSDK.EVENTS.NOTIFICATION_OPENED, payload);
     // Also emit unified deep link event for push source
     this.emitDeepLinkOpened({
@@ -2863,10 +2882,13 @@ export default class SwanSDK {
       // similar to how Firebase requires onMessage() at module level.
 
       // Check if app was opened by tapping a Notifee-displayed notification (data-only architecture)
+      // Notifee's getInitialNotification() returns { notification, pressAction }.
+      // The FCM data we stored via displayNotification({ data: {...} }) lives at
+      // notification.data — NOT at the top-level .data (which doesn't exist).
       const initialNotification = await notifee.getInitialNotification();
       if (initialNotification && !this.initialNotificationHandled) {
         const messageId = initialNotification?.notification?.id;
-        const notificationData = initialNotification.data || {};
+        const notificationData = initialNotification.notification?.data || {};
         if (messageId && markClickProcessed(messageId)) {
           Logger.log('[SwanSDK] App opened from Notifee notification tap:', messageId);
           this.initialNotificationHandled = true;