diff --git a/example/main.go b/example/main.go index 9076f2e..a01390a 100644 --- a/example/main.go +++ b/example/main.go @@ -1,54 +1,62 @@ package main import ( - "github.com/orus-dev/osui" - "github.com/orus-dev/osui/colors" - . "github.com/orus-dev/osui/ui" + "github.com/orus-dev/osui" + "github.com/orus-dev/osui/colors" + "github.com/orus-dev/osui/ui" ) func main() { - screen := osui.NewScreen(App()) - screen.Run() + screen := osui.NewScreen(App()) + screen.Run() } -func App() *PaginatorComponent { - w, h := osui.GetTerminalSize() - return Paginator( - // Page 1 - Div( - Text("Welcome to the example! The blue text on the bottom show the keybindings"), - WithPosition(0, h-2, Text(colors.Blue+"Next Page: Tab. Previous Page: shift + tab")), - ), +func App() *ui.PaginatorComponent { + w, h := osui.GetTerminalSize() + + var keybindings ui.Class[*ui.TextComponent] + keybindings.SetProperties(func(tc *ui.TextComponent) *ui.TextComponent { + tc.Text = colors.Blue + tc.Text + tc.Data.Y = h - 2 + return tc + }) - // Page 2 - Div( - WithPosition(0, 0, Text("This blue square is a div. A div stores multiple components into one")), - WithPosition((w-30)/2, (h-4)/2, - WithSize(30, 5, - Div(WithPosition(4, 1, Button("Hello, World!").Params(BtnParams{Width: 19}))).Params(DivParams{Style: DivStyle{Outline: colors.Blue}}), - )), - WithPosition(0, h-2, Text(colors.Blue+"Navigate: Ctrl+(W/A/S/D)")), - ), + return ui.Paginator( + // Page 1 + ui.Div( + ui.Text("Welcome to the example! The blue text on the bottom show the keybindings"), + keybindings.Class(ui.Text("Next Page: Tab. Previous Page: shift + tab")), + ), - // Page 3 - Div( - WithPosition(0, 0, Text("This is a InputBox. It takes user input just like a GUI. "+colors.Red+colors.Bold+"NOTE: This InputBox is inside a div")), - WithPosition((w-32)/2, (h-3)/2, InputBox(30)), - WithPosition(0, h-2, Text(colors.Blue+"Navigate: W/S. Select: Enter. Exit Menu: Q. ")), - ), + // Page 2 + ui.Div( + ui.WithPosition(0, 0, ui.Text("This blue square is a div. A div stores multiple components into one")), + ui.WithPosition((w-30)/2, (h-4)/2, + ui.WithSize(30, 5, + ui.Div(ui.WithPosition(4, 1, ui.Button("Hello, World!").Params(ui.ButtonParams{Width: 19}))).Params(ui.DivParams{Style: ui.DivStyle{Outline: colors.Blue}}), + )), + keybindings.Class(ui.Text("Navigate: Ctrl+(W/A/S/D)")), + ), - // Page 4 - Div( - WithPosition(0, 0, Text("This is a Button. To click it press Enter. "+colors.Red+colors.Bold+"NOTE: This Button is inside a div")), - WithPosition((w-20)/2, (h-3)/2, Button("This is a button")), - WithPosition(0, h-2, Text(colors.Blue+"Navigate: Ctrl+(W/A/S/D). Click Button: Enter")), - ), + // Page 3 + ui.Div( + ui.WithPosition(0, 0, ui.Text("This is a InputBox. It takes user input just like a GUI. "+colors.Red+colors.Bold+"NOTE: This InputBox is inside a div")), + ui.WithPosition((w-32)/2, (h-3)/2, ui.InputBox(30)), + keybindings.Class(ui.Text("Navigate: Ctrl+(W/A/S/D). Finish: Enter.")), + ), - // Page 5 - Div( - WithPosition(0, 0, Text("This is a Menu. It prompts you to select a item. "+colors.Red+colors.Bold+"NOTE: This Menu is inside a div")), - WithPosition(0, 2, Menu("Item 1", "Item 2", "Item 3", "Item 4", "Item 5").Params(MenuParams{})), - WithPosition(0, h-2, Text(colors.Blue+"Navigate: Ctrl+(W/A/S/D). Navigate Menu: W/S. Select: Enter. Exit Menu: Q. ")), - ), - ) + // Page 4 + ui.Div( + ui.WithPosition(0, 0, ui.Text("This is a Button. To click it press Enter. "+colors.Red+colors.Bold+"NOTE: This Button is inside a div")), + ui.WithPosition((w-20)/2, (h-3)/2, ui.Button("This is a button")), + keybindings.Class(ui.Text("Navigate: Ctrl+(W/A/S/D). Click Button: Enter")), + ), + + // Page 5 + ui.Div( + ui.WithPosition(0, 0, ui.Text("This is a Menu. It prompts you to select an item. "+colors.Red+colors.Bold+"NOTE: This Menu is inside a div")), + ui.WithPosition(0, 2, ui.Menu("Item 1", "Item 2", "Item 3", "Item 4", "Item 5").Params(ui.MenuParams{OnSelected: func(mc *ui.MenuComponent, b bool) {}})), + keybindings.Class(ui.Text("Navigate: Ctrl+(W/A/S/D). Navigate Menu: W/S. Select: Enter. Exit Menu: Q. ")), + ), + ) } diff --git a/go.mod b/go.mod index a7a8085..83bfc38 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,6 @@ go 1.23.1 require golang.org/x/term v0.24.0 // direct require ( - github.com/nathan-fiscaletti/consolesize-go v0.0.0-20220204101620-317176b6684d // indirect + github.com/nathan-fiscaletti/consolesize-go v0.0.0-20220204101620-317176b6684d golang.org/x/sys v0.25.0 // indirect ) diff --git a/ui/button.go b/ui/button.go index 96a3b78..cd15866 100644 --- a/ui/button.go +++ b/ui/button.go @@ -10,7 +10,7 @@ import ( "github.com/orus-dev/osui/isKey" ) -type BtnParams struct { +type ButtonParams struct { Style ButtonStyle Toggle bool OnClick func(*ButtonComponent) bool @@ -92,7 +92,7 @@ func (b *ButtonComponent) GetComponentData() *osui.ComponentData { return &b.Data } -func (b *ButtonComponent) Params(param BtnParams) *ButtonComponent { +func (b *ButtonComponent) Params(param ButtonParams) *ButtonComponent { b.Style = osui.SetDefaults(¶m.Style).(*ButtonStyle) if param.OnClick != nil { b.on_click = param.OnClick diff --git a/ui/menu.go b/ui/menu.go index 9cdda31..4304f3c 100644 --- a/ui/menu.go +++ b/ui/menu.go @@ -81,6 +81,7 @@ func (m *MenuComponent) Update(key string) bool { func (b *MenuComponent) Params(param MenuParams) *MenuComponent { b.Style = osui.SetDefaults(¶m.Style).(*MenuStyle) + b.OnSelected = param.OnSelected return b } diff --git a/ui/utils.go b/ui/utils.go index 568a954..bf0bf41 100644 --- a/ui/utils.go +++ b/ui/utils.go @@ -81,3 +81,35 @@ func findClosestComponent(a []osui.Component, i int, d string) int { return closestIndex } + +type Id[T osui.Component] struct { + changer func(T) T + Component T +} + +func (i *Id[T]) Id(c T) T { + i.Component = c + if i.changer != nil { + return i.changer(i.Component) + } + return i.Component +} + +func (i *Id[T]) SetProperties(c func(T) T) { + i.changer = c +} + +type Class[T osui.Component] struct { + changer func(T) T +} + +func (c *Class[T]) Class(co T) T { + if c.changer != nil { + return c.changer(co) + } + return co +} + +func (c *Class[T]) SetProperties(ch func(T) T) { + c.changer = ch +}