@loyalytics/swan-react-native-sdk 2.1.3-beta.0 → 2.1.3-beta.1

package/lib/commonjs/index.js

@@ -720,12 +720,12 @@ class SwanSDK {
       _Logger.default.log('[SwanSDK] Deep link attribution: found SWAN parameters:', JSON.stringify(swanParams));
 
       // Track click via webhook API (same endpoint as push notification clicks)
-      const commId = swanParams['swan_comm_id'];
+      const commId = swanParams.swan_comm_id;
       if (!commId) {
         _Logger.default.warn('[SwanSDK] Deep link missing swan_comm_id, skipping webhook tracking');
         return;
       }
-      const linkId = swanParams['swan_link_id'] || null;
+      const linkId = swanParams.swan_link_id || null;
 
       // Queue as SWAN_NOTIFICATION_ACK with type: 'deepLink' so backend
       // can distinguish from push notification ACKs (where commId is Firebase's messageId)
@@ -2112,7 +2112,11 @@ class SwanSDK {
             alert: true,
             badge: true,
             sound: true
-          }
+          },
+          // Pass through category for Content Extension (e.g., carousel)
+          ...(remoteMessage?.category && {
+            categoryId: remoteMessage.category
+          })
         }
       };
 
@@ -2651,9 +2655,14 @@ class SwanSDK {
           await this.sendNotificationAck(messageId, 'clicked');
         }
         // Extract deep link information
+        // For carousel notifications, the default route is in 'defaultRoute' field
+        const resolvedRoute = notificationData.route || notificationData.defaultRoute;
         const deepLinkPayload = {
-          route: notificationData.route,
-          data: notificationData,
+          route: resolvedRoute,
+          data: {
+            ...notificationData,
+            route: resolvedRoute
+          },
           title: initialNotification.notification?.title || notificationData.title,
           body: initialNotification.notification?.body || notificationData.body
         };
@@ -2693,9 +2702,14 @@ class SwanSDK {
         const notificationData = initialNotification.data || {};
 
         // Extract deep link information
+        // For carousel notifications, the default route is in 'defaultRoute' field
+        const resolvedRoute = notificationData.route || notificationData.defaultRoute;
         const deepLinkPayload = {
-          route: notificationData.route,
-          data: notificationData,
+          route: resolvedRoute,
+          data: {
+            ...notificationData,
+            route: resolvedRoute
+          },
           title: initialNotification.notification?.title || notificationData.title,
           body: initialNotification.notification?.body || notificationData.body
         };
@@ -3355,6 +3369,14 @@ function createBackgroundMessageHandler() {
         }
       };
 
