RState -> State

examples/src/main/kotlin/example/AxiosSearch.kt

@@ -6,13 +6,15 @@ package example
  * This example queries the database of ZIP codes at http://ziptasticapi.com and displays the results.
  */
 
-import kotlinext.js.*
-import kotlinx.html.*
-import kotlinx.html.js.*
-import org.w3c.dom.*
+import kotlinext.js.js
+import kotlinext.js.jsObject
+import kotlinx.html.InputType
+import kotlinx.html.js.onChangeFunction
+import kotlinx.html.title
+import org.w3c.dom.HTMLInputElement
 import react.*
 import react.dom.*
-import kotlin.js.*
+import kotlin.js.Promise
 
 @JsModule("axios")
 @JsNonModule
@@ -58,7 +60,7 @@ data class ZipResult(val country: String, val state: String, val city: String)
 
 interface AxiosProps : RProps
 
-interface AxiosState : RState {
+interface AxiosState : State {
     var zipCode: String
     var zipResult: ZipResult
     var errorMessage: String

examples/src/main/kotlin/example/Product.kt

@@ -7,10 +7,11 @@ package example
  * Date: Nov 24, 2017
  */
 
-import kotlinext.js.*
-import kotlinx.html.*
-import kotlinx.html.js.*
-import org.w3c.dom.*
+import kotlinext.js.js
+import kotlinx.html.InputType
+import kotlinx.html.js.onChangeFunction
+import kotlinx.html.js.onClickFunction
+import org.w3c.dom.HTMLInputElement
 import react.*
 import react.dom.*
 
@@ -71,7 +72,7 @@ interface SearchBarProps : RProps {
     var filterText: String
 }
 
-class SearchBar(props: SearchBarProps) : RComponent<SearchBarProps, RState>(props) {
+class SearchBar(props: SearchBarProps) : RComponent<SearchBarProps, State>(props) {
     override fun RBuilder.render() {
         div {
             input(type = InputType.text, name = "filterText") {
@@ -116,7 +117,7 @@ fun RBuilder.searchBar(
 
 interface ProductProps : RProps
 
-interface ProductState : RState {
+interface ProductState : State {
     var filterText: String
     var inStockOnly: Boolean
 }

examples/src/main/kotlin/example/Quill.kt

@@ -8,7 +8,7 @@ package example
  */
 
 import react.*
-import react.dom.*
+import react.dom.div
 
 @JsModule("react-quill")
 @JsNonModule
@@ -23,7 +23,7 @@ interface QuillProps : RProps {
     var initialText: String
 }
 
-interface QuillState : RState {
+interface QuillState : State {
     var text: String
 }
 

examples/src/main/kotlin/example/TicTacToe.kt

@@ -1,6 +1,6 @@
 package example
 
-import kotlinx.html.js.*
+import kotlinx.html.js.onClickFunction
 import react.*
 import react.dom.*
 
@@ -27,7 +27,7 @@ interface BoardProps : RProps {
     var onClick: (Int) -> () -> Unit
 }
 
-class Board(props: BoardProps) : RComponent<BoardProps, RState>(props) {
+class Board(props: BoardProps) : RComponent<BoardProps, State>(props) {
     fun RBuilder.renderSquare(i: Int) {
         square(props.squares[i], props.onClick(i))
     }
@@ -62,7 +62,7 @@ fun RBuilder.board(initialSquares: Array<String?>, onClick: (Int) -> () -> Unit)
 
 interface TicTacToeProps : RProps
 
-interface TicTacToeState : RState {
+interface TicTacToeState : State {
     var history: Array<Array<String?>>
     var xIsNext: Boolean
     var stepNumber: Int

examples/src/main/kotlin/example/Todo.kt

@@ -1,8 +1,9 @@
 package example
 
-import kotlinx.html.*
-import kotlinx.html.js.*
-import org.w3c.dom.*
+import kotlinx.html.InputType
+import kotlinx.html.js.onChangeFunction
+import kotlinx.html.js.onClickFunction
+import org.w3c.dom.HTMLInputElement
 import react.*
 import react.dom.*
 
@@ -14,7 +15,7 @@ interface TodoProps : RProps {
     var initialItems: List<String?>
 }
 
-interface TodoState : RState {
+interface TodoState : State {
     var items: List<String?>
     var text: String
 }

kotlin-react-redux/src/main/kotlin/react/redux/Imports.kt

@@ -6,7 +6,7 @@ package react.redux
 import react.*
 import redux.Store
 
-external class Provider : Component<ProviderProps, RState> {
+external class Provider : Component<ProviderProps, State> {
     override fun render(): ReactElement?
 }
 

kotlin-react-router-dom/src/main/kotlin/react/router/dom/routing.kt

@@ -15,15 +15,15 @@ external val BrowserRouterComponent: RClass<BrowserRouterProps>
 external val SwitchComponent: RClass<RProps>
 
 @JsName("Route")
-external class RouteComponent<T : RProps> : Component<RouteProps<T>, RState> {
+external class RouteComponent<T : RProps> : Component<RouteProps<T>, State> {
     override fun render(): ReactElement?
 }
 
 @JsName("Link")
 external val LinkComponent: RClass<LinkProps>
 
 @JsName("NavLink")
-external class NavLinkComponent<T : RProps> : Component<NavLinkProps<T>, RState> {
+external class NavLinkComponent<T : RProps> : Component<NavLinkProps<T>, State> {
     override fun render(): ReactElement?
 }
 

kotlin-react/src/main/kotlin/react/Component.ext.kt

@@ -2,6 +2,6 @@ package react
 
 import kotlinext.js.assign
 
-fun <S : RState> Component<*, S>.setState(buildState: S.() -> Unit) {
+fun <S : State> Component<*, S>.setState(buildState: S.() -> Unit) {
     setState({ assign(it, buildState) })
 }

kotlin-react/src/main/kotlin/react/Component.kt

@@ -3,7 +3,7 @@
 
 package react
 
-abstract external class Component<P : RProps, S : RState>(
+abstract external class Component<P : RProps, S : State>(
     props: P = definedExternally,
 ) {
     val props: P

kotlin-react/src/main/kotlin/react/ComponentClass.kt

@@ -5,14 +5,14 @@ import kotlin.reflect.KClass
 // TODO: Should extend RComponentClassStatics, but has problems with generic params
 external interface ComponentClass<in P : RProps> :
     ComponentType<P>,
-    RComponentClassStatics<RProps, RState, Context<*>?>
+    RComponentClassStatics<RProps, State, Context<*>?>
 
 typealias RClass<P> = ComponentClass<P>
 
 val <P : RProps> KClass<out Component<P, *>>.rClass: ComponentClass<P>
     get() = js.unsafeCast<ComponentClass<P>>()
 
-external interface RComponentClassStatics<P : RProps, S : RState, C : Context<*>?> {
+external interface RComponentClassStatics<P : RProps, S : State, C : Context<*>?> {
     var displayName: String?
     var defaultProps: P?
     var contextType: C
@@ -34,6 +34,6 @@ external interface RComponentClassStatics<P : RProps, S : RState, C : Context<*>
  *
  * in your class components
  */
-open class RStatics<P : RProps, S : RState, C : Component<P, S>, CTX : Context<*>?>(
+open class RStatics<P : RProps, S : State, C : Component<P, S>, CTX : Context<*>?>(
     klazz: KClass<C>,
 ) : RComponentClassStatics<P, S, CTX> by klazz.js.unsafeCast<RComponentClassStatics<P, S, CTX>>()

kotlin-react/src/main/kotlin/react/PureComponent.kt

@@ -3,7 +3,7 @@
 
 package react
 
-abstract external class PureComponent<P : RProps, S : RState>(
+abstract external class PureComponent<P : RProps, S : State>(
     props: P = definedExternally,
 ) : Component<P, S> {
 

kotlin-react/src/main/kotlin/react/RComponent.kt

@@ -2,7 +2,7 @@ package react
 
 import kotlinext.js.jsObject
 
-abstract class RComponent<P : RProps, S : RState> : Component<P, S> {
+abstract class RComponent<P : RProps, S : State> : Component<P, S> {
     constructor() : super() {
         state = jsObject { init() }
     }

kotlin-react/src/main/kotlin/react/RPureComponent.kt

@@ -2,7 +2,7 @@ package react
 
 import kotlinext.js.jsObject
 
-abstract class RPureComponent<P : RProps, S : RState> : PureComponent<P, S> {
+abstract class RPureComponent<P : RProps, S : State> : PureComponent<P, S> {
     constructor() : super() {
         state = jsObject { init() }
     }

kotlin-react/src/main/kotlin/react/State.kt

@@ -1,5 +1,11 @@
 package react
 
-external interface RState
+external interface State
 
-class BoxedState<T>(var state: T) : RState
+class BoxedState<T>(var state: T) : State
+
+@Deprecated(
+    message = "Legacy type alias",
+    replaceWith = ReplaceWith("State", "react.State"),
+)
+typealias RState = State