react-native-userleap 2.21.0 → 3.1.0

package/android/build.gradle

@@ -76,6 +76,6 @@ dependencies {
     if (findProject(':userleap-android-sdk') != null) {
         implementation project(':userleap-android-sdk')
     } else {
-        implementation ("com.userleap:userleap-android-sdk:2.23.0") // update this version on android updates
+        implementation ("com.userleap:userleap-android-sdk:2.24.0") // update this version on android updates
     }
 }

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

@@ -13,8 +13,6 @@ 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.facebook.react.modules.core.DeviceEventManagerModule;
-
 import com.userleap.EventListener;
 import com.userleap.EventName;
 import com.userleap.EventPayload;
@@ -22,17 +20,16 @@ import com.userleap.SprigEvent;
 import com.userleap.SprigSurveyResult;
 import com.userleap.SurveyState;
 import com.userleap.UserLeap;
+import com.userleap.SprigUserInterfaceMode;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 import javax.annotation.Nullable;
@@ -44,34 +41,6 @@ public class UserLeapModule extends ReactContextBaseJavaModule {
 
     private static final String TAG = "UserLeapModule";
 
-    /**
-     * Lifecycle events we forward to React Native via DeviceEventEmitter.
-     * Excluded:
-     *   - LOGGING_EVENT: handled separately via logcat
-     *   - REPLAY_CAPTURE: internal Web SDK plumbing, not meaningful to RN consumers
-     *   - REPLAY_EVENTS_UPLOADED_COMPLETED: deprecated alias for REPLAY_EVENTS_UPLOAD_COMPLETED
-     */
-    private static final Set<EventName> FORWARDED_EVENTS = EnumSet.of(
-            EventName.SDK_READY,
-            EventName.VISITOR_ID_UPDATED,
-            EventName.SURVEY_HEIGHT,
-            EventName.SURVEY_STATE_RETURNED,
-            EventName.SURVEY_WILL_PRESENT,
-            EventName.SURVEY_PRESENTED,
-            EventName.SURVEY_APPEARED,
-            EventName.QUESTION_ANSWERED,
-            EventName.SURVEY_CLOSE_REQUESTED,
-            EventName.SURVEY_WILL_CLOSE,
-            EventName.SURVEY_CLOSED,
-            EventName.SURVEY_COMPLETED,
-            EventName.REPLAY_CAPTURE_STARTED,
-            EventName.REPLAY_CAPTURE_STOPPED,
-            EventName.REPLAY_CAPTURE_COMPLETED,
-            EventName.REPLAY_RENDERING_COMPLETED,
-            EventName.REPLAY_UPLOAD_COMPLETED,
-            EventName.REPLAY_EVENTS_UPLOAD_COMPLETED
-    );
-
     private final ReactApplicationContext reactContext;
 
     public UserLeapModule(ReactApplicationContext reactContext) {
@@ -84,48 +53,6 @@ public class UserLeapModule extends ReactContextBaseJavaModule {
         return "UserLeapBindings";
     }
 
-    // ---------------------------------------------------------------------------
-    // Required stubs for RN's NativeEventEmitter on the JS side.
-    // ---------------------------------------------------------------------------
-
-    @ReactMethod
-    public void addListener(String eventName) {
-        // No-op: listeners are registered once in configure() for the SDK lifetime.
-    }
-
-    @ReactMethod
-    public void removeListeners(int count) {
-        // No-op: listeners are registered once in configure() for the SDK lifetime.
-    }
-
-    // ---------------------------------------------------------------------------
-    // Lifecycle event registration
-    // ---------------------------------------------------------------------------
-
-    private void registerForAllLifecycleEvents() {
-        for (EventName eventName : FORWARDED_EVENTS) {
-            UserLeap.INSTANCE.addEventListener(eventName, new EventListener() {
-                @Override
-                public void onEvent(SprigEvent event) {
-                    sendSprigEvent(event);
-                }
-            });
-        }
-    }
-
-    private void sendSprigEvent(SprigEvent event) {
-        if (!reactContext.hasActiveCatalystInstance()) {
-            return;
-        }
-
-        WritableMap params = jsonObjectToWritableMap(event.getData());
-        String eventName = toCamelCase(event.getName().name());
-
-        reactContext
-                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                .emit(eventName, params);
-    }
-
     // ---------------------------------------------------------------------------
     // Bridge helpers
     // ---------------------------------------------------------------------------
@@ -187,11 +114,7 @@ public class UserLeapModule extends ReactContextBaseJavaModule {
     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);
-        }
+        resultMap.putInt("surveyId", surveyResult.getSurveyId());
         return resultMap;
     }
 
