@datadog/mobile-react-native-webview 2.14.1 → 3.0.1

package/DatadogSDKReactNativeWebView.podspec

@@ -23,8 +23,8 @@ Pod::Spec.new do |s|
   end
 
   # /!\ Remember to keep the version in sync with DatadogSDKReactNative.podspec
-  s.dependency 'DatadogWebViewTracking', '2.30.2'
-  s.dependency 'DatadogInternal', '2.30.2'
+  s.dependency 'DatadogWebViewTracking', '3.4.0'
+  s.dependency 'DatadogInternal', '3.4.0'
   s.dependency 'DatadogSDKReactNative'
 
   s.test_spec 'Tests' do |test_spec|

package/android/build.gradle

@@ -196,7 +196,7 @@ dependencies {
     implementation "com.facebook.react:react-android:$reactNativeVersion"
   }
 
-  implementation "com.datadoghq:dd-sdk-android-webview:2.26.2"
+  implementation "com.datadoghq:dd-sdk-android-webview:3.4.0"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
   implementation project(path: ':datadog_mobile-react-native')

package/android/gradle.properties

@@ -1,5 +1,5 @@
 DatadogSDKReactNativeWebView_kotlinVersion=1.7.21
-DatadogSDKReactNativeWebView_minSdkVersion=21
+DatadogSDKReactNativeWebView_minSdkVersion=23
 DatadogSDKReactNativeWebView_compileSdkVersion=33
 DatadogSDKReactNativeWebView_buildToolsVersion=33.0.0
 DatadogSDKReactNativeWebView_targetSdkVersion=33

package/ios/Sources/RCTDatadogWebViewTracking.swift

@@ -8,26 +8,27 @@ import WebKit
 import DatadogWebViewTracking
 import DatadogSDKReactNative
 import DatadogCore
+import DatadogInternal
 
 @objc public class RCTDatadogWebViewTracking: NSObject {
     var webView: RCTDatadogWebView? = nil
     var allowedHosts: Set<String> = Set()
-    var coreListener: OnCoreInitializedListener?
+    var onSdkInitializedListener: OnSdkInitializedListener?
     
     public override init() {
         super.init()
-        self.coreListener = { [weak self] (core: DatadogCoreProtocol) in
+        self.onSdkInitializedListener = { [weak self] (core: DatadogCoreProtocol) in
             guard let strongSelf = self, let webView = strongSelf.webView else {
                 return
             }
             strongSelf.enableWebViewTracking(
                 webView: webView,
                 allowedHosts: strongSelf.allowedHosts,
-                core: core
+                core: CoreRegistry.default
             )
         }
     }
-    
+   
     /**
      Enables tracking on the given WebView.
      
@@ -42,15 +43,16 @@ import DatadogCore
 
         guard !webView.isTrackingEnabled else { return }
 
-        if let core = DatadogSDKWrapper.shared.getCoreInstance() {
-            enableWebViewTracking(webView: webView, allowedHosts: allowedHosts, core: core)
-        } else if let coreListener = self.coreListener {
-            DatadogSDKWrapper.shared.addOnCoreInitializedListener(listener: coreListener)
+        if CoreRegistry.isRegistered(instanceName: CoreRegistry.defaultInstanceName) {
+            enableWebViewTracking(webView: webView, allowedHosts: allowedHosts, core: CoreRegistry.default)
+        } else if let onSdkInitializedListener = self.onSdkInitializedListener {
+            DatadogSDKWrapper.shared.addOnSdkInitializedListener(listener: onSdkInitializedListener)
         } else {
             // TODO: Report initialization problem
         }
     }
     
+
     private func enableWebViewTracking(
         webView: RCTDatadogWebView,
         allowedHosts: Set<String>,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@datadog/mobile-react-native-webview",
-    "version": "2.14.1",
+    "version": "3.0.1",
     "description": "A client-side React Native module to interact with react-native-webview and Datadog",
     "keywords": [
         "datadog",
@@ -52,7 +52,7 @@
         "react-native-webview": "^13.12.2"
     },
     "peerDependencies": {
-        "@datadog/mobile-react-native": "^2.0.1",
+        "@datadog/mobile-react-native": "^3.0.0",
         "react": ">=16.13.1",
         "react-native": ">=0.63.4 <1.0",
         "react-native-webview": ">=11.0.0"
@@ -94,5 +94,5 @@
             "javaPackageName": "com.datadog.reactnative.webview"
         }
     },
-    "gitHead": "ceddd4c317a90a7b19409146690022cd6889cb26"
+    "gitHead": "da8d12a8463fda158d657b3b3695b58e6efdd5ca"
 }