@datadog/mobile-react-native-session-replay 2.8.2 → 2.9.1

package/DatadogSDKReactNativeSessionReplay.podspec

@@ -30,7 +30,16 @@ Pod::Spec.new do |s|
 
 
   xcconfig = {
-    "HEADER_SEARCH_PATHS" => "$(PODS_ROOT)/React-RCTFabric/**",
+    "HEADER_SEARCH_PATHS" => "$(inherited) " +
+      "$(PODS_ROOT)/React-RCTFabric/** " +
+      "$(PODS_ROOT)/React-FabricComponents/** " +
+      "${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_RCTFabric.framework/Headers/** " +
+      "$(PODS_CONFIGURATION_BUILD_DIR)/React-FabricComponents/React_FabricComponents.framework/Headers/**",
+    "USER_HEADER_SEARCH_PATHS" => "$(inherited) " +
+      "$(PODS_ROOT)/React-RCTFabric/** " +
+      "$(PODS_ROOT)/React-FabricComponents/** " +
+      "${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_RCTFabric.framework/Headers/** " +
+      "$(PODS_CONFIGURATION_BUILD_DIR)/React-FabricComponents/React_FabricComponents.framework/Headers/**"
   }
 
   if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then

package/android/build.gradle

@@ -135,7 +135,9 @@ android {
         java.srcDirs += ['src/oldarch/kotlin']
       }
 
