RUM-16379: Fix dialog opening from another dialog in sr #3563
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /* | ||
| * 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.android.sessionreplay.internal.recorder | ||
|
|
||
| import android.annotation.SuppressLint | ||
| import android.view.View | ||
| import android.view.Window | ||
|
|
||
| @SuppressLint("PrivateApi") // intentional: accessing mWindow via reflection to get the Window from a decor view | ||
| internal object WindowReflectionUtils { | ||
|
|
||
| private const val WINDOW_FIELD_NAME = "mWindow" | ||
|
|
||
| fun getWindowFromDecorView(view: View): Window? { | ||
| return try { | ||
| var currentClass: Class<*>? = view.javaClass | ||
| while (currentClass != null) { | ||
| try { | ||
| @Suppress("UnsafeThirdPartyFunctionCall") // exceptions caught by outer try-catch | ||
| return currentClass.getDeclaredField(WINDOW_FIELD_NAME) | ||
| .also { it.isAccessible = true } | ||
| .get(view) as? Window | ||
| } catch (_: NoSuchFieldException) { | ||
| currentClass = currentClass.superclass | ||
| } | ||
| } | ||
| null | ||
| } catch (_: ReflectiveOperationException) { | ||
| null | ||
| } catch (_: SecurityException) { | ||
| null | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /* | ||
| * 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.android.sessionreplay.internal.recorder | ||
|
|
||
| import android.view.View | ||
| import android.view.Window | ||
| import com.datadog.android.sessionreplay.forge.ForgeConfigurator | ||
| import fr.xgouchet.elmyr.junit5.ForgeConfiguration | ||
| import fr.xgouchet.elmyr.junit5.ForgeExtension | ||
| import org.assertj.core.api.Assertions.assertThat | ||
| import org.junit.jupiter.api.Test | ||
| import org.junit.jupiter.api.extension.ExtendWith | ||
| import org.junit.jupiter.api.extension.Extensions | ||
| import org.mockito.junit.jupiter.MockitoExtension | ||
| import org.mockito.junit.jupiter.MockitoSettings | ||
| import org.mockito.kotlin.mock | ||
| import org.mockito.quality.Strictness | ||
|
|
||
| @Extensions( | ||
| ExtendWith(MockitoExtension::class), | ||
| ExtendWith(ForgeExtension::class) | ||
| ) | ||
| @MockitoSettings(strictness = Strictness.LENIENT) | ||
| @ForgeConfiguration(ForgeConfigurator::class) | ||
| internal class WindowReflectionUtilsTest { | ||
|
|
||
| @Test | ||
| fun `M return null W getWindowFromDecorView {view has no mWindow field}`() { | ||
| assertThat(WindowReflectionUtils.getWindowFromDecorView(mock())).isNull() | ||
| } | ||
|
|
||
| @Test | ||
| fun `M return Window W getWindowFromDecorView {view class has mWindow field}`() { | ||
| // Given — mimics DecorView's private mWindow field | ||
| val fakeWindow = mock<Window>() | ||
| val fakeDecorLike = object : View(mock()) { | ||
| @Suppress("unused") | ||
| private val mWindow: Window = fakeWindow | ||
| } | ||
|
|
||
| // When + Then | ||
| assertThat(WindowReflectionUtils.getWindowFromDecorView(fakeDecorLike)).isSameAs(fakeWindow) | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When a Compose dialog contains an
AndroidView/interop node,RootSemanticsNodeMapperdelegates it tomappingContext.interopViewCallback.map(), which traverses the Android View with the normal view mappers andDefaultViewBoundsResolver.getLocationOnScreen(), so those wireframes are already screen-absolute. Offsetting the entire returned list here shifts those interop wireframes by the dialog position a second time, causing embedded Android Views inside offset Compose roots/dialogs to appear in the wrong location.Useful? React with 👍 / 👎.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll move this change into it's own pr