Fix IME window insets and view offset when keyboard appears #1199
Conversation
This file contains 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
MatkovIvan
requested changes
Mar 18, 2024
compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/uikit/KeyboardOverlapHeight.uikit.kt
Outdated
Show resolved
Hide resolved
compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/uikit/KeyboardOverlapHeight.uikit.kt
Outdated
Show resolved
Hide resolved
compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/uikit/KeyboardOverlapHeight.uikit.kt
Outdated
Show resolved
Hide resolved
# Conflicts: # compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/scene/ComposeSceneMediator.uikit.kt # compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/scene/UIViewComposeSceneLayer.uikit.kt
|
Updates: Keyboard overlapping logic was updated. Also lots of bugs connected with platform layers where fixed. PTAL. |
MatkovIvan
reviewed
Apr 3, 2024
compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/uikit/KeyboardOverlapHeight.uikit.kt
Outdated
Show resolved
Hide resolved
Merged
MatkovIvan
reviewed
Apr 4, 2024
...ui/ui/src/uikitMain/kotlin/androidx/compose/ui/uikit/KeyboardSceneDisplayParameters.uikit.kt
Outdated
Show resolved
Hide resolved
...ui/ui/src/uikitMain/kotlin/androidx/compose/ui/uikit/KeyboardSceneDisplayParameters.uikit.kt
Outdated
Show resolved
Hide resolved
...ui/ui/src/uikitMain/kotlin/androidx/compose/ui/uikit/KeyboardSceneDisplayParameters.uikit.kt
Outdated
Show resolved
Hide resolved
...ui/ui/src/uikitMain/kotlin/androidx/compose/ui/uikit/KeyboardSceneDisplayParameters.uikit.kt
Outdated
Show resolved
Hide resolved
...ui/ui/src/uikitMain/kotlin/androidx/compose/ui/uikit/KeyboardSceneDisplayParameters.uikit.kt
Outdated
Show resolved
Hide resolved
MatkovIvan
reviewed
Apr 4, 2024
compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/window/ComposeContainer.uikit.kt
Show resolved
Hide resolved
...e/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/window/ComposeSceneKeyboardOffsetManager.kt
Outdated
Show resolved
Hide resolved
compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/uikit/SoftwareKeyboardState.uikit.kt
Outdated
Show resolved
Hide resolved
MatkovIvan
requested changes
Apr 5, 2024
There was a problem hiding this comment.
After discussion with @ASalavei we found that the problem is in incorrect coordinates conversion, so it must be fixed instead of introducing a new offset for selection handles.
...on/src/uikitMain/kotlin/androidx/compose/foundation/text/selection/SelectionHandles.uikit.kt
Outdated
Show resolved
Hide resolved
compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/uikit/SoftwareKeyboardState.uikit.kt
Outdated
Show resolved
Hide resolved
...e/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/window/ComposeSceneKeyboardOffsetManager.kt
Outdated
Show resolved
Hide resolved
# Conflicts: # compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/scene/ComposeSceneMediator.uikit.kt
MatkovIvan
reviewed
Apr 9, 2024
compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/platform/PlatformInsets.uikit.kt
Outdated
Show resolved
Hide resolved
compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/scene/ComposeSceneMediator.uikit.kt
Outdated
Show resolved
Hide resolved
compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/scene/ComposeSceneMediator.uikit.kt
Outdated
Show resolved
Hide resolved
compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/uikit/KeyboardOverlapHeight.uikit.kt
Outdated
Show resolved
Hide resolved
compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/window/ComposeContainer.uikit.kt
Outdated
Show resolved
Hide resolved
…election handlers location
MatkovIvan
reviewed
Apr 12, 2024
compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/scene/ComposeSceneMediator.uikit.kt
Outdated
Show resolved
Hide resolved
...on/src/uikitMain/kotlin/androidx/compose/foundation/text/selection/SelectionHandles.uikit.kt
Outdated
Show resolved
Hide resolved
# Conflicts: # compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/window/IntermediateTextInputUIView.uikit.kt
MatkovIvan
approved these changes
Apr 15, 2024
| animationView.setFrame(animationTargetFrame) | ||
| }, | ||
| completion = { isFinished -> | ||
| keyboardDisplayLink.invalidate() |
There was a problem hiding this comment.
Should we also set keyboardAnimationListener to nil here? Unlike usual target:selector: APIs, CADisplayLink strongly retains its target. Could that lead to a retain-cycle that GC can't break?
There was a problem hiding this comment.
Thanks, that's make sense! I added nullification code.
Comment on lines
+225
to
+226
| dispatch_async(dispatch_get_main_queue()) { | ||
| keyboardDisplayLink.addToRunLoop(NSRunLoop.mainRunLoop(), NSDefaultRunLoopMode) |
There was a problem hiding this comment.
Can that potentially trigger race condition if for some reason animation at 208 is immediately cancelled for some reason? Its completion handler will execute with displayLink being invalidated, but then the displayLink will be added to runloop after.
There was a problem hiding this comment.
Thanks for spotting. I checked various scenarios and it looks like everything works pretty fine. Invalidated display ling can be added successfully to run loop with no further effect.
elijah-semyonov
approved these changes
Apr 15, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Proposed Changes
UIViewComposeSceneLayer. Untie it from the view controller life cycle.ImeWindowInsetsclass andState<Float>to calculate and pass insets for each individual compose window.Fixes JetBrains/compose-multiplatform#4016
Fixes JetBrains/compose-multiplatform#4618