@datadog/mobile-react-native-session-replay 2.1.0-alpha.0 → 2.1.1-alpha.0

package/DatadogSDKReactNativeSessionReplay.podspec

@@ -20,7 +20,8 @@ Pod::Spec.new do |s|
 
   # /!\ Remember to keep the version in sync with DatadogSDKReactNative.podspec
   s.dependency 'DatadogSessionReplay', '~> 2.6.0'
-  
+  s.dependency 'DatadogSDKReactNative'
+
   s.test_spec 'Tests' do |test_spec|
     test_spec.dependency "React-RCTText"
     test_spec.source_files = 'ios/Tests/*.swift'

package/android/build.gradle

@@ -189,6 +189,7 @@ dependencies {
   }
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation "com.datadoghq:dd-sdk-android-session-replay:2.5.0"
+  implementation project(path: ':datadog_mobile-react-native')
 
   testImplementation "org.junit.platform:junit-platform-launcher:1.6.2"
   testImplementation "org.junit.jupiter:junit-jupiter-api:5.6.2"

package/android/src/main/kotlin/com/datadog/reactnative/sessionreplay/DdSessionReplayImplementation.kt

@@ -10,6 +10,7 @@ import com.datadog.android.Datadog
 import com.datadog.android.api.feature.FeatureSdkCore
 import com.datadog.android.sessionreplay.SessionReplayConfiguration
 import com.datadog.android.sessionreplay.SessionReplayPrivacy
+import com.datadog.reactnative.DatadogSDKWrapperStorage
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactContext
 import java.util.Locale
