react-native-mparticle 3.1.3 → 3.1.5

package/android/build.gradle

@@ -120,7 +120,7 @@ dependencies {
     //
     // Bounded upper bound prevents resolving to 6.0.0-rc.1+ on Maven Central.
     // 6.x removed deprecated symbols (e.g. UserAttributeListener); see #710.
-    api 'com.mparticle:android-core:[5.79.0, 6.0)'
+    api 'com.mparticle:android-core:[5.79.2, 6.0)'
 
     //
     // And, if you want to include kits, you can do so as follows:
@@ -136,6 +136,6 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     testImplementation files('libs/java-json.jar')
 
-    testImplementation 'com.mparticle:android-core:5.79.0'
+    testImplementation 'com.mparticle:android-core:5.79.2'
     testImplementation("com.facebook.react:react-android:+")
 }

package/ios/RNMParticle/RNMParticle.mm

@@ -19,6 +19,13 @@
 - (void)setUserId:(NSNumber *)userId;
 @end
 
+// Forward declare so New Arch `logCommerceEvent` can use the same JS→native
+// mappings as `RCTConvert (MPCommerceEvent)` (defined later in this file).
+@interface RCTConvert (MPCommerceEvent)
++ (MPCommerceEventAction)MPCommerceEventAction:(id)json;
++ (MPPromotionAction)MPPromotionAction:(id)json;
+@end
+
 @implementation RNMParticle
 
 RCT_EXTERN void RCTRegisterModule(Class);
@@ -447,11 +454,14 @@ RCT_EXPORT_METHOD(getSession:(RCTResponseSenderBlock)completion)
     MPCommerceEvent *mpCommerceEvent = [[MPCommerceEvent alloc] init];
 
     if (commerceEvent.productActionType().has_value()) {
-        mpCommerceEvent.action = (MPCommerceEventAction)commerceEvent.productActionType().value();
+        mpCommerceEvent.action = [RCTConvert MPCommerceEventAction:@(commerceEvent.productActionType().value())];
     }
 
     if (commerceEvent.promotionActionType().has_value()) {
-        mpCommerceEvent.promotionContainer = [[MPPromotionContainer alloc] initWithAction:(MPPromotionAction)commerceEvent.promotionActionType().value() promotion:nil];
+        MPPromotionAction promotionAction =
+            [RCTConvert MPPromotionAction:@(commerceEvent.promotionActionType().value())];
+        mpCommerceEvent.promotionContainer =
+            [[MPPromotionContainer alloc] initWithAction:promotionAction promotion:nil];
     }
 
     if (commerceEvent.products().has_value()) {
@@ -778,7 +788,7 @@ RCT_EXPORT_METHOD(setCCPAConsentState:(MPCCPAConsent *)consent)
     MPCommerceEvent *commerceEvent = [[MPCommerceEvent alloc] init];
 
     if (dict[@"productActionType"] && dict[@"productActionType"] != [NSNull null]) {
-        commerceEvent.action = (MPCommerceEventAction)[dict[@"productActionType"] integerValue];
+        commerceEvent.action = [RCTConvert MPCommerceEventAction:dict[@"productActionType"]];
     }
 
     if (dict[@"products"] && dict[@"products"] != [NSNull null]) {
@@ -920,6 +930,7 @@ typedef NS_ENUM(NSUInteger, MPReactCommerceEventAction) {
 + (MPTransactionAttributes *)MPTransactionAttributes:(id)json;
 + (MPProduct *)MPProduct:(id)json;
 + (MPCommerceEventAction)MPCommerceEventAction:(id)json;
++ (MPPromotionAction)MPPromotionAction:(id)json;
 + (MPIdentityApiRequest *)MPIdentityApiRequest:(id)json;
 + (MPIdentityApiResult *)MPIdentityApiResult:(id)json;
 + (MPAliasRequest *)MPAliasRequest:(id)json;
@@ -989,7 +1000,7 @@ typedef NS_ENUM(NSUInteger, MPReactCommerceEventAction) {
 }
 
 + (MPPromotionContainer *)MPPromotionContainer:(id)json {
-    MPPromotionAction promotionAction = (MPPromotionAction)[json[@"promotionActionType"] intValue];
+    MPPromotionAction promotionAction = [RCTConvert MPPromotionAction:json[@"promotionActionType"]];
     MPPromotionContainer *promotionContainer = [[MPPromotionContainer alloc] initWithAction:promotionAction promotion:nil];
     NSArray *jsonPromotions = json[@"promotions"];
     [jsonPromotions enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
@@ -1039,6 +1050,20 @@ typedef NS_ENUM(NSUInteger, MPReactCommerceEventAction) {
     return product;
 }
 
++ (MPPromotionAction)MPPromotionAction:(NSNumber *)json {
+    // JS `PromotionActionType`: View = 0, Click = 1 (js/index.tsx).
+    // Apple `MPPromotionAction`: Click = 0, View = 1 (MPPromotion.h).
+    switch ([json intValue]) {
+        case 0:
+            return MPPromotionActionView;
+        case 1:
+            return MPPromotionActionClick;
+        default:
+            // Match Android `convertPromotionActionType`: non-zero → Click
+            return MPPromotionActionClick;
+    }
+}
+
 + (MPCommerceEventAction)MPCommerceEventAction:(NSNumber *)json {
     int actionInt = [json intValue];
     MPCommerceEventAction action;

package/package.json

@@ -4,7 +4,7 @@
   "homepage": "https://www.mparticle.com",
   "license": "Apache-2.0",
   "repository": "mParticle/react-native-mparticle",
-  "version": "3.1.3",
+  "version": "3.1.5",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "react-native": "js/index",

package/plugin/build/withMParticleAndroid.js

@@ -287,7 +287,7 @@ const withMParticleAppBuildGradle = (config, props) => {
         // to a pre-release (e.g. 6.0.0-rc.1) and transitively drag the core past
         // the bridge's compiled-against API surface.
         const kitDependencies = props.androidKits
-            .map(kit => `    implementation "com.mparticle:${kit}:[5.79.0, 6.0)"`)
+            .map(kit => `    implementation "com.mparticle:${kit}:[5.79.2, 6.0)"`)
             .join('\n');
         // Use mergeContents for idempotent injection
         const withKits = (0, generateCode_1.mergeContents)({

package/plugin/src/withMParticleAndroid.ts

@@ -385,7 +385,7 @@ const withMParticleAppBuildGradle: ConfigPlugin<MParticlePluginProps> = (
     // to a pre-release (e.g. 6.0.0-rc.1) and transitively drag the core past
     // the bridge's compiled-against API surface.
     const kitDependencies = props.androidKits
-      .map(kit => `    implementation "com.mparticle:${kit}:[5.79.0, 6.0)"`)
+      .map(kit => `    implementation "com.mparticle:${kit}:[5.79.2, 6.0)"`)
       .join('\n');
 
     // Use mergeContents for idempotent injection