Fix a11y wrong bounds calculation #1165
Conversation
| * space of the root UIWindow in which hierarchy with the container window resides. | ||
| */ | ||
| fun convertContainerWindowRectToRootWindowCGRect(rect: Rect): CValue<CGRect> { | ||
| val windowContainer = _windowContainer ?: return CGRectZero.readValue() |
There was a problem hiding this comment.
It should return rect from parameters, not zero rect in the case
There was a problem hiding this comment.
Same as:
#1165 (comment)
| rect.toDpRect(windowContainer.density()).asCGRect() | ||
| } else { | ||
| // windowContainer is not attached to any window | ||
| CGRectZero.readValue() |
There was a problem hiding this comment.
Again, return rect in this case
There was a problem hiding this comment.
Do we support the case where _windowContainer is null and we still perform this calculation? Why should we return any value at this point? I'd better throw an exception instead, tbh
There was a problem hiding this comment.
Yes we do. for this class without context from its usages, it means that _windowContainer == compose view
|
|
||
| val windowContainerWindow = windowContainer.window | ||
|
|
||
| fun UIWindow.density(): Density { |
There was a problem hiding this comment.
no need to be local function, move to the end of the file
There was a problem hiding this comment.
I don't want to move it in that scope, because that's not a real density with correct fontScale. It's only there because following calculations need Density instead of just Float, and that can be derived from UIWindow directly.
| // windowContainer is not attached to any window | ||
| CGRectZero.readValue() | ||
| } | ||
| } else { |
There was a problem hiding this comment.
check if windowContainerWindow != windowContainer
There was a problem hiding this comment.
windowContainer.window will be null in case it's true, it's a redundant check.
compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/platform/PlatformWindowContext.uikit.kt
Outdated
Show resolved
Hide resolved
compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/platform/PlatformWindowContext.uikit.kt
Outdated
Show resolved
Hide resolved
Proposed Changes
Fix the logical error where
boundsInWindowis treated as view local coordinates.Testing
Test: Demo NativeModalWithNavigation now resolves correct
accessibilityFrame. So is the case for the views whose frames don't match the app root UIWindow bounds.