From 64351b357b7523b9c5fdeb301827fd0925c92791 Mon Sep 17 00:00:00 2001 From: Dolev Hadar Date: Sat, 12 Aug 2023 19:14:16 +0300 Subject: [PATCH] fix: background color of seleted line --- ui/components/pr/pr.go | 82 ++++++++++++++++++++------ ui/components/prssection/prssection.go | 10 +++- ui/components/utils.go | 20 ++++--- 3 files changed, 84 insertions(+), 28 deletions(-) diff --git a/ui/components/pr/pr.go b/ui/components/pr/pr.go index 1cc81438..033782ce 100644 --- a/ui/components/pr/pr.go +++ b/ui/components/pr/pr.go @@ -5,6 +5,7 @@ import ( "strings" "github.com/charmbracelet/lipgloss" + "github.com/dlvhdr/gh-dash/data" "github.com/dlvhdr/gh-dash/ui/components" "github.com/dlvhdr/gh-dash/ui/components/table" @@ -31,14 +32,18 @@ func (pr *PullRequest) renderReviewStatus() string { reviewCellStyle := pr.getTextStyle() if pr.Data.ReviewDecision == "APPROVED" { if pr.Data.State == "OPEN" { - reviewCellStyle = reviewCellStyle.Foreground(pr.Ctx.Theme.SuccessText) + reviewCellStyle = reviewCellStyle.Foreground( + pr.Ctx.Theme.SuccessText, + ) } return reviewCellStyle.Render("󰄬") } if pr.Data.ReviewDecision == "CHANGES_REQUESTED" { if pr.Data.State == "OPEN" { - reviewCellStyle = reviewCellStyle.Foreground(pr.Ctx.Theme.WarningText) + reviewCellStyle = reviewCellStyle.Foreground( + pr.Ctx.Theme.WarningText, + ) } return reviewCellStyle.Render("󰌑") } @@ -56,9 +61,11 @@ func (pr *PullRequest) renderState() string { return mergeCellStyle.Foreground(pr.Ctx.Styles.Colors.OpenPR).Render("") } case "CLOSED": - return mergeCellStyle.Foreground(pr.Ctx.Styles.Colors.ClosedPR).Render("") + return mergeCellStyle.Foreground(pr.Ctx.Styles.Colors.ClosedPR). + Render("") case "MERGED": - return mergeCellStyle.Foreground(pr.Ctx.Styles.Colors.MergedPR).Render("") + return mergeCellStyle.Foreground(pr.Ctx.Styles.Colors.MergedPR). + Render("") default: return mergeCellStyle.Foreground(pr.Ctx.Theme.FaintText).Render("-") } @@ -121,25 +128,63 @@ func (pr *PullRequest) renderCiStatus() string { return ciCellStyle.Render(constants.FailureIcon) } -func (pr *PullRequest) renderLines() string { +func (pr *PullRequest) renderLines(isSelected bool) string { deletions := 0 if pr.Data.Deletions > 0 { deletions = pr.Data.Deletions } - return pr.getTextStyle().Render( - components.KeepSameSpacesOnAddDeletions( - fmt.Sprintf( - "\033[32m+%s \033[31m-%s", - components.FormatNumber(pr.Data.Additions), - components.FormatNumber(deletions), - ), - ), - ) + var additionsFg, deletionsFg lipgloss.AdaptiveColor + state := pr.Data.State + if state != "OPEN" { + additionsFg = pr.Ctx.Theme.FaintText + deletionsFg = pr.Ctx.Theme.FaintText + } else { + additionsFg = pr.Ctx.Theme.SuccessText + deletionsFg = pr.Ctx.Theme.WarningText + } + + baseStyle := lipgloss.NewStyle() + if isSelected { + baseStyle = baseStyle.Background(pr.Ctx.Theme.SelectedBackground) + } + + additionsText := baseStyle.Copy(). + Foreground(additionsFg). + Render(fmt.Sprintf("+%s", components.FormatNumber(pr.Data.Additions))) + deletionsText := baseStyle.Copy(). + Foreground(deletionsFg). + Render(fmt.Sprintf("-%s", components.FormatNumber(deletions))) + + return pr.getTextStyle().Render( + keepSameSpacesOnAddDeletions( + lipgloss.JoinHorizontal( + lipgloss.Left, + additionsText, + baseStyle.Render(" "), + deletionsText, + )), + ) +} + +func keepSameSpacesOnAddDeletions(str string) string { + strAsList := strings.Split(str, " ") + return fmt.Sprintf( + "%7s", + strAsList[0], + ) + " " + fmt.Sprintf( + "%7s", + strAsList[1], + ) } func (pr *PullRequest) renderTitle() string { - return components.RenderIssueTitle(pr.Ctx, pr.Data.State, pr.Data.Title, pr.Data.Number) + return components.RenderIssueTitle( + pr.Ctx, + pr.Data.State, + pr.Data.Title, + pr.Data.Number, + ) } func (pr *PullRequest) renderAuthor() string { @@ -185,7 +230,7 @@ func (pr *PullRequest) RenderState() string { } } -func (pr *PullRequest) ToTableRow() table.Row { +func (pr *PullRequest) ToTableRow(isSelected bool) table.Row { return table.Row{ pr.renderUpdateAt(), pr.renderState(), @@ -196,12 +241,13 @@ func (pr *PullRequest) ToTableRow() table.Row { pr.renderBaseName(), pr.renderReviewStatus(), pr.renderCiStatus(), - pr.renderLines(), + pr.renderLines(isSelected), } } func isConclusionAFailure(conclusion string) bool { - return conclusion == "FAILURE" || conclusion == "TIMED_OUT" || conclusion == "STARTUP_FAILURE" + return conclusion == "FAILURE" || conclusion == "TIMED_OUT" || + conclusion == "STARTUP_FAILURE" } func isStatusWaiting(status string) bool { diff --git a/ui/components/prssection/prssection.go b/ui/components/prssection/prssection.go index 29aa391d..549b7a00 100644 --- a/ui/components/prssection/prssection.go +++ b/ui/components/prssection/prssection.go @@ -145,6 +145,7 @@ func (m Model) Update(msg tea.Msg) (section.Section, tea.Cmd) { } search, searchCmd := m.SearchBar.Update(msg) + m.Table.SetRows(m.BuildRows()) m.SearchBar = search return &m, tea.Batch(cmd, searchCmd) } @@ -232,9 +233,14 @@ func GetSectionColumns( func (m *Model) BuildRows() []table.Row { var rows []table.Row - for _, currPr := range m.Prs { + currItem := m.Table.GetCurrItem() + for i, currPr := range m.Prs { + i := i prModel := pr.PullRequest{Ctx: m.Ctx, Data: currPr} - rows = append(rows, prModel.ToTableRow()) + rows = append( + rows, + prModel.ToTableRow(currItem == i), + ) } if rows == nil { diff --git a/ui/components/utils.go b/ui/components/utils.go index 2e41583c..878fe851 100644 --- a/ui/components/utils.go +++ b/ui/components/utils.go @@ -2,18 +2,14 @@ package components import ( "fmt" - "strings" "strconv" + "strings" "github.com/charmbracelet/lipgloss" + "github.com/dlvhdr/gh-dash/ui/context" ) -func KeepSameSpacesOnAddDeletions(str string) string { - str_as_list := strings.Split(str, " ") - return fmt.Sprintf("%7s", str_as_list[0]) + " " + fmt.Sprintf("%7s", str_as_list[1]) -} - func FormatNumber(num int) string { if num >= 1000000 { million := float64(num) / 1000000.0 @@ -26,14 +22,22 @@ func FormatNumber(num int) string { return strconv.Itoa(num) } -func GetIssueTextStyle(ctx *context.ProgramContext, state string) lipgloss.Style { +func GetIssueTextStyle( + ctx *context.ProgramContext, + state string, +) lipgloss.Style { if state == "OPEN" { return lipgloss.NewStyle().Foreground(ctx.Theme.PrimaryText) } return lipgloss.NewStyle().Foreground(ctx.Theme.FaintText) } -func RenderIssueTitle(ctx *context.ProgramContext, state string, title string, number int) string { +func RenderIssueTitle( + ctx *context.ProgramContext, + state string, + title string, + number int, +) string { prNumber := fmt.Sprintf("#%d", number) var prNumberFg lipgloss.AdaptiveColor if state != "OPEN" {