@loyalytics/swan-react-native-sdk 2.7.0 → 2.7.1-beta.1

package/ios/SwanNotificationContentExtension/Info.plist

@@ -30,6 +30,8 @@
 			<real>0.7</real>
 			<key>UNNotificationExtensionDefaultContentHidden</key>
 			<false/>
+			<key>UNNotificationExtensionUserInteractionEnabled</key>
+			<true/>
 		</dict>
 		<key>NSExtensionPointIdentifier</key>
 		<string>com.apple.usernotifications.content-extension</string>

package/ios/SwanNotificationContentExtension/MainInterface.storyboard

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="AppleSDK" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="jFH-bh-RYg">
-    <device id="retina6_12" orientation="portrait" appearance="light"/>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17139" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="jFH-bh-RYg">
     <scenes>
         <scene sceneID="8ME-jv-LvP">
             <objects>

package/ios/SwanNotificationContentExtension/NotificationViewController.swift

@@ -131,13 +131,14 @@ class NotificationViewController: UIViewController, UNNotificationContentExtensi
 
         self.currentUserInfo = userInfo
 
-        // Tap on carousel image/labels opens the app via deep link URL (CleverTap pattern)
+        // Tap on carousel image opens the app via deep link URL (CleverTap pattern)
         // Falls back to App Group + performNotificationDefaultAction if openURL fails
