update

Author: cnlubo

common/color.go

@@ -34,6 +34,8 @@ func RenderedText(str, strcolor string) string {
 		return color.New(color.Bold, color.FgHiBlue).SprintfFunc()(str)
 	case "white":
 		return color.New(color.Bold, color.FgHiWhite).SprintFunc()(str)
+	case "red":
+		return color.New(color.Bold, color.FgHiRed).SprintFunc()(str)
 	}
 	return str
 }

myssh/keymg.go

@@ -2,7 +2,6 @@ package myssh
 
 import (
 	"fmt"
-	"github.com/cnlubo/myssh/common"
 	"github.com/cnlubo/myssh/confirmation"
 	"github.com/cnlubo/myssh/prompt"
 	"github.com/cnlubo/myssh/selection"
@@ -168,19 +167,19 @@ func createDefaultSSHKey(env *Environment) error {
 				selection.Choices(sshKeyType))
 			sp.PageSize = 5
 			sp.Filter = nil
-			sp.SelectedChoiceStyle = func(c *selection.Choice) string {
-				a, _ := c.Value.(KeyType)
-
-				return common.RenderedText(a.Name, "blue")
-			}
-			sp.UnselectedChoiceStyle = func(c *selection.Choice) string {
-				a, _ := c.Value.(KeyType)
-
-				return common.RenderedText(a.Name, "white")
-			}
-			sp.ExtendedTemplateFuncs = map[string]interface{}{
-				"name": func(c *selection.Choice) string { return c.Value.(KeyType).Name },
-			}
+			//sp.SelectedChoiceStyle = func(c *selection.Choice) string {
+			//	a, _ := c.Value.(KeyType)
+			//
+			//	return common.RenderedText(a.Name, "blue")
+			//}
+			//sp.UnselectedChoiceStyle = func(c *selection.Choice) string {
+			//	a, _ := c.Value.(KeyType)
+			//
+			//	return common.RenderedText(a.Name, "white")
+			//}
+			//sp.ExtendedTemplateFuncs = map[string]interface{}{
+			//	"name": func(c *selection.Choice) string { return c.Value.(KeyType).Name },
+			//}
 
 			choice, err := sp.RunPrompt()
 			if err != nil {

selection/keymap.go

@@ -17,6 +17,8 @@ func NewDefaultKeyMap() *KeyMap {
 		ClearFilter: []string{"esc"},
 		ScrollDown:  []string{"pgdown"},
 		ScrollUp:    []string{"pgup"},
+		Left:        []string{"left"},
+		Right:       []string{"right"},
 	}
 }
 
@@ -29,6 +31,8 @@ type KeyMap struct {
 	ClearFilter []string
 	ScrollDown  []string
 	ScrollUp    []string
+	Left        []string
+	Right       []string
 }
 
 func keyMatches(key tea.KeyMsg, mapping []string) bool {
@@ -62,4 +66,4 @@ func validateKeyMap(km *KeyMap) error {
 	}
 
 	return nil
-}
+}

selection/model.go

@@ -206,6 +206,10 @@ func (m *Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			m.scrollDown()
 		case keyMatches(msg, m.KeyMap.ScrollUp):
 			m.scrollUp()
+		case keyMatches(msg, m.KeyMap.Left):
+			m.scrollUp()
+		case keyMatches(msg, m.KeyMap.Right):
+			m.scrollDown()
 		default:
 			return m.updateFilter(msg)
 		}
@@ -291,8 +295,7 @@ func (m *Model) View() string {
 	}
 
 	err := m.tmpl.Execute(viewBuffer, map[string]interface{}{
-		"HeadPrompt":    m.HeadPrompt,
-		"Prompt":        m.Prompt,
+		"Prompt":        defaultHeader + "\n" + m.Prompt,
 		"IsFiltered":    m.Filter != nil,
 		"FilterPrompt":  m.FilterPrompt,
 		"FilterInput":   m.filterInput.View(),

selection/prompt.go

@@ -30,34 +30,24 @@ const (
 
 	accentColor = termenv.ANSI256Color(32)
 
-	DefaultHeader = "Use the arrow keys to navigate: ↓ ↑ → ←"
+	defaultHeader = "Use the arrow keys to navigate: ↓ ↑ → ←"
+	//DefaultCursor = "»"
 )
 
 // DefaultSelectedChoiceStyle is the default style for selected choices.
 func DefaultSelectedChoiceStyle(c *Choice) string {
-	return termenv.String(c.String).Foreground(accentColor).Bold().String()
+	//return termenv.String(c.String).Foreground(accentColor).Bold().String()
+	//return common.RenderedText(c.String, "red")
+	return c.String
 }
 
 // DefaultFinalChoiceStyle is the default style for final choices.
 func DefaultFinalChoiceStyle(c *Choice) string {
 	return termenv.String(c.String).Foreground(accentColor).String()
 }
 
-// DefaultHeaderFuncWithAppend return the default HeaderFunc and append
-// the given string to the next line of the default header
-func DefaultHeaderFuncWithAppend(append string) func(m Model, obj interface{}, gdIndex int) string {
-	return func(m Model, obj interface{}, gdIndex int) string {
-		//return common.FontColor(DefaultHeader+"\n"+append, ColorHeader)
-		return DefaultHeader + "\n" + append
-	}
-}
-
 // Selection represents a configurable selection prompt.
 type Selection struct {
-	HeadPrompt string
-
-	// HeaderFunc Header rendering function
-	HeaderFunc func(m Model, obj interface{}, gdIndex int) string
 
 	// Choices represent all selectable choices of the selection. Slices of
 	// arbitrary types can be converted to a slice of choices using the helper
@@ -194,7 +184,6 @@ func New(prompt string, choices []*Choice) *Selection {
 
 	return &Selection{
 		Choices:                     choices,
-		HeadPrompt:                  DefaultHeader,
 		Prompt:                      prompt,
 		FilterPrompt:                DefaultFilterPrompt,
 		Template:                    DefaultTemplate,

selection/templates.go

@@ -4,11 +4,8 @@ package selection
 // be copied as a starting point for a custom template.
 //{{ .HeadPrompt | bold | cyan }}
 const DefaultTemplate = `
-{{- if .HeadPrompt -}}
-  {{- print | faint | cyan .HeadPrompt "\n" -}}
-{{ end -}}
 {{- if .Prompt -}}
-  {{ .Prompt | bold | cyan }}
+  {{ .Prompt | bold | yellow }}
 {{ end -}}
 {{ if .IsFiltered }}
   {{- print .FilterPrompt " " .FilterInput }}
@@ -24,12 +21,14 @@ const DefaultTemplate = `
   {{- end -}}
 
   {{- if eq $.SelectedIndex $i }}
-   {{- print (Foreground "32" (Bold "▸ ")) (Selected $choice) "\n" }}
+   {{- print (red (bold "» ")) (Selected $choice) "\n" }}
   {{- else }}
     {{- print "  " (Unselected $choice) "\n" }}
   {{- end }}
 {{- end}}`
 
+// {{- print (red (bold "▸ ")) (Selected $choice) "\n" }}
+
 // DefaultResultTemplate defines the default appearance with which the
 // finale result of the selection is presented.
 const DefaultResultTemplate = `