Data: review r1 fixes

examples/gallery/pages_data.go

@@ -39,7 +39,7 @@ var dataPages = []page{
 // dataSection lays out a titled block of a demo.
 func dataSection(c *ui.Context, title string, fn func()) {
 	ui.Column(c).Gap(12).Children(func() {
-		ui.Text(c, title).Font(theme.SerifFont).FontSize(theme.H3Size)
+		ui.Text(c, title).Font(theme.SerifFont).FontSize(mujica.FontSize(c, theme.H3Size))
 		fn()
 	})
 }
@@ -50,7 +50,7 @@ func dataStates(c *ui.Context, fn func(state func(name string, body func()))) {
 	ui.Row(c).Gap(24).Wrap().AlignItems(ui.Start).Children(func() {
 		fn(func(name string, body func()) {
 			ui.Column(c).Gap(6).AlignItems(ui.Start).Children(func() {
-				ui.Text(c, name).FontSize(theme.CaptionSize).TextColor(k.TextMuted)
+				ui.Text(c, name).FontSize(mujica.FontSize(c, theme.CaptionSize)).TextColor(k.TextMuted)
 				body()
 			})
 		})

examples/gallery/pages_data_collections.go

@@ -134,7 +134,6 @@ func dataTableDemo(c *ui.Context, log func(string)) {
 			ui.Checkbox(c, &s.multiple, "Multiple")
 			ui.Select(c, &s.status, dataStatuses)
 			ui.TextInput(c, &s.table.Filter).Width(180).Placeholder("Filter")
-			mujica.DataTableColumnPicker(c, &s.table, cols)
 		})
 		v := mujica.DataTable(c, &s.table, rows, mujica.DataTableOptions[dataRelic, int]{
 			Columns: cols, Key: func(r dataRelic) int { return r.ID }, Multiple: s.multiple, Status: st,

examples/gallery/pages_data_content.go

@@ -63,7 +63,9 @@ func dataAccordionDemo(c *ui.Context, log func(string)) {
 			{ID: "nave", Title: "Nave", Content: func() { ui.Text(c, "Pews of black oak, polished for the feast.") }},
 			{ID: "crypt", Title: "Crypt (disabled)", Disabled: true, Content: func() {}},
 			{ID: "bells", Title: "Bells", Content: func() {
-				mujica.Button(c, "Ring", mujica.ButtonOptions{})
+				if mujica.Button(c, "Ring", mujica.ButtonOptions{}).Clicked() {
+					log("ring the bells")
+				}
 			}},
 		}, mujica.AccordionOptions{Multiple: s.multiple, KeepOne: s.keepOne}).Width(420).Changed() {
 			log(fmt.Sprintf("open %v", s.open))
@@ -84,7 +86,9 @@ func dataCollapsibleDemo(c *ui.Context, log func(string)) {
 		})
 		if mujica.Collapsible(c, &s.open, mujica.CollapsibleOptions{Title: "Rites of the evening", Disabled: s.disabled}, func() {
 			ui.Text(c, "Candles are lit at the seventh bell; the choir enters from the north door.")
-			mujica.Button(c, "Light candles", mujica.ButtonOptions{Variant: mujica.Outline})
+			if mujica.Button(c, "Light candles", mujica.ButtonOptions{Variant: mujica.Outline}).Clicked() {
+				log("light candles")
+			}
 		}).Changed() {
 			log(fmt.Sprintf("open=%v", s.open))
 		}

examples/gallery/pages_data_test.go

@@ -0,0 +1,49 @@
+package main
+
+import (
+	"slices"
+	"testing"
+
+	"github.com/egoist/mygo/ui"
+
+	mujica "mujicaui"
+)
+
+// dataDemo runs the demo of page id and returns its tester and event log.
+func dataDemo(t *testing.T, id string) (*ui.Tester, *[]string) {
+	t.Helper()
+	i := slices.IndexFunc(dataPages, func(p page) bool { return p.ID == id })
+	if i < 0 {
+		t.Fatalf("no page %s", id)
+	}
+	events := &[]string{}
+	tt := ui.NewTester(func(c *ui.Context) {
+		mujica.Use(c, mujica.Settings{})
+		ui.Scroll(c).Fill().Padding(24).Children(func() {
+			dataPages[i].Demo(c, func(s string) { *events = append(*events, s) })
+		})
+	}, 900, 700)
+	tt.SetPreferences(ui.Preferences{ReduceMotion: true, TextScale: 1})
+	return tt, events
+}
+
+func TestDataDemoButtonsLog(t *testing.T) {
+	tt, events := dataDemo(t, "074")
+	for _, s := range []string{"Bells", "Ring"} {
+		if err := tt.Click(s); err != nil {
+			t.Fatal(err)
+		}
+	}
+	if !slices.Contains(*events, "ring the bells") {
+		t.Fatalf("Ring not logged: %q", *events)
+	}
+	tt, events = dataDemo(t, "075")
+	for _, s := range []string{"Open from outside", "Light candles"} {
+		if err := tt.Click(s); err != nil {
+			t.Fatal(err)
+		}
+	}
+	if !slices.Contains(*events, "light candles") {
+		t.Fatalf("Light candles not logged: %q", *events)
+	}
+}