UIView-based Compose integration API#2589
Merged
Conversation
ASalavei
changed the title
ASalavei
changed the title
# Conflicts: # compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/scene/ComposeHostingViewController.uikit.kt
ASalavei
requested review from
MatkovIvan,
igordmn,
mazunin-v-jb and
svastven
mazunin-v-jb
approved these changes
Dec 9, 2025
...i/src/uikitInstrumentedTest/kotlin/androidx/compose/ui/interop/InteropInteractionModeTest.kt
Outdated
Show resolved
Hide resolved
.../ui/src/uikitInstrumentedTest/kotlin/androidx/compose/ui/interaction/BasicInteractionTest.kt
Outdated
Show resolved
Hide resolved
compose/ui/ui/src/uikitInstrumentedTest/kotlin/androidx/compose/ui/interop/InteropUIMenuTest.kt
Outdated
Show resolved
Hide resolved
...i/src/uikitInstrumentedTest/kotlin/androidx/compose/ui/modifiers/KeepScreenOnModifierTest.kt
Outdated
Show resolved
Hide resolved
compose/ui/ui/src/uikitInstrumentedTest/kotlin/androidx/compose/ui/scroll/ScrollTest.kt
Outdated
Show resolved
Hide resolved
.../ui/src/uikitInstrumentedTest/kotlin/androidx/compose/ui/interaction/BasicInteractionTest.kt
Outdated
Show resolved
Hide resolved
compose/ui/ui/src/iosMain/kotlin/androidx/compose/ui/scene/ComposeSceneMediator.ios.kt
Show resolved
Hide resolved
MatkovIvan
requested changes
Dec 12, 2025
compose/ui/ui/src/iosMain/kotlin/androidx/compose/ui/scene/ComposeContainer.ios.kt
Show resolved
Hide resolved
compose/ui/ui/src/iosMain/kotlin/androidx/compose/ui/scene/ComposeContainer.ios.kt
Outdated
Show resolved
Hide resolved
compose/ui/ui/src/iosMain/kotlin/androidx/compose/ui/scene/ComposeContainer.ios.kt
Outdated
Show resolved
Hide resolved
compose/ui/ui/src/iosMain/kotlin/androidx/compose/ui/scene/ComposeHostingView.ios.kt
Show resolved
Hide resolved
compose/ui/ui/src/iosMain/kotlin/androidx/compose/ui/uikit/ComposeContainerConfiguration.ios.kt
Show resolved
Hide resolved
Comment on lines
+21
to
+23
| /** | ||
| * Base configuration of the Compose container. | ||
| */ |
Member
There was a problem hiding this comment.
For the public, it should contain more details. At lease references to usages
Author
There was a problem hiding this comment.
Generally it looks okay since all the internal properties are documented. Added references to the point of use in child classes.
compose/ui/ui/src/iosMain/kotlin/androidx/compose/ui/uikit/ComposeContainerConfiguration.ios.kt
Outdated
Show resolved
Hide resolved
| } | ||
| } | ||
|
|
||
| println("Debug: Running test with ComposeHostingViewController") |
Member
There was a problem hiding this comment.
Should we keep this println in jb-main?
I see that there is a pattern to hide it under const flag and set it to false
Author
There was a problem hiding this comment.
That's for tests debugging purposes. Otherwise it will be hard to understand what was the conditions where the test failed.
|
|
||
| fun waitUntil( | ||
| conditionDescription: String? = null, | ||
| timeoutMillis: Long = 5_000, |
Member
There was a problem hiding this comment.
Let's convert it to Duration to have XXX.milliseconds outside for self-documentation
Author
There was a problem hiding this comment.
Current API is already established - the function was moved here.
svastven
reviewed
Dec 12, 2025
compose/ui/ui/src/iosMain/kotlin/androidx/compose/ui/scene/ComposeHostingViewController.ios.kt
Show resolved
Hide resolved
.../uikitInstrumentedTest/kotlin/androidx/compose/ui/integrations/ComposeViewIntegrationTest.kt
Outdated
Show resolved
Hide resolved
compose/ui/ui/src/uikitInstrumentedTest/kotlin/androidx/compose/ui/leaks/MemoryLeaksTest.kt
Outdated
Show resolved
Hide resolved
.../uikitInstrumentedTest/kotlin/androidx/compose/ui/integrations/ComposeViewIntegrationTest.kt
Outdated
Show resolved
Hide resolved
mazunin-v-jb
approved these changes
Dec 15, 2025
MatkovIvan
approved these changes
Dec 15, 2025
svastven
approved these changes
Dec 15, 2025
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
ComposeUIViewAPI to allow Compose content to be placed directly in the view hierarchy without explicitly attaching it to the parent View Controller. However, theUIViewControllermust still be present in the hierarchy.ComposeContainerclass.ComposeContainerConfigurationfor theComposeUIViewConfigurationandComposeUIViewControllerConfiguration.Fixes https://youtrack.jetbrains.com/issue/CMP-8478/Implement-UIView-based-compose-injection-API
Fixes https://youtrack.jetbrains.com/issue/CMP-7805/Unable-to-render-composable-inside-SwiftUI-Form
Release Notes
Features - iOS
ComposeUIViewAPI enabling Compose embedding in view hierarchyFixes - iOS
Formview