Move TextInputSession calls to TextInputSession.

ASalavei · ASalavei · commit 25efbda6a8f4 · 2025-04-22T17:26:59.000+02:00
diff --git a/compose/mpp/demo/src/uikitMain/kotlin/androidx/compose/mpp/demo/main.uikit.kt b/compose/mpp/demo/src/uikitMain/kotlin/androidx/compose/mpp/demo/main.uikit.kt
@@ -1,18 +1,29 @@
 // Use `xcodegen` first, then `open ./SkikoSample.xcodeproj` and then Run button in XCode.
 package androidx.compose.mpp.demo
 
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.safeDrawingPadding
+import androidx.compose.foundation.text.input.rememberTextFieldState
+import androidx.compose.material.Button
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.material.TextField
 import androidx.compose.mpp.demo.bugs.IosBugs
 import androidx.compose.mpp.demo.bugs.StartRecompositionCheck
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.ExperimentalComposeApi
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.InterceptPlatformTextInput
 import androidx.compose.ui.window.ComposeUIViewController
 import kotlinx.cinterop.BetaInteropApi
 import kotlinx.cinterop.autoreleasepool
 import kotlinx.cinterop.cstr
 import kotlinx.cinterop.memScoped
 import kotlinx.cinterop.toCValues
+import kotlinx.coroutines.awaitCancellation
 import platform.Foundation.NSStringFromClass
 import platform.UIKit.UIApplication
 import platform.UIKit.UIApplicationDelegateProtocol
@@ -43,7 +54,37 @@ fun main(vararg args: String) {
                 parallelRendering = true
             }
         ) {
-            IosDemo(arg)
+            MaterialTheme {
+                // IosDemo(arg)
+                Column(modifier = Modifier.fillMaxSize().safeDrawingPadding()) {
+                    Text("Hello World!")
+                    Button({}) {
+                        Text("Hello Button!")
+                    }
+
+                    val text = rememberTextFieldState("test")
+                    InterceptPlatformTextInput(
+                        interceptor = { _, _ -> awaitCancellation() }
+                    ) {
+                        TextField(text)
+                    }
+
+                    val text1 = remember { mutableStateOf("test") }
+                    InterceptPlatformTextInput(
+                        interceptor = { _, _ -> awaitCancellation() }
+                    ) {
+                        TextField(text1.value, onValueChange = { text1.value = it})
+                    }
+
+
+                    val text2 = rememberTextFieldState("test")
+                    TextField(text2)
+
+                    val text133 = remember { mutableStateOf("test") }
+                    TextField(text133.value, onValueChange = { text133.value = it})
+
+                }
+            }
         }
     }
 }
diff --git a/compose/ui/ui-test/src/skikoMain/kotlin/androidx/compose/ui/test/ComposeUiTest.skiko.kt b/compose/ui/ui-test/src/skikoMain/kotlin/androidx/compose/ui/test/ComposeUiTest.skiko.kt
@@ -20,7 +20,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.snapshots.Snapshot
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.InternalComposeUiApi
-import androidx.compose.ui.SessionMutex
 import androidx.compose.ui.draganddrop.DragAndDropTransferData
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Size
@@ -34,7 +33,6 @@ import androidx.compose.ui.platform.PlatformContext
 import androidx.compose.ui.platform.PlatformDragAndDropManager
 import androidx.compose.ui.platform.PlatformDragAndDropSource
 import androidx.compose.ui.platform.PlatformTextInputMethodRequest
-import androidx.compose.ui.platform.PlatformTextInputSessionScope
 import androidx.compose.ui.platform.WindowInfo
 import androidx.compose.ui.scene.CanvasLayersComposeScene
 import androidx.compose.ui.scene.ComposeScene
@@ -398,13 +396,6 @@ open class SkikoComposeUiTest @InternalTestApi constructor(
             get() = size
     }
 
