react-native-userleap 2.20.0 → 3.0.0

package/android/build.gradle

@@ -70,11 +70,12 @@ repositories {
 }
 dependencies {
     implementation 'com.facebook.react:react-native:+'  // From node_modules
-    
+    implementation "androidx.webkit:webkit:1.8.0"
+
     // Use conditional logic for local vs Maven
     if (findProject(':userleap-android-sdk') != null) {
         implementation project(':userleap-android-sdk')
     } else {
-        implementation ("com.userleap:userleap-android-sdk:2.22.1") // update this version on android updates
+        implementation ("com.userleap:userleap-android-sdk:2.23.0") // update this version on android updates
     }
 }

package/android/src/main/java/com/userleap/reactnative/UserLeapModule.java

@@ -1,20 +1,31 @@
 package com.userleap.reactnative;
 
 import android.app.Activity;
+import android.util.Log;
 
 import androidx.fragment.app.FragmentActivity;
 
+import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
-
+import com.facebook.react.bridge.WritableMap;
+import com.userleap.EventListener;
+import com.userleap.EventName;
+import com.userleap.EventPayload;
+import com.userleap.SprigEvent;
+import com.userleap.SprigSurveyResult;
 import com.userleap.SurveyState;
 import com.userleap.UserLeap;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -25,19 +36,10 @@ import javax.annotation.Nullable;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 
