ZacharyZhang-NYandClaude Opus 5.5
bcce34cda1
MyGo v0.5.5 returns ui.Element as a checked value handle instead of a
pointer. Migrated with `mygo migrate-ui`, then fixed what the codemod
leaves to review:
- Element nil checks become .Valid(); absent elements are ui.Element{}.
- Input handlers and paint callbacks run outside the build pass, where
elements expire and Context methods are inert: read IsDisabled into a
local during the build, keep a ui.Handle for Focus, use c.Services()
for clipboard access, create ui.Local state during the build.
- Add core.AutoFocus: v0.5.5 records an overlay's opener after its
content builds, so same-frame autofocus lost focus restore on close.
It focuses one frame later; cascader rows defer their focus likewise.
- core.OverlayLayer identifies build passes by the root element, not
c.Now(), which repeats across passes and under the Tester clock.
- Context menus survive the opening press counted as PressedOutside;
split button tooltip no longer reorders its open menu; disabled
menubar rows pass presses to the panel; Form defers blur-started
async checks so the growing message no longer moves Submit away
from the release; Combobox drops its disabled copy now that MyGo
blocks typing under a disabled wrapper (canary flipped to a guard).
- The Tester clock is virtual: tests use Advance/Now instead of
time.Sleep/time.Now and read element state inside the view. The web
mirror advances the clock to wall time before each frame and input.
- AGENTS.md and docs describe the value Element API and the new pin.
Snapshot goldens are darwin-only and were not re-verified here.
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
101 lines
3.0 KiB
Go
101 lines
3.0 KiB
Go
package input
|
|
|
|
import (
|
|
"github.com/egoist/mygo/ui"
|
|
|
|
"git.zacharyzhang.com/ZacharyZhang-NY/MujicaUI/core"
|
|
"git.zacharyzhang.com/ZacharyZhang-NY/MujicaUI/theme"
|
|
)
|
|
|
|
// FormFieldOptions configure a FormField.
|
|
type FormFieldOptions struct {
|
|
// Required marks the label; the check itself belongs to the caller or Form.
|
|
Required bool
|
|
Description string
|
|
// Error shows below the control and marks it invalid for assistive technology.
|
|
Error string
|
|
// Horizontal puts the label beside the control instead of above it.
|
|
Horizontal bool
|
|
}
|
|
|
|
// 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 := core.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.
|
|
// formFieldBuild keys its cells by key when set, so focus follows a reordered field.
|
|
func formFieldBuild(c *ui.Context, key, label string, opts FormFieldOptions, beside bool, control func() ui.Element) ui.Element {
|
|
if label == "" {
|
|
panic("mujica: FormField needs a label")
|
|
}
|
|
k := core.Tokens(c)
|
|
d := core.Density(c)
|
|
var head, content, ctrl ui.Element
|
|
body := func() {
|
|
head = ui.Row(c)
|
|
if key != "" && beside {
|
|
head.Key(key + "/label")
|
|
}
|
|
head.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)
|
|
if key != "" && beside {
|
|
content.Key(key + "/control")
|
|
}
|
|
content.Gap(d.Unit() * 1.5).MinWidth(0)
|
|
content.Children(func() {
|
|
ctrl = control()
|
|
if !ctrl.Valid() {
|
|
panic("mujica: FormField " + label + ": control returned nil")
|
|
}
|
|
if opts.Description != "" {
|
|
ui.Text(c, opts.Description).TextColor(k.TextMuted).FontSize(core.FontSize(c, theme.CaptionSize)).Role(ui.RoleNone)
|
|
}
|
|
if opts.Error != "" {
|
|
ui.Text(c, opts.Error).TextColor(k.Danger).FontSize(core.FontSize(c, theme.CaptionSize)).Role(ui.RoleNone)
|
|
}
|
|
})
|
|
ctrl.Label(label).Description(opts.Description).Error(opts.Error)
|
|
if opts.Required {
|
|
ctrl.Description(core.Msg(c, "form.required"))
|
|
}
|
|
if ctrl.IsDisabled() {
|
|
text.TextColor(k.TextMuted)
|
|
} else if clicked {
|
|
ctrl.Focus()
|
|
}
|
|
}
|
|
if beside {
|
|
body()
|
|
return content
|
|
}
|
|
root := ui.Column(c)
|
|
if key != "" {
|
|
root.Key(key)
|
|
}
|
|
return root.Gap(d.Unit() * 1.5).Children(body)
|
|
}
|