-    private inner class TestTextInputSession(
-        coroutineScope: CoroutineScope
-    ) : PlatformTextInputSessionScope, CoroutineScope by coroutineScope {
-        override suspend fun startInputMethod(request: PlatformTextInputMethodRequest): Nothing =
-            awaitCancellation()
-    }
-
     private inner class TestDragAndDropManager : PlatformDragAndDropManager {
         override val isRequestDragAndDropTransferRequired: Boolean
             get() = true
@@ -443,13 +434,9 @@ open class SkikoComposeUiTest @InternalTestApi constructor(
 
         override val dragAndDropManager: PlatformDragAndDropManager = TestDragAndDropManager()
 
-        private val textInputSessionMutex = SessionMutex<TestTextInputSession>()
-
-        override suspend fun textInputSession(
-            session: suspend PlatformTextInputSessionScope.() -> Nothing
-        ): Nothing = textInputSessionMutex.withSessionCancellingPrevious(
-            sessionInitializer = { TestTextInputSession(it) }, session = session
-        )
+        override suspend fun startInputMethod(request: PlatformTextInputMethodRequest): Nothing {
+            awaitCancellation()
+        }
     }
 }
 
diff --git a/compose/ui/ui/api/desktop/ui.api b/compose/ui/ui/api/desktop/ui.api
@@ -3506,7 +3506,7 @@ public abstract interface class androidx/compose/ui/platform/PlatformContext {
 	public fun isWindowTransparent ()Z
 	public fun requestFocus ()Z
 	public fun setPointerIcon (Landroidx/compose/ui/input/pointer/PointerIcon;)V
-	public fun textInputSession (Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun startInputMethod (Landroidx/compose/ui/platform/PlatformTextInputMethodRequest;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public final class androidx/compose/ui/platform/PlatformContext$Companion {
diff --git a/compose/ui/ui/api/ui.klib.api b/compose/ui/ui/api/ui.klib.api
@@ -971,7 +971,7 @@ abstract interface androidx.compose.ui.platform/PlatformContext { // androidx.co
     open fun convertWindowToLocalPosition(androidx.compose.ui.geometry/Offset): androidx.compose.ui.geometry/Offset // androidx.compose.ui.platform/PlatformContext.convertWindowToLocalPosition|convertWindowToLocalPosition(androidx.compose.ui.geometry.Offset){}[0]
     open fun requestFocus(): kotlin/Boolean // androidx.compose.ui.platform/PlatformContext.requestFocus|requestFocus(){}[0]
     open fun setPointerIcon(androidx.compose.ui.input.pointer/PointerIcon) // androidx.compose.ui.platform/PlatformContext.setPointerIcon|setPointerIcon(androidx.compose.ui.input.pointer.PointerIcon){}[0]
-    open suspend fun textInputSession(kotlin.coroutines/SuspendFunction1<androidx.compose.ui.platform/PlatformTextInputSessionScope, kotlin/Nothing>): kotlin/Nothing // androidx.compose.ui.platform/PlatformContext.textInputSession|textInputSession(kotlin.coroutines.SuspendFunction1<androidx.compose.ui.platform.PlatformTextInputSessionScope,kotlin.Nothing>){}[0]
+    open suspend fun startInputMethod(androidx.compose.ui.platform/PlatformTextInputMethodRequest): kotlin/Nothing // androidx.compose.ui.platform/PlatformContext.startInputMethod|startInputMethod(androidx.compose.ui.platform.PlatformTextInputMethodRequest){}[0]
 
     abstract interface RootForTestListener { // androidx.compose.ui.platform/PlatformContext.RootForTestListener|null[0]
         abstract fun onRootForTestCreated(androidx.compose.ui.platform/PlatformRootForTest) // androidx.compose.ui.platform/PlatformContext.RootForTestListener.onRootForTestCreated|onRootForTestCreated(androidx.compose.ui.platform.PlatformRootForTest){}[0]
diff --git a/compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/scene/ComposeSceneMediator.desktop.kt b/compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/scene/ComposeSceneMediator.desktop.kt
@@ -715,16 +715,27 @@ internal class ComposeSceneMediator(
         override val viewConfiguration: ViewConfiguration = DesktopViewConfiguration()
         override val textInputService = this@ComposeSceneMediator.textInputService
 
-        private val textInputSessionMutex = SessionMutex<DesktopTextInputSession>()
-
-        override suspend fun textInputSession(
-            session: suspend PlatformTextInputSessionScope.() -> Nothing
-        ): Nothing = textInputSessionMutex.withSessionCancellingPrevious(
-            sessionInitializer = {
-                DesktopTextInputSession(coroutineScope = it)
-            },
-            session = session
-        )
+        override suspend fun startInputMethod(request: PlatformTextInputMethodRequest): Nothing {
+            coroutineScope {
+                launch {
+                    request.focusedRectInRoot.collect {
+                        textInputService2.focusedRectChanged(it)
+                    }
+                }
+
+                suspendCancellableCoroutine<Nothing> { continuation ->
+                    textInputService2.startInput(
+                        state = request.state,
+                        imeOptions = request.imeOptions,
+                        editText = request.editText,
+                    )
+
+                    continuation.invokeOnCancellation {
+                        textInputService2.stopInput()
+                    }
+                }
+            }
+        }
 
         override fun setPointerIcon(pointerIcon: PointerIcon) {
             contentComponent.cursor =
@@ -776,41 +787,6 @@ internal class ComposeSceneMediator(
             get() = contentComponent.density
     }
 
-    @OptIn(InternalComposeUiApi::class)
-    private inner class DesktopTextInputSession(
-        coroutineScope: CoroutineScope,
-    ) : PlatformTextInputSessionScope, CoroutineScope by coroutineScope {
-
-        private val innerSessionMutex = SessionMutex<Nothing?>()
-
-        override suspend fun startInputMethod(
-            request: PlatformTextInputMethodRequest
-        ): Nothing = innerSessionMutex.withSessionCancellingPrevious(
-            // This session has no data, just init/dispose tasks.
-            sessionInitializer = { null }
-        ) {
-            coroutineScope {
-                launch {
-                    request.focusedRectInRoot.collect {
-                        textInputService2.focusedRectChanged(it)
-                    }
-                }
-
-                suspendCancellableCoroutine<Nothing> { continuation ->
-                    textInputService2.startInput(
-                        state = request.state,
-                        imeOptions = request.imeOptions,
-                        editText = request.editText,
-                    )
-
-                    continuation.invokeOnCancellation {
-                        textInputService2.stopInput()
-                    }
-                }
-            }
-        }
-    }
-
     private class InvisibleComponent : Component() {
         fun requestFocusTemporary(): Boolean {
             return super.requestFocus(true)
diff --git a/compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/node/RootNodeOwner.skiko.kt b/compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/node/RootNodeOwner.skiko.kt
@@ -26,6 +26,7 @@ import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.InternalComposeUiApi
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.SessionMutex
 import androidx.compose.ui.autofill.Autofill
 import androidx.compose.ui.autofill.AutofillManager
 import androidx.compose.ui.autofill.AutofillTree
@@ -67,6 +68,7 @@ import androidx.compose.ui.platform.OwnedLayerManager
 import androidx.compose.ui.platform.PlatformClipboardManager
 import androidx.compose.ui.platform.PlatformContext
 import androidx.compose.ui.platform.PlatformRootForTest
+import androidx.compose.ui.platform.PlatformTextInputMethodRequest
 import androidx.compose.ui.platform.PlatformTextInputSessionScope
 import androidx.compose.ui.platform.createPlatformClipboard
 import androidx.compose.ui.platform.setLightingInfo
@@ -366,27 +368,43 @@ internal class RootNodeOwner(
         override val softwareKeyboardController =
             DelegatingSoftwareKeyboardController(textInputService)
 
-        @OptIn(InternalTextApi::class)
-        override suspend fun textInputSession(
-            session: suspend PlatformTextInputSessionScope.() -> Nothing
-        ) : Nothing {
-            coroutineScope {
-                // Currently TextInputService is used for keyboard show/hide actions and for
-                // backward compatibility by the LocalTextInputService.
-                // startInput and stopInput calls are required to properly configure the service
-                // and allow it to pass keyboard show/hide calls to the PlatformTextInputService.
-                textInputService.startInput()
-                launch {
-                    suspendCancellableCoroutine<Nothing> {
-                        it.invokeOnCancellation {
-                            textInputService.stopInput()
+        private val textInputSessionMutex = SessionMutex<TextInputSession>()
+        private inner class TextInputSession(
+            coroutineScope: CoroutineScope,
+        ) : PlatformTextInputSessionScope, CoroutineScope by coroutineScope {
+            private val innerSessionMutex = SessionMutex<Nothing?>()
+
+            @OptIn(InternalTextApi::class)
+            override suspend fun startInputMethod(request: PlatformTextInputMethodRequest): Nothing {
+                innerSessionMutex.withSessionCancellingPrevious(
+                    sessionInitializer = { null }
+                ) {
+                    // Currently TextInputService is used for keyboard show/hide actions and for
+                    // backward compatibility by the LocalTextInputService.
+                    // startInput and stopInput calls are required to properly configure the service
+                    // and allow it to pass keyboard show/hide calls to the PlatformTextInputService.
+                    textInputService.startInput()
+                    launch {
+                        suspendCancellableCoroutine<Nothing> {
+                            it.invokeOnCancellation {
+                                textInputService.stopInput()
+                            }
                         }
                     }
+                    platformContext.startInputMethod(request)
                 }
-                platformContext.textInputSession(session)
             }
         }
 
+        override suspend fun textInputSession(
+            session: suspend PlatformTextInputSessionScope.() -> Nothing
+        ) : Nothing {
+            textInputSessionMutex.withSessionCancellingPrevious(
+                sessionInitializer = ::TextInputSession,
+                session = session
+            )
+        }
+
         override val dragAndDropManager = this@RootNodeOwner.dragAndDropOwner
         override val pointerIconService = PointerIconServiceImpl()
         override val semanticsOwner = SemanticsOwner(root, rootSemanticsNode, layoutNodes)
diff --git a/compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/platform/PlatformContext.skiko.kt b/compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/platform/PlatformContext.skiko.kt
@@ -111,9 +111,7 @@ interface PlatformContext {
     val inputModeManager: InputModeManager
     val textInputService: PlatformTextInputService get() = EmptyPlatformTextInputService
 
-    suspend fun textInputSession(
-        session: suspend PlatformTextInputSessionScope.() -> Nothing
-    ): Nothing {
+    suspend fun startInputMethod(request: PlatformTextInputMethodRequest): Nothing {
         awaitCancellation()
     }
 
diff --git a/compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/scene/ComposeSceneMediator.uikit.kt b/compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/scene/ComposeSceneMediator.uikit.kt
diff --git a/compose/ui/ui/src/webCommonW3C/kotlin/androidx/compose/ui/window/ComposeWindow.web.kt b/compose/ui/ui/src/webCommonW3C/kotlin/androidx/compose/ui/window/ComposeWindow.web.kt
diff --git a/compose/ui/ui/src/webCommonW3C/kotlin/androidx/compose/ui/window/WebTextInputSession.kt b/compose/ui/ui/src/webCommonW3C/kotlin/androidx/compose/ui/window/WebTextInputSession.kt

Original file line number	Diff line number	Diff line change
`@@ -3506,7 +3506,7 @@ public abstract interface class androidx/compose/ui/platform/PlatformContext {`
`3506`	`3506`	`public fun isWindowTransparent ()Z`
`3507`	`3507`	`public fun requestFocus ()Z`
`3508`	`3508`	`public fun setPointerIcon (Landroidx/compose/ui/input/pointer/PointerIcon;)V`
`3509`		`- public fun textInputSession (Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;`
	`3509`	`+ public fun startInputMethod (Landroidx/compose/ui/platform/PlatformTextInputMethodRequest;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;`
`3510`	`3510`	`}`
`3511`	`3511`
`3512`	`3512`	`public final class androidx/compose/ui/platform/PlatformContext$Companion {`
Original file line number	Diff line number	Diff line change
`@@ -111,9 +111,7 @@ interface PlatformContext {`
`111`	`111`	`val inputModeManager: InputModeManager`
`112`	`112`	`val textInputService: PlatformTextInputService get() = EmptyPlatformTextInputService`
`113`	`113`
`114`		`- suspend fun textInputSession(`
`115`		`- session: suspend PlatformTextInputSessionScope.() -> Nothing`
`116`		`- ): Nothing {`
	`114`	`+ suspend fun startInputMethod(request: PlatformTextInputMethodRequest): Nothing {`
`117`	`115`	`awaitCancellation()`
`118`	`116`	`}`
`119`	`117`