Remove js/wasm events handling from skiko (almost) completely (#864)

This is first part of achieving goal of COMPOSE-891
JetBrains · Feb 6, 2024 · f49e746 · f49e746
1 parent 21d7a12
commit f49e746
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 558 deletions.
diff --git a/skiko/src/jsMain/kotlin/org/jetbrains/skiko/Convertors.js.kt b/skiko/src/jsMain/kotlin/org/jetbrains/skiko/Convertors.js.kt
diff --git a/skiko/src/jsMain/kotlin/org/jetbrains/skiko/SkiaLayer.js.kt b/skiko/src/jsMain/kotlin/org/jetbrains/skiko/SkiaLayer.js.kt
@@ -1,82 +1,9 @@
 package org.jetbrains.skiko
 
 import kotlinx.browser.window
-import org.jetbrains.skiko.w3c.HTMLCanvasElement
-import org.w3c.dom.TouchEvent
 import org.w3c.dom.events.KeyboardEvent
-import org.w3c.dom.events.MouseEvent
-import org.w3c.dom.events.WheelEvent
 import org.w3c.dom.events.UIEvent
 
-internal actual fun SkiaLayer.bindCanvasEventsToSkikoView(
-    canvas: HTMLCanvasElement
-) {
-    val htmlCanvas = canvas.unsafeCast<org.w3c.dom.HTMLCanvasElement>()
-    var offsetX = 0.0
-    var offsetY = 0.0
-    htmlCanvas.addEventListener("touchstart", { event ->
-        event.preventDefault()
-        event as TouchEvent
-        htmlCanvas.getBoundingClientRect().apply {
-            offsetX = left
-            offsetY = top
-        }
-        skikoView?.onPointerEvent(toSkikoEvent(event, SkikoPointerEventKind.DOWN, offsetX, offsetY))
-    })
-    htmlCanvas.addEventListener("touchmove", { event ->
-        event.preventDefault()
-        event as TouchEvent
-        skikoView?.onPointerEvent(toSkikoEvent(event, SkikoPointerEventKind.MOVE, offsetX, offsetY))
-    })
-    htmlCanvas.addEventListener("touchend", { event ->
-        event.preventDefault()
-        event as TouchEvent
-        skikoView?.onPointerEvent(toSkikoEvent(event, SkikoPointerEventKind.UP, offsetX, offsetY))
-    })
-    htmlCanvas.addEventListener("touchcancel", { event ->
-        event.preventDefault()
-        event as TouchEvent
-        skikoView?.onPointerEvent(toSkikoEvent(event, SkikoPointerEventKind.UP, offsetX, offsetY))
-    })
-    htmlCanvas.addEventListener("mousedown", { event ->
-        event as MouseEvent
-        isPointerPressed = true
-        skikoView?.onPointerEvent(toSkikoEvent(event, SkikoPointerEventKind.DOWN))
-    })
-    htmlCanvas.addEventListener("mouseup", { event ->
-        event as MouseEvent
-        isPointerPressed = false
-        skikoView?.onPointerEvent(toSkikoEvent(event, SkikoPointerEventKind.UP))
-    })
-    htmlCanvas.addEventListener("mousemove", { event ->
-        event as MouseEvent
-        if (isPointerPressed) {
-            skikoView?.onPointerEvent(toSkikoDragEvent(event))
-        } else {
-            skikoView?.onPointerEvent(toSkikoEvent(event, SkikoPointerEventKind.MOVE))
-        }
-    })
-    htmlCanvas.addEventListener("wheel", { event ->
-        event as WheelEvent
-        skikoView?.onPointerEvent(toSkikoScrollEvent(event))
-    })
-    htmlCanvas.addEventListener("contextmenu", { event ->
-        event.preventDefault()
-    })
-    htmlCanvas.addEventListener("keydown", { event ->
-        event as KeyboardEvent
-        skikoView?.onKeyboardEvent(toSkikoEvent(event, SkikoKeyboardEventKind.DOWN))
-
-        toSkikoTypeEvent(event.key, event)?.let { inputEvent ->
-            skikoView?.input?.onInputEvent(inputEvent)
-        }
-    })
-    htmlCanvas.addEventListener("keyup", { event ->
-        event as KeyboardEvent
-        skikoView?.onKeyboardEvent(toSkikoEvent(event, SkikoKeyboardEventKind.UP))
-    })
-}
-
 actual typealias SkikoGesturePlatformEvent = Any
 actual typealias SkikoPlatformInputEvent = KeyboardEvent
 actual typealias SkikoPlatformKeyboardEvent = KeyboardEvent

diff --git a/skiko/src/jsWasmMain/kotlin/org/jetbrains/skiko/SkiaLayer.js.kt b/skiko/src/jsWasmMain/kotlin/org/jetbrains/skiko/SkiaLayer.js.kt
@@ -101,7 +101,6 @@ actual open class SkiaLayer {
         }.apply { initCanvas(desiredWidth, desiredHeight, contentScale, pixelGeometry) }
         // See https://www.w3schools.com/jsref/dom_obj_event.asp
         // https://developer.mozilla.org/en-US/docs/Web/API/Pointer_events
-        bindCanvasEventsToSkikoView(htmlCanvas)
     }
 
     internal actual fun draw(canvas: Canvas) {
@@ -115,5 +114,4 @@ actual open class SkiaLayer {
 }
 
 
-internal expect fun SkiaLayer.bindCanvasEventsToSkikoView(canvas: HTMLCanvasElement)
 internal expect fun SkiaLayer.setOnChangeScaleNotifier()