@loyalytics/swan-react-native-sdk 2.7.1-beta.2 → 2.7.1-beta.3

package/ios/SwanNotificationContentExtension/NotificationViewController.swift

@@ -12,8 +12,8 @@ import UserNotificationsUI
  *
  * User interaction:
  *   - Swipe left/right on the carousel to navigate between items
- *   - Tap on the carousel image to open the deep link for the current item
- *   - Deep link uses extensionContext.open(URL) with full URLs from carousel item routes
+ *   - Tap on a carousel image to save click data to App Group and open the app
+ *   - SDK's checkPendingCarouselClick() reads the click data and handles navigation
  *
  * Action button identifiers (reserved for future use if categories are registered):
  *   - swan_prev: Navigate to previous carousel item
@@ -23,7 +23,6 @@ import UserNotificationsUI
 class NotificationViewController: UIViewController, UNNotificationContentExtension {
 
     private var carouselView: CarouselView?
-    private var currentUserInfo: [AnyHashable: Any] = [:]
 
     /// Action button identifiers (reserved for future use if notification categories are registered)
     private enum ActionID {
@@ -32,6 +31,10 @@ class NotificationViewController: UIViewController, UNNotificationContentExtensi
         static let open = "swan_open"
     }
 
+    /// Set to true after onItemTapped saves click data, so didReceive doesn't overwrite
+    /// with a potentially stale currentIndex (e.g., if auto-scroll advanced between tap and callback).
+    private var tapHandled = false
+
     required init?(coder: NSCoder) {
         self.carouselView = nil
         super.init(coder: coder)
@@ -84,21 +87,16 @@ class NotificationViewController: UIViewController, UNNotificationContentExtensi
             completion(.doNotDismiss)
 
         case ActionID.open, UNNotificationDefaultActionIdentifier:
-            guard let carousel = carouselView else {
-                completion(.dismissAndForwardAction)
-                return
-            }
-            openDeepLink(
-                itemIndex: carousel.currentIndex,
-                itemRoute: carousel.currentItem?.route,
-                userInfo: userInfo
-            ) { opened in
-                if opened {
-                    completion(.dismiss)
-                } else {
-                    completion(.dismissAndForwardAction)
-                }
+            // If onItemTapped already saved click data, skip to avoid overwriting
+            // with a potentially stale currentIndex (auto-scroll race).
+            if !tapHandled, let carousel = carouselView {
+                handleCarouselTap(
+                    itemIndex: carousel.currentIndex,
+                    itemRoute: carousel.currentItem?.route,
+                    userInfo: userInfo
+                )
             }
+            completion(.dismissAndForwardAction)
 
         default:
             completion(.dismissAndForwardAction)
@@ -129,22 +127,18 @@ class NotificationViewController: UIViewController, UNNotificationContentExtensi
         let mode: CarouselView.CarouselMode = modeString == "auto" ? .auto : .manual
         carousel.configure(with: items, mode: mode, autoScrollInterval: interval / 1000.0)
 
-        self.currentUserInfo = userInfo
-
-        // Tap on carousel image opens the app via deep link URL (CleverTap pattern)
-        // Falls back to App Group + performNotificationDefaultAction if openURL fails
+        // Tap on carousel image: save click data to App Group, then open the app.
+        // SDK's checkPendingCarouselClick() reads the data and handles navigation.
         carousel.onItemTapped = { [weak self] tappedIndex in
-            guard let self = self, let cv = self.carouselView else { return }
+            guard let self = self else { return }
             let tappedItem = tappedIndex < items.count ? items[tappedIndex] : nil
-            self.openDeepLink(
+            self.handleCarouselTap(
                 itemIndex: tappedIndex,
                 itemRoute: tappedItem?.route,
                 userInfo: userInfo
-            ) { opened in
-                if !opened {
-                    self.extensionContext?.performNotificationDefaultAction()
-                }
-            }
+            )
+            self.tapHandled = true
+            self.extensionContext?.performNotificationDefaultAction()
         }
 
         self.carouselView = carousel
@@ -155,74 +149,44 @@ class NotificationViewController: UIViewController, UNNotificationContentExtensi
         preferredContentSize = CGSize(width: width, height: width * imageAspectRatio + 80)
     }
 
-    // MARK: - Deep Link via URL (CleverTap pattern)
-
-    /// Try to open a deep link URL directly from the Content Extension.
-    /// If the route is a full URL (contains "://"), appends swan_ tracking params and opens it.
-    /// On failure or relative routes, falls back to saving click data to App Group.
-    ///
-    /// - Parameters:
-    ///   - itemIndex: Current carousel item index
-    ///   - itemRoute: Route from the tapped carousel item (e.g., "swanexample://product/123")
-    ///   - userInfo: Push notification payload
-    ///   - completion: Called with `true` if openURL succeeded, `false` if fell back
-    private func openDeepLink(
+    // MARK: - Click Data Persistence
+    // Tested in SwanSDKTestable/Tests/SwanParsersTests.swift (ClickDataSerializationTests, RouteResolutionTests)
+
+    /// Save carousel click data to App Group for the SDK to read.
+    /// The SDK's checkPendingCarouselClick() reads this data on app open and
+    /// handles navigation + click ACK. This avoids extensionContext.open(url)
+    /// race conditions on cold start where the app hasn't finished initializing
+    /// React Navigation before the URL arrives.
+    private func handleCarouselTap(
         itemIndex: Int,
         itemRoute: String?,
-        userInfo: [AnyHashable: Any],
-        completion: @escaping (Bool) -> Void
+        userInfo: [AnyHashable: Any]
     ) {
-        let messageId = userInfo["messageId"] as? String ?? ""
-        let defaultRoute = userInfo["defaultRoute"] as? String
-        // Use per-item route if non-nil and non-empty, otherwise fall back to defaultRoute.
+        // messageId: try data field first, then FCM's auto-generated key
+        let messageId = (userInfo["messageId"] as? String)
+            ?? (userInfo["gcm.message_id"] as? String)
+            ?? ""
+        // Use per-item route if non-nil and non-empty, otherwise fall back to defaultRoute/route.
         // Logic mirrors SwanParsers.resolveRoute() — keep in sync.
         let route: String
         if let itemRoute = itemRoute, !itemRoute.isEmpty {
             route = itemRoute
         } else {
-            route = defaultRoute ?? ""
+            route = (userInfo["defaultRoute"] as? String)
+                ?? (userInfo["route"] as? String)
+                ?? ""
         }
 
-        // Always save click data first — the async extensionContext.open() completion
-        // uses [weak self], so saveClickData() could be skipped if self is deallocated.
-        // Writing before the async call guarantees the data is persisted.
-        saveClickData(messageId: messageId, itemIndex: itemIndex, route: route)
-
-        // Try openURL if route is a full URL (contains "://")
-        // URL construction logic mirrors SwanParsers.buildCarouselDeepLinkURL()
-        // If changing this logic, update SwanParsers.swift too (and vice versa)
-        if !route.isEmpty, route.contains("://") {
-            guard var components = URLComponents(string: route) else {
-                completion(false)
-                return
-            }
-
-            // Merge swan_ tracking params with any existing query params from the route
-            var queryItems = components.queryItems ?? []
-            queryItems.append(contentsOf: [
-                URLQueryItem(name: "swan_carousel", value: "1"),
-                URLQueryItem(name: "swan_comm_id", value: messageId),
-                URLQueryItem(name: "swan_item_index", value: "\(itemIndex)"),
-            ])
-            components.queryItems = queryItems
-
-            if let url = components.url {
-                self.extensionContext?.open(url) { success in
-                    DispatchQueue.main.async {
-                        completion(success)
-                    }
-                }
-                return
-            }
-        }
-
-        completion(false)
+        saveClickData(
+            messageId: messageId,
+            itemIndex: itemIndex,
+            route: route,
+            title: userInfo["title"] as? String ?? "",
+            body: userInfo["body"] as? String ?? ""
+        )
     }
 
-    // MARK: - Click Data Persistence
-    // Tested in SwanSDKTestable/Tests/SwanParsersTests.swift (ClickDataSerializationTests)
-
-    private func saveClickData(messageId: String, itemIndex: Int, route: String) {
+    private func saveClickData(messageId: String, itemIndex: Int, route: String, title: String, body: String) {
         let appGroupId = "group.swan.sdk.notifications"
         guard let defaults = UserDefaults(suiteName: appGroupId) else { return }
 
@@ -230,6 +194,8 @@ class NotificationViewController: UIViewController, UNNotificationContentExtensi
             "messageId": messageId,
             "itemIndex": itemIndex,
             "route": route,
+            "title": title,
+            "body": body,
             "timestamp": Date().timeIntervalSince1970,
         ]
 

package/ios/SwanNotificationContentExtension/templates/CarouselView.swift

@@ -279,6 +279,7 @@ extension CarouselView: UICollectionViewDataSource, UICollectionViewDelegate, UI
     }
 
     func scrollViewDidEndDecelerating(_ scrollView: UIScrollView) {
+        guard scrollView.bounds.width > 0 else { return }
         let page = Int(scrollView.contentOffset.x / scrollView.bounds.width)
         if page != currentIndex {
             currentIndex = page

package/lib/commonjs/index.js

@@ -1891,6 +1891,12 @@ class SwanSDK {
         }
       }
       if (!clickData) return;
+
+      // Discard stale click data (>60s old) from a previous session
+      if (clickData.timestamp && Date.now() / 1000 - clickData.timestamp > 60) {
+        _Logger.default.log('[SwanSDK] Stale carousel click data (>60s old), discarding');
+        return;
+      }
       _Logger.default.log('[SwanSDK] Pending carousel click found:', JSON.stringify(clickData));
       const {
         messageId,