-        carousel.onItemTapped = { [weak self] in
+        carousel.onItemTapped = { [weak self] tappedIndex in
             guard let self = self, let cv = self.carouselView else { return }
+            let tappedItem = tappedIndex < items.count ? items[tappedIndex] : nil
             self.openDeepLink(
-                itemIndex: cv.currentIndex,
-                itemRoute: cv.currentItem?.route,
+                itemIndex: tappedIndex,
+                itemRoute: tappedItem?.route,
                 userInfo: userInfo
             ) { opened in
                 if !opened {
@@ -172,7 +173,15 @@ class NotificationViewController: UIViewController, UNNotificationContentExtensi
         completion: @escaping (Bool) -> Void
     ) {
         let messageId = userInfo["messageId"] as? String ?? ""
-        let route = itemRoute ?? userInfo["defaultRoute"] as? String ?? ""
+        let defaultRoute = userInfo["defaultRoute"] as? String
+        // Use per-item route if non-nil and non-empty, otherwise fall back to defaultRoute.
+        // Logic mirrors SwanParsers.resolveRoute() — keep in sync.
+        let route: String
+        if let itemRoute = itemRoute, !itemRoute.isEmpty {
+            route = itemRoute
+        } else {
+            route = defaultRoute ?? ""
+        }
 
         // Always save click data first — the async extensionContext.open() completion
         // uses [weak self], so saveClickData() could be skipped if self is deallocated.

package/ios/SwanNotificationContentExtension/templates/CarouselView.swift

@@ -79,8 +79,8 @@ class CarouselView: UIView {
         return label
     }()
 
-    /// Called when user taps a carousel item (image or label area)
-    var onItemTapped: (() -> Void)?
+    /// Called when user taps a carousel image, passes the tapped item index
+    var onItemTapped: ((Int) -> Void)?
 
     // Image cache
     private var imageCache: [Int: UIImage] = [:]
@@ -109,10 +109,6 @@ class CarouselView: UIView {
             addSubview($0)
         }
 
-        // Tap anywhere on carousel opens the app
-        let tap = UITapGestureRecognizer(target: self, action: #selector(handleTap))
-        self.addGestureRecognizer(tap)
-
         NSLayoutConstraint.activate([
             collectionView.topAnchor.constraint(equalTo: topAnchor),
             collectionView.leadingAnchor.constraint(equalTo: leadingAnchor),
@@ -203,10 +199,6 @@ class CarouselView: UIView {
         autoScrollTimer = nil
     }
 
-    @objc private func handleTap() {
-        onItemTapped?()
-    }
-
     // MARK: - Helpers
 
     private func updateLabels() {
@@ -280,7 +272,10 @@ extension CarouselView: UICollectionViewDataSource, UICollectionViewDelegate, UI
     }
 
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
-        onItemTapped?()
+        currentIndex = indexPath.item
+        pageControl.currentPage = indexPath.item
+        updateLabels()
+        onItemTapped?(indexPath.item)
     }
 
     func scrollViewDidEndDecelerating(_ scrollView: UIScrollView) {

package/lib/commonjs/index.js

@@ -153,8 +153,17 @@ const directAckSentIds = new Set();
 function _resetClickDedup() {
   processedClickIds.clear();
   directAckSentIds.clear();
+  _lastCarouselClickHandledAt = 0;
 }
 
+/**
+ * Timestamp of the last iOS carousel click handled by checkPendingCarouselClick().
+ * Used by createNotificationOpenedHandler to detect when checkPendingCarouselClick
+ * already consumed the one-time App Group click data, avoiding a duplicate
+ * NOTIFICATION_OPENED emission with the wrong (default) route.
+ */
+let _lastCarouselClickHandledAt = 0;
+
 /**
  * Notification deep link payload
  * Emitted when user clicks on a push notification
@@ -1899,6 +1908,12 @@ class SwanSDK {
         return;
       }
 
+      // Signal that we handled this iOS carousel click, so
+      // createNotificationOpenedHandler can skip its duplicate emit.
+      if (_reactNative.Platform.OS === 'ios') {
+        _lastCarouselClickHandledAt = Date.now();
+      }
+
       // Send click ACK
       if (messageId) {
         this.sendNotificationAck(messageId, 'clicked');
@@ -3831,16 +3846,53 @@ function createNotificationOpenedHandler() {
       // 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
+      // For carousel on iOS, Content Extension writes per-item click data to
+      // App Group. Two handlers race to read it:
+      //   1. checkPendingCarouselClick() — fires on AppState 'active'
+      //   2. This handler — fires on Firebase onNotificationOpenedApp
+      //
+      // readTemplateClickData() is destructive (clears after read), so the
+      // second reader gets null and falls back to defaultRoute — wrong.
+      //
+      // Fix: peek (non-destructive) to check if data exists. If it does,
+      // defer to checkPendingCarouselClick which has exponential backoff
+      // and is the canonical iOS carousel click handler.
+      // If no data: either already consumed or simple tap (no Content Extension).
       if (isIOSCarousel) {
         try {
-          const clickData = await _SharedCredentialsManager.SharedCredentialsManager.readTemplateClickData();
+          const clickData = await _SharedCredentialsManager.SharedCredentialsManager.peekTemplateClickData();
           if (clickData?.route) {
-            _Logger.default.log('[SwanSDK] Carousel item route from Content Extension:', clickData.route);
-            route = clickData.route;
+            // Content Extension click data exists — checkPendingCarouselClick
+            // will read it (with backoff) and emit NOTIFICATION_OPENED.
+            // Send ACKs here too as safety net: if app is already foregrounded,
+            // AppState won't transition to 'active' so checkPendingCarouselClick
+            // may never fire.
+            _Logger.default.log('[SwanSDK] iOS carousel click data found, deferring to checkPendingCarouselClick');
+            if (messageId) {
+              await sdkInstance.sendNotificationAck(messageId, 'delivered');
+            }
+            if (messageId) {
+              await sdkInstance.sendNotificationAck(messageId, 'clicked');
+            }
+            return;
+          }
+
+          // No click data from peek. Either:
+          // (a) checkPendingCarouselClick already consumed it
+          // (b) Simple tap — no Content Extension interaction
+          // Brief wait then check if (a).
+          await new Promise(r => setTimeout(r, 300));
+          if (Date.now() - _lastCarouselClickHandledAt < 5000) {
+            _Logger.default.log('[SwanSDK] iOS carousel click already handled by checkPendingCarouselClick');
+            if (messageId) {
+              await sdkInstance.sendNotificationAck(messageId, 'clicked');
+            }
+            return;
           }
+          // Case (b): simple tap, proceed with defaultRoute below
+          _Logger.default.log('[SwanSDK] iOS carousel simple tap, using defaultRoute:', route);
         } catch (err) {
-          _Logger.default.warn('[SwanSDK] Failed to read Content Extension click data:', err);
+          _Logger.default.warn('[SwanSDK] Failed to peek Content Extension click data:', err);
         }
       }
       const deepLinkPayload = {