a few more changes

updated structure
2024-10-13 16:32:05 +02:00 · 2024-10-12 22:36:20 +02:00 · 2024-10-12 22:36:09 +02:00 · 2024-10-12 17:49:55 +02:00
14 changed files with 481 additions and 496 deletions
@@ -39,7 +39,6 @@ func AsBg(s string) string {
 	})
 }

-
 func AsFg(s string) string {
 	re, _ := regexp.Compile(`\x1b\[4([0-9]+)`)
 	return re.ReplaceAllStringFunc(s, func(match string) string {
@@ -0,0 +1,126 @@
+package osui
+
+import (
+	"github.com/orus-dev/osui/colors"
+)
+
+type Style struct {
+	Background string `json:"background"`
+	Foreground string `json:"foreground"`
+	Outline    string `json:"outline"`
+
+	ActiveBackground string `json:"activeBackground"`
+	ActiveForeground string `json:"activeForeground"`
+	ActiveOutline    string `json:"activeOutline"`
+
+	ClickedBackground string `json:"clickedBackground"`
+	ClickedForeground string `json:"clickedForeground"`
+	ClickedOutline    string `json:"clickedOutline"`
+
+	SelectedBackground string `json:"selectedBackground"`
+	SelectedForeground string `json:"selectedForeground"`
+	SelectedOutline    string `json:"selectedOutline"`
+
+	Cursor         string `json:"cursor"`
+	CursorColor    string `json:"cursorColor"`
+	InactiveCursor string `json:"inactiveCursor"`
+}
+
+func (s *Style) SetDefaults() {
+	defaultValue(&s.Cursor, "> ")
+	defaultValue(&s.SelectedForeground, colors.Black)
+	defaultValue(&s.SelectedBackground, colors.Magenta)
+	defaultValue(&s.ActiveOutline, colors.Blue)
+	defaultValue(&s.ClickedForeground, colors.Blue)
+	defaultValue(&s.ClickedOutline, colors.Blue)
+	s.UseStyle()
+}
+
+func (s *Style) UseStyle() {
+	s.Foreground = colors.AsFg(s.Foreground)
+	s.Background = colors.AsBg(s.Background)
+	s.Outline = colors.AsFg(s.Outline)
+
+	s.ActiveForeground = colors.AsFg(s.ActiveForeground)
+	s.ActiveBackground = colors.AsBg(s.ActiveBackground)
+	s.ActiveOutline = colors.AsFg(s.ActiveOutline)
+
+	s.ClickedForeground = colors.AsFg(s.ClickedForeground)
+	s.ClickedBackground = colors.AsBg(s.ClickedBackground)
+	s.ClickedOutline = colors.AsFg(s.ClickedOutline)
+
+	s.SelectedForeground = colors.AsFg(s.SelectedForeground)
+	s.SelectedBackground = colors.AsBg(s.SelectedBackground)
+	s.SelectedOutline = colors.AsFg(s.SelectedOutline)
+}
+
+func defaultValue(sd *string, s string) {
+	if *sd == "" {
+		*sd = s
+	}
+}
+
+type Param struct {
+	Style   Style `json:"style"`
+	X       int   `json:"y"`
+	Y       int   `json:"x"`
+	Width   int   `json:"width"`
+	Height  int   `json:"height"`
+	OnClick func()
+	Keys    map[string]string
+	Toggle  bool `json:"useToggle"`
+}
+
+func (p *Param) SetDefaultBindings(keys map[string]string) {
+	p.Style.SetDefaults()
+	if p.Keys == nil {
+		p.Keys = keys
+		return
+	}
+	for k, f := range keys {
+		if _, ok := p.Keys[k]; !ok {
+			p.Keys[k] = f
+		}
+	}
+}
+
+func (p *Param) UseParam(c Component) Component {
+	data := c.GetComponentData()
+
+	p.Style.SetDefaults()
+	data.Style = p.Style
+	data.X = p.X
+	data.Y = p.Y
+	if p.Height != 0 {
+		data.Height = p.Height
+	}
+	if p.Width != 0 {
+		data.Width = p.Width
+	}
+
+	if p.OnClick != nil {
+		data.OnClick = p.OnClick
+	} else {
+		data.OnClick = func() {}
+	}
+
+	data.Toggle = p.Toggle
+
+	data.Keys = p.Keys
+
+	return c
+}
+
+type ComponentData struct {
+	X            int
+	Y            int
+	Width        int
+	Height       int
+	DefaultColor string
+	IsActive     bool
+	Style        Style
+	OnClick      func()
+	Keys         map[string]string
+	Toggle       bool
+	Screen       *Screen
+}
@@ -2,61 +2,45 @@ package main

 import (
 	"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()
+	// my_btn := ui.Button(osui.Param{},
+	// 	"Button",
+	// )
+	// screen.Run(my_btn)

-func App() *ui.PaginatorComponent {
-	w, h := osui.GetTerminalSize()
+	// var menu ui.Id[*ui.MenuComponent]
+	// screen := osui.NewScreen()
+	// screen.Run(ui.Div(osui.Param{},

-	var keybindings ui.Class[*ui.TextComponent]
-	keybindings.SetProperties(func(tc *ui.TextComponent) *ui.TextComponent {
-		tc.Text = colors.Blue + tc.Text
-		tc.Data.Y = h - 3
-		return tc
-	})
+	// 	menu.Id(ui.Menu(osui.Param{OnClick: func() {
+	// 		screen.SetComponent(ui.Text(osui.Param{}, menu.Component.Items[menu.Component.SelectedItem]))
+	// 		screen.Exit()
+	// 	}},
+	// 		"Item 1", "Item 24324322", "Item 366",
+	// 	)),

-	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")),
+	// ))
+
+	// screen := osui.NewScreen()
+	// my_btn := ui.InputBox(osui.Param{},
+	// 	24,
+	// )
+	// screen.Run(my_btn)
+
+	screen := osui.NewScreen()
+
+	my_btn := ui.Paginator(osui.Param{OnClick: func() {screen.Exit()}},
+		ui.Div(osui.Param{},
+			ui.Text(osui.Param{}, "Page 1"),
 		),
-
-		// 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(32, 7,
-					ui.Div(ui.WithPosition(2, 2, ui.Text("This text is inside a div!"))).Params(ui.DivParams{Style: ui.DivStyle{Outline: colors.Blue, Foreground: colors.Red}}),
-				)),
-			keybindings.Class(ui.Text("Navigate: Ctrl+(W/A/S/D)")),
-		),
-
-		// 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 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. ")),
+		ui.Div(osui.Param{},
+			ui.Text(osui.Param{}, "Page 2"),
 		),
 	)
+
+	screen.Run(my_btn)
 }
@@ -1,53 +0,0 @@
-package isKey
-
-func Enter(s string) bool {
-	return s == "\r" || s == "\n"
-}
-
-func Tab(s string) bool {
-	return s == "\t"
-}
-
-func Backspace(s string) bool {
-	return s == "\x7f" || s == "\b"
-}
-
-func Escape(s string) bool {
-	return s == "\x1b"
-}
-
-func Up(s string) bool {
-	return s == "\x1b[A"
-}
-
-func Down(s string) bool {
-	return s == "\x1b[B"
-}
-
-func Right(s string) bool {
-	return s == "\x1b[C"
-}
-
-func Left(s string) bool {
-	return s == "\x1b[D"
-}
-
-func Char(s string, s1 string) bool {
-	return s == s1
-}
-
-func CtrlW(s string) bool {
-	return s == "\x17" 
-}
-
-func CtrlS(s string) bool {
-	return s == "\x13" 
-}
-
-func CtrlA(s string) bool {
-	return s == "\x01" 
-}
-
-func CtrlD(s string) bool {
-	return s == "\x04" 
-}
@@ -0,0 +1,55 @@
+package keys
+
+const (
+	Enter     = "Enter"
+	Tab       = "Tab"
+	ShiftTab  = "ShiftTab"
+	Backspace = "Backspace"
+	Escape    = "Escape"
+	Up        = "Up"
+	Down      = "Down"
+	Left      = "Left"
+	Right     = "Right"
+	CtrlW     = "CtrlW"
+	CtrlS     = "CtrlS"
+	CtrlA     = "CtrlA"
+	CtrlD     = "CtrlD"
+	Error     = "Error"
+)
+
+func Char(key string) string {
+	return "Char(" + key + ")"
+}
+
+func GetKeyName(key string) string {
+	switch key {
+	case "\r", "\n":
+		return Enter
+	case "\x7f", "\b":
+		return Backspace
+	case "\t":
+		return Tab
+	case "\x1b[Z":
+		return ShiftTab
+	case "\x1b":
+		return Escape
+	case "\x1b[A":
+		return Up
+	case "\x1b[B":
+		return Down
+	case "\x1b[C":
+		return Right
+	case "\x1b[D":
+		return Left
+	case "\x17":
+		return CtrlW
+	case "\x13":
+		return CtrlS
+	case "\x01":
+		return CtrlA
+	case "\x04":
+		return CtrlD
+	default:
+		return Char(key)
+	}
+}
@@ -4,41 +4,87 @@ import (
 	"fmt"
 	"os"
 	"strings"
+	"time"

 	"github.com/orus-dev/osui/colors"
 	"golang.org/x/term"
 )

-type ComponentData struct {
-	X            int
-	Y            int
-	Width        int
-	Height       int
-	DefaultColor string
-	IsActive     bool
-	Screen       *Screen
+type Key struct {
+	Chars [3]rune
+	Name  string
+}
+
+type UpdateContext struct {
+	UpdateKind uint8
+	Tick       uint8
+	Key        Key
 }

 type Component interface {
 	Render() string
 	GetComponentData() *ComponentData
-	Update(string) bool
+	Update(UpdateContext) bool
 }

 type Screen struct {
-	component Component
+	Component Component
+	tickRate  uint8
+	running   bool
 }

-func NewScreen(c Component) *Screen {
-	HideCursor()
-	s := &Screen{component: c}
-	return s
+func NewScreen() *Screen {
+	s := Screen{}
+	s.tickRate = 1
+	return &s
 }

 func (s *Screen) Render() {
 	width, height := GetTerminalSize()
+	data := s.Component.GetComponentData()
+	if data.Height == 0 {
+		data.Height = height
+	}
+	if data.Width == 0 {
+		data.Width = width
+	}
 	frame := NewFrame(width, height)
-	data := s.component.GetComponentData()
+	RenderOnFrame(s.Component, &frame)
+	Clear()
+	fmt.Print(strings.Join(frame, ""))
+}
+
+func (s *Screen) Run(c Component) {
+	s.SetComponent(c)
+	HideCursor()
+	oldState, err := term.MakeRaw(int(os.Stdin.Fd()))
+	if err != nil {
+		panic(err)
+	}
+	defer term.Restore(int(os.Stdin.Fd()), oldState)
+	s.running = true
+	for s.running {
+		s.Render()
+		s.Component.Update(UpdateContext{UpdateKind: UpdateKindKey, Key: ReadKey()})
+	}
+	defer term.Restore(int(os.Stdin.Fd()), oldState)
+}
+
+func (s *Screen) _() {
+	var tick uint8 = 0
+	for s.running {
+		s.Component.Update(UpdateContext{UpdateKind: UpdateKindTick, Tick: tick})
+		if tick == 255 {
+			tick = 0
+		}
+		time.Sleep(time.Duration(1000/int(s.tickRate)) * time.Millisecond)
+	}
+}
+
+func (s *Screen) SetComponent(c Component) {
+	s.Component = c
+	width, height := GetTerminalSize()
+	data := s.Component.GetComponentData()
 	if data.Height == 0 {
 		data.Height = height
 	}
@@ -48,25 +94,14 @@ func (s *Screen) Render() {
 	data.Screen = s
 	data.IsActive = true
 	data.DefaultColor = colors.Reset
-	RenderOnFrame(s.component, &frame)
-	Clear()
-	fmt.Print(strings.Join(frame, ""))
 }

-func (s *Screen) Run() {
-	oldState, err := term.MakeRaw(int(os.Stdin.Fd()))
-	if err != nil {
-		panic(err)
-	}
-	defer term.Restore(int(os.Stdin.Fd()), oldState)
-	data := s.component.GetComponentData()
-	data.Screen = s
-	for {
-		s.Render()
-		k, _ := ReadKey()
-		if s.component.Update(k) {
-			ShowCursor()
-			return
-		}
-	}
+func (s *Screen) Exit() {
+	s.running = false
+	ShowCursor()
 }
+
+const (
+	UpdateKindKey = uint8(iota)
+	UpdateKindTick
+)
@@ -1,38 +0,0 @@
-# Component template (use rename symbol)
-
-```go
-type HelloStyle struct {
-	Fg string `defaults:"" type:"fg"`
-}
-
-type HelloComponent struct {
-	Data  osui.ComponentData
-	Style *HelloStyle
-	Name  string
-}
-
-func (h *HelloComponent) GetComponentData() *osui.ComponentData {
-	return &h.Data
-}
-
-func (h *HelloComponent) Render() string {
-	osui.UseStyle(h.Style)
-	return "Hello " + h.Style.Fg + h.Name + colors.Reset + "!"
-}
-
-func (h *HelloComponent) Update(key string) bool {
-	return false
-}
-
-func (b *MenuComponent) Params(param MenuParams) *MenuComponent {
-	b.Style = osui.SetDefaults(&param.Style).(*MenuStyle)
-	return b
-}
-
-func Hello(name string) *HelloComponent {
-	return osui.NewComponent(&HelloComponent{
-		Name:  name,
-		Style: osui.SetDefaults(&HelloStyle{}).(*HelloStyle),
-	}).(*HelloComponent)
-}
-```
@@ -7,84 +7,64 @@ import (

 	"github.com/orus-dev/osui"
 	"github.com/orus-dev/osui/colors"
-	"github.com/orus-dev/osui/isKey"
+	"github.com/orus-dev/osui/keys"
 )

-type ButtonParams struct {
-	Style   ButtonStyle
-	Toggle  bool
-	OnClick func(*ButtonComponent) bool
-	Width   int
-}
-
-type ButtonStyle struct {
-	Background string `default:"" type:"bg"`
-	Foreground string `default:"" type:"fg"`
-	Outline    string `default:"" type:"fg"`
-
-	ActiveBackground string `default:"" type:"bg"`
-	ActiveForeground string `default:"\x1b[34m" type:"fg"`
-	ActiveOutline    string `default:"" type:"fg"`
-
-	ClickedBackground string `default:"" type:"bg"`
-	ClickedForeground string `default:"\x1b[32m" type:"fg"`
-	ClickedOutline    string `default:"" type:"fg"`
-}
-
 type ButtonComponent struct {
-	Data     osui.ComponentData
-	Style    *ButtonStyle
-	Text     string
-	Toggle   bool
-	Clicked  bool
-	on_click func(*ButtonComponent) bool
+	Data    osui.ComponentData
+	Text    string
+	clicked bool
 }

 func (b *ButtonComponent) Render() string {
-	osui.UseStyle(b.Style)
+	b.Data.Style.UseStyle()

-	if b.Clicked {
+	if b.clicked {
 		return fmt.Sprintf(" %s\n%s│%s│%s\n %s",
-			colors.Reset+b.Style.ClickedOutline+strings.Repeat("_", b.Data.Width-2)+colors.Reset+b.Data.DefaultColor,
-			colors.Reset+b.Style.ClickedOutline,
-			colors.Reset+colors.Combine(b.Style.ClickedBackground, b.Style.ClickedForeground)+centerText(b.Text, b.Data.Width-2)+colors.Reset+b.Style.ClickedOutline,
+			colors.Reset+b.Data.Style.ClickedOutline+strings.Repeat("_", b.Data.Width-2)+colors.Reset+b.Data.DefaultColor,
+			colors.Reset+b.Data.Style.ClickedOutline,
+			colors.Reset+colors.Combine(b.Data.Style.ClickedBackground, b.Data.Style.ClickedForeground)+centerText(b.Text, b.Data.Width-2)+colors.Reset+b.Data.Style.ClickedOutline,
 			colors.Reset+b.Data.DefaultColor,
-			colors.Reset+b.Style.ClickedOutline+strings.Repeat("‾", b.Data.Width-2)+colors.Reset+b.Data.DefaultColor,
+			colors.Reset+b.Data.Style.ClickedOutline+strings.Repeat("‾", b.Data.Width-2)+colors.Reset+b.Data.DefaultColor,
 		)
 	}

 	if b.Data.IsActive {
 		return fmt.Sprintf(" %s\n%s│%s│%s\n %s",
-			colors.Reset+b.Style.ActiveOutline+strings.Repeat("_", b.Data.Width-2)+colors.Reset+b.Data.DefaultColor,
-			colors.Reset+b.Style.ActiveOutline,
-			colors.Reset+colors.Combine(b.Style.ActiveBackground, b.Style.ActiveForeground)+centerText(b.Text, b.Data.Width-2)+colors.Reset+b.Style.ActiveOutline,
+			colors.Reset+b.Data.Style.ActiveOutline+strings.Repeat("_", b.Data.Width-2)+colors.Reset+b.Data.DefaultColor,
+			colors.Reset+b.Data.Style.ActiveOutline,
+			colors.Reset+colors.Combine(b.Data.Style.ActiveBackground, b.Data.Style.ActiveForeground)+centerText(b.Text, b.Data.Width-2)+colors.Reset+b.Data.Style.ActiveOutline,
 			colors.Reset+b.Data.DefaultColor,
-			colors.Reset+b.Style.ActiveOutline+strings.Repeat("‾", b.Data.Width-2)+colors.Reset+b.Data.DefaultColor,
+			colors.Reset+b.Data.Style.ActiveOutline+strings.Repeat("‾", b.Data.Width-2)+colors.Reset+b.Data.DefaultColor,
 		)
 	}

 	return fmt.Sprintf(" %s\n%s│%s│%s\n %s",
-		colors.Reset+b.Style.Outline+strings.Repeat("_", b.Data.Width-2)+colors.Reset+b.Data.DefaultColor,
-		colors.Reset+b.Style.Outline,
-		colors.Reset+colors.Combine(b.Style.Background, b.Style.Foreground)+centerText(b.Text, b.Data.Width-2)+colors.Reset+b.Style.Outline,
+		colors.Reset+b.Data.Style.Outline+strings.Repeat("_", b.Data.Width-2)+colors.Reset+b.Data.DefaultColor,
+		colors.Reset+b.Data.Style.Outline,
+		colors.Reset+colors.Combine(b.Data.Style.Background, b.Data.Style.Foreground)+centerText(b.Text, b.Data.Width-2)+colors.Reset+b.Data.Style.Outline,
 		colors.Reset+b.Data.DefaultColor,
-		colors.Reset+b.Style.Outline+strings.Repeat("‾", b.Data.Width-2)+colors.Reset+b.Data.DefaultColor,
+		colors.Reset+b.Data.Style.Outline+strings.Repeat("‾", b.Data.Width-2)+colors.Reset+b.Data.DefaultColor,
 	)
 }

-func (b *ButtonComponent) Update(key string) bool {
-	if isKey.Enter(key) {
-		if !b.on_click(b) {
-			if b.Toggle {
-				b.Clicked = !b.Clicked
+func (b *ButtonComponent) Update(ctx osui.UpdateContext) bool {
+	if ctx.UpdateKind == osui.UpdateKindKey {
+		switch b.Data.Keys[ctx.Key.Name] {
+		case "click":
+			b.Data.OnClick()
+			if b.Data.Toggle {
+				b.clicked = !b.clicked
 				return false
 			}
-			b.Clicked = true
+			b.clicked = true
 			b.Data.Screen.Render()
 			time.Sleep(time.Millisecond * 120)
-			b.Clicked = false
+			b.clicked = false
 		}
+	} else if ctx.UpdateKind == osui.UpdateKindTick {
 	}
+
 	return false
 }

@@ -92,22 +72,15 @@ func (b *ButtonComponent) GetComponentData() *osui.ComponentData {
 	return &b.Data
 }

-func (b *ButtonComponent) Params(param ButtonParams) *ButtonComponent {
-	b.Style = osui.SetDefaults(&param.Style).(*ButtonStyle)
-	if param.OnClick != nil {
-		b.on_click = param.OnClick
-	}
-	b.Data.Width = osui.LogicValueInt(param.Width == 0, 20, param.Width)
-	return b
-}
-
-func Button(text string) *ButtonComponent {
-	return &ButtonComponent{Text: text,
-		Style: osui.SetDefaults(&ButtonStyle{}).(*ButtonStyle),
+func Button(param osui.Param, text string) *ButtonComponent {
+	param.SetDefaultBindings(map[string]string{
+		keys.Enter: "click",
+	})
+	return param.UseParam(&ButtonComponent{Text: text,
 		Data: osui.ComponentData{
 			Width:  20,
 			Height: 1,
 		},
-		on_click: func(bc *ButtonComponent) bool { return false },
-	}
+		clicked: false,
+	}).(*ButtonComponent)
 }
@@ -5,24 +5,11 @@ import (

 	"github.com/orus-dev/osui"
 	"github.com/orus-dev/osui/colors"
-	"github.com/orus-dev/osui/isKey"
+	"github.com/orus-dev/osui/keys"
 )

-type DivParams struct {
-	Style  DivStyle
-	Width  int
-	Height int
-}
-
-type DivStyle struct {
-	Background string `default:"" type:"bg"`
-	Foreground string `default:"" type:"fg"`
-	Outline    string `default:"" type:"fg"`
-}
-
 type DivComponent struct {
 	Data            osui.ComponentData
-	Style           *DivStyle
 	Components      []osui.Component
 	ActiveComponent int
 }
@@ -32,7 +19,7 @@ func (d *DivComponent) GetComponentData() *osui.ComponentData {
 }

 func (d *DivComponent) Render() string {
-	osui.UseStyle(d.Style)
+	d.Data.Style.UseStyle()
 	frame := osui.NewFrame(d.Data.Width-2, d.Data.Height-2)
 	for i, c := range d.Components {
 		data := c.GetComponentData()
@@ -47,51 +34,48 @@ func (d *DivComponent) Render() string {
 		if data.Height == 0 {
 			data.Height = d.Data.Height - 2
 		}
-		data.DefaultColor = colors.Combine(d.Style.Background, d.Style.Foreground)
+		data.DefaultColor = colors.Combine(d.Data.Style.Background, d.Data.Style.Foreground)
 		data.Screen = d.Data.Screen
 		osui.RenderOnFrame(c, &frame)
 	}
-	if d.Style.Outline == "" {
+	if d.Data.Style.Outline == "" {
 		for i, f := range frame {
-			frame[i] = colors.Combine(d.Style.Foreground, d.Style.Background) + f + colors.Reset
+			frame[i] = colors.Combine(d.Data.Style.Foreground, d.Data.Style.Background) + f + colors.Reset
 		}
 		return strings.Join(frame, "\n")
 	} else {
 		for i, f := range frame {
-			frame[i] = d.Style.Outline + "│" + colors.Reset + colors.Combine(d.Style.Foreground, d.Style.Background) + f + colors.Reset + d.Style.Outline + "│" + colors.Reset
+			frame[i] = d.Data.Style.Outline + "│" + colors.Reset + colors.Combine(d.Data.Style.Foreground, d.Data.Style.Background) + f + colors.Reset + d.Data.Style.Outline + "│" + colors.Reset
 		}
 	}
-	return " " + d.Style.Outline + strings.Repeat("_", d.Data.Width-2) + colors.Reset + "\n" + strings.Join(frame, "\n") + "\n " + d.Style.Outline + strings.Repeat("‾", d.Data.Width-2) + colors.Reset
+	return " " + d.Data.Style.Outline + strings.Repeat("_", d.Data.Width-2) + colors.Reset + "\n" + strings.Join(frame, "\n") + "\n " + d.Data.Style.Outline + strings.Repeat("‾", d.Data.Width-2) + colors.Reset
 }

-func (d *DivComponent) Update(key string) bool {
-	if isKey.CtrlW(key) {
-		d.updateActive(findClosestComponent(d.Components, d.ActiveComponent, "up"))
-	} else if isKey.CtrlS(key) {
-		d.updateActive(findClosestComponent(d.Components, d.ActiveComponent, "down"))
-	} else if isKey.CtrlA(key) {
-		d.updateActive(findClosestComponent(d.Components, d.ActiveComponent, "left"))
-	} else if isKey.CtrlD(key) {
-		d.updateActive(findClosestComponent(d.Components, d.ActiveComponent, "right"))
-	} else {
-		if len(d.Components) > 0 {
+func (d *DivComponent) Update(ctx osui.UpdateContext) bool {
+	if ctx.UpdateKind == osui.UpdateKindKey {
+		switch d.Data.Keys[ctx.Key.Name] {
+		case "up":
+			d.updateActive(findClosestComponent(d.Components, d.ActiveComponent, "up"))
+		case "down":
+			d.updateActive(findClosestComponent(d.Components, d.ActiveComponent, "down"))
+		case "left":
+			d.updateActive(findClosestComponent(d.Components, d.ActiveComponent, "left"))
+		case "right":
+			d.updateActive(findClosestComponent(d.Components, d.ActiveComponent, "right"))
+		default:
 			d.Components[d.ActiveComponent].GetComponentData().IsActive = d.Data.IsActive
-			if d.Components[d.ActiveComponent].Update(key) {
-				if d.ActiveComponent < len(d.Components)-1 {
-					d.updateActive(d.ActiveComponent + 1)
-				} else {
-					return true
-				}
+			if d.Components[d.ActiveComponent].Update(ctx) {
+				d.updateActive(findClosestComponent(d.Components, d.ActiveComponent, "down"))
 			}
 		}
+	} else if ctx.UpdateKind == osui.UpdateKindTick {
+		d.Components[d.ActiveComponent].GetComponentData().IsActive = d.Data.IsActive
+		if d.Components[d.ActiveComponent].Update(ctx) {
+			d.updateActive(findClosestComponent(d.Components, d.ActiveComponent, "down"))
+		}
 	}
-	return false
-}

-func (b *DivComponent) Params(param DivParams) *DivComponent {
-	b.Style = osui.SetDefaults(&param.Style).(*DivStyle)
-	b.Data.Width = osui.LogicValueInt(param.Width == 0, 20, param.Width)
-	return b
+	return false
 }

 func (d *DivComponent) updateActive(newIndex int) {
@@ -100,9 +84,14 @@ func (d *DivComponent) updateActive(newIndex int) {
 	}
 }

-func Div(components ...osui.Component) *DivComponent {
-	return &DivComponent{
+func Div(param osui.Param, components ...osui.Component) *DivComponent {
+	param.SetDefaultBindings(map[string]string{
+		keys.CtrlW: "up",
+		keys.CtrlS: "down",
+		keys.CtrlA: "left",
+		keys.CtrlD: "right",
+	})
+	return param.UseParam(&DivComponent{
 		Components: components,
-		Style:      osui.SetDefaults(&DivStyle{}).(*DivStyle),
-	}
+	}).(*DivComponent)
 }
@@ -6,25 +6,11 @@ import (

 	"github.com/orus-dev/osui"
 	"github.com/orus-dev/osui/colors"
-	"github.com/orus-dev/osui/isKey"
+	"github.com/orus-dev/osui/keys"
 )

-type InputBoxParams struct {
-	Style  DivStyle
-	Width  int
-	Height int
-}
-
-type InputBoxStyle struct {
-	Background string `default:"" type:"bg"`
-	Foreground string `default:"" type:"fg"`
-	Outline    string `default:"" type:"fg"`
-	Cursor     string `default:"" type:"fg"`
-}
-
 type InputBoxComponent struct {
 	Data      osui.ComponentData
-	Style     *InputBoxStyle
 	max_size  uint
 	cursor    uint
 	InputData string
@@ -35,61 +21,65 @@ func (s *InputBoxComponent) GetComponentData() *osui.ComponentData {
 }

 func (s InputBoxComponent) Render() string {
-	osui.UseStyle(s.Style)
+	s.Data.Style.UseStyle()
 	if s.max_size > uint(len(s.InputData)) {
 		return fmt.Sprintf(
 			" %s\n%s│%s%s│%s\n %s",
-			colors.Reset+s.Style.Outline+strings.Repeat("_", int(s.max_size))+colors.Reset,
-			colors.Reset+s.Style.Outline,
-			colors.Combine(s.Style.Foreground, s.Style.Background)+s.InputData+osui.LogicValue(s.Data.IsActive, s.Style.Cursor+"█"+colors.Combine(s.Style.Foreground, s.Style.Background), ""),
-			strings.Repeat(" ", int(s.max_size)-len(s.InputData)-osui.LogicValueInt(s.Data.IsActive, 1, 0))+colors.Reset+s.Style.Outline,
+			colors.Reset+s.Data.Style.Outline+strings.Repeat("_", int(s.max_size))+colors.Reset,
+			colors.Reset+s.Data.Style.Outline,
+			colors.Combine(s.Data.Style.Foreground, s.Data.Style.Background)+s.InputData+osui.LogicValue(s.Data.IsActive, s.Data.Style.CursorColor+"█"+colors.Combine(s.Data.Style.Foreground, s.Data.Style.Background), ""),
+			strings.Repeat(" ", int(s.max_size)-len(s.InputData)-osui.LogicValueInt(s.Data.IsActive, 1, 0))+colors.Reset+s.Data.Style.Outline,
 			colors.Reset+s.Data.DefaultColor,
-			s.Style.Outline+strings.Repeat("‾", int(s.max_size))+colors.Reset+s.Data.DefaultColor,
+			s.Data.Style.Outline+strings.Repeat("‾", int(s.max_size))+colors.Reset+s.Data.DefaultColor,
 		)
 	}

 	return fmt.Sprintf(
 		" %s\n%s│%s%s\n %s",
-		colors.Reset+s.Style.Outline+strings.Repeat("_", int(s.max_size))+colors.Reset,
-		colors.Reset+s.Style.Outline,
-		colors.Combine(s.Style.Foreground, s.Style.Background)+s.InputData+osui.LogicValue(s.Data.IsActive, s.Style.Cursor+"█"+colors.Reset, s.Style.Outline+"|"+colors.Reset),
+		colors.Reset+s.Data.Style.Outline+strings.Repeat("_", int(s.max_size))+colors.Reset,
+		colors.Reset+s.Data.Style.Outline,
+		colors.Combine(s.Data.Style.Foreground, s.Data.Style.Background)+s.InputData+osui.LogicValue(s.Data.IsActive, s.Data.Style.CursorColor+"█"+colors.Reset, s.Data.Style.Outline+"|"+colors.Reset),
 		colors.Reset+s.Data.DefaultColor,
-		colors.Reset+s.Style.Outline+strings.Repeat("‾", int(s.max_size))+colors.Reset+s.Data.DefaultColor,
+		colors.Reset+s.Data.Style.Outline+strings.Repeat("‾", int(s.max_size))+colors.Reset+s.Data.DefaultColor,
 	)
 }

-func (s *InputBoxComponent) Update(key string) bool {
-	if isKey.Enter(key) {
-		return true
-	} else if isKey.Backspace(key) {
-		if len(s.InputData) > 0 {
-			s.InputData = s.InputData[:len(s.InputData)-1]
-		}
-	} else if isKey.Left(key) {
-		if s.cursor > 0 {
-			s.cursor--
-		}
-	} else if isKey.Right(key) {
-		if s.cursor < s.max_size {
-			s.cursor++
-		}
-	} else {
-		if len(key) == 1 {
-			if int(s.max_size) > len(s.InputData) {
-				s.InputData += key
+func (s *InputBoxComponent) Update(ctx osui.UpdateContext) bool {
+	if ctx.UpdateKind == osui.UpdateKindKey {
+		switch s.Data.Keys[ctx.Key.Name] {
+		case "done":
+			s.Data.OnClick()
+			return true
+		case "remove":
+			if len(s.InputData) > 0 {
+				s.InputData = s.InputData[:len(s.InputData)-1]
+			}
+		case "left":
+			if s.cursor > 0 {
+				s.cursor--
+			}
+		case "right":
+			if s.cursor < s.max_size {
+				s.cursor++
+			}
+		default:
+			if ctx.Key.Chars[1] == '\x00' {
+				if int(s.max_size) > len(s.InputData) {
+					s.InputData += string(ctx.Key.Chars[0])
+				}
 			}
 		}
 	}
+
 	return false
 }

-func (b *InputBoxComponent) Params(p interface{}) *InputBoxComponent {
-	param := p.(InputBoxParams)
-	b.Style = osui.SetDefaults(&param.Style).(*InputBoxStyle)
-	b.Data.Width = osui.LogicValueInt(param.Width == 0, 20, param.Width)
-	return b
-}
-
-func InputBox(max_size uint) *InputBoxComponent {
-	return &InputBoxComponent{max_size: max_size, Style: osui.SetDefaults(&InputBoxStyle{}).(*InputBoxStyle)}
+func InputBox(param osui.Param, max_size uint) *InputBoxComponent {
+	param.SetDefaultBindings(map[string]string{
+		keys.Enter:     "done",
+		keys.Backspace: "remove",
+		keys.Left:      "left",
+		keys.Right:     "right",
+	})
+	return param.UseParam(&InputBoxComponent{max_size: max_size, Data: osui.ComponentData{}}).(*InputBoxComponent)
 }
@@ -5,29 +5,13 @@ import (

 	"github.com/orus-dev/osui"
 	"github.com/orus-dev/osui/colors"
-	"github.com/orus-dev/osui/isKey"
+	"github.com/orus-dev/osui/keys"
 )

-type MenuParams struct {
-	Style      MenuStyle
-	OnSelected func(*MenuComponent, bool)
-}
-
-type MenuStyle struct {
-	Fg             string `default:"" type:"fg"`
-	Bg             string `default:"" type:"bg"`
-	SelectedFg     string `default:"\x1b[34m" type:"fg"`
-	SelectedBg     string `default:"" type:"bg"`
-	Cursor         string `default:"> " type:"fg"`
-	CursorInactive string `default:"  " type:"fg"`
-}
-
 type MenuComponent struct {
 	Data         osui.ComponentData
-	Style        *MenuStyle
 	Items        []string
 	SelectedItem int
-	OnSelected   func(*MenuComponent, bool)
 }

 func (m *MenuComponent) GetComponentData() *osui.ComponentData {
@@ -35,59 +19,60 @@ func (m *MenuComponent) GetComponentData() *osui.ComponentData {
 }

 func (m *MenuComponent) Render() string {
-	osui.UseStyle(m.Style)
+	m.Data.Style.UseStyle()
 	res := []string{}

-	cursor := m.Style.Cursor
+	cursor := m.Data.Style.Cursor
 	if !m.Data.IsActive {
-		cursor = m.Style.CursorInactive
+		cursor = m.Data.Style.InactiveCursor
 	}
-	d, _ := osui.CompressString(m.Style.Cursor)
+	d, _ := osui.CompressString(m.Data.Style.Cursor)
 	empty := strings.Repeat(" ", len(d))

 	for i, item := range m.Items {
 		if i == m.SelectedItem {
-			res = append(res, cursor+colors.Combine(m.Style.SelectedFg, m.Style.SelectedBg)+item+colors.Reset+m.Data.DefaultColor)
+			res = append(res, colors.Reset+cursor+m.Data.Style.SelectedBackground+m.Data.Style.SelectedForeground+item+"\x1b[0m ")
 		} else {
-			res = append(res, empty+colors.Combine(m.Style.Fg, m.Style.Bg)+item+colors.Reset+m.Data.DefaultColor)
+			res = append(res, colors.Reset+empty+m.Data.Style.Foreground+m.Data.Style.Background+item)
 		}
 	}

 	return strings.Join(res, "\n")
 }

-func (m *MenuComponent) Update(key string) bool {
-	if isKey.Char(key, "s") {
-		if m.SelectedItem+1 < len(m.Items) {
-			m.SelectedItem++
-		} else {
-			m.SelectedItem = 0
+func (m *MenuComponent) Update(ctx osui.UpdateContext) bool {
+	if ctx.UpdateKind == osui.UpdateKindKey {
+		switch m.Data.Keys[ctx.Key.Name] {
+		case "up":
+			if m.SelectedItem > 0 {
+				m.SelectedItem--
+			} else {
+				m.SelectedItem = len(m.Items) - 1
+			}
+		case "down":
+			if m.SelectedItem+1 < len(m.Items) {
+				m.SelectedItem++
+			} else {
+				m.SelectedItem = 0
+			}
+		case "select":
+			m.Data.OnClick()
+			return true
+		case "exit":
+			return true
 		}
-	} else if isKey.Char(key, "w") {
-		if m.SelectedItem > 0 {
-			m.SelectedItem--
-		} else {
-			m.SelectedItem = len(m.Items) - 1
-		}
-	} else if isKey.Enter(key) {
-		m.OnSelected(m, true)
-		return true
-	} else if isKey.Char(key, "q") {
-		m.OnSelected(m, false)
-		return true
 	}
+
 	return false
 }

-func (b *MenuComponent) Params(param MenuParams) *MenuComponent {
-	b.Style = osui.SetDefaults(&param.Style).(*MenuStyle)
-	b.OnSelected = param.OnSelected
-	return b
-}
-
-func Menu(items ...string) *MenuComponent {
-	return &MenuComponent{
+func Menu(param osui.Param, items ...string) *MenuComponent {
+	param.SetDefaultBindings(map[string]string{
+		keys.Up:    "up",
+		keys.Down:  "down",
+		keys.Enter: "select",
+	})
+	return param.UseParam(&MenuComponent{
 		Items: items,
-		Style: osui.SetDefaults(&MenuStyle{}).(*MenuStyle),
-	}
+	}).(*MenuComponent)
 }
@@ -6,23 +6,11 @@ import (

 	"github.com/orus-dev/osui"
 	"github.com/orus-dev/osui/colors"
-	"github.com/orus-dev/osui/isKey"
+	"github.com/orus-dev/osui/keys"
 )

-type PaginatorParams struct {
-	Style  DivStyle
-	Width  int
-	Height int
-}
-
-type PaginatorStyle struct {
-	Active   string `default:"\033[32m"`
-	Inactive string `default:""`
-}
-
 type PaginatorComponent struct {
 	Data            osui.ComponentData
-	Style           *PaginatorStyle
 	Components      []osui.Component
 	ActiveComponent int
 }
@@ -34,15 +22,15 @@ func (p *PaginatorComponent) GetComponentData() *osui.ComponentData {
 func (p *PaginatorComponent) Render() string {
 	width, _ := osui.GetTerminalSize()
 	pgs := strings.Repeat(" ", (width-len(p.Components))/2)
-	osui.UseStyle(p.Style)
+	p.Data.Style.UseStyle()
 	frame := osui.NewFrame(p.Data.Width, p.Data.Height)
 	for i, c := range p.Components {
 		data := c.GetComponentData()
 		if i == p.ActiveComponent {
-			pgs += p.Style.Active + "•" + colors.Reset
+			pgs += p.Data.Style.SelectedForeground + data.Style.SelectedBackground + "•" + colors.Reset
 			data.IsActive = true
 		} else {
-			pgs += colors.Reset + p.Style.Inactive + "•"
+			pgs += colors.Reset + p.Data.Style.Foreground + data.Style.Background + "•"
 			data.IsActive = false
 		}
 		if data.Width == 0 {
@@ -58,33 +46,37 @@ func (p *PaginatorComponent) Render() string {
 	for i, f := range frame {
 		frame[i] = colors.Reset + p.Data.DefaultColor + f + colors.Reset
 	}
-	return fmt.Sprintf("%s\n%s", pgs, colors.Reset+strings.Join(frame, "\n"))
+	return fmt.Sprintf("%s\n%s", pgs+" ", colors.Reset+strings.Join(frame, "\n"))
 }

-func (p *PaginatorComponent) Update(key string) bool {
-	if key == "\x1b[Z" {
-		if p.ActiveComponent > 0 {
-			p.updateActive(p.ActiveComponent - 1)
-		} else {
-			p.updateActive(len(p.Components) - 1)
-		}
-	} else if isKey.Tab(key) {
-		if p.ActiveComponent < len(p.Components)-1 {
-			p.updateActive(p.ActiveComponent + 1)
-		} else {
-			p.updateActive(0)
-		}
-	} else if isKey.Escape(key) {
-		fmt.Print("\n\n")
-		return true
-	} else {
-		if len(p.Components) > 0 {
-			p.Components[p.ActiveComponent].GetComponentData().IsActive = p.Data.IsActive
-			if p.Components[p.ActiveComponent].Update(key) {
-				if p.ActiveComponent < len(p.Components)-1 {
-					p.updateActive(p.ActiveComponent + 1)
-				} else {
-					p.updateActive(0)
+func (p *PaginatorComponent) Update(ctx osui.UpdateContext) bool {
+	if ctx.UpdateKind == osui.UpdateKindKey {
+		switch p.Data.Keys[ctx.Key.Name] {
+		case "previous":
+			if p.ActiveComponent > 0 {
+				p.updateActive(p.ActiveComponent - 1)
+			} else {
+				p.updateActive(len(p.Components) - 1)
+			}
+		case "next":
+			if p.ActiveComponent < len(p.Components)-1 {
+				p.updateActive(p.ActiveComponent + 1)
+			} else {
+				p.updateActive(0)
+			}
+		case "exit":
+			p.Data.OnClick()
+			fmt.Print("\n\n")
+			return true
+		default:
+			if len(p.Components) > 0 {
+				p.Components[p.ActiveComponent].GetComponentData().IsActive = p.Data.IsActive
+				if p.Components[p.ActiveComponent].Update(ctx) {
+					if p.ActiveComponent < len(p.Components)-1 {
+						p.updateActive(p.ActiveComponent + 1)
+					} else {
+						p.updateActive(0)
+					}
 				}
 			}
 		}
@@ -98,15 +90,13 @@ func (p *PaginatorComponent) updateActive(newIndex int) {
 	}
 }

-func (b *PaginatorComponent) Params(p interface{}) *PaginatorComponent {
-	param := p.(PaginatorParams)
-	b.Style = osui.SetDefaults(&param.Style).(*PaginatorStyle)
-	return b
-}
-
-func Paginator(pages ...osui.Component) *PaginatorComponent {
-	return &PaginatorComponent{
+func Paginator(param osui.Param, pages ...osui.Component) *PaginatorComponent {
+	param.SetDefaultBindings(map[string]string{
+		keys.ShiftTab: "previous",
+		keys.Tab:      "next",
+		keys.Escape:   "exit",
+	})
+	return param.UseParam(&PaginatorComponent{
 		Components: pages,
-		Style:      osui.SetDefaults(&PaginatorStyle{}).(*PaginatorStyle),
-	}
+	}).(*PaginatorComponent)
 }
@@ -9,7 +9,7 @@ type TextComponent struct {
 	Text string
 }

-func (t *TextComponent) Update(string) bool {
+func (t *TextComponent) Update(ctx osui.UpdateContext) bool {
 	return false
 }

@@ -21,6 +21,7 @@ func (t TextComponent) Render() string {
 	return t.Text
 }

-func Text(text string) *TextComponent {
-	return &TextComponent{Text: text}
+func Text(param osui.Param, text string) *TextComponent {
+	param.SetDefaultBindings(map[string]string{})
+	return param.UseParam(&TextComponent{Text: text}).(*TextComponent)
 }
@@ -4,13 +4,12 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
-	"reflect"
 	"regexp"
 	"runtime"
 	"strings"

 	"github.com/nathan-fiscaletti/consolesize-go"
-	"github.com/orus-dev/osui/colors"
+	"github.com/orus-dev/osui/keys"
 )

 var re = regexp.MustCompile(`(\x1b\[([0-9;]*)[a-zA-Z])+`)
@@ -69,13 +68,13 @@ func RenderOnFrame(c Component, frame *[]string) {
 	}
 }

-func ReadKey() (string, error) {
+func ReadKey() Key {
 	var b [3]byte
 	n, err := os.Stdin.Read(b[:])
 	if err != nil {
-		return "", err
+		return Key{Chars: [3]rune{'E', 'r', 'r'}, Name: err.Error()}
 	}
-	return string(b[:n]), nil
+	return Key{Chars: [3]rune{rune(b[0]), rune(b[1]), rune(b[2])}, Name: keys.GetKeyName(string(b[:n]))}
 }

 func NewFrame(width, height int) []string {
@@ -99,55 +98,6 @@ func Clear() {
 	}
 }

-func SetDefaults(p interface{}) interface{} {
-	v := reflect.ValueOf(p)
-	if v.Kind() != reflect.Ptr {
-		panic("SetDefaults: expected a pointer to a struct")
-	}
-	val := v.Elem()
-	if val.Kind() != reflect.Struct {
-		panic("SetDefaults: expected a pointer to a struct")
-	}
-	typ := val.Type()
-	for i := 0; i < val.NumField(); i++ {
-		field := val.Field(i)
-		structField := typ.Field(i)
-		if defaultValue, ok := structField.Tag.Lookup("default"); ok {
-			if field.Kind() == reflect.String && field.String() == "" {
-				field.SetString(defaultValue)
-			}
-		}
-	}
-	return p
-}
-
-func UseStyle(p interface{}) {
-	SetDefaults(p)
-	v := reflect.ValueOf(p)
-	if v.Kind() != reflect.Ptr {
-		panic("SetStyle: expected a pointer to a struct")
-	}
-	val := v.Elem()
-	if val.Kind() != reflect.Struct {
-		panic("SetStyle: expected a pointer to a struct")
-	}
-	typ := val.Type()
-	for i := 0; i < val.NumField(); i++ {
-		field := val.Field(i)
-		structField := typ.Field(i)
-		if styleType, ok := structField.Tag.Lookup("type"); ok {
-			if field.Kind() == reflect.String {
-				if styleType == "bg" || styleType == "background" {
-					field.SetString(colors.AsBg(field.String()))
-				} else {
-					field.SetString(colors.AsFg(field.String()))
-				}
-			}
-		}
-	}
-
-}
-
 func ShowCursor() {
 	fmt.Print("\033[?25h")
 }
@@ -170,7 +120,6 @@ func LogicValueInt(b bool, _if, _else int) int {
 	return _else
 }

-// Get the terminal size
 func GetTerminalSize() (int, int) {
 	return consolesize.GetConsoleSize()
 }
Author	SHA1	Message	Date
selimaj-dev	553804ec51	a few more changes	2024-10-13 16:32:05 +02:00
selimaj-dev	905bb6711e	updated structure	2024-10-12 22:36:20 +02:00
selimaj-dev	8ea250c1b1	updated structure	2024-10-12 22:36:09 +02:00
selimaj-dev	039bc27999	updated structure	2024-10-12 17:49:55 +02:00