{{ err, hasErr := form.Error(name) }}
+ {{ value, hasValue := field.Get("value") }}
-
@@ -65,30 +146,12 @@ templ FormSelect(form *form.Form, id string, name string, label string, kvOption
}
}
-type SelectOption struct {
- Value string
- Label string
-}
-
-func keyValuesToOptions(kv []string) []SelectOption {
- if len(kv)%2 != 0 {
- panic(errors.New("expected pair number of key/values"))
- }
-
- options := make([]SelectOption, 0)
-
- var key string
- for idx := range kv {
- if idx%2 == 0 {
- key = kv[idx]
- continue
+func mergeAttrs(attrs ...map[string]any) map[string]any {
+ merged := make(form.Attrs)
+ for _, a := range attrs {
+ for k, v := range a {
+ merged[k] = v
}
-
- options = append(options, SelectOption{
- Value: kv[idx],
- Label: key,
- })
}
-
- return options
+ return merged
}
diff --git a/internal/http/handler/webui/common/component/field_templ.go b/internal/http/handler/webui/common/component/field_templ.go
index ecd333d..857e88c 100644
--- a/internal/http/handler/webui/common/component/field_templ.go
+++ b/internal/http/handler/webui/common/component/field_templ.go
@@ -327,7 +327,82 @@ func FormTextarea(form *form.Form, id string, name string, label string) templ.C
})
}
-func FormSelect(form *form.Form, id string, name string, label string, kvOptions ...string) templ.Component {
+type FormSelectOptions struct {
+ Options []formSelectOption
+ Attrs map[string]any
+}
+
+type FormSelectOptionFunc func(opts *FormSelectOptions)
+
+func WithOptions(kvOptions ...string) FormSelectOptionFunc {
+ return func(opts *FormSelectOptions) {
+ opts.Options = keyValuesToOptions(kvOptions)
+ }
+}
+
+func WithAttrs(kvAttrs ...any) FormSelectOptionFunc {
+ return func(opts *FormSelectOptions) {
+ opts.Attrs = keyValuesToAttrs(kvAttrs)
+ }
+}
+
+func keyValuesToAttrs(kv []any) map[string]any {
+ if len(kv)%2 != 0 {
+ panic(errors.New("expected pair number of key/values"))
+ }
+
+ attrs := make(map[string]any, 0)
+
+ var key string
+ for idx := range kv {
+ if idx%2 == 0 {
+ key = kv[idx].(string)
+ continue
+ }
+
+ attrs[key] = kv[idx]
+ }
+
+ return attrs
+}
+
+type formSelectOption struct {
+ Value string
+ Label string
+}
+
+func keyValuesToOptions(kv []string) []formSelectOption {
+ if len(kv)%2 != 0 {
+ panic(errors.New("expected pair number of key/values"))
+ }
+
+ options := make([]formSelectOption, 0)
+
+ var key string
+ for idx := range kv {
+ if idx%2 == 0 {
+ key = kv[idx]
+ continue
+ }
+
+ options = append(options, formSelectOption{
+ Value: kv[idx],
+ Label: key,
+ })
+ }
+
+ return options
+}
+
+func newFormSelectOptions(funcs ...FormSelectOptionFunc) *FormSelectOptions {
+ opts := &FormSelectOptions{}
+ for _, fn := range funcs {
+ fn(opts)
+ }
+ return opts
+}
+
+func FormSelect(form *form.Form, id string, name string, label string, funcs ...FormSelectOptionFunc) templ.Component {
return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
@@ -348,6 +423,7 @@ func FormSelect(form *form.Form, id string, name string, label string, kvOptions
templ_7745c5c3_Var20 = templ.NopComponent
}
ctx = templ.ClearChildren(ctx)
+ opts := newFormSelectOptions(funcs...)
field := form.Field(name)
if field != nil {
templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "
")
+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 38, "
")
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
if hasErr {
- templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 37, "
")
+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 39, "
")
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
var templ_7745c5c3_Var27 string
templ_7745c5c3_Var27, templ_7745c5c3_Err = templ.JoinStringErrs(err.Message())
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/http/handler/webui/common/component/field.templ`, Line: 61, Col: 46}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/http/handler/webui/common/component/field.templ`, Line: 142, Col: 46}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var27))
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
- templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 38, "
")
+ templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 40, "")
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
}
- templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 39, "