Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating to be compatible with the latest kotlin-wrappers #15

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Updating to be compatible with the latest kotlin-wrappers #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56e5550
Update Kotlin version to v1.6.10
Dec 29, 2021
f1b0ea7
Update README.md
Jan 7, 2022
ec866d3
Updating to be compatible with the latest kotlin-wrappers
robertfmurdock Feb 1, 2022
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
7 changes: 5 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
This repository hosts a number of Kotlin JS wrappers for popular JavaScript libraries.

To learn more please refer to the README's of individual modules:
* [kotlin-antd](kotlin-antd/README.md)
* [kotlin-moment](kotlin-moment/README.md)
* [kotlin-antd](kotlin-antd/README.md) (Discontinued)
* [kotlin-moment](kotlin-moment/README.md) (Discontinued)
* [kotlin-react-intl](kotlin-react-intl/README.md)
* [kotlin-react-responsive](kotlin-react-responsive/README.md)
* [kotlin-uikit](kotlin-uikit/README.md)
Expand All @@ -16,6 +16,9 @@ Artifacts using Maven and Gradle are published to Maven Central.
**Important:** versions starting from the Kotlin `v1.5.21` are being published with the new group ID `io.sunland`, since
the repository has been transferred from [samgarasx](https://github.com/samgarasx) GitHub.

Also see official [JetBrains Kotlin Wrappers](https://github.com/JetBrains/kotlin-wrappers), they are including
more and more wrappers in their list.

### Contributing

If you are interested to help in this project, please see the open [issues](https://github.com/sunlandx/kotlin-js-wrappers/issues)
Expand Down
19 changes: 10 additions & 9 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
kotlin.code.style=official

kotlin.version=1.5.31
kotlin.version=1.6.10

kotlin-react.version=17.0.2-pre.258
kotlin-react-dom.version=17.0.2-pre.258
kotlin-styled.version=5.3.1-pre.258
kotlin-react-legacy.version=17.0.2-pre.293
kotlin-react-dom-legacy.version=17.0.2-pre.293
kotlin-extensions.version=1.0.1-pre.293
kotlin-styled.version=5.3.3-pre.284

kotlin-antd.version=4.8.6-pre.15
kotlin-moment.version=2.29.1-pre.14
kotlin-react-intl.version=5.21.0-pre.15
kotlin-react-responsive.version=8.2.0-pre.14
kotlin-uikit.version=3.7.6-pre.13
kotlin-antd.version=4.8.6-pre.16
kotlin-moment.version=2.29.1-pre.15
kotlin-react-intl.version=5.21.0-pre.16
kotlin-react-responsive.version=8.2.0-pre.15
kotlin-uikit.version=3.7.6-pre.14
5 changes: 5 additions & 0 deletions kotlin-antd/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,8 @@ dependencies {
You can view the [samples](https://github.com/sunlandx/kotlin-js-wrappers/tree/master/kotlin-antd/antd-samples) that follows
Ant Design [demo](https://github.com/ant-design/ant-design/tree/master/components) of each component to know
how to use this library.

### (Discontinued)

It takes so much time to be up-to-date with the latest version of Ant Design since it is being maintained
by hand instead of being auto-generated.
2 changes: 1 addition & 1 deletion kotlin-antd/antd-samples/src/main/kotlin/samples/Main.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import react.dom.render
fun main() {
require("antd/dist/antd.css")

render(document.getElementById("root")) {
render(document.getElementById("root")!!) {
app()
}
}
4 changes: 2 additions & 2 deletions kotlin-antd/antd-samples/src/main/kotlin/samples/card/Tabs.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package samples.card

import antd.card.card
import kotlinext.js.js
import kotlinext.js.jsObject
import kotlinext.js.jso
import react.*
import react.dom.a
import react.dom.br
Expand Down Expand Up @@ -67,7 +67,7 @@ class TabsCard : RComponent<Props, TabsCardState>() {
private val handleTabChange = fun(key: String, type: String) {
console.log(key, type)

val newState: dynamic = jsObject<TabsCardState> {}
val newState: dynamic = jso<TabsCardState> {}

newState[type] = key

Expand Down
14 changes: 7 additions & 7 deletions kotlin-antd/antd-samples/src/main/kotlin/samples/cascader/Basic.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,37 @@ package samples.cascader
import antd.cascader.CascaderOptionType
import antd.cascader.CascaderValueType
import antd.cascader.cascader
import kotlinext.js.jsObject
import kotlinext.js.jso
import react.RBuilder
import styled.css
import styled.styledDiv

private val cascaderOptions = arrayOf<CascaderOptionType>(
jsObject {
jso {
value = "zhejiang"
label = "Zhejiang"
children = arrayOf(
jsObject {
jso {
value = "hangzhou"
label = "Hangzhou"
children = arrayOf(
jsObject {
jso {
value = "xihu"
label = "West Lake"
}
)
}
)
},
jsObject {
jso {
value = "jiangsu"
label = "Jiangsu"
children = arrayOf(
jsObject {
jso {
value = "nanjing"
label = "Nanjing"
children = arrayOf(
jsObject {
jso {
value = "zhonghuamen"
label = "Zhong Hua Men"
}
Expand Down
14 changes: 7 additions & 7 deletions kotlin-antd/antd-samples/src/main/kotlin/samples/cascader/ChangeOnSelect.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,37 @@ package samples.cascader
import antd.cascader.CascaderOptionType
import antd.cascader.CascaderValueType
import antd.cascader.cascader
import kotlinext.js.jsObject
import kotlinext.js.jso
import react.RBuilder
import styled.css
import styled.styledDiv

private val cascaderOptions = arrayOf<CascaderOptionType>(
jsObject {
jso {
value = "zhejiang"
label = "Zhejiang"
children = arrayOf(
jsObject {
jso {
value = "hangzhou"
label = "Hangzhou"
children = arrayOf(
jsObject {
jso {
value = "xihu"
label = "West Lake"
}
)
}
)
},
jsObject {
jso {
value = "jiangsu"
label = "Jiangsu"
children = arrayOf(
jsObject {
jso {
value = "nanjing"
label = "Nanjing"
children = arrayOf(
jsObject {
jso {
value = "zhonghuamen"
label = "Zhong Hua Men"
}
Expand Down
14 changes: 7 additions & 7 deletions kotlin-antd/antd-samples/src/main/kotlin/samples/cascader/CustomRender.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package samples.cascader
import antd.cascader.CascaderOptionType
import antd.cascader.cascader
import kotlinext.js.js
import kotlinext.js.jsObject
import kotlinext.js.jso
import kotlinx.html.js.onClickFunction
import org.w3c.dom.events.Event
import react.RBuilder
Expand All @@ -20,15 +20,15 @@ external interface CustomRenderCascaderOptionType : CascaderOptionType {
}

private val cascaderOptions = arrayOf<CascaderOptionType>(
jsObject {
jso {
value = "zhejiang"
label = "Zhejiang"
children = arrayOf(
jsObject {
jso {
value = "hangzhou"
label = "Hangzhou"
children = arrayOf(
jsObject<CustomRenderCascaderOptionType> {
jso<CustomRenderCascaderOptionType> {
value = "xihu"
label = "West Lake"
code = 752100
Expand All @@ -37,15 +37,15 @@ private val cascaderOptions = arrayOf<CascaderOptionType>(
}
)
},
jsObject {
jso {
value = "jiangsu"
label = "Jiangsu"
children = arrayOf(
jsObject {
jso {
value = "nanjing"
label = "Nanjing"
children = arrayOf(
jsObject<CustomRenderCascaderOptionType> {
jso<CustomRenderCascaderOptionType> {
value = "zhonghuamen"
label = "Zhong Hua Men"
code = 453400
Expand Down
10 changes: 5 additions & 5 deletions kotlin-antd/antd-samples/src/main/kotlin/samples/cascader/CustomTrigger.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,29 @@ package samples.cascader
import antd.cascader.CascaderOptionType
import antd.cascader.CascaderValueType
import antd.cascader.cascader
import kotlinext.js.jsObject
import kotlinext.js.jso
import react.*
import react.dom.a
import react.dom.span
import styled.css
import styled.styledDiv

private val cascaderOptions = arrayOf<CascaderOptionType>(
jsObject {
jso {
value = "zhejiang"
label = "Zhejiang"
children = arrayOf(
jsObject {
jso {
value = "hangzhou"
label = "Hangzhou"
}
)
},
jsObject {
jso {
value = "jiangsu"
label = "Jiangsu"
children = arrayOf(
jsObject {
jso {
value = "nanjing"
label = "Nanjing"
}
Expand Down
14 changes: 7 additions & 7 deletions kotlin-antd/antd-samples/src/main/kotlin/samples/cascader/DefaultValue.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,37 @@ package samples.cascader
import antd.cascader.CascaderOptionType
import antd.cascader.CascaderValueType
import antd.cascader.cascader
import kotlinext.js.jsObject
import kotlinext.js.jso
import react.RBuilder
import styled.css
import styled.styledDiv

private val cascaderOptions = arrayOf<CascaderOptionType>(
jsObject {
jso {
value = "zhejiang"
label = "Zhejiang"
children = arrayOf(
jsObject {
jso {
value = "hangzhou"
label = "Hangzhou"
children = arrayOf(
jsObject {
jso {
value = "xihu"
label = "West Lake"
}
)
}
)
},
jsObject {
jso {
value = "jiangsu"
label = "Jiangsu"
children = arrayOf(
jsObject {
jso {
value = "nanjing"
label = "Nanjing"
children = arrayOf(
jsObject {
jso {
value = "zhonghuamen"
label = "Zhong Hua Men"
}
Expand Down
14 changes: 7 additions & 7 deletions kotlin-antd/antd-samples/src/main/kotlin/samples/cascader/DisabledOption.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,37 @@ package samples.cascader
import antd.cascader.CascaderOptionType
import antd.cascader.CascaderValueType
import antd.cascader.cascader
import kotlinext.js.jsObject
import kotlinext.js.jso
import react.RBuilder
import styled.css
import styled.styledDiv

private val cascaderOptions = arrayOf<CascaderOptionType>(
jsObject {
jso {
value = "zhejiang"
label = "Zhejiang"
children = arrayOf(
jsObject {
jso {
value = "hangzhou"
label = "Hangzhou"
children = arrayOf(
jsObject {
jso {
value = "xihu"
label = "West Lake"
}
)
}
)
},
jsObject {
jso {
value = "jiangsu"
label = "Jiangsu"
children = arrayOf(
jsObject {
jso {
value = "nanjing"
label = "Nanjing"
children = arrayOf(
jsObject {
jso {
value = "zhonghuamen"
label = "Zhong Hua Men"
}
Expand Down
16 changes: 8 additions & 8 deletions kotlin-antd/antd-samples/src/main/kotlin/samples/cascader/FieldNames.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package samples.cascader
import antd.cascader.CascaderOptionType
import antd.cascader.CascaderValueType
import antd.cascader.cascader
import kotlinext.js.jsObject
import kotlinext.js.jso
import react.RBuilder
import styled.css
import styled.styledDiv
Expand All @@ -15,31 +15,31 @@ external interface FieldNamesCascaderOptionType : CascaderOptionType {
}

private val cascaderOptions = arrayOf<FieldNamesCascaderOptionType>(
jsObject {
jso {
code = "zhejiang"
name = "Zhejiang"
items = arrayOf(
jsObject {
jso {
code = "hangzhou"
name = "Hangzhou"
items = arrayOf(
jsObject {
jso {
code = "xihu"
name = "West Lake"
}
)
}
)
},
jsObject {
jso {
code = "jiangsu"
name = "Jiangsu"
items = arrayOf(
jsObject {
jso {
code = "nanjing"
name = "Nanjing"
items = arrayOf(
jsObject {
jso {
code = "zhonghuamen"
name = "Zhong Hua Men"
}
Expand All @@ -58,7 +58,7 @@ fun RBuilder.fieldNames() {
css { +CascaderStyles.fieldNames }
cascader {
attrs {
fieldNames = jsObject {
fieldNames = jso {
value = "code"
label = "name"
children = "items"
Expand Down
Loading