-      if (reactNativeMinorVersion >= 79) {
+      if (reactNativeMinorVersion >= 80) {
+        java.srcDirs += ['src/rn80/kotlin']
+      } else if (reactNativeMinorVersion >= 79) {
         java.srcDirs += ['src/rn79/kotlin']
       } else if (reactNativeMinorVersion >= 76) {
         java.srcDirs += ['src/rn76/kotlin']
@@ -209,8 +211,8 @@ 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.19.2"
-  implementation "com.datadoghq:dd-sdk-android-internal:2.19.2"
+  implementation "com.datadoghq:dd-sdk-android-session-replay:2.21.0"
+  implementation "com.datadoghq:dd-sdk-android-internal:2.21.0"
   implementation project(path: ':datadog_mobile-react-native')
 
   testImplementation "org.junit.platform:junit-platform-launcher:1.6.2"

package/android/src/rn80/kotlin/com/datadog/reactnative/sessionreplay/extensions/ComputedBorderRadiusExt.kt

@@ -0,0 +1,27 @@
+/*
+ * 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.extensions
+
+import com.facebook.react.uimanager.style.ComputedBorderRadius
+import com.facebook.react.uimanager.style.ComputedBorderRadiusProp
+
+internal fun ComputedBorderRadius?.getAverage(): Float {
+    val topRightRadius = this
+        ?.getAverageForProp(ComputedBorderRadiusProp.COMPUTED_BORDER_TOP_RIGHT_RADIUS) ?: 0f
+    val topLeftRadius = this
+        ?.getAverageForProp(ComputedBorderRadiusProp.COMPUTED_BORDER_TOP_LEFT_RADIUS) ?: 0f
+    val bottomRightRadius = this
+        ?.getAverageForProp(ComputedBorderRadiusProp.COMPUTED_BORDER_BOTTOM_RIGHT_RADIUS) ?: 0f
+    val bottomLeftRadius = this
+        ?.getAverageForProp(ComputedBorderRadiusProp.COMPUTED_BORDER_BOTTOM_LEFT_RADIUS) ?: 0f
+    return (topRightRadius + topLeftRadius + bottomRightRadius + bottomLeftRadius) / 4f
+}
+
+internal fun ComputedBorderRadius?.getAverageForProp(prop: ComputedBorderRadiusProp): Float {
+    val vertical = this?.get(prop)?.vertical ?: 0f
+    val horizontal = this?.get(prop)?.vertical ?: 0f
+    return (vertical + horizontal) / 2f
+}

package/android/src/rn80/kotlin/com/datadog/reactnative/sessionreplay/utils/ReactViewBackgroundDrawableUtils.kt

@@ -0,0 +1,157 @@
+/*
+ * 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.
+ */
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.ColorFilter
+import android.graphics.PixelFormat
+import android.graphics.drawable.Drawable
+import android.graphics.drawable.InsetDrawable
+import android.graphics.drawable.LayerDrawable
+import com.datadog.android.sessionreplay.model.MobileSegment
+import com.datadog.reactnative.sessionreplay.extensions.getAverage
+import com.datadog.reactnative.sessionreplay.utils.DrawableUtils
+import com.datadog.reactnative.sessionreplay.utils.formatAsRgba
+import com.facebook.react.common.annotations.UnstableReactNativeAPI
+import com.facebook.react.uimanager.Spacing
+import com.facebook.react.uimanager.drawable.CSSBackgroundDrawable
+import com.facebook.react.uimanager.style.ComputedBorderRadius
+
+internal class ReactViewBackgroundDrawableUtils : DrawableUtils() {
+    /**
+     * Used to wrap instances of internal class:
+     * com.facebook.react.uimanager.drawable.BackgroundDrawable
+     */
+    class BackgroundDrawableWrapper(
+        val backgroundColor: String,
+        val cornerRadius: Float
+    ) : Drawable() {
+        override fun draw(p0: Canvas) {}
+        override fun setAlpha(p0: Int) {}
+        override fun setColorFilter(p0: ColorFilter?) {}
+        @Suppress("OVERRIDE_DEPRECATION")
+        override fun getOpacity(): Int { return PixelFormat.OPAQUE }
+    }
+
+    @OptIn(UnstableReactNativeAPI::class)
+    override fun resolveShapeAndBorder(
+        drawable: Drawable,
+        opacity: Float,
+        pixelDensity: Float
+    ): Pair<MobileSegment.ShapeStyle?, MobileSegment.ShapeBorder?> {
+        if (drawable is BackgroundDrawableWrapper) {
+            return MobileSegment.ShapeStyle(
+                drawable.backgroundColor,
+                opacity,
+                drawable.cornerRadius
+            ) to null
+        } else if (drawable is CSSBackgroundDrawable) {
+            val borderProps = resolveBorder(drawable, pixelDensity)
+            val backgroundColor = getCSSBackgroundColor(drawable)
+            val colorHexString = if (backgroundColor != null) {
+                formatAsRgba(backgroundColor)
+            } else {
+                return null to borderProps
+            }
+
+            return MobileSegment.ShapeStyle(
+                colorHexString,
+                opacity,
+                getCSSComputedBorderRadius(drawable)?.getAverage() ?: 0f
+            ) to borderProps
+        }
+
+        return null to null
+    }
+
+    @OptIn(UnstableReactNativeAPI::class)
+    override fun getReactBackgroundFromDrawable(drawable: Drawable?): Drawable? {
+        return when(drawable) {
+            is CSSBackgroundDrawable -> drawable
+            is InsetDrawable -> getReactBackgroundFromDrawable(drawable.drawable)
+            is LayerDrawable -> getDrawableFromLayerDrawable(drawable)
+            else -> null
+        }
+    }
+
+    @OptIn(UnstableReactNativeAPI::class)
+    private fun getDrawableFromLayerDrawable(layerDrawable: LayerDrawable): Drawable? {
+        for (layerNumber in 0 until layerDrawable.numberOfLayers) {
+            val layer = layerDrawable.getDrawable(layerNumber)
+            if (layer is CSSBackgroundDrawable) {
+                return layer
+            } else if (layer != null) {
+                if (layer.javaClass.name == "com.facebook.react.uimanager.drawable.BackgroundDrawable") {
+                    val backgroundColor = getBackgroundColor(layer) ?: Color.TRANSPARENT
+                    val cornerRadius = getComputedBorderRadius(layer)?.getAverage() ?: 0f
+                    return BackgroundDrawableWrapper(
+                        backgroundColor = formatAsRgba(backgroundColor),
+                        cornerRadius = cornerRadius,
+                    )
+                }
+            }
+        }
+        return null
+    }
+
+    @OptIn(UnstableReactNativeAPI::class)
+    private fun getCSSComputedBorderRadius(
+        drawable: CSSBackgroundDrawable
+    ): ComputedBorderRadius? {
+        return reflectionUtils.getDeclaredField(
+            drawable,
+            CSS_COMPUTED_BORDER_RADIUS_FIELD_NAME
+        ) as? ComputedBorderRadius
+    }
+
+    private fun getComputedBorderRadius(
+        drawable: Any
+    ): ComputedBorderRadius? {
+        return reflectionUtils.getDeclaredField(
+            drawable,
+            COMPUTED_BORDER_RADIUS_FIELD_NAME
+        ) as? ComputedBorderRadius
+    }
+
+    @OptIn(UnstableReactNativeAPI::class)
+    private fun getCSSBackgroundColor(
+        backgroundDrawable: CSSBackgroundDrawable
+    ): Int? {
+        return reflectionUtils.getDeclaredField(
+            backgroundDrawable,
+            CSS_BACKGROUND_COLOR_FIELD_NAME
+        ) as? Int
+    }
+
+    private fun getBackgroundColor(
+        backgroundDrawable: Any
+    ): Int? {
+        return reflectionUtils.getDeclaredField(
+            backgroundDrawable,
+            BACKGROUND_COLOR_FIELD_NAME
+        ) as? Int
+    }
+
+    @OptIn(UnstableReactNativeAPI::class)
+    private fun resolveBorder(
+        backgroundDrawable: CSSBackgroundDrawable,
+        pixelDensity: Float
+    ): MobileSegment.ShapeBorder {
+        val borderWidth = (backgroundDrawable.fullBorderWidth / pixelDensity).toLong()
+        val borderColor = formatAsRgba(backgroundDrawable.getBorderColor(Spacing.ALL))
+
+        return MobileSegment.ShapeBorder(
+            color = borderColor,
+            width = borderWidth
+        )
+    }
+
+    private companion object {
+        private const val CSS_BACKGROUND_COLOR_FIELD_NAME = "mColor"
+        private const val CSS_COMPUTED_BORDER_RADIUS_FIELD_NAME = "mComputedBorderRadius"
+        private const val COMPUTED_BORDER_RADIUS_FIELD_NAME = "computedBorderRadius"
+        private const val BACKGROUND_COLOR_FIELD_NAME = "backgroundColor"
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@datadog/mobile-react-native-session-replay",
-    "version": "2.8.2",
+    "version": "2.9.1",
     "description": "A client-side React Native module to enable session replay with Datadog",
     "keywords": [
         "datadog",
@@ -90,5 +90,5 @@
             "javaPackageName": "com.datadog.reactnative.sessionreplay"
         }
     },
-    "gitHead": "fb2d2cf6dcc860a49503b2229f533c4f852b25ca"
+    "gitHead": "9d0f15e59dbf874f04a0695025c6ba3933b4291b"
 }