diff --git a/ui/components/footer/footer.go b/ui/components/footer/footer.go index 7516cdf4..2acfccf4 100644 --- a/ui/components/footer/footer.go +++ b/ui/components/footer/footer.go @@ -23,7 +23,7 @@ type Model struct { } func NewModel(ctx context.ProgramContext) Model { - help := bbHelp.NewModel() + help := bbHelp.New() help.ShowAll = true help.Styles = ctx.Styles.Help.BubbleStyles l := "" diff --git a/ui/components/inputbox/inputbox.go b/ui/components/inputbox/inputbox.go index df772e8c..2c315cbd 100644 --- a/ui/components/inputbox/inputbox.go +++ b/ui/components/inputbox/inputbox.go @@ -8,6 +8,7 @@ import ( "github.com/charmbracelet/bubbles/textarea" tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/lipgloss" + "github.com/dlvhdr/gh-dash/ui/context" ) @@ -38,7 +39,7 @@ func NewModel(ctx *context.ProgramContext) Model { ta.FocusedStyle.EndOfBuffer = lipgloss.NewStyle().Foreground(ctx.Theme.FaintText) ta.Focus() - h := help.NewModel() + h := help.New() h.Styles = ctx.Styles.Help.BubbleStyles return Model{ ctx: ctx, diff --git a/ui/components/issuesidebar/issuesidebar.go b/ui/components/issuesidebar/issuesidebar.go index 56b76405..b4540608 100644 --- a/ui/components/issuesidebar/issuesidebar.go +++ b/ui/components/issuesidebar/issuesidebar.go @@ -8,6 +8,7 @@ import ( "github.com/charmbracelet/bubbles/textarea" tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/lipgloss" + "github.com/dlvhdr/gh-dash/data" "github.com/dlvhdr/gh-dash/ui/common" "github.com/dlvhdr/gh-dash/ui/components/inputbox" @@ -254,7 +255,7 @@ func (m *Model) SetIsCommenting(isCommenting bool) tea.Cmd { m.inputBox.SetPrompt("Leave a comment...") if isCommenting { - return tea.Sequentially(textarea.Blink, m.inputBox.Focus()) + return tea.Sequence(textarea.Blink, m.inputBox.Focus()) } return nil } @@ -274,7 +275,7 @@ func (m *Model) SetIsAssigning(isAssigning bool) tea.Cmd { } if isAssigning { - return tea.Sequentially(textarea.Blink, m.inputBox.Focus()) + return tea.Sequence(textarea.Blink, m.inputBox.Focus()) } return nil } @@ -301,7 +302,7 @@ func (m *Model) SetIsUnassigning(isUnassigning bool) tea.Cmd { m.inputBox.SetValue(strings.Join(m.issueAssignees(), "\n")) if isUnassigning { - return tea.Sequentially(textarea.Blink, m.inputBox.Focus()) + return tea.Sequence(textarea.Blink, m.inputBox.Focus()) } return nil } diff --git a/ui/components/issuessection/constants.go b/ui/components/issuessection/constants.go index 5113ced5..a9e21df4 100644 --- a/ui/components/issuessection/constants.go +++ b/ui/components/issuessection/constants.go @@ -1,11 +1,5 @@ package issuessection -import "github.com/charmbracelet/lipgloss" - var ( - updatedAtCellWidth = lipgloss.Width("2mo ago") - issueRepoCellWidth = 15 - issueAuthorCellWidth = 15 - issueAssigneesCellWidth = 20 issueNumCommentsCellWidth = 6 ) diff --git a/ui/components/pr/pr.go b/ui/components/pr/pr.go index 033782ce..b1a7b788 100644 --- a/ui/components/pr/pr.go +++ b/ui/components/pr/pr.go @@ -19,11 +19,6 @@ type PullRequest struct { Data data.PullRequestData } -type sectionPullRequestsFetchedMsg struct { - SectionId int - Prs []PullRequest -} - func (pr *PullRequest) getTextStyle() lipgloss.Style { return components.GetIssueTextStyle(pr.Ctx, pr.Data.State) } diff --git a/ui/components/prsidebar/prsidebar.go b/ui/components/prsidebar/prsidebar.go index 13a91b41..8c2f4e35 100644 --- a/ui/components/prsidebar/prsidebar.go +++ b/ui/components/prsidebar/prsidebar.go @@ -8,6 +8,7 @@ import ( "github.com/charmbracelet/bubbles/textarea" tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/lipgloss" + "github.com/dlvhdr/gh-dash/data" "github.com/dlvhdr/gh-dash/ui/common" "github.com/dlvhdr/gh-dash/ui/components/inputbox" @@ -291,7 +292,7 @@ func (m *Model) SetIsCommenting(isCommenting bool) tea.Cmd { m.inputBox.SetPrompt("Leave a comment...") if isCommenting { - return tea.Sequentially(textarea.Blink, m.inputBox.Focus()) + return tea.Sequence(textarea.Blink, m.inputBox.Focus()) } return nil } @@ -315,7 +316,7 @@ func (m *Model) SetIsAssigning(isAssigning bool) tea.Cmd { } if isAssigning { - return tea.Sequentially(textarea.Blink, m.inputBox.Focus()) + return tea.Sequence(textarea.Blink, m.inputBox.Focus()) } return nil } @@ -342,7 +343,7 @@ func (m *Model) SetIsUnassigning(isUnassigning bool) tea.Cmd { m.inputBox.SetValue(strings.Join(m.prAssignees(), "\n")) if isUnassigning { - return tea.Sequentially(textarea.Blink, m.inputBox.Focus()) + return tea.Sequence(textarea.Blink, m.inputBox.Focus()) } return nil }