Merge pull request #79 from myitcv/tidy_up

Tidy up package

Author: myitcv

a.go renamed to a_elem.go

@@ -8,7 +8,7 @@ type AElem struct {
 	Element
 }
 
-// _APropsDef defines the properties for the <a> element
+// _AProps defines the properties for the <a> element
 type _AProps struct {
 	*BasicHTMLElement
 
@@ -28,13 +28,7 @@ func A(props *AProps, children ...Element) *AElem {
 		props.assign(rProps)
 	}
 
-	args := []interface{}{"a", rProps}
-
-	for _, v := range children {
-		args = append(args, elementToReactObj(v))
+	return &AElem{
+		Element: createElement("a", rProps, children...),
 	}
-
-	underlying := react.Call("createElement", args...)
-
-	return &AElem{Element: elementHolder{elem: underlying}}
 }

br.go

@@ -0,0 +1,30 @@
+// Copyright (c) 2016 Paul Jolly <paul@myitcv.org.uk>, all rights reserved.
+// Use of this document is governed by a license found in the LICENSE document.
+
+package react
+
+// BrElem is the React element definition corresponding to the HTML <br> element
+type BrElem struct {
+	Element
+}
+
+// _BrProps defines the properties for the <br> element
+type _BrProps struct {
+	*BasicHTMLElement
+}
+
+// Br creates a new instance of a <br> element with the provided props
+func Br(props *BrProps) *BrElem {
+
+	rProps := &_BrProps{
+		BasicHTMLElement: newBasicHTMLElement(),
+	}
+
+	if props != nil {
+		props.assign(rProps)
+	}
+
+	return &BrElem{
+		Element: createElement("br", rProps),
+	}
+}

br_elem.go

@@ -27,13 +27,7 @@ func Button(props *ButtonProps, children ...Element) *ButtonElem {
 		props.assign(rProps)
 	}
 
-	args := []interface{}{"button", rProps}
-
-	for _, v := range children {
-		args = append(args, elementToReactObj(v))
+	return &ButtonElem{
+		Element: createElement("button", rProps, children...),
 	}
-
-	underlying := react.Call("createElement", args...)
-
-	return &ButtonElem{Element: elementHolder{elem: underlying}}
 }

button.go renamed to button_elem.go

@@ -212,7 +212,7 @@ type {{.Name}}Elem struct {
 	react.Element
 }
 
-func ({{.Recv}} {{.Name}}Def) ShouldComponentUpdateIntf(nextProps, prevState, nextState interface{}) bool {
+func ({{.Recv}} {{.Name}}Def) ShouldComponentUpdateIntf(nextProps react.Props, prevState, nextState react.State) bool {
 	res := false
 
 	{{if .HasProps -}}
@@ -271,7 +271,7 @@ func ({{.Recv}} {{.Name}}Def) GetInitialStateIntf() react.State {
 {{end -}}
 }
 
-func ({{.Recv}} {{.Name}}State) EqualsIntf(val interface{}) bool {
+func ({{.Recv}} {{.Name}}State) EqualsIntf(val react.State) bool {
 	{{if .StateHasEquals -}}
 	return {{.Recv}}.Equals(val.({{.Name}}State))
 	{{else -}}
@@ -282,6 +282,10 @@ func ({{.Recv}} {{.Name}}State) EqualsIntf(val interface{}) bool {
 
 
 {{if .HasProps}}
+// IsProps is an auto-generated definition so that {{.Name}}Props implements
+// the myitcv.io/react.Props interface.
+func ({{.Recv}} {{.Name}}Props) IsProps() {}
+
 // Props is an auto-generated proxy to the current props of {{.Name}}
 func ({{.Recv}} {{.Name}}Def) Props() {{.Name}}Props {
 	uprops := {{.Recv}}.ComponentDef.Props()
@@ -297,15 +301,15 @@ func ({{.Recv}} {{.Name}}Def) ComponentWillReceivePropsIntf(val interface{}) {
 }
 {{end}}
 
-func ({{.Recv}} {{.Name}}Props) EqualsIntf(val interface{}) bool {
+func ({{.Recv}} {{.Name}}Props) EqualsIntf(val react.Props) bool {
 	{{if .PropsHasEquals -}}
 	return {{.Recv}}.Equals(val.({{.Name}}Props))
 	{{else -}}
 	return {{.Recv}} == val.({{.Name}}Props)
 	{{end -}}
 }
 
-var _ react.Equals = {{.Name}}Props{}
+var _ react.Props = {{.Name}}Props{}
 {{end}}
 	`, cg)
 

cmd/reactGen/comp_gen.go

@@ -23,7 +23,6 @@ type propsGen struct {
 }
 
 func (g *gen) genProps(defName string, t typeFile) {
-
 	name := strings.TrimPrefix(defName, propsTypeTmplPrefix)
 
 	r, _ := utf8.DecodeRuneInString(name)

cmd/reactGen/props_gen.go

@@ -24,13 +24,7 @@ func Code(props *CodeProps, children ...Element) *CodeElem {
 		props.assign(rProps)
 	}
 
-	args := []interface{}{"code", rProps}
-
-	for _, v := range children {
-		args = append(args, elementToReactObj(v))
+	return &CodeElem{
+		Element: createElement("code", rProps, children...),
 	}
-
-	underlying := react.Call("createElement", args...)
-
-	return &CodeElem{Element: elementHolder{elem: underlying}}
 }

code.go renamed to code_elem.go

@@ -43,7 +43,6 @@ func newBasicHTMLElement() *BasicHTMLElement {
 	}
 }
 
-// TODO complete the definition
 type SyntheticEvent struct {
 	o *js.Object
 

components/imm/gen_Select_reactGen.go

@@ -24,13 +24,7 @@ func Div(props *DivProps, children ...Element) *DivElem {
 		props.assign(rProps)
 	}
 
-	args := []interface{}{"div", rProps}
-
-	for _, v := range children {
-		args = append(args, elementToReactObj(v))
+	return &DivElem{
+		Element: createElement("div", rProps, children...),
 	}
-
-	underlying := react.Call("createElement", args...)
-
-	return &DivElem{Element: elementHolder{elem: underlying}}
 }