refactor contexts

1 files changed, 10 insertions, 14 deletions

diff --git a/pkg/gui/controllers/menu_controller.go b/pkg/gui/controllers/menu_controller.go
index cbd24e188..392fe3da6 100644
--- a/pkg/gui/controllers/menu_controller.go
+++ b/pkg/gui/controllers/menu_controller.go
@@ -1,7 +1,7 @@
 package controllers
 
 import (
-	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/gui/context"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )
 
@@ -9,24 +9,20 @@ type MenuController struct {
 	baseController
 
 	c       *types.ControllerCommon
-	context types.IListContext
-
-	getSelectedMenuItem func() *types.MenuItem
+	context *context.MenuContext
 }
 
 var _ types.IController = &MenuController{}
 
 func NewMenuController(
 	c *types.ControllerCommon,
-	context types.IListContext,
-	getSelectedMenuItem func() *types.MenuItem,
+	context *context.MenuContext,
 ) *MenuController {
 	return &MenuController{
 		baseController: baseController{},
 
-		c:                   c,
-		context:             context,
-		getSelectedMenuItem: getSelectedMenuItem,
+		c:       c,
+		context: context,
 	}
 }
 
@@ -44,17 +40,17 @@ func (self *MenuController) GetKeybindings(opts types.KeybindingsOpts) []*types.
 			Key:     opts.GetKey(opts.Config.Universal.ConfirmAlt1),
 			Handler: self.press,
 		},
-		{
-			Key:     gocui.MouseLeft,
-			Handler: func() error { return self.context.HandleClick(self.press) },
-		},
+		// {
+		// 	Key:     gocui.MouseLeft,
+		// 	Handler: func() error { return self.context.HandleClick(self.press) },
+		// },
 	}
 
 	return bindings
 }
 
 func (self *MenuController) press() error {
-	selectedItem := self.getSelectedMenuItem()
+	selectedItem := self.context.GetSelected()
 
 	if err := self.c.PopContext(); err != nil {
 		return err