Merge pull request #52 from linkdata/remove-uihtml

remove UiHtml, refactor

uihtml_test.go → jawsevent_test.go

@@ -10,7 +10,6 @@ import (
 )
 
 type testJawsEvent struct {
-	UiHtml
 	msgCh    chan string
 	tag      any
 	clickerr error

uihtmlinner.go

@@ -5,12 +5,11 @@ import (
 )
 
 type UiHtmlInner struct {
-	UiHtml
 	HtmlGetter
 }
 
 func (ui *UiHtmlInner) renderInner(e *Element, w io.Writer, htmltag, htmltype string, params []any) error {
-	ui.applyGetter(e, ui.HtmlGetter)
+	e.ApplyGetter(ui.HtmlGetter)
 	return WriteHtmlInner(w, e.Jid(), htmltag, htmltype, ui.JawsGetHtml(e), e.ApplyParams(params)...)
 }
 

uiimg.go

@@ -7,12 +7,11 @@ import (
 )
 
 type UiImg struct {
-	UiHtml
 	Getter[string]
 }
 
 func (ui *UiImg) JawsRender(e *Element, w io.Writer, params []any) error {
-	ui.applyGetter(e, ui.Getter)
+	e.ApplyGetter(ui.Getter)
 	srcattr := template.HTMLAttr("src=" + strconv.Quote(ui.JawsGet(e))) // #nosec G203
 	attrs := append(e.ApplyParams(params), srcattr)
 	return WriteHtmlInner(w, e.Jid(), "img", "", "", attrs...)

uiinput.go

@@ -3,10 +3,14 @@ package jaws
 import "sync/atomic"
 
 type UiInput struct {
-	UiHtml
+	Tag  any
 	Last atomic.Value
 }
 
+func (ui *UiInput) applyGetter(e *Element, getter any) {
+	ui.Tag = e.ApplyGetter(getter)
+}
+
 func (ui *UiInput) maybeDirty(val any, e *Element, err error) error {
 	var changed bool
 	if changed, err = e.maybeDirty(ui.Tag, err); changed {

uiselect.go

@@ -12,7 +12,7 @@ type UiSelect struct {
 
 func NewUiSelect(sh SelectHandler) *UiSelect {
 	return &UiSelect{
-		uiWrapContainer{
+		uiWrapContainer: uiWrapContainer{
 			Container: sh,
 		},
 	}

uiwrapcontainer.go

@@ -10,14 +10,14 @@ import (
 )
 
 type uiWrapContainer struct {
-	UiHtml
 	Container
+	Tag      any
 	mu       deadlock.Mutex
 	contents []*Element
 }
 
 func (ui *uiWrapContainer) renderContainer(e *Element, w io.Writer, outerhtmltag string, params []any) (err error) {
-	ui.applyGetter(e, ui.Container)
+	ui.Tag = e.ApplyGetter(ui.Container)
 	attrs := e.ApplyParams(params)
 	b := e.Jid().AppendStartTagAttr(nil, outerhtmltag)
 	for _, attr := range attrs {

html_test.go → writehtml_test.go

@@ -8,72 +8,7 @@ import (
 	"github.com/linkdata/jaws/jid"
 )
 
-func TestHtmlInput(t *testing.T) {
-	type args struct {
-		jid   jid.Jid
-		typ   string
-		val   string
-		attrs []template.HTMLAttr
-	}
-	tests := []struct {
-		name string
-		args args
-		want string
-	}{
-		{
-			name: "HtmlInput no attrs",
-			args: args{
-				jid: 1,
-				typ: "input_type",
-				val: "initial_val",
-			},
-			want: `<input id="Jid.1" type="input_type" value="initial_val">`,
-		},
-		{
-			name: "HtmlInput one empty attr",
-			args: args{
-				jid:   2,
-				typ:   "input_type2",
-				val:   "initial_val2",
-				attrs: []template.HTMLAttr{""},
-			},
-			want: `<input id="Jid.2" type="input_type2" value="initial_val2">`,
-		},
-		{
-			name: "HtmlInput one filled attr",
-			args: args{
-				jid:   3,
-				typ:   "input_type2",
-				val:   "initial_val2",
-				attrs: []template.HTMLAttr{"some_attr"},
-			},
-			want: `<input id="Jid.3" type="input_type2" value="initial_val2" some_attr>`,
-		},
-		{
-			name: "HtmlInput two filled attr, one empty",
-			args: args{
-				jid:   4,
-				typ:   "input_type2",
-				val:   "initial_val2",
-				attrs: []template.HTMLAttr{"some_attr1", "", "some_attr2"},
-			},
-			want: `<input id="Jid.4" type="input_type2" value="initial_val2" some_attr1 some_attr2>`,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var sb strings.Builder
-			if err := WriteHtmlInput(&sb, tt.args.jid, tt.args.typ, tt.args.val, tt.args.attrs); err != nil {
-				t.Fatal(err)
-			}
-			if got := sb.String(); got != tt.want {
-				t.Errorf("HtmlInput() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func TestHtmlInner(t *testing.T) {
+func Test_WriteHtmlInner(t *testing.T) {
 	type args struct {
 		jid   jid.Jid
 		tag   string
@@ -131,7 +66,7 @@ func TestHtmlInner(t *testing.T) {
 	}
 }
 
-func TestHtmlSelect(t *testing.T) {
+func Test_WriteHtmlSelect(t *testing.T) {
 	type args struct {
 		jid   jid.Jid
 		val   *NamedBoolArray
@@ -184,3 +119,68 @@ func TestHtmlSelect(t *testing.T) {
 		})
 	}
 }
+
+func Test_WriteHtmlInput(t *testing.T) {
+	type args struct {
+		jid   jid.Jid
+		typ   string
+		val   string
+		attrs []template.HTMLAttr
+	}
+	tests := []struct {
+		name string
+		args args
+		want string
+	}{
+		{
+			name: "HtmlInput no attrs",
+			args: args{
+				jid: 1,
+				typ: "input_type",
+				val: "initial_val",
+			},
+			want: `<input id="Jid.1" type="input_type" value="initial_val">`,
+		},
+		{
+			name: "HtmlInput one empty attr",
+			args: args{
+				jid:   2,
+				typ:   "input_type2",
+				val:   "initial_val2",
+				attrs: []template.HTMLAttr{""},
+			},
+			want: `<input id="Jid.2" type="input_type2" value="initial_val2">`,
+		},
+		{
+			name: "HtmlInput one filled attr",
+			args: args{
+				jid:   3,
+				typ:   "input_type2",
+				val:   "initial_val2",
+				attrs: []template.HTMLAttr{"some_attr"},
+			},
+			want: `<input id="Jid.3" type="input_type2" value="initial_val2" some_attr>`,
+		},
+		{
+			name: "HtmlInput two filled attr, one empty",
+			args: args{
+				jid:   4,
+				typ:   "input_type2",
+				val:   "initial_val2",
+				attrs: []template.HTMLAttr{"some_attr1", "", "some_attr2"},
+			},
+			want: `<input id="Jid.4" type="input_type2" value="initial_val2" some_attr1 some_attr2>`,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			var sb strings.Builder
+			if err := WriteHtmlInput(&sb, tt.args.jid, tt.args.typ, tt.args.val, tt.args.attrs); err != nil {
+				t.Fatal(err)
+			}
+			if got := sb.String(); got != tt.want {
+				t.Errorf("HtmlInput() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}