@datadog/mobile-react-native-session-replay 2.3.6-alpha.0 → 2.4.0-alpha.0

package/DatadogSDKReactNativeSessionReplay.podspec

@@ -19,7 +19,7 @@ Pod::Spec.new do |s|
   s.dependency "React-Core"
 
   # /!\ Remember to keep the version in sync with DatadogSDKReactNative.podspec
-  s.dependency 'DatadogSessionReplay', '~> 2.7.1'
+  s.dependency 'DatadogSessionReplay', '~> 2.13.0'
   s.dependency 'DatadogSDKReactNative'
 
   s.test_spec 'Tests' do |test_spec|

package/android/build.gradle

@@ -188,7 +188,7 @@ dependencies {
     api "com.facebook.react:react-android:$reactNativeVersion"
   }
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation "com.datadoghq:dd-sdk-android-session-replay:2.6.2"
+  implementation "com.datadoghq:dd-sdk-android-session-replay:2.11.0"
   implementation project(path: ':datadog_mobile-react-native')
 
   testImplementation "org.junit.platform:junit-platform-launcher:1.6.2"

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

@@ -6,15 +6,12 @@
 
 package com.datadog.reactnative.sessionreplay
 
-import android.view.View
 import androidx.annotation.VisibleForTesting
 import com.datadog.android.api.InternalLogger
 import com.datadog.android.sessionreplay.ExtensionSupport
-import com.datadog.android.sessionreplay.SessionReplayPrivacy
-import com.datadog.android.sessionreplay.internal.recorder.OptionSelectorDetector
-import com.datadog.android.sessionreplay.internal.recorder.mapper.WireframeMapper
-import com.datadog.reactnative.sessionreplay.mappers.ReactMaskInputTextMapper
-import com.datadog.reactnative.sessionreplay.mappers.ReactMaskTextMapper
+import com.datadog.android.sessionreplay.MapperTypeWrapper
+import com.datadog.android.sessionreplay.recorder.OptionSelectorDetector
+import com.datadog.reactnative.sessionreplay.mappers.ReactEditTextMapper
 import com.datadog.reactnative.sessionreplay.mappers.ReactTextMapper
 import com.datadog.reactnative.sessionreplay.mappers.ReactViewGroupMapper
 import com.facebook.react.bridge.ReactContext
