Forms: review r1 fixes
This commit is contained in:
27 files changed
+305
-97
No files matched your search
+63
-15
@@ -2,6 +2,8 @@ package mujica
|
||||
|
||||
import (
|
||||
"github.com/egoist/mygo/ui"
|
||||
|
||||
"mujicaui/theme"
|
||||
)
|
||||
|
||||
// FormFieldOptions configure a FormField.
|
||||
@@ -15,24 +17,70 @@ type FormFieldOptions struct {
|
||||
Horizontal bool
|
||||
}
|
||||
|
||||
// FormField labels the control that control builds and adds help and error text.
|
||||
// The label names the control and a click on it focuses the control.
|
||||
func FormField(c *ui.Context, label string, opts FormFieldOptions, control func()) *ui.Element {
|
||||
// FormField labels the element control returns and shows help and error text for it.
|
||||
func FormField(c *ui.Context, label string, opts FormFieldOptions, control func() *ui.Element) *ui.Element {
|
||||
if !opts.Horizontal {
|
||||
return formFieldBuild(c, label, opts, false, control)
|
||||
}
|
||||
var f *ui.Element
|
||||
formFieldGrid(c, func() { f = formFieldBuild(c, label, opts, true, control) })
|
||||
return f
|
||||
}
|
||||
|
||||
// formFieldGrid holds fields whose labels sit in a column beside their controls.
|
||||
func formFieldGrid(c *ui.Context, fields func()) *ui.Element {
|
||||
d := Density(c)
|
||||
return ui.Grid(c).ColumnTracks(ui.FitContent(), ui.Fr(1)).GapX(d.Unit() * 3).GapY(d.Unit() * 4).
|
||||
AlignItems(ui.Start).Children(fields)
|
||||
}
|
||||
|
||||
// formFieldBuild builds the label and the control column; beside makes them two grid cells.
|
||||
func formFieldBuild(c *ui.Context, label string, opts FormFieldOptions, beside bool, control func() *ui.Element) *ui.Element {
|
||||
if label == "" {
|
||||
panic("mujica: FormField needs a label")
|
||||
}
|
||||
if opts.Horizontal {
|
||||
var f *ui.Element
|
||||
ui.Form(c, func() { f = formFieldBuild(c, label, opts, control) })
|
||||
return f
|
||||
k := Tokens(c)
|
||||
d := Density(c)
|
||||
var head, content, ctrl *ui.Element
|
||||
body := func() {
|
||||
head = ui.Row(c).Gap(d.Unit()).AlignItems(ui.Center)
|
||||
if beside {
|
||||
head.MinHeight(d.ControlHeight()).Justify(ui.End)
|
||||
}
|
||||
var text *ui.Element
|
||||
head.Children(func() {
|
||||
text = ui.Text(c, label).FontWeight(500).SingleLine()
|
||||
if opts.Required {
|
||||
ui.Text(c, "*").TextColor(k.Danger).Role(ui.RoleNone)
|
||||
}
|
||||
})
|
||||
clicked := head.Clicked()
|
||||
content = ui.Column(c).Gap(d.Unit() * 1.5).MinWidth(0)
|
||||
content.Children(func() {
|
||||
ctrl = control()
|
||||
if ctrl == nil {
|
||||
panic("mujica: FormField " + label + ": control returned nil")
|
||||
}
|
||||
if opts.Description != "" {
|
||||
ui.Text(c, opts.Description).TextColor(k.TextMuted).FontSize(FontSize(c, theme.CaptionSize)).Role(ui.RoleNone)
|
||||
}
|
||||
if opts.Error != "" {
|
||||
ui.Text(c, opts.Error).TextColor(k.Danger).FontSize(FontSize(c, theme.CaptionSize)).Role(ui.RoleNone)
|
||||
}
|
||||
})
|
||||
ctrl.Label(label).Description(opts.Description).Error(opts.Error)
|
||||
if opts.Required {
|
||||
ctrl.Description(msg(c, "form.required"))
|
||||
}
|
||||
if ctrl.IsDisabled() {
|
||||
text.TextColor(k.TextMuted)
|
||||
} else if clicked {
|
||||
ctrl.Focus()
|
||||
}
|
||||
}
|
||||
return formFieldBuild(c, label, opts, control)
|
||||
}
|
||||
|
||||
// formFieldBuild builds the field in the layout the caller set up.
|
||||
func formFieldBuild(c *ui.Context, label string, opts FormFieldOptions, control func()) *ui.Element {
|
||||
if opts.Required {
|
||||
label += " *"
|
||||
if beside {
|
||||
body()
|
||||
return content
|
||||
}
|
||||
return ui.Field(c, label, control).Description(opts.Description).Error(opts.Error)
|
||||
return ui.Column(c).Gap(d.Unit() * 1.5).Children(body)
|
||||
}
|
||||
Reference in new issue
Block a user