Merge pull request #190 from turansky/strict-contract-build-element

Strict contract for `buildElement`
JetBrains · Apr 14, 2020 · bbbd58f · bbbd58f
2 parents ff6b6ab + a177303
commit bbbd58f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/kotlin-extensions/src/main/kotlin/kotlinext/js/Object.kt b/kotlin-extensions/src/main/kotlin/kotlinext/js/Object.kt
@@ -17,7 +17,7 @@ external interface JsObject {
     fun propertyIsEnumerable(v: String): Boolean
 }
 
-fun Any.asJsObject() = this as JsObject
+fun Any.asJsObject() = unsafeCast<JsObject>()
 
 external object Object {
     fun <P, T : P> getPrototypeOf(o: T): P?

diff --git a/kotlin-react/src/main/kotlin/react/RBuilder.kt b/kotlin-react/src/main/kotlin/react/RBuilder.kt
@@ -85,8 +85,10 @@ fun buildElements(handler: RBuilder.() -> Unit): dynamic {
 
 open class RBuilderSingle : RBuilder()
 
-inline fun buildElement(handler: RBuilder.() -> Unit): ReactElement? =
-    RBuilder().apply(handler).childList.first() as ReactElement?
+inline fun buildElement(handler: RBuilder.() -> Unit): ReactElement =
+    RBuilder().apply(handler)
+        .childList.first()
+        .unsafeCast<ReactElement>()
 
 open class RElementBuilder<out P : RProps>(open val attrs: P) : RBuilder() {
     fun attrs(handler: P.() -> Unit) {