@@ -28,28 +25,14 @@ internal class ReactNativeSessionReplayExtensionSupport(
     private val logger: InternalLogger
 ) : ExtensionSupport {
 
-    override fun getCustomViewMappers(): Map<SessionReplayPrivacy, Map<Class<*>, WireframeMapper<View, *>>> {
+    override fun getCustomViewMappers(): List<MapperTypeWrapper<*>> {
         val uiManagerModule = getUiManagerModule()
 
-        return mapOf(
-            SessionReplayPrivacy.ALLOW to mapOf(
-                ReactViewGroup::class.java to ReactViewGroupMapper(),
-                ReactTextView::class.java to ReactTextMapper(reactContext, uiManagerModule),
-                ReactEditText::class.java to ReactTextMapper(reactContext, uiManagerModule)
-            ),
-            SessionReplayPrivacy.MASK to mapOf(
-                ReactViewGroup::class.java to ReactViewGroupMapper(),
-                ReactTextView::class.java to ReactMaskTextMapper(reactContext, uiManagerModule),
-                ReactEditText::class.java to ReactMaskTextMapper(reactContext, uiManagerModule)
-            ),
-            SessionReplayPrivacy.MASK_USER_INPUT to mapOf(
-                ReactViewGroup::class.java to ReactViewGroupMapper(),
-                ReactTextView::class.java to ReactMaskInputTextMapper(reactContext, uiManagerModule),
-                ReactEditText::class.java to ReactMaskInputTextMapper(reactContext, uiManagerModule)
-            )
-        ).mapValues {
-            it.value as Map<Class<*>, WireframeMapper<View, *>>
-        }
+        return listOf(
+            MapperTypeWrapper(ReactViewGroup::class.java, ReactViewGroupMapper()),
+            MapperTypeWrapper(ReactTextView::class.java, ReactTextMapper(reactContext, uiManagerModule)),
+            MapperTypeWrapper(ReactEditText::class.java, ReactEditTextMapper(reactContext, uiManagerModule)),
+        )
     }
 
     override fun getOptionSelectorDetectors(): List<OptionSelectorDetector> {

package/android/src/main/kotlin/com/datadog/reactnative/sessionreplay/mappers/{ReactMaskTextMapper.kt → ReactEditTextMapper.kt}

@@ -6,23 +6,36 @@
 
 package com.datadog.reactnative.sessionreplay.mappers
 
-import android.widget.TextView
-import com.datadog.android.sessionreplay.internal.AsyncJobStatusCallback
-import com.datadog.android.sessionreplay.internal.recorder.MappingContext
-import com.datadog.android.sessionreplay.internal.recorder.mapper.MaskTextViewMapper
+import com.datadog.android.api.InternalLogger
 import com.datadog.android.sessionreplay.model.MobileSegment
+import com.datadog.android.sessionreplay.recorder.MappingContext
+import com.datadog.android.sessionreplay.recorder.mapper.EditTextMapper
+import com.datadog.android.sessionreplay.recorder.mapper.WireframeMapper
+import com.datadog.android.sessionreplay.utils.AsyncJobStatusCallback
+import com.datadog.android.sessionreplay.utils.DefaultColorStringFormatter
+import com.datadog.android.sessionreplay.utils.DefaultViewBoundsResolver
+import com.datadog.android.sessionreplay.utils.DefaultViewIdentifierResolver
+import com.datadog.android.sessionreplay.utils.DrawableToColorMapper
 import com.datadog.reactnative.sessionreplay.NoopTextPropertiesResolver
 import com.datadog.reactnative.sessionreplay.ReactTextPropertiesResolver
 import com.datadog.reactnative.sessionreplay.TextPropertiesResolver
 import com.datadog.reactnative.sessionreplay.utils.TextViewUtils
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.uimanager.UIManagerModule
+import com.facebook.react.views.textinput.ReactEditText
 
-internal class ReactMaskTextMapper(
+internal class ReactEditTextMapper(
     private val reactTextPropertiesResolver: TextPropertiesResolver =
         NoopTextPropertiesResolver(),
-    private val textViewUtils: TextViewUtils = TextViewUtils()
-): MaskTextViewMapper() {
+    private val textViewUtils: TextViewUtils = TextViewUtils(),
+): WireframeMapper<ReactEditText> {
+
+    private val editTextMapper = EditTextMapper(
+        viewIdentifierResolver = DefaultViewIdentifierResolver,
+        colorStringFormatter = DefaultColorStringFormatter,
+        viewBoundsResolver = DefaultViewBoundsResolver,
+        drawableToColorMapper = DrawableToColorMapper.getDefault(),
+    )
 
     internal constructor(
         reactContext: ReactContext,
@@ -37,13 +50,19 @@ internal class ReactMaskTextMapper(
             )
         }
     )
-
     override fun map(
-        view: TextView,
+        view: ReactEditText,
         mappingContext: MappingContext,
-        asyncJobStatusCallback: AsyncJobStatusCallback
+        asyncJobStatusCallback: AsyncJobStatusCallback,
+        internalLogger: InternalLogger
     ): List<MobileSegment.Wireframe> {
-        val wireframes = super.map(view, mappingContext, asyncJobStatusCallback)
+        val wireframes = editTextMapper.map(
+            view = view,
+            mappingContext = mappingContext,
+            asyncJobStatusCallback = asyncJobStatusCallback,
+            internalLogger = internalLogger
+        )
+
         return textViewUtils.mapTextViewToWireframes(
             wireframes = wireframes,
             view = view,
@@ -52,4 +71,3 @@ internal class ReactMaskTextMapper(
         )
     }
 }
-

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

@@ -7,10 +7,16 @@
 package com.datadog.reactnative.sessionreplay.mappers
 
 import android.widget.TextView
-import com.datadog.android.sessionreplay.internal.AsyncJobStatusCallback
-import com.datadog.android.sessionreplay.internal.recorder.MappingContext
-import com.datadog.android.sessionreplay.internal.recorder.mapper.TextViewMapper
+import com.datadog.android.api.InternalLogger
+import com.datadog.android.sessionreplay.SessionReplayPrivacy
 import com.datadog.android.sessionreplay.model.MobileSegment
+import com.datadog.android.sessionreplay.recorder.MappingContext
+import com.datadog.android.sessionreplay.recorder.mapper.TextViewMapper
+import com.datadog.android.sessionreplay.utils.AsyncJobStatusCallback
+import com.datadog.android.sessionreplay.utils.DefaultColorStringFormatter
+import com.datadog.android.sessionreplay.utils.DefaultViewBoundsResolver
+import com.datadog.android.sessionreplay.utils.DefaultViewIdentifierResolver
+import com.datadog.android.sessionreplay.utils.DrawableToColorMapper
 import com.datadog.reactnative.sessionreplay.NoopTextPropertiesResolver
 import com.datadog.reactnative.sessionreplay.ReactTextPropertiesResolver
 import com.datadog.reactnative.sessionreplay.TextPropertiesResolver
@@ -21,8 +27,13 @@ import com.facebook.react.uimanager.UIManagerModule
 internal class ReactTextMapper(
     private val reactTextPropertiesResolver: TextPropertiesResolver =
         NoopTextPropertiesResolver(),
-    private val textViewUtils: TextViewUtils = TextViewUtils()
-): TextViewMapper() {
+    private val textViewUtils: TextViewUtils = TextViewUtils(),
+): TextViewMapper<TextView>(
+    viewIdentifierResolver = DefaultViewIdentifierResolver,
+    colorStringFormatter = DefaultColorStringFormatter,
+    viewBoundsResolver = DefaultViewBoundsResolver,
+    drawableToColorMapper = DrawableToColorMapper.getDefault()
+) {
 
     internal constructor(
         reactContext: ReactContext,
@@ -41,9 +52,10 @@ internal class ReactTextMapper(
     override fun map(
         view: TextView,
         mappingContext: MappingContext,
-        asyncJobStatusCallback: AsyncJobStatusCallback
+        asyncJobStatusCallback: AsyncJobStatusCallback,
+        internalLogger: InternalLogger
     ): List<MobileSegment.Wireframe> {
-        val wireframes = super.map(view, mappingContext, asyncJobStatusCallback)
+        val wireframes = super.map(view, mappingContext, asyncJobStatusCallback, internalLogger)
         return textViewUtils.mapTextViewToWireframes(
             wireframes = wireframes,
             view = view,

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

@@ -6,11 +6,17 @@
 
 package com.datadog.reactnative.sessionreplay.mappers
 
-import com.datadog.android.sessionreplay.internal.AsyncJobStatusCallback
-import com.datadog.android.sessionreplay.internal.recorder.MappingContext
-import com.datadog.android.sessionreplay.internal.recorder.mapper.BaseWireframeMapper
-import com.datadog.android.sessionreplay.internal.recorder.mapper.TraverseAllChildrenMapper
+import com.datadog.android.api.InternalLogger
 import com.datadog.android.sessionreplay.model.MobileSegment
+import com.datadog.android.sessionreplay.recorder.MappingContext
+import com.datadog.android.sessionreplay.recorder.mapper.BaseWireframeMapper
+import com.datadog.android.sessionreplay.recorder.mapper.TraverseAllChildrenMapper
+import com.datadog.android.sessionreplay.utils.AsyncJobStatusCallback
+import com.datadog.android.sessionreplay.utils.DefaultColorStringFormatter
+import com.datadog.android.sessionreplay.utils.DefaultViewBoundsResolver
+import com.datadog.android.sessionreplay.utils.DefaultViewBoundsResolver.resolveViewGlobalBounds
+import com.datadog.android.sessionreplay.utils.DefaultViewIdentifierResolver
+import com.datadog.android.sessionreplay.utils.DrawableToColorMapper
 import com.datadog.reactnative.sessionreplay.utils.DrawableUtils
 import com.datadog.reactnative.sessionreplay.utils.ReactViewBackgroundDrawableUtils
 import com.facebook.react.views.view.ReactViewGroup
@@ -20,13 +26,19 @@ internal class ReactViewGroupMapper(
         ReactViewBackgroundDrawableUtils(),
     private val drawableUtils: DrawableUtils = DrawableUtils()
 ) :
-    BaseWireframeMapper<ReactViewGroup, MobileSegment.Wireframe>(),
-    TraverseAllChildrenMapper<ReactViewGroup, MobileSegment.Wireframe> {
+    BaseWireframeMapper<ReactViewGroup>(
+        viewIdentifierResolver = DefaultViewIdentifierResolver,
+        colorStringFormatter = DefaultColorStringFormatter,
+        viewBoundsResolver = DefaultViewBoundsResolver,
+        drawableToColorMapper = DrawableToColorMapper.getDefault()
+    ),
+    TraverseAllChildrenMapper<ReactViewGroup> {
 
     override fun map(
         view: ReactViewGroup,
         mappingContext: MappingContext,
-        asyncJobStatusCallback: AsyncJobStatusCallback
+        asyncJobStatusCallback: AsyncJobStatusCallback,
+        internalLogger: InternalLogger
     ): List<MobileSegment.Wireframe> {
         val pixelDensity = mappingContext.systemInformation.screenDensity
         val viewGlobalBounds = resolveViewGlobalBounds(view, pixelDensity)

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

@@ -9,8 +9,8 @@
 package com.datadog.reactnative.sessionreplay.utils
 
 import android.widget.TextView
-import com.datadog.android.sessionreplay.internal.recorder.MappingContext
 import com.datadog.android.sessionreplay.model.MobileSegment
+import com.datadog.android.sessionreplay.recorder.MappingContext
 import com.datadog.reactnative.sessionreplay.TextPropertiesResolver
 
 internal class TextViewUtils {

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

@@ -7,17 +7,12 @@
 package com.datadog.reactnative.sessionreplay
 
 import com.datadog.android.api.InternalLogger
-import com.datadog.android.sessionreplay.SessionReplayPrivacy
-import com.datadog.reactnative.sessionreplay.mappers.ReactMaskInputTextMapper
-import com.datadog.reactnative.sessionreplay.mappers.ReactMaskTextMapper
+import com.datadog.reactnative.sessionreplay.mappers.ReactEditTextMapper
 import com.datadog.reactnative.sessionreplay.mappers.ReactTextMapper
 import com.datadog.reactnative.sessionreplay.mappers.ReactViewGroupMapper
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.uimanager.UIManagerModule
-import com.facebook.react.views.text.ReactTextView
-import com.facebook.react.views.textinput.ReactEditText
-import com.facebook.react.views.view.ReactViewGroup
 import fr.xgouchet.elmyr.junit5.ForgeExtension
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
@@ -65,51 +60,18 @@ internal class ReactNativeSessionReplayExtensionSupportTest {
     fun `M get custom view mappers W getCustomViewMappers()`() {
         // When
         val customViewMappers = testedExtensionSupport.getCustomViewMappers()
-        val allowMappers = customViewMappers[SessionReplayPrivacy.ALLOW]
 
         // Then
-        check(allowMappers != null)
-        assertThat(allowMappers).hasSize(3)
-        assertThat(allowMappers[ReactViewGroup::class.java])
-            .isInstanceOf(ReactViewGroupMapper::class.java)
-        assertThat(allowMappers[ReactTextView::class.java])
-            .isInstanceOf(ReactTextMapper::class.java)
-        assertThat(allowMappers[ReactEditText::class.java])
-            .isInstanceOf(ReactTextMapper::class.java)
-    }
-
-    @Test
-    fun `M get mask input mappers W getCustomViewMappers()`() {
-        // When
-        val customViewMappers = testedExtensionSupport.getCustomViewMappers()
-        val maskUserInputMappers = customViewMappers[SessionReplayPrivacy.MASK_USER_INPUT]
+        assertThat(customViewMappers).hasSize(3)
 
-        // Then
-        check(maskUserInputMappers != null)
-        assertThat(maskUserInputMappers).hasSize(3)
-        assertThat(maskUserInputMappers[ReactViewGroup::class.java])
+        assertThat(customViewMappers[0].getUnsafeMapper())
             .isInstanceOf(ReactViewGroupMapper::class.java)
-        assertThat(maskUserInputMappers[ReactTextView::class.java])
-            .isInstanceOf(ReactMaskInputTextMapper::class.java)
-        assertThat(maskUserInputMappers[ReactEditText::class.java])
-            .isInstanceOf(ReactMaskInputTextMapper::class.java)
-    }
 
-    @Test
-    fun `M get mask mappers W getCustomViewMappers()`() {
-        // When
-        val customViewMappers = testedExtensionSupport.getCustomViewMappers()
-        val maskMappers = customViewMappers[SessionReplayPrivacy.MASK]
+        assertThat(customViewMappers[1].getUnsafeMapper())
+            .isInstanceOf(ReactTextMapper::class.java)
 
-        // Then
-        check(maskMappers != null)
-        assertThat(maskMappers).hasSize(3)
-        assertThat(maskMappers[ReactViewGroup::class.java])
-            .isInstanceOf(ReactViewGroupMapper::class.java)
-        assertThat(maskMappers[ReactTextView::class.java])
-            .isInstanceOf(ReactMaskTextMapper::class.java)
-        assertThat(maskMappers[ReactEditText::class.java])
-            .isInstanceOf(ReactMaskTextMapper::class.java)
+        assertThat(customViewMappers[2].getUnsafeMapper())
+            .isInstanceOf(ReactEditTextMapper::class.java)
     }
 
     @Test

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

@@ -9,10 +9,11 @@
 package com.datadog.reactnative.sessionreplay.mappers
 
 import android.graphics.drawable.ColorDrawable
-import com.datadog.android.sessionreplay.internal.AsyncJobStatusCallback
-import com.datadog.android.sessionreplay.internal.recorder.MappingContext
-import com.datadog.android.sessionreplay.internal.recorder.SystemInformation
+import com.datadog.android.api.InternalLogger
 import com.datadog.android.sessionreplay.model.MobileSegment
+import com.datadog.android.sessionreplay.recorder.MappingContext
+import com.datadog.android.sessionreplay.recorder.SystemInformation
+import com.datadog.android.sessionreplay.utils.AsyncJobStatusCallback
 import com.datadog.reactnative.sessionreplay.utils.DrawableUtils
 import com.datadog.reactnative.sessionreplay.utils.ReactViewBackgroundDrawableUtils
 import com.facebook.react.views.view.ReactViewBackgroundDrawable
@@ -50,6 +51,9 @@ internal class ReactViewGroupMapperTest {
     @Mock
     private lateinit var mockAsyncJobStatusCallback: AsyncJobStatusCallback
 
+    @Mock
+    private lateinit var mockInternalLogger: InternalLogger
+
     @Mock
     private lateinit var mockSystemInformation: SystemInformation
 
@@ -92,7 +96,8 @@ internal class ReactViewGroupMapperTest {
         val result = testedMapper.map(
             view = mockReactViewGroup,
             mappingContext = mockMappingContext,
-            asyncJobStatusCallback = mockAsyncJobStatusCallback
+            asyncJobStatusCallback = mockAsyncJobStatusCallback,
+            internalLogger = mockInternalLogger
         )[0] as MobileSegment.Wireframe.ShapeWireframe
 
         // Then
@@ -121,7 +126,8 @@ internal class ReactViewGroupMapperTest {
         val result = testedMapper.map(
             view = mockReactViewGroup,
             mappingContext = mockMappingContext,
-            asyncJobStatusCallback = mockAsyncJobStatusCallback
+            asyncJobStatusCallback = mockAsyncJobStatusCallback,
+            internalLogger = mockInternalLogger
         )[0] as MobileSegment.Wireframe.ShapeWireframe
 
         // Then

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

@@ -10,9 +10,9 @@ import android.content.res.Resources
 import android.graphics.Typeface
 import android.util.DisplayMetrics
 import android.widget.TextView
-import com.datadog.android.sessionreplay.internal.recorder.MappingContext
-import com.datadog.android.sessionreplay.internal.recorder.SystemInformation
 import com.datadog.android.sessionreplay.model.MobileSegment
+import com.datadog.android.sessionreplay.recorder.MappingContext
+import com.datadog.android.sessionreplay.recorder.SystemInformation
 import com.datadog.reactnative.sessionreplay.ReactTextPropertiesResolver
 import fr.xgouchet.elmyr.Forge
 import fr.xgouchet.elmyr.junit5.ForgeExtension

package/ios/Sources/DdSessionReplayImplementation.swift

@@ -55,7 +55,7 @@ public class DdSessionReplayImplementation: NSObject {
         resolve(nil)
     }
     
-    func buildPrivacyLevel(privacyLevel: NSString) -> SessionReplay.Configuration.PrivacyLevel {
+    func buildPrivacyLevel(privacyLevel: NSString) -> SessionReplayPrivacyLevel {
         switch privacyLevel.lowercased {
         case "mask":
             return .mask

package/package.json

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

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

@@ -1,54 +0,0 @@
-/*
- * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
- * This product includes software developed at Datadog (https://www.datadoghq.com/).
- * Copyright 2016-Present Datadog, Inc.
- */
-
-package com.datadog.reactnative.sessionreplay.mappers
-
-import android.widget.TextView
-import com.datadog.android.sessionreplay.internal.AsyncJobStatusCallback
-import com.datadog.android.sessionreplay.internal.recorder.MappingContext
-import com.datadog.android.sessionreplay.internal.recorder.mapper.MaskInputTextViewMapper
-import com.datadog.android.sessionreplay.model.MobileSegment
-import com.datadog.reactnative.sessionreplay.NoopTextPropertiesResolver
-import com.datadog.reactnative.sessionreplay.ReactTextPropertiesResolver
-import com.datadog.reactnative.sessionreplay.TextPropertiesResolver
-import com.datadog.reactnative.sessionreplay.utils.TextViewUtils
-import com.facebook.react.bridge.ReactContext
-import com.facebook.react.uimanager.UIManagerModule
-
-internal class ReactMaskInputTextMapper(
-    private val reactTextPropertiesResolver: TextPropertiesResolver,
-    private val textViewUtils: TextViewUtils = TextViewUtils()
-): MaskInputTextViewMapper() {
-
-    internal constructor(
-        reactContext: ReactContext,
-        uiManagerModule: UIManagerModule?
-    ): this(
-        reactTextPropertiesResolver = if (uiManagerModule == null) {
-            NoopTextPropertiesResolver()
-        } else {
-            ReactTextPropertiesResolver(
-                reactContext = reactContext,
-                uiManagerModule = uiManagerModule
-            )
-        }
-    )
-
-    override fun map(
-        view: TextView,
-        mappingContext: MappingContext,
-        asyncJobStatusCallback: AsyncJobStatusCallback
-    ): List<MobileSegment.Wireframe> {
-        val wireframes = super.map(view, mappingContext, asyncJobStatusCallback)
-        return textViewUtils.mapTextViewToWireframes(
-            wireframes = wireframes,
-            view = view,
-            mappingContext = mappingContext,
-            reactTextPropertiesResolver = reactTextPropertiesResolver
-        )
-    }
-}
-