@datadog/mobile-react-native-session-replay 2.13.2 → 2.14.1

package/README.md

@@ -127,6 +127,21 @@ yarn android
 
 The `datadog-generate-sr-assets` CLI utility scans your codebase for SVG elements and pre-generates optimized assets that will be included in your native builds.
 
+#### CLI Options
+
+The `datadog-generate-sr-assets` command supports the following options:
+
+```sh
+npx datadog-generate-sr-assets [options]
+```
+
+| Option | Alias | Description | Example |
+|--------|-------|-------------|---------|
+| `--ignore <pattern>` | `-i` | Additional glob patterns to ignore during scanning. Can be specified multiple times. | `npx datadog-generate-sr-assets --ignore "**/legacy/**" --ignore "**/vendor/**"` |
+| `--verbose` | `-v` | Enable verbose output for debugging. | `npx datadog-generate-sr-assets --verbose` |
+| `--path <path>` | `-p` | Path to the root directory to scan. Defaults to the current working directory. | `npx datadog-generate-sr-assets --path ./src` |
+| `--followSymlinks` | | Follow symbolic links during directory traversal. Default: false (symlinks are ignored). | `npx datadog-generate-sr-assets --followSymlinks` |
+
 **Note for CI/CD**: If you use continuous integration for your builds, make sure to include these steps in your CI pipeline. The workflow should be: `yarn install` → `npx datadog-generate-sr-assets` → `pod install` (for iOS) → build your app. This ensures SVG assets are properly generated before the native build process.
 
 ### Development Workflow

package/android/build.gradle

@@ -137,7 +137,9 @@ android {
         java.srcDirs += ['src/oldarch/kotlin']
       }
 
-      if (reactNativeMinorVersion >= 80) {
+      if (reactNativeMinorVersion >= 83) {
+        java.srcDirs += ['src/rn83/kotlin']
+      } else if (reactNativeMinorVersion >= 80) {
         java.srcDirs += ['src/rn80/kotlin']
       } else if (reactNativeMinorVersion >= 79) {
         java.srcDirs += ['src/rn79/kotlin']

package/android/src/rn83/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/rn83/kotlin/com/datadog/reactnative/sessionreplay/utils/ReactViewBackgroundDrawableUtils.kt

@@ -0,0 +1,103 @@
+/*
+ * 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.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
+        }
+
+        return null to null
+    }
+
+    @OptIn(UnstableReactNativeAPI::class)
+    override fun getReactBackgroundFromDrawable(drawable: Drawable?): Drawable? {
+        return when(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 != 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
+    }
+
+    private fun getComputedBorderRadius(
+        drawable: Any
+    ): ComputedBorderRadius? {
+        return reflectionUtils.getDeclaredField(
+            drawable,
+            COMPUTED_BORDER_RADIUS_FIELD_NAME
+        ) as? ComputedBorderRadius
+    }
+
+    private fun getBackgroundColor(
+        backgroundDrawable: Any
+    ): Int? {
+        return reflectionUtils.getDeclaredField(
+            backgroundDrawable,
+            BACKGROUND_COLOR_FIELD_NAME
+        ) as? Int
+    }
+
+    private companion object {
+        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.13.2",
+    "version": "2.14.1",
     "description": "A client-side React Native module to enable session replay with Datadog",
     "keywords": [
         "datadog",
@@ -96,5 +96,5 @@
     "dependencies": {
         "chokidar": "^4.0.3"
     },
-    "gitHead": "c87943251791af901cc49d1444d4a224e3846ac0"
+    "gitHead": "ceddd4c317a90a7b19409146690022cd6889cb26"
 }