+      // Add iOS category for Content Extension (e.g., carousel)
+      if (remoteMessage?.category) {
+        notificationConfig.ios = {
+          ...(notificationConfig.ios || {}),
+          categoryId: remoteMessage.category
+        };
+      }
+
       // Add image if present
       if (imageUrl) {
         const {
@@ -3365,8 +3387,8 @@ function createBackgroundMessageHandler() {
           picture: imageUrl
         };
         // iOS: Add image as attachment
-        // Note: For best results on iOS, implement a Notification Service Extension
         notificationConfig.ios = {
+          ...(notificationConfig.ios || {}),
           attachments: [{
             url: imageUrl
           }]
@@ -3412,29 +3434,51 @@ function createNotificationOpenedHandler() {
         return;
       }
 
-      // Check if iOS Notification Service Extension is active then skip delivery handling
-      const isNESActive = await _SharedCredentialsManager.SharedCredentialsManager.isNotificationServiceExtensionActive();
-      if (!isNESActive && _reactNative.Platform.OS === 'ios') {
-        _Logger.default.log('[SwanSDK] ✅ iOS Notification Service Extension is inactive, will be handled by notifee handlers for click tracking');
-        return;
-      }
-      _Logger.default.log('[SwanSDK] ✅ iOS Notification Service Extension is active, click tracking will be handled now');
-
       // Get messageId and notification data
       const messageId = event?.messageId;
       const notificationData = event?.data || {};
 
+      // For iOS carousel notifications, iOS displays the notification (not Notifee),
+      // so this handler MUST process the click regardless of NES status.
+      // For non-carousel, defer to Notifee click handlers unless NES is active.
+      const isIOSCarousel = _reactNative.Platform.OS === 'ios' && notificationData.notificationType === 'carousel';
+      if (!isIOSCarousel) {
+        const isNESActive = await _SharedCredentialsManager.SharedCredentialsManager.isNotificationServiceExtensionActive();
+        if (!isNESActive && _reactNative.Platform.OS === 'ios') {
+          _Logger.default.log('[SwanSDK] Non-carousel iOS without NES, deferring to Notifee click handler');
+          return;
+        }
+      }
+
       // Extract deep link information
-      // Note: route field can contain either a path (/products/123) or full URL (myapp://products/123)
+      // For carousel notifications, the default route is in 'defaultRoute' field
+      let route = notificationData.route || notificationData.defaultRoute;
+
+      // For carousel on iOS, check for per-item route from Content Extension
+      if (isIOSCarousel) {
+        try {
+          const clickData = await _SharedCredentialsManager.SharedCredentialsManager.readTemplateClickData();
+          if (clickData?.route) {
+            _Logger.default.log('[SwanSDK] Carousel item route from Content Extension:', clickData.route);
+            route = clickData.route;
+          }
+        } catch (err) {
+          _Logger.default.warn('[SwanSDK] Failed to read Content Extension click data:', err);
+        }
+      }
       const deepLinkPayload = {
-        route: notificationData.route,
-        data: notificationData,
+        route,
+        data: {
+          ...notificationData,
+          route
+        },
         title: notificationData.title,
         body: notificationData.body
       };
-      _Logger.default.log('[SwanSDK] Foreground notification clicked:', {
+      _Logger.default.log('[SwanSDK] Notification opened:', {
         messageId,
-        route: deepLinkPayload.route
+        route: deepLinkPayload.route,
+        isIOSCarousel
       });
 
       // Emit notificationOpened event for host app to handle
@@ -3498,19 +3542,40 @@ function createNotifeeForegroundHandler() {
 
       // Extract deep link information
       // Note: route field can contain either a path (/products/123) or full URL (myapp://products/123)
+      // For carousel notifications, the default route is in 'defaultRoute' field
+      let route = notificationData.route || notificationData.defaultRoute;
+
+      // For carousel notifications on iOS, the Content Extension saves per-item
+      // click data (including item-specific route) to the App Group.
+      if (_reactNative.Platform.OS === 'ios' && notificationData.notificationType === 'carousel') {
+        try {
+          const clickData = await _SharedCredentialsManager.SharedCredentialsManager.readTemplateClickData();
+          if (clickData?.route) {
+            _Logger.default.log('[SwanSDK] Foreground: carousel item route from Content Extension:', clickData.route);
+            route = clickData.route;
+          }
+        } catch (err) {
+          _Logger.default.warn('[SwanSDK] Failed to read Content Extension click data:', err);
+        }
+      }
       const deepLinkPayload = {
-        route: notificationData.route,
-        data: notificationData,
+        route,
+        data: {
+          ...notificationData,
+          route
+        },
         title: event?.detail?.notification?.title,
         body: event?.detail?.notification?.body
       };
       _Logger.default.log('[SwanSDK] Foreground notification clicked (Notifee):', {
         messageId,
-        route: deepLinkPayload.route
+        route: deepLinkPayload.route,
+        type: notificationData.notificationType
       });
 
       // Emit notificationOpened event for host app to handle
       sdkInstance.emitNotificationOpened(deepLinkPayload);
+      _Logger.default.log('[SwanSDK] Foreground: emitted notificationOpened with route:', deepLinkPayload.route);
 
       // Send click ACK
       if (messageId) {
@@ -3554,12 +3619,8 @@ function createNotifeeBackgroundHandler() {
         return;
       }
 
-      // Check if iOS Notification Service Extension is active then skip delivery handling
-      const isNESActive = await _SharedCredentialsManager.SharedCredentialsManager.isNotificationServiceExtensionActive();
-      if (isNESActive) {
-        _Logger.default.log('[SwanSDK] ✅ iOS Notification Service Extension is active, skipping delivery ACK (NES handles it)');
-        return;
-      }
+      // NOTE: NES handles delivery ACK, but click ACK is ALWAYS our responsibility.
+      // Never skip click handling based on NES status.
 
       // Get messageId and notification data
       const messageId = detail?.notification?.data?.messageId;
@@ -3567,15 +3628,35 @@ function createNotifeeBackgroundHandler() {
 
       // Extract deep link information
       // Note: route field can contain either a path (/products/123) or full URL (myapp://products/123)
+      // For carousel notifications, the default route is in 'defaultRoute' field
+      let route = notificationData.route || notificationData.defaultRoute;
+
+      // For carousel notifications on iOS, the Content Extension saves per-item
+      // click data (including item-specific route) to the App Group.
+      if (_reactNative.Platform.OS === 'ios' && notificationData.notificationType === 'carousel') {
+        try {
+          const clickData = await _SharedCredentialsManager.SharedCredentialsManager.readTemplateClickData();
+          if (clickData?.route) {
+            _Logger.default.log('[SwanSDK] Background: carousel item route from Content Extension:', clickData.route);
+            route = clickData.route;
+          }
+        } catch (err) {
+          _Logger.default.warn('[SwanSDK] Failed to read Content Extension click data:', err);
+        }
+      }
       const deepLinkPayload = {
-        route: notificationData.route,
-        data: notificationData,
+        route,
+        data: {
+          ...notificationData,
+          route
+        },
         title: detail?.notification?.title,
         body: detail?.notification?.body
       };
       _Logger.default.log('[SwanSDK] Background notification clicked:', {
         messageId,
-        route: deepLinkPayload.route
+        route: deepLinkPayload.route,
+        type: notificationData.notificationType
       });
 
       // Try to use SDK instance if available and ready (has deviceId)
@@ -3588,11 +3669,12 @@ function createNotifeeBackgroundHandler() {
 
         // Emit notificationOpened event for host app to handle
         sdkInstance.emitNotificationOpened(deepLinkPayload);
+        _Logger.default.log('[SwanSDK] Background: emitted notificationOpened with route:', deepLinkPayload.route);
 
-        // Send click ACK
+        // Send click ACK (NES handles delivery ACK, but click ACK is always ours)
         if (messageId) {
           await sdkInstance.sendNotificationAck(messageId, 'clicked');
-          _Logger.default.log('[SwanSDK] Click ACK sent via SDK');
+          _Logger.default.log('[SwanSDK] Background: click ACK sent via SDK');
         }
         return;
       }