Skip to content
This repository has been archived by the owner on Sep 15, 2024. It is now read-only.

updating kotlin-wrappers, including react-legacy #4

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

updating kotlin-wrappers, including react-legacy #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ fun versionOf(name: String, isWrapper: Boolean = true): String {

dependencies {
implementation("org.jetbrains.kotlin-wrappers:kotlin-react:${versionOf("react")}")
implementation("org.jetbrains.kotlin-wrappers:kotlin-react-legacy:${versionOf("react")}")
implementation("org.jetbrains.kotlin-wrappers:kotlin-react-dom:${versionOf("react")}")

implementation(npm("react-test-renderer", versionOf("react", isWrapper = false)))
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ kotlin.code.style=official
kotlin.js.generate.executable.default=false

version.react=17.0.2
version.wrappers=pre.281-kotlin-1.6.10
version.wrappers=pre.293-kotlin-1.6.10
17 changes: 11 additions & 6 deletions src/test/kotlin/TestComponent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package mysticfall.kotlin.react.test

import react.*
import react.dom.div
import react.dom.h1
import react.dom.html.ReactHTML.div
import react.dom.html.ReactHTML.h1
import react.dom.html.ReactHTML.style

external interface TestProps : Props {
var name: String
Expand All @@ -19,8 +20,10 @@ val TestFuncComponent = fc<TestProps> { props ->
setName("Updated: ${props.name}")
}

div(classes = "test-component") {
h1(classes = "title") {
div {
attrs.className = "test-component"
h1 {
attrs.className = "title"
+name
}
}
Expand All @@ -39,8 +42,10 @@ class TestClassComponent(props: TestProps) : RComponent<TestProps, TestState>(pr
}

override fun RBuilder.render() {
div(classes = "test-component") {
h1(classes = "title") {
div {
attrs.className = "test-component"
h1 {
attrs.className = "title"
+state.name
}
}
Expand Down
38 changes: 27 additions & 11 deletions src/test/kotlin/TestInstanceTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ package mysticfall.kotlin.react.test

import kotlinext.js.jso
import react.dom.*
import react.dom.html.ReactHTML.a
import react.dom.html.ReactHTML.div
import react.dom.html.ReactHTML.h1
import react.dom.html.ReactHTML.h5
import react.dom.html.ReactHTML.p
import react.react
import kotlin.js.json
import kotlin.test.*
Expand All @@ -18,7 +23,8 @@ class TestInstanceTest : ReactTestSupport {
div {
+"Div 3"

div(classes = "selected") {
div {
attrs.className = "selected"
+"Div 4"
}
}
Expand Down Expand Up @@ -63,7 +69,8 @@ class TestInstanceTest : ReactTestSupport {
fun testFindAll() {
val renderer = render {
div {
div(classes = "selected") {
div {
attrs.className = "selected"
+"Div 1"
}
div {
Expand All @@ -72,7 +79,8 @@ class TestInstanceTest : ReactTestSupport {
div {
+"Div 3"

div(classes = "selected") {
div {
attrs.className = "selected"
+"Div 4"
}
}
Expand Down Expand Up @@ -354,7 +362,8 @@ class TestInstanceTest : ReactTestSupport {
fun testFindByPropsJson() {
val renderer = render {
div {
a(classes = "selected") {
a {
attrs.className = "selected"
attrs.href = "#anchor1"

+"Link 1"
Expand All @@ -364,7 +373,8 @@ class TestInstanceTest : ReactTestSupport {

+"Link 2"
}
a(classes = "selected") {
a {
attrs.className = "selected"
+"Link 3"
}
}
Expand All @@ -382,7 +392,8 @@ class TestInstanceTest : ReactTestSupport {
fun testFindByPropsJsonNoMatch() {
val renderer = render {
div {
a(classes = "selected") {
a {
attrs.className = "selected"
+"Link 1"
}
}
Expand All @@ -399,10 +410,12 @@ class TestInstanceTest : ReactTestSupport {
fun testFindByPropsJsonMultipleMatches() {
val renderer = render {
div {
a(classes = "selected") {
a {
attrs.className = "selected"
+"Link 1"
}
a(classes = "selected") {
a {
attrs.className = "selected"
+"Link 2"
}
}
Expand Down Expand Up @@ -463,7 +476,8 @@ class TestInstanceTest : ReactTestSupport {
fun testFindAllByPropsJsonNoMatch() {
val renderer = render {
div {
a(classes = "selected") {
a {
attrs.className = "selected"
attrs.href = "#anchor1"
}
}
Expand Down Expand Up @@ -530,7 +544,8 @@ class TestInstanceTest : ReactTestSupport {
fun testProps() {
val renderer = render {
div {
h5(classes = "title") {
h5 {
attrs.className = "title"
+"Heading"
}
TestFuncComponent {
Expand All @@ -555,7 +570,8 @@ class TestInstanceTest : ReactTestSupport {
fun testParent() {
val renderer = render {
div {
div(classes = "header") {
div {
attrs.className = "header"
p {
+"Body"
}
Expand Down
15 changes: 7 additions & 8 deletions src/test/kotlin/TestRendererTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package mysticfall.kotlin.react.test

import org.w3c.dom.Element
import react.*
import react.dom.div
import react.dom.html.ReactHTML.div
import kotlin.js.json
import kotlin.test.Test
import kotlin.test.assertEquals
Expand Down Expand Up @@ -51,15 +51,13 @@ class TestRendererTest : ReactTestSupport {
|{
| "type": "div",
| "props": {
| "className": "test-component",
| "style": {}
| "className": "test-component"
| },
| "children": [
| {
| "type": "h1",
| "props": {
| "className": "title",
| "style": {}
| "className": "title"
| },
| "children": [
| "Updated: Test"
Expand Down Expand Up @@ -92,12 +90,12 @@ class TestRendererTest : ReactTestSupport {
fun testUpdate() = withComponents { type, component ->
act {
update(component) {
div(classes = "test") {}
div { attrs.className = "test"}
}
}

val actual = JSON.stringify(component.toJSON())
val expected = """{"type":"div","props":{"className":"test","style":{}},"children":null}"""
val expected = """{"type":"div","props":{"className":"test"},"children":null}"""

assertEquals(expected, actual, "Unexpected component state after update for $type")
}
Expand Down Expand Up @@ -129,7 +127,8 @@ class TestRendererTest : ReactTestSupport {
setName(elem.current?.className ?: "no ref")
}

div(classes = "test-component") {
div {
attrs.className = "test-component"
ref = elem

+name
Expand Down