Making react work

Author: grantnelson-wf

playground/internal/react/react.go

@@ -30,11 +30,11 @@ type (
 
 	StateMap map[string]any
 
+	State[T any] struct{ getter, setter *js.Object }
+
 	// Component is a React component used when rendering with state.
 	// See: https://react.dev/reference/react/Component
 	Component struct{ *js.Object }
-
-	State[T any] struct{ getter, setter *js.Object }
 )
 
 func reactDom() *js.Object { return js.Global.Get(`ReactDOM`) }
@@ -66,30 +66,6 @@ func checkNode(n Node) Node {
 	}
 }
 
-func NewComponent(props Props, init StateMap, render func(*Component) Node) *Element {
-	reactComp := react().Get("Component")
-	ctor := js.MakeFunc(func(this *js.Object, args []*js.Object) any {
-		reactComp.Call(`call`, props)
-		this.Set(`state`, init)
-		return nil
-	})
-	rf := js.MakeFunc(func(this *js.Object, args []*js.Object) any {
-		return render(&Component{Object: this})
-	})
-	ctor.Set(`prototype`, reactComp.Get(`prototype`))
-	ctor.Get(`prototype`).Set(`constructor`, ctor)
-	ctor.Get("prototype").Set("render", rf)
-	return &Element{Object: react().Call(`createElement`, ctor)}
-}
-
-func (c *Component) GetState(key string) *js.Object {
-	return c.Get("state").Get(key)
-}
-
-func (c *Component) SetState(newState StateMap) {
-	c.Call("setState", newState)
-}
-
 func StrictMode(children ...Node) *Element {
 	return CreateElement(react().Get(`StrictMode`), nil, children...)
 }
@@ -124,3 +100,30 @@ func UseState[T any](initial T) State[T] {
 func (s State[T]) Get() T { return s.getter.Interface().(T) }
 
 func (s State[T]) Set(v T) { s.setter.Invoke(v) }
+
+func NewComponent(props Props, init StateMap, render func(*Component) Node) *Element {
+	reactComp := react().Get("Component")
+	ctor := js.MakeFunc(func(this *js.Object, args []*js.Object) any {
+		reactComp.Call(`call`, props)
+		this.Set(`state`, init)
+		//if constructor != nil {
+		//	js.Global.Get(`Reflect`).Call(`apply`, constructor, this, []any{})
+		//}
+		return nil
+	})
+	rf := js.MakeFunc(func(this *js.Object, args []*js.Object) any {
+		return render(&Component{Object: this})
+	})
+	ctor.Set(`prototype`, reactComp.Get(`prototype`))
+	ctor.Get(`prototype`).Set(`constructor`, ctor)
+	ctor.Get("prototype").Set("render", rf)
+	return &Element{Object: react().Call(`createElement`, ctor)}
+}
+
+func (c *Component) GetState(key string) *js.Object {
+	return c.Get("state").Get(key)
+}
+
+func (c *Component) SetState(newState StateMap) {
+	c.Call("setState", newState)
+}