@ua/react-native-airship 26.0.0 → 26.2.0

package/android/build.gradle

@@ -60,14 +60,10 @@ android {
     targetCompatibility JavaVersion.VERSION_17
   }
 
-  sourceSets {
-    main {
-      java.srcDirs += [
-        "generated/java",
-        "generated/jni"
-      ]
-    }
-  }
+  // Note: android/generated/ directory contains pre-generated codegen files
+  // for backwards compatibility with older React Native versions (< 0.72).
+  // For RN 0.72+ with new architecture, codegen generates these automatically
+  // in build/generated/source/codegen/, so we don't include them here.
 }
 
 repositories {

package/android/gradle.properties

@@ -3,4 +3,4 @@ Airship_minSdkVersion=23
 Airship_targetSdkVersion=36
 Airship_compileSdkVersion=36
 Airship_ndkversion=26.1.10909125
-Airship_airshipProxyVersion=15.0.1
+Airship_airshipProxyVersion=15.4.0

package/android/src/main/java/com/urbanairship/reactnative/ReactMessageView.kt

@@ -181,21 +181,16 @@ class ReactMessageView(context: Context) : FrameLayout(context), LifecycleEventL
     }
 
     companion object {
-        const val EVENT_LOAD_STARTED_REGISTRATION_NAME = "topLoadStarted"
-        const val EVENT_LOAD_FINISHED_REGISTRATION_NAME = "topLoadFinished"
-        const val EVENT_LOAD_ERROR_REGISTRATION_NAME = "topLoadError"
-        const val EVENT_CLOSE_REGISTRATION_NAME = "topClose"
+        const val EVENT_LOAD_STARTED = "topAirshipMessageViewLoadStarted"
+        const val EVENT_LOAD_FINISHED = "topAirshipMessageViewLoadFinished"
+        const val EVENT_LOAD_ERROR = "topAirshipMessageViewLoadError"
+        const val EVENT_CLOSE = "topAirshipMessageViewClose"
 
         const val EVENT_LOAD_STARTED_HANDLER_NAME = "onLoadStarted"
         const val EVENT_LOAD_FINISHED_HANDLER_NAME = "onLoadFinished"
         const val EVENT_LOAD_ERROR_HANDLER_NAME = "onLoadError"
         const val EVENT_CLOSE_HANDLER_NAME = "onClose"
 
-        const val EVENT_LOAD_STARTED = "loadStarted"
-        const val EVENT_LOAD_FINISHED = "loadFinished"
-        const val EVENT_LOAD_ERROR = "loadError"
-        const val EVENT_CLOSE = "close"
-
         private const val MESSAGE_ID_KEY = "messageId"
         private const val RETRYABLE_KEY = "retryable"
         private const val ERROR_KEY = "error"

package/android/src/main/java/com/urbanairship/reactnative/ReactMessageViewManager.kt

@@ -59,10 +59,10 @@ class ReactMessageViewManager : SimpleViewManager<ReactMessageView>(),
 
     override fun getExportedCustomBubblingEventTypeConstants(): Map<String, Any> {
         val events = listOf(
-                ReactMessageView.EVENT_CLOSE_REGISTRATION_NAME to ReactMessageView.EVENT_CLOSE_HANDLER_NAME,
-                ReactMessageView.EVENT_LOAD_ERROR_REGISTRATION_NAME to ReactMessageView.EVENT_LOAD_ERROR_HANDLER_NAME,
-                ReactMessageView.EVENT_LOAD_FINISHED_REGISTRATION_NAME to ReactMessageView.EVENT_LOAD_FINISHED_HANDLER_NAME,
-                ReactMessageView.EVENT_LOAD_STARTED_REGISTRATION_NAME to ReactMessageView.EVENT_LOAD_STARTED_HANDLER_NAME
+                ReactMessageView.EVENT_CLOSE to ReactMessageView.EVENT_CLOSE_HANDLER_NAME,
+                ReactMessageView.EVENT_LOAD_ERROR to ReactMessageView.EVENT_LOAD_ERROR_HANDLER_NAME,
+                ReactMessageView.EVENT_LOAD_FINISHED to ReactMessageView.EVENT_LOAD_FINISHED_HANDLER_NAME,
+                ReactMessageView.EVENT_LOAD_STARTED to ReactMessageView.EVENT_LOAD_STARTED_HANDLER_NAME
             )
 
 

package/ios/AirshipPluginLoader.swift

@@ -1,14 +1,20 @@
 /* Copyright Airship and Contributors */
 
 import AirshipFrameworkProxy
+import AirshipKit
 
 @objc(AirshipPluginLoader)
+@MainActor
 public class AirshipPluginLoader: NSObject, AirshipPluginLoaderProtocol {
     @objc
     public static var disabled: Bool = false
+
     public static func onLoad() {
         if (!disabled) {
+            AirshipLogger.trace("AirshipPluginLoader onLoad.")
             AirshipReactNative.shared.onLoad()
+        } else {
+            AirshipLogger.trace("AirshipPluginLoader onLoad skipped (disabled).")
         }
     }
 }

package/ios/AirshipReactNative.swift

@@ -6,8 +6,8 @@ import AirshipFrameworkProxy
 import React
 
 @objc
-public class AirshipReactNative: NSObject {
-    
+public final class AirshipReactNative: NSObject, Sendable {
+
     @objc
     public static let pendingEventsEventName = "com.airship.pending_events"
 
@@ -18,19 +18,16 @@ public class AirshipReactNative: NSObject {
     public static let pendingEmbeddedUpdated = "com.airship.iax.pending_embedded_updated"
 
     private let serialQueue = AirshipAsyncSerialQueue()
-    var lock = AirshipLock()
-    var pendingPresentationRequests: [String: PresentationOptionsOverridesRequest] = [:]
-    
+    private let _pendingPresentationRequests = AirshipAtomicValue<[String: PresentationOptionsOverridesRequest]>([:])
+    private let _overridePresentationOptionsEnabled = AirshipAtomicValue<Bool>(false)
+
     @objc
-    public var overridePresentationOptionsEnabled: Bool = false {
-        didSet {
-            if (!overridePresentationOptionsEnabled) {
-                lock.sync {
-                    self.pendingPresentationRequests.values.forEach { request in
-                        request.result(options: nil)
-                    }
-                    self.pendingPresentationRequests.removeAll()
-                }
+    public var overridePresentationOptionsEnabled: Bool {
+        get { _overridePresentationOptionsEnabled.value }
+        set {
+            _overridePresentationOptionsEnabled.value = newValue
+            if (!newValue) {
+                self.clearPendingPresentationRequests()
             }
         }
     }
@@ -39,7 +36,7 @@ public class AirshipReactNative: NSObject {
         AirshipProxy.shared
     }
 
-    public static let version: String = "26.0.0"
+    public static let version: String = "26.2.0"
 
     private let eventNotifier = EventNotifier()
 
@@ -48,17 +45,22 @@ public class AirshipReactNative: NSObject {
 
     @objc
     public func setNotifier(_ notifier: ((String, [String: Any]) -> Void)?) {
+        AirshipLogger.trace("AirshipReactNative setNotifier called. Enabled: \(notifier != nil)")
+        let wrappedNotifier = AirshipUnsafeSendableWrapper(notifier)
         self.serialQueue.enqueue { @MainActor in
-            if let notifier = notifier {
+          if wrappedNotifier.value != nil {
+                AirshipLogger.trace("AirshipReactNative notifier registered.")
                 await self.eventNotifier.setNotifier {
-                    notifier(AirshipReactNative.pendingEventsEventName, [:])
+                    wrappedNotifier.value?(AirshipReactNative.pendingEventsEventName, [:])
                 }
 
                 if AirshipProxyEventEmitter.shared.hasAnyEvents() {
+                    AirshipLogger.trace("AirshipReactNative has pending events; notifying.")
                     await self.eventNotifier.notifyPendingEvents()
                 }
 
                 AirshipProxy.shared.push.presentationOptionOverrides = { request in
+                    AirshipLogger.trace("AirshipReactNative presentation override request received.")
                     guard self.overridePresentationOptionsEnabled else {
                         request.result(options: nil)
                         return
@@ -76,10 +78,13 @@ public class AirshipReactNative: NSObject {
                     }
 
                     let requestID = UUID().uuidString
-                    self.lock.sync {
-                        self.pendingPresentationRequests[requestID] = request
+                    self._pendingPresentationRequests.update {
+                        var requests = $0
+                        requests[requestID] = request
+                        return requests
                     }
-                    notifier(
+
+                    wrappedNotifier.value?(
                         AirshipReactNative.overridePresentationOptionsEventName,
                         [
                             "pushPayload": requestPayload,
@@ -88,30 +93,36 @@ public class AirshipReactNative: NSObject {
                     )
                 }
             } else {
+                AirshipLogger.trace("AirshipReactNative notifier cleared.")
                 await self.eventNotifier.setNotifier(nil)
                 AirshipProxy.shared.push.presentationOptionOverrides = nil
-
-                self.lock.sync {
-                    self.pendingPresentationRequests.values.forEach { request in
-                        request.result(options: nil)
-                    }
-                    self.pendingPresentationRequests.removeAll()
-                }
+                self.clearPendingPresentationRequests()
             }
         }
     }
     
     @objc
     public func presentationOptionOverridesResult(requestID: String, presentationOptions: [String]?) {
-        lock.sync {
-            pendingPresentationRequests[requestID]?.result(optionNames: presentationOptions)
-            pendingPresentationRequests[requestID] = nil
+        _pendingPresentationRequests.update {
+            var requests = $0
+            requests[requestID]?.result(optionNames: presentationOptions)
+            requests[requestID] = nil
+            return requests
+        }
+    }
+
+    private func clearPendingPresentationRequests() {
+        _pendingPresentationRequests.update { requests in
+            requests.values.forEach { request in
+                request.result(options: nil)
+            }
+            return [:]
         }
     }
-    
 
     @MainActor
     func onLoad() {
+        AirshipLogger.trace("AirshipReactNative onLoad.")
         AirshipProxy.shared.delegate = self
         try? AirshipProxy.shared.attemptTakeOff()
 
@@ -125,6 +136,7 @@ public class AirshipReactNative: NSObject {
 
     @objc
     public func onListenerAdded(eventName: String) {
+        AirshipLogger.trace("AirshipReactNative listener added: \(eventName)")
         guard let type = try? AirshipProxyEventType.fromReactName(eventName) else {
             return
         }
@@ -767,8 +779,8 @@ extension AirshipReactNative: AirshipProxyDelegate {
 
 
 private actor EventNotifier {
-    private var notifier: (() -> Void)?
-    func setNotifier(_ notifier: (() -> Void)?) {
+    private var notifier: (@Sendable () -> Void)?
+    func setNotifier(_ notifier: (@Sendable () -> Void)?) {
         self.notifier = notifier
     }
 

package/ios/MessageWebViewWrapper.swift

@@ -16,6 +16,7 @@ public protocol MessageWebViewWrapperDelegate {
 }
 
 @objc(RNAirshipMessageWebViewWrapper)
+@MainActor
 public class MessageWebViewWrapper: NSObject {
     private let innerWrapper: _MessageWebViewWrapper
 
@@ -36,7 +37,6 @@ public class MessageWebViewWrapper: NSObject {
         }
     }
 
-    @MainActor
     @objc
     public func loadMessage(messageID: String?) {
         self.innerWrapper.loadMessage(messageID: messageID)
@@ -49,7 +49,7 @@ public class MessageWebViewWrapper: NSObject {
 }
 
 
-class _MessageWebViewWrapper: NSObject, AirshipWKNavigationDelegate, NativeBridgeDelegate {
+class _MessageWebViewWrapper: NSObject, AirshipWKNavigationDelegate, @preconcurrency NativeBridgeDelegate {
 
     public weak var delegate: MessageWebViewWrapperDelegate? = nil
 
@@ -93,8 +93,6 @@ class _MessageWebViewWrapper: NSObject, AirshipWKNavigationDelegate, NativeBridg
         }
     }
 
-
-
     @MainActor
     private func startLoad(messageID: String) async {
         var message: MessageCenterMessage? = nil

package/lib/module/RNAirshipMessageViewNativeComponent.ts

@@ -27,14 +27,14 @@ interface NativeProps extends ViewProps {
   messageId: string;
   onLoadStarted: BubblingEventHandler<
     MessageLoadStartedEvent,
-    'topLoadStarted'
+    'topAirshipMessageViewLoadStarted'
   >;
   onLoadFinished: BubblingEventHandler<
     MessageLoadFinishedEvent,
-    'topLoadFinished'
+    'topAirshipMessageViewLoadFinished'
   >;
-  onLoadError: BubblingEventHandler<MessageLoadErrorEvent, 'topLoadError'>;
-  onClose: BubblingEventHandler<MessageClosedEvent, 'topClose'>;
+  onLoadError: BubblingEventHandler<MessageLoadErrorEvent, 'topAirshipMessageViewLoadError'>;
+  onClose: BubblingEventHandler<MessageClosedEvent, 'topAirshipMessageViewClose'>;
 }
 
 export default codegenNativeComponent<NativeProps>('RNAirshipMessageView') as HostComponent<NativeProps>;

package/lib/typescript/src/RNAirshipMessageViewNativeComponent.d.ts

@@ -16,10 +16,10 @@ type MessageClosedEvent = Readonly<{
 }>;
 interface NativeProps extends ViewProps {
     messageId: string;
-    onLoadStarted: BubblingEventHandler<MessageLoadStartedEvent, 'topLoadStarted'>;
-    onLoadFinished: BubblingEventHandler<MessageLoadFinishedEvent, 'topLoadFinished'>;
-    onLoadError: BubblingEventHandler<MessageLoadErrorEvent, 'topLoadError'>;
-    onClose: BubblingEventHandler<MessageClosedEvent, 'topClose'>;
+    onLoadStarted: BubblingEventHandler<MessageLoadStartedEvent, 'topAirshipMessageViewLoadStarted'>;
+    onLoadFinished: BubblingEventHandler<MessageLoadFinishedEvent, 'topAirshipMessageViewLoadFinished'>;
+    onLoadError: BubblingEventHandler<MessageLoadErrorEvent, 'topAirshipMessageViewLoadError'>;
+    onClose: BubblingEventHandler<MessageClosedEvent, 'topAirshipMessageViewClose'>;
 }
 declare const _default: HostComponent<NativeProps>;
 export default _default;

package/lib/typescript/src/RNAirshipMessageViewNativeComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RNAirshipMessageViewNativeComponent.d.ts","sourceRoot":"","sources":["../../../src/RNAirshipMessageViewNativeComponent.ts"],"names":[],"mappings":"AACA,OAAO,EAA0B,KAAK,aAAa,EAAE,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAC1F,OAAO,KAAK,EACV,oBAAoB,EAErB,MAAM,2CAA2C,CAAC;AAEnD,KAAK,uBAAuB,GAAG,QAAQ,CAAC;IACtC,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC,CAAC;AAEH,KAAK,wBAAwB,GAAG,QAAQ,CAAC;IACvC,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC,CAAC;AAEH,KAAK,qBAAqB,GAAG,QAAQ,CAAC;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC,CAAC;AAEH,KAAK,kBAAkB,GAAG,QAAQ,CAAC;IACjC,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC,CAAC;AAEH,UAAU,WAAY,SAAQ,SAAS;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,oBAAoB,CACjC,uBAAuB,EACvB,gBAAgB,CACjB,CAAC;IACF,cAAc,EAAE,oBAAoB,CAClC,wBAAwB,EACxB,iBAAiB,CAClB,CAAC;IACF,WAAW,EAAE,oBAAoB,CAAC,qBAAqB,EAAE,cAAc,CAAC,CAAC;IACzE,OAAO,EAAE,oBAAoB,CAAC,kBAAkB,EAAE,UAAU,CAAC,CAAC;CAC/D;wBAE6E,aAAa,CAAC,WAAW,CAAC;AAAxG,wBAAyG"}
+{"version":3,"file":"RNAirshipMessageViewNativeComponent.d.ts","sourceRoot":"","sources":["../../../src/RNAirshipMessageViewNativeComponent.ts"],"names":[],"mappings":"AACA,OAAO,EAA0B,KAAK,aAAa,EAAE,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAC1F,OAAO,KAAK,EACV,oBAAoB,EAErB,MAAM,2CAA2C,CAAC;AAEnD,KAAK,uBAAuB,GAAG,QAAQ,CAAC;IACtC,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC,CAAC;AAEH,KAAK,wBAAwB,GAAG,QAAQ,CAAC;IACvC,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC,CAAC;AAEH,KAAK,qBAAqB,GAAG,QAAQ,CAAC;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC,CAAC;AAEH,KAAK,kBAAkB,GAAG,QAAQ,CAAC;IACjC,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC,CAAC;AAEH,UAAU,WAAY,SAAQ,SAAS;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,oBAAoB,CACjC,uBAAuB,EACvB,kCAAkC,CACnC,CAAC;IACF,cAAc,EAAE,oBAAoB,CAClC,wBAAwB,EACxB,mCAAmC,CACpC,CAAC;IACF,WAAW,EAAE,oBAAoB,CAAC,qBAAqB,EAAE,gCAAgC,CAAC,CAAC;IAC3F,OAAO,EAAE,oBAAoB,CAAC,kBAAkB,EAAE,4BAA4B,CAAC,CAAC;CACjF;wBAE6E,aAAa,CAAC,WAAW,CAAC;AAAxG,wBAAyG"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ua/react-native-airship",
-  "version": "26.0.0",
+  "version": "26.2.0",
   "description": "Airship plugin for React Native apps.",
   "source": "./src/index.tsx",
   "main": "./lib/module/index.js",

package/react-native-airship.podspec

@@ -16,8 +16,9 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,swift,cpp}"
   s.exclude_files = "ios/generated/**/*"
   s.private_header_files = "ios/**/*.h"
+  s.swift_version = "6.0"
 
   install_modules_dependencies(s)
   
-  s.dependency "AirshipFrameworkProxy", "15.0.1"
+  s.dependency "AirshipFrameworkProxy", "15.4.0"
 end

package/src/RNAirshipMessageViewNativeComponent.ts

@@ -27,14 +27,14 @@ interface NativeProps extends ViewProps {
   messageId: string;
   onLoadStarted: BubblingEventHandler<
     MessageLoadStartedEvent,
-    'topLoadStarted'
+    'topAirshipMessageViewLoadStarted'
   >;
   onLoadFinished: BubblingEventHandler<
     MessageLoadFinishedEvent,
-    'topLoadFinished'
+    'topAirshipMessageViewLoadFinished'
   >;
-  onLoadError: BubblingEventHandler<MessageLoadErrorEvent, 'topLoadError'>;
-  onClose: BubblingEventHandler<MessageClosedEvent, 'topClose'>;
+  onLoadError: BubblingEventHandler<MessageLoadErrorEvent, 'topAirshipMessageViewLoadError'>;
+  onClose: BubblingEventHandler<MessageClosedEvent, 'topAirshipMessageViewClose'>;
 }
 
 export default codegenNativeComponent<NativeProps>('RNAirshipMessageView') as HostComponent<NativeProps>;