JetBrains · jershell · Feb 8, 2024 · Feb 8, 2024 · Feb 15, 2024 · Feb 15, 2024
diff --git a/...ndation/foundation/src/jsWasmMain/kotlin/androidx/compose/foundation/text/TouchMode.js.kt b/...ndation/foundation/src/jsWasmMain/kotlin/androidx/compose/foundation/text/TouchMode.js.kt
@@ -16,4 +16,4 @@
 
 package androidx.compose.foundation.text
 
-internal actual val isInTouchMode = false
+internal actual val isInTouchMode = true
diff --git a/compose/mpp/demo/src/jsMain/resources/index.html b/compose/mpp/demo/src/jsMain/resources/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0">
     <title>compose multiplatform web demo</title>
     <script src="skiko.js"> </script>
     <link type="text/css" rel="stylesheet" href="styles.css">

diff --git a/compose/mpp/demo/src/wasmJsMain/resources/index.html b/compose/mpp/demo/src/wasmJsMain/resources/index.html
@@ -18,7 +18,7 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0">
     <title>compose wasm web demo</title>
     <script src="demo.js"> </script>
     <link type="text/css" rel="stylesheet" href="styles.css">

diff --git a/compose/ui/ui/src/jsMain/kotlin/androidx/compose/ui/platform/getVisualViewport.js.kt b/compose/ui/ui/src/jsMain/kotlin/androidx/compose/ui/platform/getVisualViewport.js.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.ui.platform
+
+internal actual fun getVisualViewport(): VisualViewport? {
+    return js("window.visualViewport") as? VisualViewport
+}
diff --git a/compose/ui/ui/src/jsNativeMain/kotlin/androidx/compose/ui/native/ComposeLayer.jsNative.kt b/compose/ui/ui/src/jsNativeMain/kotlin/androidx/compose/ui/native/ComposeLayer.jsNative.kt
@@ -22,6 +22,7 @@ import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.asComposeCanvas
 import androidx.compose.ui.input.InputMode
 import androidx.compose.ui.input.key.KeyEvent
+import androidx.compose.ui.input.pointer.PointerButton
 import androidx.compose.ui.input.pointer.PointerId
 import androidx.compose.ui.input.pointer.PointerType
 import androidx.compose.ui.input.pointer.toCompose
@@ -73,6 +74,9 @@ internal class ComposeLayer(
                 onPointerEventWithMultitouch(event)
             } else {
                 // macos and desktop`s web don't work properly when using onPointerEventWithMultitouch
+                if (scene.platformContext.inputModeManager.inputMode != InputMode.Keyboard) {
+                    scene.platformContext.inputModeManager.requestInputMode(InputMode.Keyboard)
+                }
                 onPointerEventNoMultitouch(event)
             }
         }

diff --git a/compose/ui/ui/src/jsWasmMain/kotlin/androidx/compose/ui/native/Actuals.js.kt b/compose/ui/ui/src/jsWasmMain/kotlin/androidx/compose/ui/native/Actuals.js.kt
@@ -15,4 +15,4 @@
  */
 package androidx.compose.ui.native
 
-internal actual val supportsMultitouch: Boolean get() = false
+internal actual val supportsMultitouch: Boolean get() = true
diff --git a/...ose/ui/ui/src/jsWasmMain/kotlin/androidx/compose/ui/platform/ImeMobileKeyboardListener.kt b/...ose/ui/ui/src/jsWasmMain/kotlin/androidx/compose/ui/platform/ImeMobileKeyboardListener.kt
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.ui.platform
+
+import kotlinx.browser.window
+import org.w3c.dom.events.*
+
+internal interface ImeMobileKeyboardListener {
+    fun onShow(callback: ()->Unit)
+    fun onHide(callback: ()->Unit)
+}
+
+internal class ImeKeyboardListenerImpl: ImeMobileKeyboardListener {
+    private var callbackOnShow = {}
+    private var callbackOnHide = {}
+
+    init {
+        val visualViewport = getVisualViewport()
+
+        if (visualViewport != null) {
+            val viewportVsClientHeightRatio = 0.75
+
+            visualViewport.addEventListener("resize", { event ->
+                val target = event.target as? VisualViewport ?: return@addEventListener
+                if (
+                    (target.height * target.scale) / window.screen.height <
+                    viewportVsClientHeightRatio
+                ) {
+                    callbackOnShow()
+                } else {
+                    callbackOnHide()
+                }
+            }, false)
+        }
+    }
+
+    override fun onShow(callback: () -> Unit) {
+        callbackOnShow = callback
+    }
+
+    override fun onHide(callback: () -> Unit) {
+        callbackOnHide = callback
+    }
+}
+
+abstract external class VisualViewport : EventTarget {
+    val offsetLeft: Double
+    val offsetTop: Double
+
+    val pageLeft: Double
+    val pageTop: Double
+
+    val width: Double
+    val height: Double
+
+    val scale: Double
+
+    val onresize: (Event) -> Unit
+    val onscroll: (Event) -> Unit
+    val onscrollend: (Event) -> Unit
+}