issue-11: started working on toggling the size of table and item views
This commit is contained in:
parent
7e87b3e5a6
commit
6d23e3ee2c
|
@ -6,6 +6,10 @@ import (
|
||||||
"github.com/lmika/audax/internal/dynamo-browse/models"
|
"github.com/lmika/audax/internal/dynamo-browse/models"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
type SetTableItemView struct {
|
||||||
|
ViewIndex int
|
||||||
|
}
|
||||||
|
|
||||||
type NewResultSet struct {
|
type NewResultSet struct {
|
||||||
ResultSet *models.ResultSet
|
ResultSet *models.ResultSet
|
||||||
currentFilter string
|
currentFilter string
|
||||||
|
|
|
@ -27,9 +27,12 @@ type Model struct {
|
||||||
statusAndPrompt *statusandprompt.StatusAndPrompt
|
statusAndPrompt *statusandprompt.StatusAndPrompt
|
||||||
tableSelect *tableselect.Model
|
tableSelect *tableselect.Model
|
||||||
|
|
||||||
|
mainViewIndex int
|
||||||
|
|
||||||
root tea.Model
|
root tea.Model
|
||||||
tableView *dynamotableview.Model
|
tableView *dynamotableview.Model
|
||||||
itemView *dynamoitemview.Model
|
itemView *dynamoitemview.Model
|
||||||
|
mainView tea.Model
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewModel(
|
func NewModel(
|
||||||
|
@ -42,7 +45,7 @@ func NewModel(
|
||||||
|
|
||||||
dtv := dynamotableview.New(uiStyles)
|
dtv := dynamotableview.New(uiStyles)
|
||||||
div := dynamoitemview.New(itemRendererService, uiStyles)
|
div := dynamoitemview.New(itemRendererService, uiStyles)
|
||||||
mainView := layout.NewVBox(layout.LastChildFixedAt(13), dtv, div)
|
mainView := layout.NewVBox(layout.LastChildFixedAt(14), dtv, div)
|
||||||
|
|
||||||
itemEdit := dynamoitemedit.NewModel(mainView)
|
itemEdit := dynamoitemedit.NewModel(mainView)
|
||||||
statusAndPrompt := statusandprompt.New(itemEdit, "", uiStyles.StatusAndPrompt)
|
statusAndPrompt := statusandprompt.New(itemEdit, "", uiStyles.StatusAndPrompt)
|
||||||
|
@ -131,6 +134,7 @@ func NewModel(
|
||||||
root: root,
|
root: root,
|
||||||
tableView: dtv,
|
tableView: dtv,
|
||||||
itemView: div,
|
itemView: div,
|
||||||
|
mainView: mainView,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -140,6 +144,9 @@ func (m Model) Init() tea.Cmd {
|
||||||
|
|
||||||
func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
||||||
switch msg := msg.(type) {
|
switch msg := msg.(type) {
|
||||||
|
case controllers.SetTableItemView:
|
||||||
|
cmd := m.setMainViewIndex(msg.ViewIndex)
|
||||||
|
return m, cmd
|
||||||
case controllers.ResultSetUpdated:
|
case controllers.ResultSetUpdated:
|
||||||
return m, m.tableView.Refresh()
|
return m, m.tableView.Refresh()
|
||||||
case tea.KeyMsg:
|
case tea.KeyMsg:
|
||||||
|
@ -161,6 +168,8 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
||||||
return m, m.tableReadController.Filter
|
return m, m.tableReadController.Filter
|
||||||
case "backspace":
|
case "backspace":
|
||||||
return m, m.tableReadController.ViewBack
|
return m, m.tableReadController.ViewBack
|
||||||
|
case "w":
|
||||||
|
return m, func() tea.Msg { return controllers.SetTableItemView{ViewIndex: (m.mainViewIndex + 1) % 3} }
|
||||||
//case "e":
|
//case "e":
|
||||||
// m.itemEdit.Visible()
|
// m.itemEdit.Visible()
|
||||||
// return m, nil
|
// return m, nil
|
||||||
|
@ -180,3 +189,22 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
||||||
func (m Model) View() string {
|
func (m Model) View() string {
|
||||||
return m.root.View()
|
return m.root.View()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (m *Model) setMainViewIndex(viewIndex int) tea.Cmd {
|
||||||
|
var newMainView tea.Model
|
||||||
|
switch viewIndex {
|
||||||
|
case 0:
|
||||||
|
newMainView = layout.NewVBox(layout.LastChildFixedAt(14), m.tableView, m.itemView)
|
||||||
|
case 1:
|
||||||
|
newMainView = layout.NewVBox(layout.EqualSize(), m.tableView, m.itemView)
|
||||||
|
case 2:
|
||||||
|
newMainView = layout.NewVBox(layout.FirstChildFixedAt(7), m.tableView, m.itemView)
|
||||||
|
default:
|
||||||
|
newMainView = m.mainView
|
||||||
|
}
|
||||||
|
|
||||||
|
m.mainViewIndex = viewIndex
|
||||||
|
m.mainView = newMainView
|
||||||
|
m.itemEdit.SetSubmodel(m.mainView)
|
||||||
|
return m.tableView.Refresh()
|
||||||
|
}
|
||||||
|
|
|
@ -107,3 +107,8 @@ func (m *Model) Resize(w, h int) layout.ResizingModel {
|
||||||
func (m *Model) Visible() {
|
func (m *Model) Visible() {
|
||||||
m.visible = true
|
m.visible = true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (m *Model) SetSubmodel(submodel tea.Model) {
|
||||||
|
m.submodel = submodel
|
||||||
|
m.Resize(m.w, m.h)
|
||||||
|
}
|
||||||
|
|
|
@ -24,6 +24,21 @@ func (l equalSize) childSize(idx, cnt, available int) int {
|
||||||
return childrenHeight
|
return childrenHeight
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func FirstChildFixedAt(size int) BoxSize {
|
||||||
|
return firstChildFixedAt{size}
|
||||||
|
}
|
||||||
|
|
||||||
|
type firstChildFixedAt struct {
|
||||||
|
firstChildSize int
|
||||||
|
}
|
||||||
|
|
||||||
|
func (l firstChildFixedAt) childSize(idx, cnt, available int) int {
|
||||||
|
if idx == 0 {
|
||||||
|
return l.firstChildSize
|
||||||
|
}
|
||||||
|
return (equalSize{}).childSize(idx, cnt-1, available-l.firstChildSize)
|
||||||
|
}
|
||||||
|
|
||||||
func LastChildFixedAt(size int) BoxSize {
|
func LastChildFixedAt(size int) BoxSize {
|
||||||
return lastChildFixedAt{size}
|
return lastChildFixedAt{size}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue