Switch to Scala.js-defined React Class component

Author: viktor-podzigun

core/src/main/resources/io/github/shogowada/scalajs/reactjs/CreateClass.js

@@ -0,0 +1,69 @@
+package io.github.shogowada.scalajs.reactjs
+
+import io.github.shogowada.scalajs.reactjs.classes.ReactClass
+import io.github.shogowada.scalajs.reactjs.elements.ReactElement
+
+import scala.scalajs.js
+
+object NativeCreateClass {
+
+  def create(
+    displayName: String,
+    renderDef: js.Function1[js.Dynamic, ReactElement],
+    getInitialState: js.Function1[js.Dynamic, js.Dynamic],
+    componentDidMountDef: js.Function1[js.Dynamic, Unit],
+    shouldComponentUpdateDef: js.Function3[js.Dynamic, js.Dynamic, js.Dynamic, Boolean],
+    componentDidUpdateDef: js.Function3[js.Dynamic, js.Dynamic, js.Dynamic, Unit],
+    componentWillUnmountDef: js.Function1[js.Dynamic, Unit],
+    componentDidCatchDef: js.Function3[js.Dynamic, js.Object, js.Dynamic, Unit]
+  ): ReactClass = {
+
+    class ReactComponentImpl(props: js.Dynamic) extends ReactComponent(props) {
+
+      this.asInstanceOf[js.Dynamic].state = getInitialState(this.asInstanceOf[js.Dynamic])
+
+      def componentDidMount(): Unit = {
+        componentDidMountDef(this.asInstanceOf[js.Dynamic])
+      }
+
+      def shouldComponentUpdate(nextProps: js.Dynamic, nextState: js.Dynamic): Boolean = {
+        shouldComponentUpdateDef(this.asInstanceOf[js.Dynamic], nextProps, nextState)
+      }
+
+      def componentDidUpdate(prevProps: js.Dynamic, prevState: js.Dynamic): Unit = {
+        componentDidUpdateDef(this.asInstanceOf[js.Dynamic], prevProps, prevState)
+      }
+
+      def componentWillUnmount(): Unit = {
+        componentWillUnmountDef(this.asInstanceOf[js.Dynamic])
+      }
+
+      def render(): ReactElement = {
+        renderDef(this.asInstanceOf[js.Dynamic])
+      }
+    }
+
+    val res =
+      if (componentDidCatchDef != null) {
+
+        class ErrorBoundaryImpl(props: js.Dynamic) extends ReactComponentImpl(props) {
+
+          def componentDidCatch(error: js.Object, info: js.Dynamic): Unit = {
+            componentDidCatchDef(this.asInstanceOf[js.Dynamic], error, info)
+          }
+        }
+
+        js.constructorOf[ErrorBoundaryImpl]
+      }
+      else js.constructorOf[ReactComponentImpl]
+
+    if (displayName != null) {
+      res.displayName = displayName
+      res.updateDynamic("toString")({ () =>
+        displayName
+      }: js.Function0[String])
+    }
+
+    res.asInstanceOf[ReactClass]
+  }
+}

core/src/main/scala/io/github/shogowada/scalajs/reactjs/NativeCreateClass.scala

@@ -76,42 +76,42 @@ object React {
   ): ReactClass = {
     NativeCreateClass.create(
       displayName = displayName,
-      render = js.ThisFunction.fromFunction1((native: js.Dynamic) => {
+      renderDef = { (native: js.Dynamic) =>
         render(Self(native))
-      }),
-      getInitialState = js.ThisFunction.fromFunction1((native: js.Dynamic) => {
+      },
+      getInitialState = { (native: js.Dynamic) =>
         if (getInitialState != null) {
           React.stateToNative(getInitialState(Self(native)))
         } else {
           React.stateToNative(())
         }
-      }),
-      componentDidMount = js.ThisFunction.fromFunction1((native: js.Dynamic) => {
+      },
+      componentDidMountDef = { (native: js.Dynamic) =>
         if (componentDidMount != null) {
           componentDidMount(Self(native))
         }
-      }),
-      shouldComponentUpdate = js.ThisFunction.fromFunction3((native: js.Dynamic, nextProps: js.Dynamic, nextState: js.Dynamic) => {
+      },
+      shouldComponentUpdateDef = { (native: js.Dynamic, nextProps: js.Dynamic, nextState: js.Dynamic) =>
         if (shouldComponentUpdate != null) {
           shouldComponentUpdate(Self(native), Props(nextProps), React.stateFromNative(nextState))
         }
         else true
-      }),
-      componentDidUpdate = js.ThisFunction.fromFunction3((native: js.Dynamic, prevProps: js.Dynamic, prevState: js.Dynamic) => {
+      },
+      componentDidUpdateDef = { (native: js.Dynamic, prevProps: js.Dynamic, prevState: js.Dynamic) =>
         if (componentDidUpdate != null) {
           componentDidUpdate(Self(native), Props(prevProps), React.stateFromNative(prevState))
         }
-      }),
-      componentWillUnmount = js.ThisFunction.fromFunction1((native: js.Dynamic) => {
+      },
+      componentWillUnmountDef = { (native: js.Dynamic) =>
         if (componentWillUnmount != null) {
           componentWillUnmount(Self(native))
         }
-      }),
-      componentDidCatch = {
+      },
+      componentDidCatchDef = {
         if (componentDidCatch != null) {
-          js.ThisFunction.fromFunction3((native: js.Dynamic, error: js.Object, info: js.Dynamic) => {
+          (native: js.Dynamic, error: js.Object, info: js.Dynamic) => {
             componentDidCatch(Self(native), error, info)
-          })
+          }
         }
         else null
       }
@@ -139,17 +139,5 @@ object NativeReact extends js.Object {
 }
 
 @js.native
-@JSImport("./io/github/shogowada/scalajs/reactjs/CreateClass.js", JSImport.Namespace)
-object NativeCreateClass extends js.Object {
-
-  def create(
-      displayName: String,
-      render: js.ThisFunction0[js.Dynamic, ReactElement],
-      getInitialState: js.ThisFunction0[js.Dynamic, js.Dynamic],
-      componentDidMount: js.ThisFunction0[js.Dynamic, Unit],
-      shouldComponentUpdate: js.ThisFunction2[js.Dynamic, js.Dynamic, js.Dynamic, Boolean],
-      componentDidUpdate: js.ThisFunction2[js.Dynamic, js.Dynamic, js.Dynamic, Unit],
-      componentWillUnmount: js.ThisFunction0[js.Dynamic, Unit],
-      componentDidCatch: js.ThisFunction2[js.Dynamic, js.Object, js.Dynamic, Unit]
-  ): ReactClass = js.native
-}
+@JSImport("react", "Component")
+class ReactComponent(props: js.Dynamic) extends js.Object