CfW: fix browser key events consumption

compose/ui/ui/src/jsNativeMain/kotlin/androidx/compose/ui/native/ComposeLayer.jsNative.kt

@@ -53,16 +53,20 @@ internal class ComposeLayer(
     // Should be set to an actual value by ComposeWindow implementation
     private var density = Density(1f)
 
-    private inner class ComponentImpl : SkikoView {
+    private inner class ComponentImpl : SkikoViewExtension {
         override val input = this@ComposeLayer.input
 
         override fun onRender(canvas: Canvas, width: Int, height: Int, nanoTime: Long) {
             scene.render(canvas.asComposeCanvas(), nanoTime)
         }
 
         override fun onKeyboardEvent(event: SkikoKeyboardEvent) {
-            if (isDisposed) return
-            scene.sendKeyEvent(KeyEvent(event))
+            onKeyboardEventWithResult(event)
+        }
+
+        override fun onKeyboardEventWithResult(event: SkikoKeyboardEvent): Boolean {
+            if (isDisposed) return false
+            return scene.sendKeyEvent(KeyEvent(event))
         }
 
         override fun onPointerEvent(event: SkikoPointerEvent) {
@@ -183,4 +187,8 @@ internal fun SkikoPointerEvent.getScrollDelta(): Offset {
     }?.let {
         Offset(it.deltaX.toFloat(), it.deltaY.toFloat())
     } ?: Offset.Zero
+}
+
+internal interface SkikoViewExtension : SkikoView {
+    fun onKeyboardEventWithResult(event: SkikoKeyboardEvent): Boolean
 }

compose/ui/ui/src/webCommonW3C/kotlin/androidx/compose/ui/window/ComposeWindow.js.kt

@@ -28,6 +28,7 @@ import androidx.compose.ui.events.toSkikoScrollEvent
 import androidx.compose.ui.input.pointer.BrowserCursor
 import androidx.compose.ui.input.pointer.PointerIcon
 import androidx.compose.ui.native.ComposeLayer
+import androidx.compose.ui.native.SkikoViewExtension
 import androidx.compose.ui.platform.JSTextInputService
 import androidx.compose.ui.platform.PlatformContext
 import androidx.compose.ui.platform.ViewConfiguration
@@ -95,9 +96,9 @@ private class ComposeWindow(
 
     val canvas = document.getElementById(canvasId) as HTMLCanvasElement
 
-    private fun <T : Event> HTMLCanvasElement.addTypedEvent(type: String, handler: (event: T, skikoView: SkikoView) -> Unit) {
+    private fun <T : Event> HTMLCanvasElement.addTypedEvent(type: String, handler: (event: T, skikoView: SkikoViewExtension) -> Unit) {
         addEventListener(type, { event ->
-            layer.layer?.skikoView?.let { skikoView -> handler(event as T, skikoView) }
+            layer.layer?.skikoView?.let { skikoView -> handler(event as T, skikoView as SkikoViewExtension) }
         })
     }
 
@@ -159,13 +160,13 @@ private class ComposeWindow(
         })
 
         canvas.addTypedEvent<KeyboardEvent>("keydown") { event, skikoView ->
-            event.preventDefault()
-            skikoView.onKeyboardEvent(event.toSkikoEvent(SkikoKeyboardEventKind.DOWN))
+            val processed = skikoView.onKeyboardEventWithResult(event.toSkikoEvent(SkikoKeyboardEventKind.DOWN))
+            if (processed) event.preventDefault()
         }
 
         canvas.addTypedEvent<KeyboardEvent>("keyup") { event, skikoView ->
-            event.preventDefault()
-            skikoView.onKeyboardEvent(event.toSkikoEvent(SkikoKeyboardEventKind.UP))
+            val processed = skikoView.onKeyboardEventWithResult(event.toSkikoEvent(SkikoKeyboardEventKind.UP))
+            if (processed) event.preventDefault()
         }
     }