From 0bff3da84bf30d79850320806ffadd16f0bfd231 Mon Sep 17 00:00:00 2001
From: Shagen Ogandzhanian <shagen.ogandzhanian@jetbrains.com>
Date: Mon, 3 Jan 2022 17:09:55 +0100
Subject: [PATCH] Attempt to have skiko-less test for Canvas application

---
 .../org/jetbrains/compose/skiko/skiko.kt      | 26 +++----
 .../jsTest/kotlin/skiko/CanvasSkikoTests.kt   | 75 +++++++++++++++++--
 2 files changed, 83 insertions(+), 18 deletions(-)

diff --git a/web/core/src/jsMain/kotlin/org/jetbrains/compose/skiko/skiko.kt b/web/core/src/jsMain/kotlin/org/jetbrains/compose/skiko/skiko.kt
index fcc8bb1e00..40f88a6afd 100644
--- a/web/core/src/jsMain/kotlin/org/jetbrains/compose/skiko/skiko.kt
+++ b/web/core/src/jsMain/kotlin/org/jetbrains/compose/skiko/skiko.kt
@@ -23,17 +23,17 @@ import androidx.compose.runtime.setValue
 
 fun ElementScope<HTMLCanvasElement>.ping() {
     onWasmReady {
-        Window("whatevs") {
-            var switched by remember { mutableStateOf(false) }
-            Button(
-                modifier = Modifier.padding(16.dp),
-                onClick = {
-                    println("Button clicked!")
-                    switched = !switched
-                }
-            ) {
-                Text(if (switched) "🦑 press 🐙" else "Press me!")
-            }
-        }
+//        Window("whatevs") {
+//            var switched by remember { mutableStateOf(false) }
+//            Button(
+//                modifier = Modifier.padding(16.dp),
+//                onClick = {
+//                    println("Button clicked!")
+//                    switched = !switched
+//                }
+//            ) {
+//                Text(if (switched) "🦑 press 🐙" else "Press me!")
+//            }
+//        }
     }
-}
\ No newline at end of file
+}
diff --git a/web/core/src/jsTest/kotlin/skiko/CanvasSkikoTests.kt b/web/core/src/jsTest/kotlin/skiko/CanvasSkikoTests.kt
index 8d544d70ff..40333062b0 100644
--- a/web/core/src/jsTest/kotlin/skiko/CanvasSkikoTests.kt
+++ b/web/core/src/jsTest/kotlin/skiko/CanvasSkikoTests.kt
@@ -1,17 +1,82 @@
 package org.jetbrains.compose.web.core.tests
 
-import kotlin.test.*
-import org.jetbrains.compose.web.testutils.*
+import androidx.compose.ui.window.ComposeCanvas
 import org.jetbrains.compose.web.dom.*
-import org.jetbrains.compose.web.skiko.ping
+import org.jetbrains.compose.web.testutils.*
+import org.w3c.dom.HTMLCanvasElement
+import kotlin.test.*
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.compose.material.Button
+import androidx.compose.material.Text
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import kotlinx.browser.document
+import org.jetbrains.compose.web.core.tests.AppStylesheet.attr
+import org.w3c.dom.CanvasRenderingContext2D
+
 
 class CanvasSkikoTests  {
     @Test
-    fun canvasSkikoTest() = runTest() {
+    fun canvasNoSkikoTest() = runTest {
+        composition {
+            Canvas {
+                attr("height", "60")
+                attr("width", "60")
+
+                DomSideEffect { canvas ->
+                    val ctx = canvas.getContext("2d") as CanvasRenderingContext2D
+                    ctx.beginPath()
+                    ctx.rect(20.0, 20.0, 40.0, 40.0)
+                    ctx.stroke()
+                }
+            }
+        }
+
+        val domCanvas = document.createElement("canvas") as HTMLCanvasElement
+        domCanvas.width = 60
+        domCanvas.height = 60
+        val ctx = domCanvas.getContext("2d") as CanvasRenderingContext2D
+        ctx.beginPath()
+        ctx.rect(10.0, 10.0, 30.0, 30.0)
+        ctx.stroke()
+
+        val canvas = nextChild() as HTMLCanvasElement
+        assertEquals(domCanvas.toDataURL(), canvas.toDataURL())
+    }
+
+
+    @Test
+    fun canvasSkikoTest() = runTest {
         composition {
             Canvas() {
-                ping()
+                DomSideEffect { canvas ->
+
+                    ComposeCanvas(canvas).apply {
+                        setContent {
+                            Button(
+                                modifier = Modifier.padding(16.dp),
+                                onClick = {
+                                    println("Button clicked!")
+                                   // switched = !switched
+                                }
+                            ) {
+                                //Text(if (switched) "🦑 press 🐙" else "Press me!")
+                                Text("Press me!")
+                            }
+                        }
+
+                     }
+                }
             }
         }
+
+        val canvas = nextChild() as HTMLCanvasElement
+        assertEquals("xxx", canvas.toDataURL())
     }
 }
\ No newline at end of file