Add support for clicking on arrows in the file list to expand/collapse directories (#5365)

stefanhaller · web-flow · commit d864edb0c3d5 · 2026-03-25T20:58:49.000+01:00
### PR Description This PR adds support for clicking on arrows in the file changes list view, so that a mouse can be used to expand/collapse directories. This enhancement was raised here as issue #5088.
diff --git a/pkg/gui/context/base_context.go b/pkg/gui/context/base_context.go
@@ -15,7 +15,8 @@ type BaseContext struct {
 
 	keybindingsFns           []types.KeybindingsFn
 	mouseKeybindingsFns      []types.MouseKeybindingsFn
-	onClickFn                func() error
+	onDoubleClickFn          func() error
+	onClickFn                func(opts gocui.ViewMouseBindingOpts) error
 	onClickFocusedMainViewFn onClickFocusedMainViewFn
 	onRenderToMainFn         func()
 	onFocusFns               []onFocusFn
@@ -140,12 +141,22 @@ func (self *BaseContext) ClearAllAttachedControllerFunctions() {
 	self.mouseKeybindingsFns = nil
 	self.onFocusFns = nil
 	self.onFocusLostFns = nil
+	self.onDoubleClickFn = nil
 	self.onClickFn = nil
 	self.onClickFocusedMainViewFn = nil
 	self.onRenderToMainFn = nil
 }
 
-func (self *BaseContext) AddOnClickFn(fn func() error) {
+func (self *BaseContext) AddOnDoubleClickFn(fn func() error) {
+	if fn != nil {
+		if self.onDoubleClickFn != nil {
+			panic("only one controller is allowed to set an onDoubleClickFn")
+		}
+		self.onDoubleClickFn = fn
+	}
+}
+
+func (self *BaseContext) AddOnClickFn(fn func(opts gocui.ViewMouseBindingOpts) error) {
 	if fn != nil {
 		if self.onClickFn != nil {
 			panic("only one controller is allowed to set an onClickFn")
@@ -163,7 +174,11 @@ func (self *BaseContext) AddOnClickFocusedMainViewFn(fn onClickFocusedMainViewFn
 	}
 }
 
-func (self *BaseContext) GetOnClick() func() error {
+func (self *BaseContext) GetOnDoubleClick() func() error {
+	return self.onDoubleClickFn
+}
+
+func (self *BaseContext) GetOnClick() func(opts gocui.ViewMouseBindingOpts) error {
 	return self.onClickFn
 }
 
diff --git a/pkg/gui/context/suggestions_context.go b/pkg/gui/context/suggestions_context.go
@@ -89,6 +89,6 @@ func (self *SuggestionsContext) RangeSelectEnabled() bool {
 	return false
 }
 
-func (self *SuggestionsContext) GetOnClick() func() error {
+func (self *SuggestionsContext) GetOnDoubleClick() func() error {
 	return self.State.OnConfirm
 }
diff --git a/pkg/gui/controllers/attach.go b/pkg/gui/controllers/attach.go
@@ -6,6 +6,7 @@ func AttachControllers(context types.Context, controllers ...types.IController)
 	for _, controller := range controllers {
 		context.AddKeybindingsFn(controller.GetKeybindings)
 		context.AddMouseKeybindingsFn(controller.GetMouseKeybindings)
+		context.AddOnDoubleClickFn(controller.GetOnDoubleClick())
 		context.AddOnClickFn(controller.GetOnClick())
 		context.AddOnClickFocusedMainViewFn(controller.GetOnClickFocusedMainView())
 		context.AddOnRenderToMainFn(controller.GetOnRenderToMain())
diff --git a/pkg/gui/controllers/base_controller.go b/pkg/gui/controllers/base_controller.go
@@ -15,14 +15,18 @@ func (self *baseController) GetMouseKeybindings(opts types.KeybindingsOpts) []*g
 	return nil
 }
 
-func (self *baseController) GetOnClick() func() error {
+func (self *baseController) GetOnDoubleClick() func() error {
 	return nil
 }
 
 func (self *baseController) GetOnClickFocusedMainView() func(mainViewName string, clickedLineIdx int) error {
 	return nil
 }
 
+func (self *baseController) GetOnClick() func(opts gocui.ViewMouseBindingOpts) error {
+	return nil
+}
+
 func (self *baseController) GetOnRenderToMain() func() {
 	return nil
 }
diff --git a/pkg/gui/controllers/commits_files_controller.go b/pkg/gui/controllers/commits_files_controller.go
@@ -142,6 +142,30 @@ func (self *CommitFilesController) context() *context.CommitFilesContext {
 	return self.c.Contexts().CommitFiles
 }
 
+func (self *CommitFilesController) GetOnClick() func(opts gocui.ViewMouseBindingOpts) error {
+	return func(opts gocui.ViewMouseBindingOpts) error {
+		clickedIdx := self.context().GetSelectedLineIdx()
+		node := self.context().CommitFileTreeViewModel.Get(clickedIdx)
+		if node == nil || node.File != nil {
+			return nil
+		}
+
+		// The arrow is at column visualDepth*2 (after indentation of 2 spaces per level).
+		// Only treat clicks on the arrow and the trailing space as arrow clicks.
+		visualDepth := self.context().CommitFileTreeViewModel.GetVisualDepth(clickedIdx)
+		arrowStartCol := visualDepth * 2
+		arrowEndCol := arrowStartCol + 1
+		if opts.X < arrowStartCol || opts.X > arrowEndCol {
+			return nil
+		}
+
+		self.context().CommitFileTreeViewModel.ToggleCollapsed(node.GetInternalPath())
+		self.c.PostRefreshUpdate(self.context())
+
+		return nil
+	}
+}
+
 func (self *CommitFilesController) GetOnRenderToMain() func() {
 	return func() {
 		node := self.context().GetSelected()
diff --git a/pkg/gui/controllers/files_controller.go b/pkg/gui/controllers/files_controller.go
@@ -229,6 +229,30 @@ func (self *FilesController) GetMouseKeybindings(opts types.KeybindingsOpts) []*
 	}
 }
 
+func (self *FilesController) GetOnClick() func(opts gocui.ViewMouseBindingOpts) error {
+	return func(opts gocui.ViewMouseBindingOpts) error {
+		clickedIdx := self.context().GetSelectedLineIdx()
+		node := self.context().FileTreeViewModel.Get(clickedIdx)
+		if node == nil || node.File != nil {
+			return nil
+		}
+
+		// The arrow is at column visualDepth*2 (after indentation of 2 spaces per level).
+		// Only treat clicks on the arrow and the trailing space as arrow clicks.
+		visualDepth := self.context().FileTreeViewModel.GetVisualDepth(clickedIdx)
+		arrowStartCol := visualDepth * 2
+		arrowEndCol := arrowStartCol + 1
+		if opts.X < arrowStartCol || opts.X > arrowEndCol {
+			return nil
+		}
+
+		self.context().FileTreeViewModel.ToggleCollapsed(node.GetInternalPath())
+		self.c.PostRefreshUpdate(self.context())
+
+		return nil
+	}
+}
+
 func (self *FilesController) GetOnRenderToMain() func() {
 	return func() {
 		self.c.Helpers().Diff.WithDiffModeCheck(func() {
@@ -329,7 +353,7 @@ func (self *FilesController) GetOnRenderToMain() func() {
 	}
 }
 
-func (self *FilesController) GetOnClick() func() error {
+func (self *FilesController) GetOnDoubleClick() func() error {
 	return self.withItemGraceful(func(node *filetree.FileNode) error {
 		return self.press([]*filetree.FileNode{node})
 	})
diff --git a/pkg/gui/controllers/list_controller.go b/pkg/gui/controllers/list_controller.go
@@ -243,10 +243,17 @@ func (self *ListController) HandleClick(opts gocui.ViewMouseBindingOpts) error {
 
 	self.context.GetList().SetSelection(newSelectedLineIdx)
 
-	if opts.IsDoubleClick && alreadyFocused && self.context.GetOnClick() != nil {
-		return self.context.GetOnClick()()
+	if opts.IsDoubleClick && alreadyFocused && self.context.GetOnDoubleClick() != nil {
+		return self.context.GetOnDoubleClick()()
 	}
+
 	self.context.HandleFocus(types.OnFocusOpts{})
+
+	// Let view-specific controllers do additional click handling
+	if self.context.GetOnClick() != nil {
+		return self.context.GetOnClick()(opts)
+	}
+
 	return nil
 }
 
diff --git a/pkg/gui/controllers/menu_controller.go b/pkg/gui/controllers/menu_controller.go
@@ -55,7 +55,7 @@ func (self *MenuController) GetKeybindings(opts types.KeybindingsOpts) []*types.
 	return bindings
 }
 
-func (self *MenuController) GetOnClick() func() error {
+func (self *MenuController) GetOnDoubleClick() func() error {
 	return self.withItemGraceful(self.press)
 }
 
diff --git a/pkg/gui/controllers/remotes_controller.go b/pkg/gui/controllers/remotes_controller.go
@@ -120,7 +120,7 @@ func (self *RemotesController) GetOnRenderToMain() func() {
 	}
 }
 
-func (self *RemotesController) GetOnClick() func() error {
+func (self *RemotesController) GetOnDoubleClick() func() error {
 	return self.withItemGraceful(self.enter)
 }
 
diff --git a/pkg/gui/controllers/submodules_controller.go b/pkg/gui/controllers/submodules_controller.go
@@ -102,7 +102,7 @@ func (self *SubmodulesController) GetKeybindings(opts types.KeybindingsOpts) []*
 	}
 }
 
-func (self *SubmodulesController) GetOnClick() func() error {
+func (self *SubmodulesController) GetOnDoubleClick() func() error {
 	return self.withItemGraceful(self.enter)
 }
 
diff --git a/pkg/gui/controllers/switch_to_diff_files_controller.go b/pkg/gui/controllers/switch_to_diff_files_controller.go
@@ -54,7 +54,7 @@ func (self *SwitchToDiffFilesController) Context() types.Context {
 	return self.context
 }
 
-func (self *SwitchToDiffFilesController) GetOnClick() func() error {
+func (self *SwitchToDiffFilesController) GetOnDoubleClick() func() error {
 	return func() error {
 		if self.canEnter() == nil {
 			return self.enter()
diff --git a/pkg/gui/controllers/switch_to_sub_commits_controller.go b/pkg/gui/controllers/switch_to_sub_commits_controller.go
@@ -55,7 +55,7 @@ func (self *SwitchToSubCommitsController) GetKeybindings(opts types.KeybindingsO
 	return bindings
 }
 
-func (self *SwitchToSubCommitsController) GetOnClick() func() error {
+func (self *SwitchToSubCommitsController) GetOnDoubleClick() func() error {
 	return self.viewCommits
 }
 
diff --git a/pkg/gui/controllers/worktrees_controller.go b/pkg/gui/controllers/worktrees_controller.go
@@ -133,7 +133,7 @@ func (self *WorktreesController) remove(worktree *models.Worktree) error {
 	return self.c.Helpers().Worktree.Remove(worktree, false)
 }
 
-func (self *WorktreesController) GetOnClick() func() error {
+func (self *WorktreesController) GetOnDoubleClick() func() error {
 	return self.withItemGraceful(self.enter)
 }
 
diff --git a/pkg/gui/filetree/commit_file_tree.go b/pkg/gui/filetree/commit_file_tree.go
@@ -151,6 +151,10 @@ func (self *CommitFileTree) GetFile(path string) *models.CommitFile {
 	return nil
 }
 
+func (self *CommitFileTree) GetVisualDepth(index int) int {
+	return self.tree.GetVisualDepthAtIndex(index+1, self.collapsedPaths) // +1 to skip root
+}
+
 func (self *CommitFileTree) InTreeMode() bool {
 	return self.showTree
 }
diff --git a/pkg/gui/filetree/file_tree.go b/pkg/gui/filetree/file_tree.go
@@ -34,6 +34,7 @@ type ITree[T any] interface {
 	CollapsedPaths() *CollapsedPaths
 	CollapseAll()
 	ExpandAll()
+	GetVisualDepth(index int) int
 }
 
 type IFileTree interface {
@@ -221,6 +222,10 @@ func (self *FileTree) CollapsedPaths() *CollapsedPaths {
 	return self.collapsedPaths
 }
 
+func (self *FileTree) GetVisualDepth(index int) int {
+	return self.tree.GetVisualDepthAtIndex(index+1, self.collapsedPaths) // +1 to skip root
+}
+
 func (self *FileTree) GetStatusFilter() FileTreeDisplayFilter {
 	return self.filter
 }
diff --git a/pkg/gui/filetree/node.go b/pkg/gui/filetree/node.go
@@ -202,29 +202,43 @@ func (self *Node[T]) GetNodeAtIndex(index int, collapsedPaths *CollapsedPaths) *
 		return nil
 	}
 
-	node, _ := self.getNodeAtIndexAux(index, collapsedPaths)
+	node, _, _ := self.getNodeAtIndexAux(index, collapsedPaths, -1)
 
 	return node
 }
 
-func (self *Node[T]) getNodeAtIndexAux(index int, collapsedPaths *CollapsedPaths) (*Node[T], int) {
+// GetVisualDepthAtIndex returns the visual depth (indentation level) of the
+// node at the given flat index. Visual depth differs from tree depth because
+// compressed nodes (e.g. "a/b/") count as a single visual level.
+// Returns -1 if the index is out of range.
+func (self *Node[T]) GetVisualDepthAtIndex(index int, collapsedPaths *CollapsedPaths) int {
+	if self == nil {
+		return -1
+	}
+
+	_, _, depth := self.getNodeAtIndexAux(index, collapsedPaths, -1)
+
+	return depth
+}
+
+func (self *Node[T]) getNodeAtIndexAux(index int, collapsedPaths *CollapsedPaths, visualDepth int) (*Node[T], int, int) {
 	offset := 1
 
 	if index == 0 {
-		return self, offset
+		return self, offset, visualDepth
 	}
 
 	if !collapsedPaths.IsCollapsed(self.path) {
 		for _, child := range self.Children {
-			foundNode, offsetChange := child.getNodeAtIndexAux(index-offset, collapsedPaths)
+			foundNode, offsetChange, depth := child.getNodeAtIndexAux(index-offset, collapsedPaths, visualDepth+1)
 			offset += offsetChange
 			if foundNode != nil {
-				return foundNode, offset
+				return foundNode, offset, depth
 			}
 		}
 	}
 
-	return nil, offset
+	return nil, offset, -1
 }
 
 func (self *Node[T]) GetIndexForPath(path string, collapsedPaths *CollapsedPaths) (int, bool) {
diff --git a/pkg/gui/filetree/node_test.go b/pkg/gui/filetree/node_test.go
diff --git a/pkg/gui/types/context.go b/pkg/gui/types/context.go
diff --git a/pkg/integration/tests/file/click_arrow_to_collapse.go b/pkg/integration/tests/file/click_arrow_to_collapse.go
diff --git a/pkg/integration/tests/test_list.go b/pkg/integration/tests/test_list.go

Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,6 @@ func (self *SuggestionsContext) RangeSelectEnabled() bool {`
`89`	`89`	`return false`
`90`	`90`	`}`
`91`	`91`
`92`		`-func (self *SuggestionsContext) GetOnClick() func() error {`
	`92`	`+func (self *SuggestionsContext) GetOnDoubleClick() func() error {`
`93`	`93`	`return self.State.OnConfirm`
`94`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,14 +15,18 @@ func (self baseController) GetMouseKeybindings(opts types.KeybindingsOpts) []g`
`15`	`15`	`return nil`
`16`	`16`	`}`
`17`	`17`
`18`		`-func (self *baseController) GetOnClick() func() error {`
	`18`	`+func (self *baseController) GetOnDoubleClick() func() error {`
`19`	`19`	`return nil`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`func (self *baseController) GetOnClickFocusedMainView() func(mainViewName string, clickedLineIdx int) error {`
`23`	`23`	`return nil`
`24`	`24`	`}`
`25`	`25`
	`26`	`+func (self *baseController) GetOnClick() func(opts gocui.ViewMouseBindingOpts) error {`
	`27`	`+ return nil`
	`28`	`+}`
	`29`	`+`
`26`	`30`	`func (self *baseController) GetOnRenderToMain() func() {`
`27`	`31`	`return nil`
`28`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ func (self MenuController) GetKeybindings(opts types.KeybindingsOpts) []types.`
`55`	`55`	`return bindings`
`56`	`56`	`}`
`57`	`57`
`58`		`-func (self *MenuController) GetOnClick() func() error {`
	`58`	`+func (self *MenuController) GetOnDoubleClick() func() error {`
`59`	`59`	`return self.withItemGraceful(self.press)`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ func (self *RemotesController) GetOnRenderToMain() func() {`
`120`	`120`	`}`
`121`	`121`	`}`
`122`	`122`
`123`		`-func (self *RemotesController) GetOnClick() func() error {`
	`123`	`+func (self *RemotesController) GetOnDoubleClick() func() error {`
`124`	`124`	`return self.withItemGraceful(self.enter)`
`125`	`125`	`}`
`126`	`126`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ func (self SubmodulesController) GetKeybindings(opts types.KeybindingsOpts) []`
`102`	`102`	`}`
`103`	`103`	`}`
`104`	`104`
`105`		`-func (self *SubmodulesController) GetOnClick() func() error {`
	`105`	`+func (self *SubmodulesController) GetOnDoubleClick() func() error {`
`106`	`106`	`return self.withItemGraceful(self.enter)`
`107`	`107`	`}`
`108`	`108`