@@ -30,7 +31,7 @@ class DdSessionReplayImplementation(
      * @param customEndpoint Custom server url for sending replay data.
      */
     fun enable(replaySampleRate: Double, defaultPrivacyLevel: String, customEndpoint: String, promise: Promise) {
-        val sdkCore = Datadog.getInstance() as FeatureSdkCore
+        val sdkCore = DatadogSDKWrapperStorage.getSdkCore() as FeatureSdkCore
         val logger = sdkCore.internalLogger
         val configuration = SessionReplayConfiguration.Builder(replaySampleRate.toFloat())
             .setPrivacy(buildPrivacy(defaultPrivacyLevel))
@@ -40,7 +41,7 @@ class DdSessionReplayImplementation(
             configuration.useCustomEndpoint(customEndpoint)
         }
 
-        sessionReplayProvider().enable(configuration.build())
+        sessionReplayProvider().enable(configuration.build(), sdkCore)
         promise.resolve(null)
     }
 

package/android/src/main/kotlin/com/datadog/reactnative/sessionreplay/ReactTextPropertiesResolver.kt

@@ -144,6 +144,12 @@ internal class ReactTextPropertiesResolver(
     }
 
     private fun getTextColor(shadowNodeWrapper: ShadowNodeWrapper): String? {
+        val isColorSet = shadowNodeWrapper
+            .getDeclaredShadowNodeField(IS_COLOR_SET_FIELD_NAME) as Boolean?
+        if (isColorSet != true) {
+            // Improvement: get default text color if different from black
+            return "#000000FF"
+        }
         val resolvedColor = shadowNodeWrapper
             .getDeclaredShadowNodeField(COLOR_FIELD_NAME) as Int?
         if (resolvedColor != null) {
@@ -187,6 +193,7 @@ internal class ReactTextPropertiesResolver(
         internal const val TEXT_ATTRIBUTES_FIELD_NAME = "mTextAttributes"
         internal const val FONT_FAMILY_FIELD_NAME = "mFontFamily"
         internal const val COLOR_FIELD_NAME = "mColor"
+        internal const val IS_COLOR_SET_FIELD_NAME = "mIsColorSet"
 
         private const val ROBOTO_TYPEFACE_NAME = "roboto"
         private const val SERIF_FAMILY_NAME = "serif"

package/android/src/main/kotlin/com/datadog/reactnative/sessionreplay/SessionReplaySDKWrapper.kt

@@ -6,6 +6,7 @@
 
 package com.datadog.reactnative.sessionreplay
 
+import com.datadog.android.api.SdkCore
 import com.datadog.android.sessionreplay.SessionReplay
 import com.datadog.android.sessionreplay.SessionReplayConfiguration
 
@@ -16,9 +17,11 @@ internal class SessionReplaySDKWrapper : SessionReplayWrapper {
      */
     override fun enable(
         sessionReplayConfiguration: SessionReplayConfiguration,
+        sdkCore: SdkCore
     ) {
         SessionReplay.enable(
             sessionReplayConfiguration,
+            sdkCore,
         )
     }
 }

package/android/src/main/kotlin/com/datadog/reactnative/sessionreplay/SessionReplayWrapper.kt

@@ -6,6 +6,7 @@
 
 package com.datadog.reactnative.sessionreplay
 
+import com.datadog.android.api.SdkCore
 import com.datadog.android.sessionreplay.SessionReplayConfiguration
 
 /**
@@ -18,5 +19,6 @@ interface SessionReplayWrapper {
      */
     fun enable(
         sessionReplayConfiguration: SessionReplayConfiguration,
+        sdkCore: SdkCore
     )
 }

package/android/src/test/kotlin/com/datadog/reactnative/sessionreplay/DdSessionReplayImplementationTest.kt

@@ -84,7 +84,7 @@ internal class DdSessionReplayImplementationTest {
         )
 
         // Then
-        verify(mockSessionReplay).enable(sessionReplayConfigCaptor.capture())
+        verify(mockSessionReplay).enable(sessionReplayConfigCaptor.capture(), any())
         assertThat(sessionReplayConfigCaptor.firstValue)
             .hasFieldEqualTo("sampleRate", replaySampleRate.toFloat())
             .hasFieldEqualTo("privacy", privacy)
@@ -104,7 +104,7 @@ internal class DdSessionReplayImplementationTest {
         testedSessionReplay.enable(replaySampleRate, privacy, "", mockPromise)
 
         // Then
-        verify(mockSessionReplay).enable(sessionReplayConfigCaptor.capture())
+        verify(mockSessionReplay).enable(sessionReplayConfigCaptor.capture(), any())
         assertThat(sessionReplayConfigCaptor.firstValue)
             .hasFieldEqualTo("sampleRate", replaySampleRate.toFloat())
             .hasFieldEqualTo("privacy", SessionReplayPrivacy.MASK)

package/android/src/test/kotlin/com/datadog/reactnative/sessionreplay/ReactTextPropertiesResolverTest.kt

@@ -10,6 +10,7 @@ import android.widget.TextView
 import com.datadog.android.sessionreplay.model.MobileSegment
 import com.datadog.reactnative.sessionreplay.ReactTextPropertiesResolver.Companion.COLOR_FIELD_NAME
 import com.datadog.reactnative.sessionreplay.ReactTextPropertiesResolver.Companion.FONT_FAMILY_FIELD_NAME
+import com.datadog.reactnative.sessionreplay.ReactTextPropertiesResolver.Companion.IS_COLOR_SET_FIELD_NAME
 import com.datadog.reactnative.sessionreplay.ReactTextPropertiesResolver.Companion.MONOSPACE_FAMILY_NAME
 import com.datadog.reactnative.sessionreplay.ReactTextPropertiesResolver.Companion.TEXT_ATTRIBUTES_FIELD_NAME
 import com.datadog.reactnative.sessionreplay.ShadowNodeWrapper.Companion.UI_IMPLEMENTATION_FIELD_NAME
@@ -238,11 +239,13 @@ internal class ReactTextPropertiesResolverTest {
     }
 
     @Test
-    fun `M resolve font color W addReactNativeProperties()`(
+    fun `M resolve font color W addReactNativeProperties() { color is defined by developer }`(
         @IntForgery fakeTextColor: Int
     ) {
         // Given
         whenever(mockTextView.background).thenReturn(null)
+        whenever(mockReflectionUtils.getDeclaredField(mockShadowNode, IS_COLOR_SET_FIELD_NAME))
+            .thenReturn(true)
         whenever(mockReflectionUtils.getDeclaredField(mockShadowNode, COLOR_FIELD_NAME))
             .thenReturn(fakeTextColor)
 
@@ -253,10 +256,30 @@ internal class ReactTextPropertiesResolverTest {
         assertThat(result.textStyle.color).isEqualTo(formatAsRgba(fakeTextColor))
     }
 
+    @Test
+    fun `M resolve font color W addReactNativeProperties() { color is not defined by developer }`(
+        @IntForgery fakeTextColor: Int
+    ) {
+        // Given
+        whenever(mockTextView.background).thenReturn(null)
+        whenever(mockReflectionUtils.getDeclaredField(mockShadowNode, IS_COLOR_SET_FIELD_NAME))
+            .thenReturn(false)
+        whenever(mockReflectionUtils.getDeclaredField(mockShadowNode, COLOR_FIELD_NAME))
+            .thenReturn(fakeTextColor)
+
+        // When
+        val result = testedResolver.addReactNativeProperties(fakeWireframe, mockTextView, 0f)
+
+        // Then
+        assertThat(result.textStyle.color).isEqualTo("#000000FF")
+    }
+
     @Test
     fun `M fallback W addReactNativeProperties() { cannot resolve fontColor }`() {
         // Given
         whenever(mockTextView.background).thenReturn(null)
+        whenever(mockReflectionUtils.getDeclaredField(mockShadowNode, IS_COLOR_SET_FIELD_NAME))
+            .thenReturn(true)
         whenever(mockShadowNodeWrapper.getDeclaredShadowNodeField(COLOR_FIELD_NAME))
             .thenReturn(null)
 

package/ios/Sources/DdSessionReplayImplementation.swift

@@ -7,6 +7,7 @@
 import Foundation
 @_spi(Internal) import DatadogSessionReplay
 import DatadogInternal
+import DatadogSDKReactNative
 import React
 
 @objc
@@ -42,9 +43,15 @@ public class DdSessionReplayImplementation: NSObject {
                     
         sessionReplayConfiguration.setAdditionalNodeRecorders([RCTTextViewRecorder(uiManager: self.uiManager)])
 
-        sessionReplay.enable(
-            with: sessionReplayConfiguration
-        )
+        if let core = DatadogSDKWrapper.shared.getCoreInstance() {
+            sessionReplay.enable(
+                with: sessionReplayConfiguration,
+                in: core
+            )
+        } else {
+            consolePrint("Core instance was not found when initializing Session Replay.")
+        }
+
         resolve(nil)
     }
     
@@ -64,12 +71,13 @@ public class DdSessionReplayImplementation: NSObject {
 
 internal protocol SessionReplayProtocol {
     func enable(
-        with configuration: SessionReplay.Configuration
+        with configuration: SessionReplay.Configuration,
+        in core: DatadogCoreProtocol
     )
 }
 
 internal class NativeSessionReplay: SessionReplayProtocol {
-    func enable(with configuration: DatadogSessionReplay.SessionReplay.Configuration) {
-        SessionReplay.enable(with: configuration)
+    func enable(with configuration: DatadogSessionReplay.SessionReplay.Configuration, in core: DatadogCoreProtocol) {
+        SessionReplay.enable(with: configuration, in: core)
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datadog/mobile-react-native-session-replay",
-  "version": "2.1.0-alpha.0",
+  "version": "2.1.1-alpha.0",
   "description": "A client-side React Native module to enable session replay with Datadog",
   "keywords": [
     "datadog",