fix: do not show help if file info is shown

dundee · Nov 9, 2021 · c60f4ca · c60f4ca
1 parent 1733548
commit c60f4ca
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 34 deletions.
diff --git a/tui/actions_test.go b/tui/actions_test.go
@@ -292,8 +292,6 @@ func TestShowInfo(t *testing.T) {
 
 	ui.keyPressed(tcell.NewEventKey(tcell.KeyRight, 'l', 0))
 	ui.keyPressed(tcell.NewEventKey(tcell.KeyRune, 'i', 0))
-	ui.table.Select(2, 0)
-	ui.keyPressed(tcell.NewEventKey(tcell.KeyRune, 'i', 0))
 
 	assert.True(t, ui.pages.HasPage("info"))
 
@@ -324,10 +322,12 @@ func TestShowInfoBW(t *testing.T) {
 
 	ui.keyPressed(tcell.NewEventKey(tcell.KeyRight, 'l', 0))
 	ui.keyPressed(tcell.NewEventKey(tcell.KeyRune, 'i', 0))
-	ui.table.Select(2, 0)
-	ui.keyPressed(tcell.NewEventKey(tcell.KeyRune, 'i', 0))
 
 	assert.True(t, ui.pages.HasPage("info"))
+
+	ui.keyPressed(tcell.NewEventKey(tcell.KeyRune, 'i', 0))
+
+	assert.False(t, ui.pages.HasPage("info"))
 }
 
 func TestShowInfoWithHardlinks(t *testing.T) {
@@ -361,8 +361,6 @@ func TestShowInfoWithHardlinks(t *testing.T) {
 
 	ui.keyPressed(tcell.NewEventKey(tcell.KeyRight, 'l', 0))
 	ui.keyPressed(tcell.NewEventKey(tcell.KeyRune, 'i', 0))
-	ui.table.Select(2, 0)
-	ui.keyPressed(tcell.NewEventKey(tcell.KeyRune, 'i', 0))
 
 	assert.True(t, ui.pages.HasPage("info"))
 

diff --git a/tui/keys.go b/tui/keys.go
@@ -18,43 +18,26 @@ func (ui *UI) keyPressed(key *tcell.EventKey) *tcell.EventKey {
 	if key.Key() == tcell.KeyEsc || key.Rune() == 'q' {
 		if ui.pages.HasPage("help") {
 			ui.pages.RemovePage("help")
-			_, page := ui.pages.GetFrontPage()
-			ui.app.SetFocus(page)
+			ui.app.SetFocus(ui.table)
 			return nil
 		}
 		if ui.pages.HasPage("info") {
 			ui.pages.RemovePage("info")
-			_, page := ui.pages.GetFrontPage()
-			ui.app.SetFocus(page)
+			ui.app.SetFocus(ui.table)
 			return nil
 		}
 	}
-
-	if key.Rune() == 'i' {
-		if ui.pages.HasPage("info") {
+
+	if ui.pages.HasPage("info") {
+		switch key.Rune() {
+		case 'i':
 			ui.pages.RemovePage("info")
-			_, page := ui.pages.GetFrontPage()
-			ui.app.SetFocus(page)
+			ui.app.SetFocus(ui.table)
+			return nil
+		case '?':
 			return nil
 		}
-	}
-
-	switch key.Rune() {
-	case 'Q':
-		ui.app.Stop()
-		fmt.Fprintf(ui.output, "%s\n", ui.currentDirPath)
-		return nil
-	case 'q':
-		ui.app.Stop()
-		return nil
-	case 'b':
-		ui.spawnShell()
-		return nil
-	case '?':
-		ui.showHelp()
-	}
 
-	if ui.pages.HasPage("info") {
 		if key.Key() == tcell.KeyUp ||
 			key.Key() == tcell.KeyDown ||
 			key.Rune() == 'j' ||
@@ -71,6 +54,26 @@ func (ui *UI) keyPressed(key *tcell.EventKey) *tcell.EventKey {
 		defer ui.showInfo() // refresh file info after any change
 	}
 
+	switch key.Rune() {
+	case 'Q':
+		ui.app.Stop()
+		fmt.Fprintf(ui.output, "%s\n", ui.currentDirPath)
+		return nil
+	case 'q':
+		ui.app.Stop()
+		return nil
+	case 'b':
+		ui.spawnShell()
+		return nil
+	case '?':
+		if ui.pages.HasPage("help") {
+			ui.pages.RemovePage("help")
+			ui.app.SetFocus(ui.table)
+			return nil
+		}
+		ui.showHelp()
+	}
+
 	if ui.pages.HasPage("confirm") ||
 		ui.pages.HasPage("progress") ||
 		ui.pages.HasPage("deleting") ||

diff --git a/tui/keys_test.go b/tui/keys_test.go
@@ -703,8 +703,6 @@ func TestShowInfoAndMoveAround(t *testing.T) {
 
 	ui.keyPressed(tcell.NewEventKey(tcell.KeyRight, 'l', 0))
 	ui.keyPressed(tcell.NewEventKey(tcell.KeyRune, 'i', 0))
-	ui.table.Select(2, 0)
-	ui.keyPressed(tcell.NewEventKey(tcell.KeyRune, 'i', 0))
 
 	assert.True(t, ui.pages.HasPage("info"))