@trycourier/courier-react-native 5.8.0 → 6.0.1

package/android/build.gradle

@@ -111,9 +111,12 @@ dependencies {
   implementation 'com.google.code.gson:gson:2.11.0'
 
   // Courier Core SDK
-  api 'com.github.trycourier:courier-android:5.3.1'
+  api 'com.github.trycourier:courier-android:6.0.1'
   api 'androidx.recyclerview:recyclerview:1.3.2'
 
+  // Firebase Messaging (needed to resolve RemoteMessage from Courier SDK APIs)
+  compileOnly 'com.google.firebase:firebase-messaging:23.4.1'
+
 }
 
 if (isNewArchitectureEnabled()) {

package/android/src/main/java/com/courierreactnative/CourierInboxViewManager.kt

@@ -120,6 +120,8 @@ class CourierInboxViewManager : SimpleViewManager<CourierInbox>() {
 
     val brandId = getString("brandId")
     val backgroundColor = getString("backgroundColor")
+    val listItemBackgroundColor = getString("listItemBackgroundColor")
+    val tabBackgroundColor = getString("tabBackgroundColor")
 
     val tabIndicatorColor = getString("tabIndicatorColor")
     val tabStyle = getMap("tabStyle")
@@ -141,6 +143,8 @@ class CourierInboxViewManager : SimpleViewManager<CourierInbox>() {
     return CourierInboxTheme(
       brandId = brandId,
       backgroundColor = backgroundColor?.toColor(),
+      listItemBackgroundColor = listItemBackgroundColor?.toColor(),
+      tabBackgroundColor = tabBackgroundColor?.toColor(),
       tabIndicatorColor = tabIndicatorColor?.toColor(),
       tabStyle = tabStyle?.toTabStyle(context) ?: CourierStyles.Inbox.TabStyle(
         selected = CourierStyles.Inbox.TabItemStyle(

package/android/src/main/java/com/courierreactnative/CourierReactNativeActivity.kt

@@ -10,16 +10,11 @@ open class CourierReactNativeActivity : ReactActivity() {
 
   override fun onCreate(savedInstanceState: Bundle?) {
 
-    // Update the user agent
     Courier.agent = Utils.COURIER_AGENT
-
-    // Starts the Courier SDK
-    // Used to ensure shared preferences works properly
     Courier.initialize(this)
 
     super.onCreate(savedInstanceState)
 
-    // See if there is a pending click event
     checkIntentForPushNotificationClick(intent)
 
   }
@@ -30,6 +25,9 @@ open class CourierReactNativeActivity : ReactActivity() {
   }
 
   private fun checkIntentForPushNotificationClick(intent: Intent?) {
+    // The Courier SDK broadcasts a CLICKED event via Courier.onPushNotificationEvent
+    // which is observed in CourierSystemModule. No need to reach into the React
+    // context here, which would crash on Bridgeless / cold start.
     intent?.trackPushNotificationClick {}
   }
 

package/android/src/main/java/com/courierreactnative/CourierSystemModule.kt

@@ -2,31 +2,29 @@ package com.courierreactnative
 
 import android.content.Intent
 import android.provider.Settings
-import android.util.Log
 import com.courier.android.Courier
 import com.courier.android.models.CourierTrackingEvent.CLICKED
 import com.courier.android.models.CourierTrackingEvent.DELIVERED
 import com.courier.android.modules.isPushPermissionGranted
 import com.courier.android.modules.requestNotificationPermission
 import com.courier.android.utils.error
-import com.courier.android.utils.onPushNotificationEvent
-import com.courier.android.utils.pushNotification
 import com.courier.android.utils.trackPushNotificationClick
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactMethod
-import com.google.firebase.messaging.RemoteMessage
 import org.json.JSONObject
 
 class CourierSystemModule(reactContext: ReactApplicationContext): ReactNativeModule(tag = "System Error", name = "CourierSystemModule", reactContext = reactContext) {
 
+  private var lastClickedPushNotification: String? = null
+
   init {
 
-    Courier.shared.onPushNotificationEvent { event ->
+    Courier.onPushNotificationEvent { event ->
       when (event.trackingEvent) {
-        CLICKED -> postPushNotificationJavascriptEvent(CourierEvents.Push.CLICKED_EVENT, event.remoteMessage)
-        DELIVERED -> postPushNotificationJavascriptEvent(CourierEvents.Push.DELIVERED_EVENT, event.remoteMessage)
-        else -> Log.w("CourierSystemModule", "Unknown tracking event: ${event.trackingEvent}")
+        DELIVERED -> postPushNotificationJavascriptEvent(CourierEvents.Push.DELIVERED_EVENT, event.data)
+        CLICKED -> postPushNotificationClickedEvent(event.data)
+        else -> {}
       }
     }
 
@@ -44,24 +42,53 @@ class CourierSystemModule(reactContext: ReactApplicationContext): ReactNativeMod
 
   @ReactMethod
   fun registerPushNotificationClickedOnKilledState() {
-    activity?.let { act ->
-      checkIntentForPushNotificationClick(act.intent)
+    lastClickedPushNotification?.let { payload ->
+      reactApplicationContext.sendEvent(
+        eventName = CourierEvents.Push.CLICKED_EVENT,
+        value = payload
+      )
+      lastClickedPushNotification = null
     }
   }
 
-  private fun checkIntentForPushNotificationClick(intent: Intent?) {
+  fun checkIntentForPushNotificationClick(intent: Intent?) {
     intent?.trackPushNotificationClick { message ->
-      postPushNotificationJavascriptEvent(CourierEvents.Push.CLICKED_EVENT, message)
+      postPushNotificationClickedEvent(message.data)
     }
   }
 
-  private fun postPushNotificationJavascriptEvent(eventName: String, message: RemoteMessage) {
+  private fun postPushNotificationClickedEvent(data: Map<String, String>) {
+    val payload = buildPushPayload(data)
+    lastClickedPushNotification = payload
+    reactApplicationContext.sendEvent(
+      eventName = CourierEvents.Push.CLICKED_EVENT,
+      value = payload
+    )
+  }
+
+  private fun postPushNotificationJavascriptEvent(eventName: String, data: Map<String, String>) {
+    val payload = buildPushPayload(data)
     reactApplicationContext.sendEvent(
       eventName = eventName,
-      value = JSONObject(message.pushNotification).toString()
+      value = payload
     )
   }
 
+  private fun buildPushPayload(data: Map<String, String>): String {
+    val rawData = data.toMutableMap()
+    val payload = mutableMapOf<String, Any?>()
+    val baseKeys = listOf("title", "subtitle", "body", "badge", "sound")
+    baseKeys.forEach { key ->
+      payload[key] = data[key]
+      rawData.remove(key)
+    }
+    for ((key, value) in rawData) {
+      payload[key] = value
+    }
+    payload["raw"] = data
+    return JSONObject(payload).toString()
+  }
+
   @ReactMethod
   fun requestNotificationPermission(promise: Promise) {
 

package/android/src/main/java/com/courierreactnative/Utils.kt

@@ -15,7 +15,7 @@ import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.google.gson.GsonBuilder
 
 internal object Utils {
-  val COURIER_AGENT = CourierAgent.ReactNativeAndroid(version = "5.8.0")
+  val COURIER_AGENT = CourierAgent.ReactNativeAndroid(version = "6.0.1")
 }
 
 internal fun ReactContext.sendEvent(eventName: String, value: Any?) {

package/courier-react-native.podspec

@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,swift}"
 
   # Courier Core Dependency
-  s.dependency "Courier_iOS", "5.8.1"
+  s.dependency "Courier_iOS", "5.8.3"
 
   # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
   # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.

package/ios/CourierInboxReactNativeManager.swift

@@ -46,14 +46,6 @@ class CourierInboxView : UIView {
         let lightTheme = theme?["light"] as? NSDictionary
         let darkTheme = theme?["dark"] as? NSDictionary
         
-        let lightBgColor = (lightTheme?["backgroundColor"] as? String)?.toColor()
-        let darkBgColor = (darkTheme?["backgroundColor"] as? String)?.toColor()
-        if let bgColor = traitCollection.userInterfaceStyle == .dark ? darkBgColor ?? lightBgColor : lightBgColor ?? darkBgColor {
-            self.backgroundColor = bgColor
-        } else {
-            self.backgroundColor = nil
-        }
-        
         let courierInbox = CourierInbox(
             canSwipePages: self.canSwipePages,
             lightTheme: lightTheme?.toInboxTheme() ?? .defaultLight,
@@ -322,6 +314,9 @@ internal extension NSDictionary {
         let defaultTheme = CourierInboxTheme()
         
         let brandId = self["brandId"] as? String
+        let backgroundColor = self["backgroundColor"] as? String
+        let tabBackgroundColor = self["tabBackgroundColor"] as? String
+        let listItemBackgroundColor = self["listItemBackgroundColor"] as? String
         let tabIndicatorColor = self["tabIndicatorColor"] as? String
         let tabStyle = self["tabStyle"] as? NSDictionary
         let readingSwipeActionStyle = self["readingSwipeActionStyle"] as? NSDictionary
@@ -340,6 +335,9 @@ internal extension NSDictionary {
         
         return CourierInboxTheme(
             brandId: brandId,
+            backgroundColor: backgroundColor?.toColor() ?? .systemBackground,
+            tabBackgroundColor: tabBackgroundColor?.toColor() ?? .systemBackground,
+            listItemBackgroundColor: listItemBackgroundColor?.toColor() ?? .systemBackground,
             tabIndicatorColor: tabIndicatorColor?.toColor(),
             tabStyle: tabStyle?.toTabStyle() ?? CourierInboxView.defaultTabStyle(),
             readingSwipeActionStyle: readingSwipeActionStyle?.toReadingSwipeActionStyle() ?? CourierInboxView.defaultReadingStyle(),

package/ios/CourierReactNativeDelegate.m

@@ -33,7 +33,7 @@ static NSString *const CourierForegroundOptionsDidChangeNotification = @"iosFore
     if (self) {
       
         // Set the user agent
-        Courier.agent = [CourierAgent reactNativeIOS:@"5.8.0"];
+        Courier.agent = [CourierAgent reactNativeIOS:@"6.0.1"];
         
         // Register for remote notifications
         UIApplication *app = [UIApplication sharedApplication];

package/ios/CourierReactNativeEventEmitter.swift

@@ -14,7 +14,7 @@ internal class CourierReactNativeEventEmitter: RCTEventEmitter {
         
         // Set the user agent
         // Used to know the platform performing requests
-        Courier.agent = CourierAgent.reactNativeIOS("5.8.0")
+        Courier.agent = CourierAgent.reactNativeIOS("6.0.1")
         
     }
     

package/ios/CourierSystemModule.swift

@@ -99,18 +99,15 @@ class CourierSystemModule: CourierReactNativeEventEmitter {
         let pollInterval: UInt64 = 250_000_000  // 250ms
         let timeout: UInt64 = 10_000_000_000    // 10s
 
-        // Poll until react native is ready
         Task.detached(priority: .background) { [weak self] in
             guard let self else { return }
 
             let start = DispatchTime.now().uptimeNanoseconds
 
-            // Hold until react native is ready
             while !self.isReactNativeReady, DispatchTime.now().uptimeNanoseconds - start < timeout {
                 try? await Task.sleep(nanoseconds: pollInterval)
             }
 
-            // If possible, broadcast the message
             await MainActor.run {
                 guard self.isReactNativeReady, let message = self.lastClickedMessage else {
                     NSLog("[Courier] Timed out waiting for React Native or no message available.")
@@ -118,6 +115,7 @@ class CourierSystemModule: CourierReactNativeEventEmitter {
                 }
 
                 self.broadcast(name: PushEvents.CLICKED_EVENT, message: message)
+                self.lastClickedMessage = nil
             }
         }
     }

package/lib/typescript/src/models/CourierInboxTheme.d.ts

@@ -39,6 +39,8 @@ export interface CourierArchivingSwipeActionStyle {
 export interface CourierInboxTheme {
     brandId?: string;
     backgroundColor?: string;
+    listItemBackgroundColor?: string;
+    tabBackgroundColor?: string;
     tabIndicatorColor?: string;
     tabStyle?: CourierInboxTabStyle;
     readingSwipeActionStyle?: CourierReadingSwipeActionStyle;

package/lib/typescript/src/models/CourierInboxTheme.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CourierInboxTheme.d.ts","sourceRoot":"","sources":["../../../../src/models/CourierInboxTheme.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,MAAM,WAAW,uBAAuB;IACtC,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,IAAI,CAAC,EAAE,aAAa,CAAC;CACtB;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,IAAI,CAAC,EAAE,WAAW,CAAC;CACpB;AAED,MAAM,WAAW,gCAAgC;IAC/C,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,6BAA6B;IAC5C,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,wBAAwB;IACvC,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,SAAS,CAAC,EAAE,6BAA6B,CAAC;CAC3C;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,EAAE,wBAAwB,CAAC;IACpC,UAAU,CAAC,EAAE,wBAAwB,CAAC;CACvC;AAED,MAAM,WAAW,uBAAuB;IACtC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,8BAA8B;IAC7C,IAAI,CAAC,EAAE,uBAAuB,CAAC;IAC/B,MAAM,CAAC,EAAE,uBAAuB,CAAC;CAClC;AAED,MAAM,WAAW,gCAAgC;IAC/C,OAAO,CAAC,EAAE,uBAAuB,CAAC;CACnC;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,oBAAoB,CAAC;IAChC,uBAAuB,CAAC,EAAE,8BAA8B,CAAC;IACzD,yBAAyB,CAAC,EAAE,gCAAgC,CAAC;IAC7D,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,oBAAoB,CAAC,EAAE,gCAAgC,CAAC;IACxD,UAAU,CAAC,EAAE,qBAAqB,CAAC;IACnC,SAAS,CAAC,EAAE,qBAAqB,CAAC;IAClC,SAAS,CAAC,EAAE,qBAAqB,CAAC;IAClC,WAAW,CAAC,EAAE,uBAAuB,CAAC;IACtC,aAAa,CAAC,EAAE,oBAAoB,CAAC;IACrC,GAAG,CAAC,EAAE;QACJ,qBAAqB,CAAC,EAClB,MAAM,GACN,OAAO,GACP,MAAM,GACN,KAAK,GACL,QAAQ,GACR,MAAM,GACN,QAAQ,GACR,WAAW,CAAC;QAChB,UAAU,CAAC,EAAE;YACX,cAAc,CAAC,EAAE,MAAM,GAAG,YAAY,GAAG,kBAAkB,CAAC;YAC5D,eAAe,CAAC,EAAE;gBAChB,GAAG,CAAC,EAAE,MAAM,CAAC;gBACb,IAAI,CAAC,EAAE,MAAM,CAAC;gBACd,MAAM,CAAC,EAAE,MAAM,CAAC;gBAChB,KAAK,CAAC,EAAE,MAAM,CAAC;aAChB,CAAC;YACF,cAAc,CAAC,EAAE,MAAM,CAAC;YACxB,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;SACvD,CAAC;KACH,CAAC;IACF,OAAO,CAAC,EAAE;QACR,qBAAqB,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;KAC7C,CAAC;CACH"}
+{"version":3,"file":"CourierInboxTheme.d.ts","sourceRoot":"","sources":["../../../../src/models/CourierInboxTheme.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,MAAM,WAAW,uBAAuB;IACtC,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,IAAI,CAAC,EAAE,aAAa,CAAC;CACtB;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,IAAI,CAAC,EAAE,WAAW,CAAC;CACpB;AAED,MAAM,WAAW,gCAAgC;IAC/C,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,6BAA6B;IAC5C,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,wBAAwB;IACvC,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,SAAS,CAAC,EAAE,6BAA6B,CAAC;CAC3C;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,EAAE,wBAAwB,CAAC;IACpC,UAAU,CAAC,EAAE,wBAAwB,CAAC;CACvC;AAED,MAAM,WAAW,uBAAuB;IACtC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,8BAA8B;IAC7C,IAAI,CAAC,EAAE,uBAAuB,CAAC;IAC/B,MAAM,CAAC,EAAE,uBAAuB,CAAC;CAClC;AAED,MAAM,WAAW,gCAAgC;IAC/C,OAAO,CAAC,EAAE,uBAAuB,CAAC;CACnC;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,oBAAoB,CAAC;IAChC,uBAAuB,CAAC,EAAE,8BAA8B,CAAC;IACzD,yBAAyB,CAAC,EAAE,gCAAgC,CAAC;IAC7D,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,oBAAoB,CAAC,EAAE,gCAAgC,CAAC;IACxD,UAAU,CAAC,EAAE,qBAAqB,CAAC;IACnC,SAAS,CAAC,EAAE,qBAAqB,CAAC;IAClC,SAAS,CAAC,EAAE,qBAAqB,CAAC;IAClC,WAAW,CAAC,EAAE,uBAAuB,CAAC;IACtC,aAAa,CAAC,EAAE,oBAAoB,CAAC;IACrC,GAAG,CAAC,EAAE;QACJ,qBAAqB,CAAC,EAClB,MAAM,GACN,OAAO,GACP,MAAM,GACN,KAAK,GACL,QAAQ,GACR,MAAM,GACN,QAAQ,GACR,WAAW,CAAC;QAChB,UAAU,CAAC,EAAE;YACX,cAAc,CAAC,EAAE,MAAM,GAAG,YAAY,GAAG,kBAAkB,CAAC;YAC5D,eAAe,CAAC,EAAE;gBAChB,GAAG,CAAC,EAAE,MAAM,CAAC;gBACb,IAAI,CAAC,EAAE,MAAM,CAAC;gBACd,MAAM,CAAC,EAAE,MAAM,CAAC;gBAChB,KAAK,CAAC,EAAE,MAAM,CAAC;aAChB,CAAC;YACF,cAAc,CAAC,EAAE,MAAM,CAAC;YACxB,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;SACvD,CAAC;KACH,CAAC;IACF,OAAO,CAAC,EAAE;QACR,qBAAqB,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;KAC7C,CAAC;CACH"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trycourier/courier-react-native",
-  "version": "5.8.0",
+  "version": "6.0.1",
   "description": "Inbox, Push Notifications, and Preferences for React Native",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -14,7 +14,6 @@
     "ios",
     "cpp",
     "*.podspec",
-    "!lib/typescript/example-073",
     "!lib/typescript/example-085",
     "!ios/build",
     "!android/build",
@@ -34,7 +33,6 @@
     "prepack": "bob build",
     "release": "release-it",
     "example": "yarn --cwd example-085",
-    "example-073": "yarn --cwd example-073",
     "build:android": "cd example-085/android && ./gradlew assembleDebug --no-daemon --console=plain -PreactNativeArchitectures=arm64-v8a",
     "build:ios": "cd example-085/ios && xcodebuild -workspace CourierReactNativeExample.xcworkspace -scheme CourierReactNativeExample -configuration Debug -sdk iphonesimulator CC=clang CPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++ GCC_OPTIMIZATION_LEVEL=0 GCC_PRECOMPILE_PREFIX_HEADER=YES ASSETCATALOG_COMPILER_OPTIMIZATION=time DEBUG_INFORMATION_FORMAT=dwarf COMPILER_INDEX_STORE_ENABLE=NO",
     "bootstrap": "yarn example && yarn install && yarn example pods",
@@ -99,7 +97,6 @@
     "preset": "react-native",
     "modulePathIgnorePatterns": [
       "<rootDir>/example-085/node_modules",
-      "<rootDir>/example-073/node_modules",
       "<rootDir>/example-expo-55/node_modules",
       "<rootDir>/lib/"
     ]

package/src/models/CourierInboxTheme.tsx

@@ -49,6 +49,8 @@ export interface CourierArchivingSwipeActionStyle {
 export interface CourierInboxTheme {
   brandId?: string;
   backgroundColor?: string;
+  listItemBackgroundColor?: string;
+  tabBackgroundColor?: string;
   tabIndicatorColor?: string;
   tabStyle?: CourierInboxTabStyle;
   readingSwipeActionStyle?: CourierReadingSwipeActionStyle;