-import android.util.Log;
-
-import com.userleap.EventListener;
-import com.userleap.EventName;
-import com.userleap.SprigEvent;
-import com.userleap.SprigLoggingLevel;
-import com.userleap.UserLeap;
-
-import kotlin.Unit;
-import kotlin.jvm.functions.Function1;
-
 public class UserLeapModule extends ReactContextBaseJavaModule {
 
+    private static final String TAG = "UserLeapModule";
+
     private final ReactApplicationContext reactContext;
 
     public UserLeapModule(ReactApplicationContext reactContext) {
@@ -50,6 +52,115 @@ public class UserLeapModule extends ReactContextBaseJavaModule {
         return "UserLeapBindings";
     }
 
+    // ---------------------------------------------------------------------------
+    // Bridge helpers
+    // ---------------------------------------------------------------------------
+
+    /**
+     * Converts UPPER_SNAKE_CASE to camelCase to match the iOS event naming
+     * convention expected by the JS layer.
+     * e.g. "SURVEY_WILL_PRESENT" -> "surveyWillPresent"
+     */
+    private String toCamelCase(String upperSnakeCase) {
+        String[] parts = upperSnakeCase.toLowerCase().split("_");
+        StringBuilder sb = new StringBuilder(parts[0]);
+        for (int i = 1; i < parts.length; i++) {
+            sb.append(Character.toUpperCase(parts[i].charAt(0)));
+            sb.append(parts[i].substring(1));
+        }
+        return sb.toString();
+    }
+
+    /**
+     * Shallow-converts a JSONObject to a WritableMap for passing across the RN bridge.
+     */
+    private WritableMap jsonObjectToWritableMap(@Nullable JSONObject json) {
+        WritableMap map = Arguments.createMap();
+        if (json == null) {
+            return map;
+        }
+        Iterator<String> keys = json.keys();
+        while (keys.hasNext()) {
+            String key = keys.next();
+            try {
+                Object value = json.get(key);
+                if (value instanceof String) {
+                    map.putString(key, (String) value);
+                } else if (value instanceof Boolean) {
+                    map.putBoolean(key, (Boolean) value);
+                } else if (value instanceof Integer) {
+                    map.putInt(key, (Integer) value);
+                } else if (value instanceof Double) {
+                    map.putDouble(key, (Double) value);
+                } else if (value instanceof JSONObject) {
+                    map.putMap(key, jsonObjectToWritableMap((JSONObject) value));
+                } else if (value == JSONObject.NULL) {
+                    map.putNull(key);
+                } else {
+                    map.putString(key, value.toString());
+                }
+            } catch (JSONException e) {
+                Log.w(TAG, "Failed to convert key '" + key + "' from SprigEvent data", e);
+            }
+        }
+        return map;
+    }
+
+    /**
+     * Converts a SprigSurveyResult to a WritableMap for passing across the RN bridge.
+     * Returns { surveyState: string, surveyId: int }
+     */
+    private WritableMap surveyResultToWritableMap(SprigSurveyResult surveyResult) {
+        WritableMap resultMap = Arguments.createMap();
+        resultMap.putString("surveyState", surveyResult.getSurveyState().name());
+        if (surveyResult.getSurveyId() != null) {
+            resultMap.putInt("surveyId", surveyResult.getSurveyId());
+        } else {
+            resultMap.putInt("surveyId", 0);
+        }
+        return resultMap;
+    }
+
+    /**
+     * Wraps a RN Callback as a Function1<SprigSurveyResult, Unit> for the EventPayload API.
+     * Returns null if the callback is null.
+     */
+    private @Nullable Function1<SprigSurveyResult, Unit> wrapResultCallback(@Nullable final Callback callback) {
+        if (callback == null) {
+            return null;
+        }
+        return new Function1<SprigSurveyResult, Unit>() {
+            @Override
+            public Unit invoke(SprigSurveyResult surveyResult) {
+                callback.invoke(surveyResultToWritableMap(surveyResult));
+                return null;
+            }
+        };
+    }
+
+    private Map<String, String> stringifyMap(ReadableMap map) {
+        Map<String, String> stringifiedMap = new HashMap<>();
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
+            stringifiedMap = map.toHashMap().entrySet().stream()
+                    .filter(m -> m.getKey() != null && m.getValue() != null)
+                    .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().toString()));
+        }
+        return stringifiedMap;
+    }
+
+    private @Nullable FragmentActivity getFragmentActivity() {
+        Activity activity = getCurrentActivity();
+        if (activity instanceof FragmentActivity) {
+            return (FragmentActivity) activity;
+        } else {
+            return null;
+        }
+    }
+
+    // ---------------------------------------------------------------------------
+    // SDK properties
+    // ---------------------------------------------------------------------------
+
     @ReactMethod(isBlockingSynchronousMethod = true)
     public int visitorIdentifier() {
         final Integer visitorIdentifierObject = UserLeap.INSTANCE.getVisitorIdentifier();
@@ -67,15 +178,16 @@ public class UserLeapModule extends ReactContextBaseJavaModule {
         return UserLeap.INSTANCE.getSdkVersion();
     }
 
+    // ---------------------------------------------------------------------------
+    // Configuration
+    // ---------------------------------------------------------------------------
+
     @ReactMethod
     public void configure(String environment, ReadableMap configuration) {
-
         UserLeap.INSTANCE.addEventListener(EventName.LOGGING_EVENT, new EventListener() {
             @Override
             public void onEvent(SprigEvent event) {
-
                 String tag = "SprigLoggingEvent";
-
                 switch (event.getLogLevel()) {
                     case INFO:
                         Log.i(tag, event.getLogMessage());
@@ -95,13 +207,17 @@ public class UserLeapModule extends ReactContextBaseJavaModule {
         });
 
         UserLeap.INSTANCE.configure(
-            reactContext,
-            environment,
-            stringifyMap(configuration),
-            getFragmentActivity()
+                reactContext,
+                environment,
+                stringifyMap(configuration),
+                getFragmentActivity()
         );
     }
 
+    // ---------------------------------------------------------------------------
+    // Deprecated track methods (return SurveyState string)
+    // ---------------------------------------------------------------------------
+
     @ReactMethod
     public void track(String event, final Callback surveyStateCallback) {
         trackAndIdentify(event, null, null, surveyStateCallback);
@@ -109,19 +225,17 @@ public class UserLeapModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void trackWithProperties(String event, String userId, String partnerAnonymousId, ReadableMap properties, final Callback surveyStateCallback) {
-         if (surveyStateCallback == null) {
+        if (surveyStateCallback == null) {
             UserLeap.INSTANCE.track(event, userId, partnerAnonymousId, stringifyMap(properties));
-         } else {
+        } else {
             UserLeap.INSTANCE.track(event, userId, partnerAnonymousId, stringifyMap(properties), new Function1<SurveyState, Unit>() {
                 @Override
                 public Unit invoke(SurveyState surveyState) {
-                    if (surveyStateCallback!=null) {
-                        surveyStateCallback.invoke(surveyState.name());
-                    }
+                    surveyStateCallback.invoke(surveyState.name());
                     return null;
                 }
-            }); 
-         }
+            });
+        }
     }
 
     @ReactMethod
@@ -139,50 +253,46 @@ public class UserLeapModule extends ReactContextBaseJavaModule {
         }
     }
 
-    @ReactMethod
-    public void setEmailAddress(String emailAddress) {
-        UserLeap.INSTANCE.setEmailAddress(emailAddress);
-    }
-
-    @ReactMethod
-    public void setVisitorAttribute(String key, String value) {
-        UserLeap.INSTANCE.setVisitorAttribute(key, value);
-    }
-
-    @ReactMethod
-    public void setVisitorAttributes(ReadableMap attributes) {
-        UserLeap.INSTANCE.setVisitorAttributes(stringifyMap(attributes));
-    }
-
-    @ReactMethod
-    public void setVisitorAttributesAndIdentify(ReadableMap attributes, String userId, String partnerAnonymousId) {
-        UserLeap.INSTANCE.setVisitorAttributes(stringifyMap(attributes), userId, partnerAnonymousId);
-    }
+    // ---------------------------------------------------------------------------
+    // New track methods (return SprigSurveyResult via EventPayload)
+    // ---------------------------------------------------------------------------
 
     @ReactMethod
-    public void removeVisitorAttributes(ReadableArray attributes) {
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
-            List<String> attributeStrings = attributes.toArrayList().stream()
-                    .map(object -> Objects.toString(object, null))
-                    .collect(Collectors.toList());
-            UserLeap.INSTANCE.removeVisitorAttributes(attributeStrings);
-        }
+    public void trackEvent(String event, final Callback surveyStateCallback) {
+        trackEventAndIdentify(event, null, null, surveyStateCallback);
     }
 
     @ReactMethod
-    public void setPreviewKey(String previewKey) {
-        UserLeap.INSTANCE.setPreviewKey(previewKey);
+    public void trackEventWithProperties(String event, String userId, String partnerAnonymousId, ReadableMap properties, final Callback surveyStateCallback) {
+        EventPayload payload = new EventPayload(
+                event,
+                userId,
+                partnerAnonymousId,
+                stringifyMap(properties),
+                wrapResultCallback(surveyStateCallback),
+                null, // shouldShowSurveyCallback
+                null  // deprecated callback
+        );
+        UserLeap.INSTANCE.track(payload);
     }
 
     @ReactMethod
-    public void setUserIdentifier(String identifier) {
-        UserLeap.INSTANCE.setUserIdentifier(identifier);
+    public void trackEventAndIdentify(String event, String userId, String partnerAnonymousId, final Callback surveyStateCallback) {
+        EventPayload payload = new EventPayload(
+                event,
+                userId,
+                partnerAnonymousId,
+                null, // properties
+                wrapResultCallback(surveyStateCallback),
+                null, // shouldShowSurveyCallback
+                null  // deprecated callback
+        );
+        UserLeap.INSTANCE.track(payload);
     }
 
-    @ReactMethod
-    public void logout() {
-        UserLeap.INSTANCE.logout();
-    }
+    // ---------------------------------------------------------------------------
+    // Track and present
+    // ---------------------------------------------------------------------------
 
     @ReactMethod
     public void trackAndPresent(String event) {
@@ -194,6 +304,10 @@ public class UserLeapModule extends ReactContextBaseJavaModule {
         UserLeap.INSTANCE.trackAndPresent(event, userId, partnerAnonymousId, getFragmentActivity());
     }
 
+    // ---------------------------------------------------------------------------
+    // Survey presentation
+    // ---------------------------------------------------------------------------
+
     @ReactMethod
     public void presentSurvey() {
         UserLeap.INSTANCE.presentSurvey(null);
@@ -214,23 +328,52 @@ public class UserLeapModule extends ReactContextBaseJavaModule {
         UserLeap.INSTANCE.unpauseDisplayingSurveys();
     }
 
-    private @Nullable
-    FragmentActivity getFragmentActivity() {
-        Activity activity = getCurrentActivity();
-        if (activity instanceof FragmentActivity) {
-            return (FragmentActivity) activity;
-        } else {
-            return null;
-        }
+    // ---------------------------------------------------------------------------
+    // User identity & attributes
+    // ---------------------------------------------------------------------------
+
+    @ReactMethod
+    public void setEmailAddress(String emailAddress) {
+        UserLeap.INSTANCE.setEmailAddress(emailAddress);
     }
 
-    private Map<String, String> stringifyMap(ReadableMap map) {
-        Map<String,String> stringifiedMap = new HashMap<>();
+    @ReactMethod
+    public void setVisitorAttribute(String key, String value) {
+        UserLeap.INSTANCE.setVisitorAttribute(key, value);
+    }
+
+    @ReactMethod
+    public void setVisitorAttributes(ReadableMap attributes) {
+        UserLeap.INSTANCE.setVisitorAttributes(stringifyMap(attributes));
+    }
+
+    @ReactMethod
+    public void setVisitorAttributesAndIdentify(ReadableMap attributes, String userId, String partnerAnonymousId) {
+        UserLeap.INSTANCE.setVisitorAttributes(stringifyMap(attributes), userId, partnerAnonymousId);
+    }
+
+    @ReactMethod
+    public void removeVisitorAttributes(ReadableArray attributes) {
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
-            stringifiedMap = map.toHashMap().entrySet().stream()
-                 .filter(m -> m.getKey() != null && m.getValue() !=null)
-                 .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().toString()));
+            List<String> attributeStrings = attributes.toArrayList().stream()
+                    .map(object -> Objects.toString(object, null))
+                    .collect(Collectors.toList());
+            UserLeap.INSTANCE.removeVisitorAttributes(attributeStrings);
         }
-        return stringifiedMap;
     }
-}
+
+    @ReactMethod
+    public void setPreviewKey(String previewKey) {
+        UserLeap.INSTANCE.setPreviewKey(previewKey);
+    }
+
+    @ReactMethod
+    public void setUserIdentifier(String identifier) {
+        UserLeap.INSTANCE.setUserIdentifier(identifier);
+    }
+
+    @ReactMethod
+    public void logout() {
+        UserLeap.INSTANCE.logout();
+    }
+}

package/index.d.ts

@@ -4,15 +4,43 @@ declare namespace UserLeap {
         DISABLED: string;
         NO_SURVEY: string;
     };
+
     function visitorIdentifier(): number;
     function visitorIdentifierString(): string;
     function sdkVersion(): string;
     function configure(environment: string, configuration?: {[key: string]: any}): void;
     function setPreviewKey(previewKey: string): void;
     function presentSurvey(): void;
+    /**
+    * @deprecated This function is outdated. Use `trackEvent()` instead.
+    */
     function track(event: string, surveyStateCallback: ((surveyState: string) => void)): void;
+    /**
+    * @deprecated This function is outdated. Use `trackEventWithProperties()` instead.
+    */
     function trackWithProperties(event: string, userId: string | undefined, partnerAnonymousId: string | undefined, properties: {[key: string]: any}, surveyStateCallback: ((surveyState: string) => void)): void;
+    /**
+    * @deprecated This function is outdated. Use `trackEventAndIdentify()` instead.
+    */
     function trackAndIdentify(event: string, userId: string | undefined, partnerAnonymousId: string | undefined, surveyStateCallback: ((surveyState: string) => void)): void;
+    function trackEvent(
+        event: string,
+        surveyResultCallback: (result: { surveyState: string; surveyId: number }) => void
+    ): void;
+    function trackEventWithProperties(
+        event: string,
+        userId: string | undefined,
+        partnerAnonymousId: string | undefined,
+        properties: { [key: string]: any },
+        surveyResultCallback: (result: { surveyState: string; surveyId: number }) => void
+    ): void;
+
+    function trackEventAndIdentify(
+        event: string,
+        userId: string | undefined,
+        partnerAnonymousId: string | undefined,
+        surveyResultCallback: (result: { surveyState: string; surveyId: number }) => void
+    ): void;
     function setEmailAddress(emailAddress: string): void;
     function setVisitorAttribute(key: string, value: string): void;
     function setVisitorAttributes(attributes: {[key: string]: string}): void;
@@ -25,8 +53,5 @@ declare namespace UserLeap {
     function unpauseDisplayingSurveys(): void;
     function trackAndPresent(event: string): void;
     function trackIdentifyAndPresent(event: string, userId: string | undefined, partnerAnonymousId: string | undefined): void;
-    // Uncomment for UI testing
-    // function renderSnapshotForUITest(name: string, maskingLevel: string)
-    
 }
 export default UserLeap;

package/index.js

@@ -8,6 +8,7 @@ const SurveyState = {
   NO_SURVEY: "NO_SURVEY",
 };
 
+
 const stringifyAttributes = (attributes) => {
   if (!(attributes instanceof Object && attributes.constructor === Object))
     return {};
@@ -21,7 +22,7 @@ const isValidPlatform = () => {
   //Platform.Version is a number for android and string for ios
   return (
     (Platform.OS === "android" && String(Platform.Version) >= "21") ||
-    (Platform.OS === "ios" && String(Platform.Version) >= "10.3")
+    (Platform.OS === "ios" && String(Platform.Version) >= "15.0")
   );
 };
 
@@ -35,7 +36,7 @@ const visitorIdentifier = () => {
 
 const sdkVersion = () => {
   if (Platform.OS === "ios") {
-    if (String(Platform.Version) >= "10.3") {
+    if (String(Platform.Version) >= "15.0") {
       return NativeModules.UserLeapBindings.sdkVersion();
     }
   } else {
@@ -81,12 +82,18 @@ const presentSurvey = () => {
   }
 };
 
+/**
+* @deprecated This function is outdated. Use `trackEvent()` instead.
+*/
 const track = (event, surveyStateCallback) => {
   if (isValidPlatform()) {
     NativeModules.UserLeapBindings.track(event, surveyStateCallback);
   }
 };
 
+/**
+* @deprecated This function is outdated. Use `trackEventWithProperties()` instead.
+*/
 const trackWithProperties = (
   event,
   userId,
@@ -105,6 +112,9 @@ const trackWithProperties = (
   }
 };
 
+/**
+* @deprecated This function is outdated. Use `trackEventAndIdentify()` instead.
+*/
 const trackAndIdentify = (
   event,
   userId,
@@ -121,6 +131,46 @@ const trackAndIdentify = (
   }
 };
 
+const trackEvent = (event, surveyResultCallback) => {
+  if (isValidPlatform()) {
+    NativeModules.UserLeapBindings.trackEvent(event, surveyResultCallback);
+  }
+};
+
+const trackEventWithProperties = (
+  event,
+  userId,
+  partnerAnonymousId,
+  properties,
+  surveyResultCallback
+) => {
+  if (isValidPlatform()) {
+    NativeModules.UserLeapBindings.trackEventWithProperties(
+      event,
+      userId,
+      partnerAnonymousId,
+      properties,
+      surveyResultCallback
+    );
+  }
+};
+
+const trackEventAndIdentify = (
+  event,
+  userId,
+  partnerAnonynmousId,
+  surveyResultCallback
+) => {
+  if (isValidPlatform()) {
+    NativeModules.UserLeapBindings.trackEventAndIdentify(
+      event,
+      userId,
+      partnerAnonynmousId,
+      surveyResultCallback
+    );
+  }
+};
+
 const setEmailAddress = (emailAddress) => {
   if (isValidPlatform()) {
     NativeModules.UserLeapBindings.setEmailAddress(emailAddress);
@@ -207,15 +257,7 @@ const trackIdentifyAndPresent = (event, userId, partnerAnonynmousId) => {
   }
 };
 
-// Uncomment for UI testing
-// const renderSnapshotForUITest = (name, maskingLevel) => {
-//   if (isValidPlatform()) {
-//     NativeModules.UserLeapBindings.renderSnapshotForUITest(name, maskingLevel);
-//   }
-// }
-
 const UserLeap = {
-  SurveyState,
   visitorIdentifier,
   visitorIdentifierString,
   sdkVersion,
@@ -225,6 +267,9 @@ const UserLeap = {
   track,
   trackWithProperties,
   trackAndIdentify,
+  trackEvent,
+  trackEventWithProperties,
+  trackEventAndIdentify,
   setEmailAddress,
   setVisitorAttribute,
   setVisitorAttributes,
@@ -237,8 +282,8 @@ const UserLeap = {
   dismissActiveSurvey,
   pauseDisplayingSurveys,
   unpauseDisplayingSurveys,
-  // Uncomment for UI testing
-  // renderSnapshotForUITest,
 };
 
+UserLeap.SurveyState = SurveyState;
+
 export default UserLeap;

package/ios/UserLeapBindings.m

@@ -18,6 +18,13 @@
     return dispatch_get_main_queue();
 }
 
+-(NSDictionary *) parseSurveyResult:(SprigSurveyResult *)result {
+    SurveyState state = [result surveyState];
+    NSString *surveyStateString = [self getSurveyState:state];
+    NSInteger surveyId = [result surveyId];
+    return @{@"surveyState": surveyStateString, @"surveyId": @(surveyId)};
+}
+
 - (NSString *)getSurveyState:(SurveyState)surveyState
 {
     NSString *surveyStateBinding = @"NO_SURVEY";
@@ -31,6 +38,9 @@
         case SurveyStateNoSurvey:
             surveyStateBinding = @"NO_SURVEY";
             break;
+        case SurveyStatePreviousSurveyReady:
+            surveyStateBinding = @"PREVIOUS_SURVEY_READY";
+            break;
     }
     return surveyStateBinding;
 }
@@ -58,6 +68,7 @@ RCT_EXPORT_METHOD(configure:(NSString *)environmentId configuration:(NSDictionar
     [[UserLeap shared] _passWithRnExtractor:self];
 }
 
+
 RCT_EXPORT_METHOD(setPreviewKey:(NSString *)previewKey)
 {
     [[UserLeap shared] setPreviewKey:previewKey];
@@ -68,6 +79,7 @@ RCT_EXPORT_METHOD(presentSurvey)
     [[UserLeap shared] presentSurveyFrom:RCTPresentedViewController()];
 }
 
+/// Use trackEvent instead of track
 RCT_EXPORT_METHOD(track:(NSString *)eventName
                   surveyStateCallback:(RCTResponseSenderBlock)callback)
 {
@@ -80,33 +92,50 @@ RCT_EXPORT_METHOD(track:(NSString *)eventName
     }
 }
 
+RCT_EXPORT_METHOD(trackEvent:(NSString *)eventName
+                  surveyResultCallback:(RCTResponseSenderBlock)callback)
+{
+    EventPayload *payload = [[EventPayload alloc] initWithEventName:eventName userId:nil partnerAnonymousId:nil properties:nil handler:nil resultHandler:^(SprigSurveyResult * result) {
+            if (callback != nil) {
+                callback(@[[self parseSurveyResult:result]]);
+            }
+        }];
+    [[UserLeap shared] trackWithPayload: payload];
+}
+
+/// Use trackEventWithProperties instead of trackWithProperties
 RCT_EXPORT_METHOD(trackWithProperties:(NSString *)eventName
                   userId:(NSString * _Nullable)userId
                   partnerAnonymousId:(NSString * _Nullable)partnerAnonymousId
                   properties: (NSDictionary *)properties
                   surveyStateCallback:(RCTResponseSenderBlock)callback)
 {
-    if (callback != nil) {
         [[UserLeap shared] trackWithEventName:eventName userId:userId partnerAnonymousId:partnerAnonymousId properties:properties handler:^(enum SurveyState surveyState) {
-            NSString *surveyStateBinding = @"NO_SURVEY";
-            switch(surveyState) {
-                case SurveyStateDisabled:
-                    surveyStateBinding = @"DISABLED";
-                    break;
-                case SurveyStateReady:
-                    surveyStateBinding = @"READY";
-                    break;
-                case SurveyStateNoSurvey:
-                    surveyStateBinding = @"NO_SURVEY";
-                    break;
+            callback(@[[self getSurveyState:surveyState]]);
+        }];
+    
+}
+
+RCT_EXPORT_METHOD(trackEventWithProperties:(NSString *)eventName
+                  userId:(NSString * _Nullable)userId
+                  partnerAnonymousId:(NSString * _Nullable)partnerAnonymousId
+                  properties: (NSDictionary *)properties
+                  surveyResultCallback:(RCTResponseSenderBlock)callback)
+{
+    EventPayload *payload = [[EventPayload alloc] initWithEventName:eventName
+                                                             userId:userId
+                                                 partnerAnonymousId:partnerAnonymousId
+                                                         properties:properties
+                                                            handler:nil
+                                                      resultHandler:^(SprigSurveyResult * result) {
+            if (callback != nil) {
+                callback(@[[self parseSurveyResult:result]]);
             }
-            callback(@[surveyStateBinding]);
         }];
-    } else {
-        [[UserLeap shared] trackWithEventName:eventName userId:userId partnerAnonymousId:partnerAnonymousId properties:properties handler:nil];
-    }
+    [[UserLeap shared] trackWithPayload: payload];
 }
 
+/// Use trackEventAndIdentify instead of trackAndIdentify
 RCT_EXPORT_METHOD(trackAndIdentify:(NSString *)eventName
                   userId:(NSString *)userId
                   partnerAnonymousId:(NSString *)partnerAnonymousId
@@ -119,7 +148,24 @@ RCT_EXPORT_METHOD(trackAndIdentify:(NSString *)eventName
     } else {
         [[UserLeap shared] trackWithEventName:eventName userId:userId partnerAnonymousId:partnerAnonymousId handler:nil];
     }
-    
+}
+
+RCT_EXPORT_METHOD(trackEventAndIdentify:(NSString *)eventName
+                  userId:(NSString *)userId
+                  partnerAnonymousId:(NSString *)partnerAnonymousId
+                  surveyResultCallback:(RCTResponseSenderBlock)callback)
+{
+    EventPayload *payload = [[EventPayload alloc] initWithEventName:eventName
+                                                             userId:userId
+                                                 partnerAnonymousId:partnerAnonymousId
+                                                         properties:nil
+                                                            handler:nil
+                                                      resultHandler:^(SprigSurveyResult * result) {
+            if (callback != nil) {
+                callback(@[[self parseSurveyResult:result]]);
+            }
+        }];
+    [[UserLeap shared] trackWithPayload: payload];
 }
 
 RCT_EXPORT_METHOD(setEmailAddress:(NSString *)emailAddress)
@@ -168,21 +214,54 @@ RCT_EXPORT_METHOD(trackIdentifyAndPresent:(NSString *)eventName userId:(NSString
 }
 
 - (_SGRNTextProperties *)textPropertiesFromView:(UIView * _Nonnull)passedView {
-    if (![passedView isKindOfClass:[RCTTextView class]]) { return nil;}
-    RCTUIManager* uiManager = [self.bridge moduleForClass:[RCTUIManager class]];
-    RCTTextView *textView = (RCTTextView *)passedView;
-    __block _SGRNTextProperties *textProperties = [[_SGRNTextProperties alloc] init];
-    dispatch_sync(RCTGetUIManagerQueue(), ^{
-        RCTShadowView *shadowView = [uiManager shadowViewForReactTag:textView.reactTag];
-        if ([shadowView isKindOfClass:[RCTTextShadowView class]]) {
-            RCTTextShadowView *textShadowView = (RCTTextShadowView *)shadowView;
-            textProperties.text = [self extractText: textShadowView.reactSubviews];
-            textProperties.color = textShadowView.textAttributes.foregroundColor;
-            textProperties.alignment = textShadowView.textAttributes.alignment;
-            textProperties.font = textShadowView.textAttributes.effectiveFont;
+
+    // Legacy for pre new arch.
+    if ([passedView isKindOfClass:[RCTTextView class]]) { 
+        RCTUIManager* uiManager = [self.bridge moduleForClass:[RCTUIManager class]];
+        RCTTextView *textView = (RCTTextView *)passedView;
+        __block _SGRNTextProperties *textProperties = [[_SGRNTextProperties alloc] init];
+        dispatch_sync(RCTGetUIManagerQueue(), ^{
+            RCTShadowView *shadowView = [uiManager shadowViewForReactTag:textView.reactTag];
+            if ([shadowView isKindOfClass:[RCTTextShadowView class]]) {
+                RCTTextShadowView *textShadowView = (RCTTextShadowView *)shadowView;
+                NSString *text = [self extractText: textShadowView.reactSubviews];
+                if (text.length == 0) return;
+                textProperties.text = text;
+                textProperties.color = textShadowView.textAttributes.foregroundColor;
+                textProperties.alignment = textShadowView.textAttributes.alignment;
+                textProperties.font = textShadowView.textAttributes.effectiveFont;
+            }
+        });
+        if (textProperties.text.length == 0) return nil;
+        return textProperties;
+    }
+
+    // Text under new arch.
+    Class ParagraphComponentView = NSClassFromString(@"RCTParagraphComponentView");
+    if (ParagraphComponentView && [passedView isKindOfClass:ParagraphComponentView]) {
+        NSString *text = [self extractTextFromParagraphComponentView:passedView];
+        if (text.length == 0) return nil;
+        _SGRNTextProperties *textProperties = [[_SGRNTextProperties alloc] init];
+        textProperties.text = text;
+        if ([passedView respondsToSelector:@selector(attributedText)]) {
+            NSAttributedString *attrText = [passedView performSelector:@selector(attributedText)];
+            if (attrText.length > 0) {
+                NSDictionary *attrs = [attrText attributesAtIndex:0 effectiveRange:nil];
+                if (!textProperties.color && attrs[NSForegroundColorAttributeName]) {
+                    textProperties.color = attrs[NSForegroundColorAttributeName];
+                }
+                if (!textProperties.font && attrs[NSFontAttributeName]) {
+                    textProperties.font = attrs[NSFontAttributeName];
+                }
+                NSParagraphStyle *style = attrs[NSParagraphStyleAttributeName];
+                if (style) {
+                    textProperties.alignment = style.alignment;
+                }
+            }
         }
-    });
-    return textProperties;
+        return textProperties;
+    }
+    return nil;
 }
 
 RCT_EXPORT_METHOD(dismissActiveSurvey)
@@ -225,4 +304,22 @@ RCT_EXPORT_METHOD(unpauseDisplayingSurveys)
     }
     return text;
 }
+
+- (NSString *)extractTextFromParagraphComponentView:(UIView *)view {
+    if ([view respondsToSelector:@selector(attributedText)]) {
+        NSAttributedString *attrText = [view performSelector:@selector(attributedText)];
+        return attrText.string;
+    }
+    if ([view respondsToSelector:@selector(text)]) {
+        NSString *text = [view performSelector:@selector(text)];
+        return text;
+    }
+    NSMutableString *result = [NSMutableString string];
+    for (UIView *subview in view.subviews) {
+        NSString *subText = [self extractTextFromParagraphComponentView:subview];
+        if (subText) [result appendString:subText];
+    }
+    return result;
+}
+
 @end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-userleap",
-  "version": "2.20.0",
+  "version": "3.0.0",
   "description": "React Native module for UserLeap",
   "main": "index.js",
   "types": "index.d.ts",
@@ -17,11 +17,6 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/UserLeap/react-native-userleap.git",
-    "baseUrl": "https://github.com/UserLeap/react-native-userleap"
-  },
   "keywords": [
     "userleap",
     "react-native",
@@ -38,9 +33,12 @@
     "babel-jest": "29.7.0",
     "eslint": "7.32.0",
     "jest": "29.7.0",
-    "metro-react-native-babel-preset": "0.67.0",
-    "react": "18.2.0",
-    "react-native": "0.74.7",
+    "@react-native/babel-preset": "^0.81.0",
+    "react": "19.1.0",
+    "react-native": "0.81.0",
     "react-test-renderer": "18.2.0"
+  },
+  "overrides": {
+    "js-yaml": "3.14.2"
   }
-}
+}

package/react-native-userleap.podspec

@@ -19,5 +19,5 @@ Pod::Spec.new do |s|
   s.requires_arc = true
 
   s.dependency "React"
-  s.dependency "UserLeapKit", "4.27.3"
+  s.dependency "UserLeapKit", "4.29.0"
 end