Fix forgery factory

DataDog · Nov 29, 2023 · 9a76ff7 · 9a76ff7
1 parent 9a120dd
commit 9a76ff7
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/...src/test/kotlin/com/datadog/tools/unit/forge/TelemetryConfigurationEventForgeryFactory.kt b/...src/test/kotlin/com/datadog/tools/unit/forge/TelemetryConfigurationEventForgeryFactory.kt
@@ -62,6 +62,7 @@ internal class TelemetryConfigurationEventForgeryFactory :
                     forge.aNullable { aBool() },
                     forge.aNullable { aBool() },
                     forge.aNullable { aBool() },
+                    forge.aNullable { aBool() },
                     forge.aNullable { aString() },
                     forge.aNullable { aBool() },
                     forge.aNullable { aBool() },

diff --git a/...ession-replay/android/src/main/kotlin/com/datadog/reactnative/sessionreplay/ColorUtils.kt b/...ession-replay/android/src/main/kotlin/com/datadog/reactnative/sessionreplay/ColorUtils.kt
@@ -42,10 +42,12 @@ internal fun resolveOpacity(view: ReactViewGroup, currentOpacity: Float): Float
     return if (view.alpha == 0f) {
         0f
     } else {
+        val combinedOpacity = view.alpha * currentOpacity
+
         if (view.parent != null && view.parent is ReactViewGroup) {
-            resolveOpacity(view.parent as ReactViewGroup, minOf(view.alpha, currentOpacity))
+            resolveOpacity(view.parent as ReactViewGroup, combinedOpacity)
         } else {
-            minOf(view.alpha, currentOpacity)
+            combinedOpacity
         }
     }
 }
diff --git a/.../kotlin/com/datadog/reactnative/sessionreplay/ReactNativeSessionReplayExtensionSupport.kt b/.../kotlin/com/datadog/reactnative/sessionreplay/ReactNativeSessionReplayExtensionSupport.kt
@@ -13,7 +13,7 @@ import com.datadog.android.sessionreplay.internal.recorder.OptionSelectorDetecto
 import com.datadog.android.sessionreplay.internal.recorder.mapper.WireframeMapper
 import com.facebook.react.views.view.ReactViewGroup
 
-internal class ReactNativeSessionReplayExtensionSupport() : ExtensionSupport {
+internal class ReactNativeSessionReplayExtensionSupport : ExtensionSupport {
 
     override fun getCustomViewMappers(): Map<SessionReplayPrivacy, Map<Class<*>, WireframeMapper<View, *>>> {
         return mapOf(SessionReplayPrivacy.ALLOW to mapOf(
@@ -25,6 +25,3 @@ internal class ReactNativeSessionReplayExtensionSupport() : ExtensionSupport {
         return listOf()
     }
 }
-
-
-
diff --git a/...lay/android/src/main/kotlin/com/datadog/reactnative/sessionreplay/ReactViewGroupMapper.kt b/...lay/android/src/main/kotlin/com/datadog/reactnative/sessionreplay/ReactViewGroupMapper.kt
@@ -100,7 +100,7 @@ internal class ReactViewGroupMapper :
                 cornerRadius = cornerRadiusDp
             ) to MobileSegment.ShapeBorder(
                 color = borderColor,
-                width = borderWidth.toLong()
+                width = borderWidth.toLong().convertToDensityNormalized(pixelDensity)
             )
         }
     }
@@ -110,4 +110,4 @@ internal class ReactViewGroupMapper :
         val alpha = resolveAlpha(opacity, borderColor)
         return colorAndAlphaAsStringHexa(borderColor, alpha)
     }
-}
+}
diff --git a/...on-replay/android/src/test/kotlin/com/datadog/reactnative/sessionreplay/ColorUtilsTest.kt b/...on-replay/android/src/test/kotlin/com/datadog/reactnative/sessionreplay/ColorUtilsTest.kt
@@ -59,4 +59,4 @@ internal class ColorUtilsTest {
         assertThat(alphaValue)
             .isEqualTo(1f)
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -59,4 +59,4 @@ internal class ColorUtilsTest { @@
             assertThat(alphaValue)
                 .isEqualTo(1f)
         }
-    }
+    }