react-native-radar 3.31.0-beta.1 → 4.0.0

package/android/src/newarch/java/com/radar/RadarModule.kt

@@ -143,7 +143,7 @@ class RadarModule(reactContext: ReactApplicationContext) :
     override fun initialize(publishableKey: String, fraud: Boolean): Unit {
         val editor = reactApplicationContext.getSharedPreferences("RadarSDK", Context.MODE_PRIVATE).edit()
         editor.putString("x_platform_sdk_type", "ReactNative")
-        editor.putString("x_platform_sdk_version", "3.31.0-beta.1")
+        editor.putString("x_platform_sdk_version", "4.0.0")
         editor.apply()
 
         Radar.initialize(reactApplicationContext, publishableKey, radarReceiver, Radar.RadarLocationServicesProvider.GOOGLE, fraud, null, radarInAppMessageReceiver, currentActivity)

package/android/src/oldarch/java/com/radar/RadarModule.java

@@ -102,7 +102,7 @@ public class RadarModule extends ReactContextBaseJavaModule implements Permissio
         this.fraud = fraud;
         SharedPreferences.Editor editor = getReactApplicationContext().getSharedPreferences("RadarSDK", Context.MODE_PRIVATE).edit();
         editor.putString("x_platform_sdk_type", "ReactNative");
-        editor.putString("x_platform_sdk_version", "3.31.0-beta.1");
+        editor.putString("x_platform_sdk_version", "4.0.0");
         editor.apply();
         Radar.initialize(getReactApplicationContext(), publishableKey, receiver, Radar.RadarLocationServicesProvider.GOOGLE, fraud, null, inAppMessageReceiver, getCurrentActivity());
         if (fraud) { 

package/dist/ui/autocomplete.js

@@ -48,7 +48,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // Autocomplete.js
 const react_1 = __importStar(require("react"));
 const react_native_1 = require("react-native");
-const react_native_safe_area_context_1 = require("react-native-safe-area-context");
+let SafeAreaView;
+try {
+    SafeAreaView = require('react-native-safe-area-context').SafeAreaView;
+}
+catch (e) {
+    SafeAreaView = require('react-native').SafeAreaView;
+}
 const index_native_1 = __importDefault(require("../index.native"));
 const images_1 = require("./images");
 const styles_1 = __importDefault(require("./styles"));
@@ -184,7 +190,7 @@ const autocompleteUI = ({ options = {} }) => {
       </react_native_1.Animated.View>
       <react_native_1.Modal animationType="slide" transparent={false} visible={isOpen} onRequestClose={() => setIsOpen(false)}>
         <react_native_1.Animated.View style={{ flex: 1, opacity: modalOpacity }}>
-          <react_native_safe_area_context_1.SafeAreaView>
+          <SafeAreaView>
             <react_native_1.KeyboardAvoidingView behavior={react_native_1.Platform.OS === "ios" ? "padding" : "height"} keyboardVerticalOffset={50} style={styles.container}>
               <react_native_1.View style={styles.modalInputContainer}>
                 <react_native_1.TouchableOpacity onPress={() => {
@@ -209,7 +215,7 @@ const autocompleteUI = ({ options = {} }) => {
                   {renderFooter()}
                 </react_native_1.View>)}
             </react_native_1.KeyboardAvoidingView>
-          </react_native_safe_area_context_1.SafeAreaView>
+          </SafeAreaView>
         </react_native_1.Animated.View>
       </react_native_1.Modal>
     </react_native_1.View>);

package/dist/ui/autocomplete.jsx

@@ -17,7 +17,12 @@ import {
   Pressable,
   Platform,
 } from 'react-native';
-import { SafeAreaView } from 'react-native-safe-area-context';
+let SafeAreaView;
+try {
+  SafeAreaView = require('react-native-safe-area-context').SafeAreaView;
+} catch (e) {
+  SafeAreaView = require('react-native').SafeAreaView;
+}
 import Radar from '../index.native';
 import {
   BACK_ICON,

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "3.31.0-beta.1";
+export declare const VERSION = "4.0.0";

package/dist/version.js

@@ -3,4 +3,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION = void 0;
 // This file contains the version of the react-native-radar package
 // It should be updated to match the version in package.json
-exports.VERSION = '3.31.0-beta.1';
+exports.VERSION = '4.0.0';

package/ios/RNRadar.mm

@@ -9,6 +9,9 @@ static NSString *_publishableKey = nil;
     CLLocationManager *locationManager;
     RCTPromiseResolveBlock permissionsRequestResolver;
     bool hasListeners;
+    #ifdef RCT_NEW_ARCH_ENABLED
+    bool jsEventEmitterReady;
+    #endif
 }
 
 RCT_EXPORT_MODULE()
@@ -52,12 +55,21 @@ RCT_EXPORT_MODULE()
     hasListeners = NO;
 }
 
+#ifdef RCT_NEW_ARCH_ENABLED
+- (void)setEventEmitterCallback:(EventEmitterCallbackWrapper *)eventEmitterCallbackWrapper {
+    [super setEventEmitterCallback:eventEmitterCallbackWrapper];
+    jsEventEmitterReady = YES;
+}
+#endif
+
 - (void)onNewInAppMessage:(RadarInAppMessage *)inAppMessage {
 
     NSMutableDictionary *body = [NSMutableDictionary new];
     [body setValue:[Radar dictionaryForInAppMessage:inAppMessage] forKey:@"inAppMessage"];
     #ifdef RCT_NEW_ARCH_ENABLED
-    [self emitNewInAppMessageEmitter:body];
+    if (jsEventEmitterReady) {
+        [self emitNewInAppMessageEmitter:body];
+    }
     #else
     if (hasListeners) {
         [self sendEventWithName:@"newInAppMessageEmitter" body:body];
@@ -69,7 +81,9 @@ RCT_EXPORT_MODULE()
     NSMutableDictionary *body = [NSMutableDictionary new];
     [body setValue:[Radar dictionaryForInAppMessage:inAppMessage] forKey:@"inAppMessage"];
     #ifdef RCT_NEW_ARCH_ENABLED
-    [self emitInAppMessageDismissedEmitter:body];
+    if (jsEventEmitterReady) {
+        [self emitInAppMessageDismissedEmitter:body];
+    }
     #else
     if (hasListeners) {
         [self sendEventWithName:@"inAppMessageDismissedEmitter" body:body];
@@ -81,7 +95,9 @@ RCT_EXPORT_MODULE()
     NSMutableDictionary *body = [NSMutableDictionary new];
     [body setValue:[Radar dictionaryForInAppMessage:inAppMessage] forKey:@"inAppMessage"];
     #ifdef RCT_NEW_ARCH_ENABLED
-    [self emitInAppMessageClickedEmitter:body];
+    if (jsEventEmitterReady) {
+        [self emitInAppMessageClickedEmitter:body];
+    }
     #else
     if (hasListeners) {
         [self sendEventWithName:@"inAppMessageClickedEmitter" body:body];
@@ -105,7 +121,9 @@ RCT_EXPORT_MODULE()
         [body setValue:[user dictionaryValue] forKey:@"user"];
     }
     #ifdef RCT_NEW_ARCH_ENABLED
-    [self emitEventsEmitter:body];
+    if (jsEventEmitterReady) {
+        [self emitEventsEmitter:body];
+    }
     #else
     if (hasListeners) {
         [self sendEventWithName:@"eventsEmitter" body:body];
@@ -115,10 +133,12 @@ RCT_EXPORT_MODULE()
 
 - (void)didUpdateLocation:(CLLocation *)location user:(RadarUser *)user {
     #ifdef RCT_NEW_ARCH_ENABLED
-    [self emitLocationEmitter:@{
-        @"location": [Radar dictionaryForLocation:location],
-        @"user": [user dictionaryValue]
-    }];
+    if (jsEventEmitterReady) {
+        [self emitLocationEmitter:@{
+            @"location": [Radar dictionaryForLocation:location],
+            @"user": [user dictionaryValue]
+        }];
+    }
     #else
     if (hasListeners) {
         [self sendEventWithName:@"locationEmitter" body:@{
@@ -131,11 +151,13 @@ RCT_EXPORT_MODULE()
 
 - (void)didUpdateClientLocation:(CLLocation *)location stopped:(BOOL)stopped source:(RadarLocationSource)source {
     #ifdef RCT_NEW_ARCH_ENABLED
-    [self emitClientLocationEmitter:@{
-        @"location": [Radar dictionaryForLocation:location],
-        @"stopped": @(stopped),
-        @"source": [Radar stringForLocationSource:source]
-    }];
+    if (jsEventEmitterReady) {
+        [self emitClientLocationEmitter:@{
+            @"location": [Radar dictionaryForLocation:location],
+            @"stopped": @(stopped),
+            @"source": [Radar stringForLocationSource:source]
+        }];
+    }
     #else
     if (hasListeners) {
         [self sendEventWithName:@"clientLocationEmitter" body:@{
@@ -152,7 +174,9 @@ RCT_EXPORT_MODULE()
         @"status": [Radar stringForStatus:status]
     };
     #ifdef RCT_NEW_ARCH_ENABLED
-    [self emitErrorEmitter:body];
+    if (jsEventEmitterReady) {
+        [self emitErrorEmitter:body];
+    }
     #else
     if (hasListeners) {
         [self sendEventWithName:@"errorEmitter" body:body];
@@ -165,7 +189,9 @@ RCT_EXPORT_MODULE()
         @"message": message
     };
     #ifdef RCT_NEW_ARCH_ENABLED
-    [self emitLogEmitter:body];
+    if (jsEventEmitterReady) {
+        [self emitLogEmitter:body];
+    }
     #else
     if (hasListeners) {
         [self sendEventWithName:@"logEmitter" body:body];
@@ -178,7 +204,9 @@ RCT_EXPORT_MODULE()
         @"token": [token dictionaryValue]
     };
     #ifdef RCT_NEW_ARCH_ENABLED
-    [self emitTokenEmitter:body];
+    if (jsEventEmitterReady) {
+        [self emitTokenEmitter:body];
+    }
     #else
     if (hasListeners) {
         [self sendEventWithName:@"tokenEmitter" body:body];
@@ -189,7 +217,7 @@ RCT_EXPORT_MODULE()
 RCT_EXPORT_METHOD(initialize:(NSString *)publishableKey fraud:(BOOL)fraud) {
     _publishableKey = publishableKey; 
     [[NSUserDefaults standardUserDefaults] setObject:@"ReactNative" forKey:@"radar-xPlatformSDKType"];
-    [[NSUserDefaults standardUserDefaults] setObject:@"3.31.0-beta.1" forKey:@"radar-xPlatformSDKVersion"];
+    [[NSUserDefaults standardUserDefaults] setObject:@"4.0.0" forKey:@"radar-xPlatformSDKVersion"];
     [Radar initializeWithPublishableKey:publishableKey];
 }
 

package/package.json

@@ -3,7 +3,7 @@
   "description": "React Native module for Radar, the leading geofencing and location tracking platform",
   "homepage": "https://radar.com",
   "license": "Apache-2.0",
-  "version": "3.31.0-beta.1",
+  "version": "4.0.0",
   "main": "dist/index.js",
   "files": [
     "dist",
@@ -56,7 +56,7 @@
     ]
   },
   "peerDependencies": {
-    "@maplibre/maplibre-react-native": ">=11.0.0-beta.6",
+    "@maplibre/maplibre-react-native": ">=11.0.0-beta.10",
     "expo": ">=43.0.5",
     "react": ">= 19.1.0",
     "react-native": ">= 0.80.0",
@@ -68,6 +68,9 @@
     },
     "expo": {
       "optional": true
+    },
+    "react-native-safe-area-context": {
+      "optional": true
     }
   },
   "devDependencies": {

package/src/ui/autocomplete.jsx

@@ -17,7 +17,12 @@ import {
   Pressable,
   Platform,
 } from 'react-native';
-import { SafeAreaView } from 'react-native-safe-area-context';
+let SafeAreaView;
+try {
+  SafeAreaView = require('react-native-safe-area-context').SafeAreaView;
+} catch (e) {
+  SafeAreaView = require('react-native').SafeAreaView;
+}
 import Radar from '../index.native';
 import {
   BACK_ICON,

package/src/version.ts

@@ -1,3 +1,3 @@
 // This file contains the version of the react-native-radar package
 // It should be updated to match the version in package.json
-export const VERSION = '3.31.0-beta.1';
+export const VERSION = '4.0.0';