@@ -280,8 +203,6 @@ public class UserLeapModule extends ReactContextBaseJavaModule {
             }
         });
 
-        registerForAllLifecycleEvents();
-
         UserLeap.INSTANCE.configure(
                 reactContext,
                 environment,
@@ -448,6 +369,17 @@ public class UserLeapModule extends ReactContextBaseJavaModule {
         UserLeap.INSTANCE.setUserIdentifier(identifier);
     }
 
+    @ReactMethod
+    public void overrideUserInterfaceMode(double mode) {
+        int modeInt = (int) mode;
+        for (SprigUserInterfaceMode m : SprigUserInterfaceMode.values()) {
+            if (m.getValue() == modeInt) {
+                UserLeap.INSTANCE.overrideUserInterfaceMode(m);
+                return;
+            }
+        }
+    }
+
     @ReactMethod
     public void logout() {
         UserLeap.INSTANCE.logout();

package/index.d.ts

@@ -5,31 +5,13 @@ declare namespace UserLeap {
         NO_SURVEY: string;
     };
 
-    const LifecycleEvent: {
-        sdkReady: number;
-        visitorIdUpdated: number;
-        surveyHeight: number;
-        surveyWillPresent: number;
-        surveyPresented: number;
-        surveyAppeared: number;
-        surveyCloseRequested: number;
-        surveyWillClose: number;
-        surveyClosed: number;
-        replayCapture: number;
-        replayCaptureStarted: number;
-        replayCaptureStopped: number;
-        replayCaptureCompleted: number;
-        replayRenderingCompleted: number;
-        replayUploadCompleted: number;
-        replayEventsUploadCompleted: number;
-        loggingEvent: number;
-        surveyCompleted: number;
-        surveyStateReturned: number;
+    const SprigUserInterfaceMode: {
+        unspecified: number;
+        light: number;
+        dark: number;
     };
 
-    // Usage: UserLeap.EventEmitter.addListener('surveyPresented', callback)
-    const EventEmitter: any;
-
+    function overrideUserInterfaceMode(mode: SprigUserInterfaceMode): void;
     function visitorIdentifier(): number;
     function visitorIdentifierString(): string;
     function sdkVersion(): string;

package/index.js

@@ -1,4 +1,4 @@
-import { Platform, NativeModules, NativeEventEmitter } from "react-native";
+import { Platform, NativeModules } from "react-native";
 
 import { version } from "./package.json";
 
@@ -8,29 +8,13 @@ const SurveyState = {
   NO_SURVEY: "NO_SURVEY",
 };
 
-const LifecycleEvent = {
-    sdkReady: 0,
-    visitorIdUpdated: 1,
-    surveyHeight: 2,
-    surveyWillPresent: 3,
-    surveyPresented: 4,
-    surveyAppeared: 5,
-    surveyCloseRequested: 6,
-    surveyWillClose: 7,
-    surveyClosed: 8,
-    replayCapture: 9,
-    replayCaptureStarted: 10,
-    replayCaptureStopped: 11,
-    replayCaptureCompleted: 12,
-    replayRenderingCompleted: 13,
-    replayUploadCompleted: 14,
-    replayEventsUploadCompleted: 15,
-    loggingEvent: 16,
-    surveyCompleted: 17,
-    surveyStateReturned: 18
-}
 
-const UserLeapEventEmitter = new NativeEventEmitter(NativeModules.UserLeapBindings);
+const SprigUserInterfaceMode = {
+    unspecified: 0,
+    light: 1,
+    dark: 2,
+};
+
 
 const stringifyAttributes = (attributes) => {
   if (!(attributes instanceof Object && attributes.constructor === Object))
@@ -45,7 +29,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")
   );
 };
 
@@ -280,6 +264,14 @@ const trackIdentifyAndPresent = (event, userId, partnerAnonynmousId) => {
   }
 };
 
+
+const overrideUserInterfaceMode = (mode) => {
+  if (isValidPlatform()) {
+    NativeModules.UserLeapBindings.overrideUserInterfaceMode(mode);
+  }
+}
+
+
 const UserLeap = {
   visitorIdentifier,
   visitorIdentifierString,
@@ -305,10 +297,10 @@ const UserLeap = {
   dismissActiveSurvey,
   pauseDisplayingSurveys,
   unpauseDisplayingSurveys,
+  overrideUserInterfaceMode,
 };
 
-UserLeap.LifecycleEvent = LifecycleEvent;
 UserLeap.SurveyState = SurveyState;
-UserLeap.EventEmitter = UserLeapEventEmitter;
+UserLeap.SprigUserInterfaceMode = SprigUserInterfaceMode;
 
 export default UserLeap;

package/ios/UserLeapBindings.h

@@ -1,7 +1,6 @@
 #import <React/RCTBridgeModule.h>
-#import <React/RCTEventEmitter.h>
 @import UserLeapKit;
 
-@interface UserLeapBindings : RCTEventEmitter <RCTBridgeModule, _SGRNExtractor>
+@interface UserLeapBindings : NSObject <RCTBridgeModule, _SGRNExtractor>
 @property (nonatomic, weak) RCTBridge *bridge;
 @end

package/ios/UserLeapBindings.m

@@ -45,11 +45,6 @@
     return surveyStateBinding;
 }
 
-/// These are required by RCTEventEmitter.
-- (NSArray<NSString *> *)supportedEvents {
-    return [LifecycleEventUtil allNameStrings];
-}
-
 RCT_EXPORT_MODULE()
 
 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(visitorIdentifier)
@@ -71,32 +66,6 @@ RCT_EXPORT_METHOD(configure:(NSString *)environmentId configuration:(NSDictionar
 {
     [[UserLeap shared] configureWithEnvironment:environmentId configuration:configuration];
     [[UserLeap shared] _passWithRnExtractor:self];
-    
-    /// Register for all the LifeCycle events.
-    [self registerForAllLifecycleEvents];
-}
-
-- (void)registerForAllLifecycleEvents {
-    
-    for (NSNumber *eventVal in [LifecycleEventUtil all]) {
-        [[UserLeap shared] registerEventListenerFor:[eventVal intValue] listener:^(NSDictionary<NSString *,id> * eventData) {
-            
-            NSString *type = eventData[LifecycleEventDataKey.eventType];
-            if (!type) {
-                return;
-            }
-            
-            LifecycleEvent lifecycleEvent = [LifecycleEventUtil fromString:type];
-            if (lifecycleEvent != LifecycleEventUnknown) {
-                
-                /// Always make sure the type exists in the supportedEvents; sending an unsupported event will crash the app.
-                NSString *lifecycleEventName = [LifecycleEventUtil stringName:lifecycleEvent];
-                if ([[self supportedEvents] containsObject: lifecycleEventName]) {
-                    [self sendEventWithName:lifecycleEventName body:eventData];
-                }
-            }
-        }];
-    }
 }
 
 
@@ -245,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)
@@ -277,6 +279,11 @@ RCT_EXPORT_METHOD(unpauseDisplayingSurveys)
     [[UserLeap shared] unpauseDisplayingSurveys];
 }
 
+RCT_EXPORT_METHOD(overrideUserInterfaceMode:(NSInteger)mode)
+{
+    [[UserLeap shared] overrideUserInterfaceModeWithMode:mode];
+}
+
 - (_SGRNViewProperties * _Nullable)propertiesFromView:(UIView * _Nonnull)passedView {
     if ([passedView isKindOfClass:[RCTView class]]) {
         RCTView *rView = (RCTView *) passedView;
@@ -302,4 +309,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.21.0",
+  "version": "3.1.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.29.0"
+  s.dependency "UserLeapKit", "4.30.0"
 end