cleanup

Author: bashor

frontend/src/org/jetbrains/react/Imports.kt

@@ -6,7 +6,8 @@ external interface ReactUpdater {
     fun enqueueCallback(dest: Any, callback: Any, method: String)
 }
 
-external interface ReactSpec {
-    @JsName("createElement")
+@JsModule("react")
+@JsNonModule
+external object React {
     fun createElement(type: Any, props: dynamic, vararg child: Any): ReactElement
 }

frontend/src/org/jetbrains/react/ReactBuilder.kt

@@ -1,7 +1,6 @@
 package react
 
-import runtime.reflect.*
-import runtime.wrappers.*
+import runtime.reflect.createInstance
 
 
 @DslMarker
@@ -18,7 +17,7 @@ open class ReactBuilder {
             get() = type
 
         fun create() : ReactElement {
-            return React.createRaw(realType, props, children)
+            return ReactWrapper.createRaw(realType, props, children)
         }
     }
 

frontend/src/org/jetbrains/react/React.kt renamed to frontend/src/org/jetbrains/react/ReactWrapper.kt

@@ -1,13 +1,10 @@
 package react
 
-import runtime.wrappers.*
+import runtime.wrappers.toPlainObjectStripNull
 
 interface ReactElement
 
-object React {
-
-    private val raw: ReactSpec = require("react")
-
+internal object ReactWrapper {
     fun normalize(child: Any?) : List<Any> = when(child) {
         null -> listOf()
         is Iterable<*> -> child.filterNotNull()
@@ -16,5 +13,5 @@ object React {
     }
 
     fun createRaw(type: Any, props: dynamic, child: Any? = null): ReactElement =
-       raw.createElement(type, toPlainObjectStripNull(props), *normalize(child).toTypedArray())
+            React.createElement(type, toPlainObjectStripNull(props), *normalize(child).toTypedArray())
 }

frontend/src/org/jetbrains/react/dom/ReactDOMComponent.kt

@@ -1,13 +1,13 @@
 package react.dom
 
+import org.w3c.dom.Element
 import react.*
-import org.w3c.dom.*
 
 abstract class ReactDOMComponent<P : RProps, S : RState> : ReactComponent<P, S>() {
     abstract fun ReactDOMBuilder.render()
 
     open fun ReactBuilder.children() {
-        children.addAll(React.normalize(props.children))
+        children.addAll(ReactWrapper.normalize(props.children))
     }
 
     val DOMNode: Element