feat: add ability to customize prompt location

kencx · Jul 23, 2022 · 019f6ca · 019f6ca
1 parent 4e836e0
commit 019f6ca
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 50 deletions.
diff --git a/README.md b/README.md
@@ -142,6 +142,7 @@ By default, the following options are included.
 | `sort_keys`   | `false`                  | Sort keys alphabetically |
 | `title`       | `""`                     | Title text |
 | `prompt`      | `"keys > "`              | Search bar prompt text |
+| `prompt_location` | `"top"`                | Location of search bar: `top, bottom` |
 | `placeholder` | `"..."`                  | Search bar placeholder text |
 | `prefix_sep`  | `";"`                    | Separator symbol between prefix and key |
 | `sep_width`   | `4`                      | Separation width between columns |

diff --git a/config/config.go b/config/config.go
@@ -22,19 +22,20 @@ type Config struct {
 }
 
 type Settings struct {
-	KeybPath    string `yaml:"keyb_path"`
-	Debug       bool
-	Reverse     bool
-	Mouse       bool
-	SortKeys    bool `yaml:"sort_keys"`
-	Title       string
-	Prompt      string
-	Placeholder string
-	PrefixSep   string `yaml:"prefix_sep"`
-	SepWidth    int    `yaml:"sep_width"`
-	Margin      int
-	Padding     int
-	BorderStyle string `yaml:"border"`
+	KeybPath       string `yaml:"keyb_path"`
+	Debug          bool
+	Reverse        bool
+	Mouse          bool
+	SortKeys       bool `yaml:"sort_keys"`
+	Title          string
+	Prompt         string
+	PromptLocation string `yaml:"prompt_location"`
+	Placeholder    string
+	PrefixSep      string `yaml:"prefix_sep"`
+	SepWidth       int    `yaml:"sep_width"`
+	Margin         int
+	Padding        int
+	BorderStyle    string `yaml:"border"`
 }
 
 type Color struct {
@@ -163,19 +164,20 @@ func generateDefaultConfig() (*Config, error) {
 
 	return &Config{
 		Settings: Settings{
-			KeybPath:    keybPath,
-			Debug:       false,
-			Reverse:     false,
-			Mouse:       true,
-			SortKeys:    false,
-			Title:       "",
-			Prompt:      "keys > ",
-			Placeholder: "...",
-			PrefixSep:   ";",
-			SepWidth:    4,
-			Margin:      0,
-			Padding:     1,
-			BorderStyle: "hidden",
+			KeybPath:       keybPath,
+			Debug:          false,
+			Reverse:        false,
+			Mouse:          true,
+			SortKeys:       false,
+			Title:          "",
+			Prompt:         "keys > ",
+			PromptLocation: "top",
+			Placeholder:    "...",
+			PrefixSep:      ";",
+			SepWidth:       4,
+			Margin:         0,
+			Padding:        1,
+			BorderStyle:    "hidden",
 		},
 		Color: Color{
 			FilterFg: "#FFA066",

diff --git a/config/config_test.go b/config/config_test.go
@@ -51,19 +51,20 @@ func TestCreateConfigDir(t *testing.T) {
 func TestParse(t *testing.T) {
 	want := &Config{
 		Settings: Settings{
-			KeybPath:    "./custom.yml",
-			Debug:       true,
-			Reverse:     true,
-			Mouse:       false,
-			SortKeys:    true,
-			Title:       "",
-			Prompt:      "keys > ",
-			Placeholder: "...",
-			PrefixSep:   ";",
-			SepWidth:    4,
-			Margin:      1,
-			Padding:     1,
-			BorderStyle: "normal",
+			KeybPath:       "./custom.yml",
+			Debug:          true,
+			Reverse:        true,
+			Mouse:          false,
+			SortKeys:       true,
+			Title:          "",
+			Prompt:         "keys > ",
+			PromptLocation: "bottom",
+			Placeholder:    "...",
+			PrefixSep:      ";",
+			SepWidth:       4,
+			Margin:         1,
+			Padding:        1,
+			BorderStyle:    "normal",
 		},
 		Color: Color{
 			FilterFg: "#FFA066",

diff --git a/testdata/testconfig.yml b/testdata/testconfig.yml
@@ -6,6 +6,7 @@ settings:
   sort_keys: true
   title: ""
   prompt: 'keys > '
+  prompt_location: "bottom"
   placeholder: '...'
   prefix_sep: ;
   sep_width: 4

diff --git a/ui/list/list.go b/ui/list/list.go
@@ -34,11 +34,12 @@ type Model struct {
 	cursor  int
 	maxRows int // max number of rows regardless of filterState
 
-	margin       int
-	padding      int
-	scrollOffset int
-	border       lipgloss.Style
-	counterStyle lipgloss.Style
+	margin         int
+	padding        int
+	scrollOffset   int
+	border         lipgloss.Style
+	counterStyle   lipgloss.Style
+	promptLocation string
 }
 
 func New(t *table.Model, config *config.Config) Model {
@@ -83,6 +84,7 @@ func (m *Model) configure(c *config.Config) {
 	m.title = c.Title
 	m.debug = c.Debug
 	m.keys = CreateKeyMap(c.Keys)
+	m.promptLocation = c.PromptLocation
 
 	m.margin = c.Margin
 	m.padding = c.Padding

diff --git a/ui/list/view.go b/ui/list/view.go
@@ -14,12 +14,23 @@ func (m *Model) View() string {
 
 	counter := formCounter(m)
 
-	view := lipgloss.JoinVertical(
-		lipgloss.Left,
-		m.searchBar.View(),
-		counter,
-		m.viewport.View(),
-	)
+	var view string
+
+	if m.promptLocation == "bottom" {
+		view = lipgloss.JoinVertical(
+			lipgloss.Left,
+			m.viewport.View(),
+			counter,
+			m.searchBar.View(),
+		)
+	} else {
+		view = lipgloss.JoinVertical(
+			lipgloss.Left,
+			m.searchBar.View(),
+			counter,
+			m.viewport.View(),
+		)
+	}
 
 	style := m.border.
 		Margin(m.margin).