refactor(filepanel): replace filePanelFocusType with isFocused boolean (#1040)

The filePanelFocusType typed constant with multiple states (noneFocus,
secondFocus, focus) added unnecessary complexity for managing panel
focus. It also made the code harder to read and maintain.
Solution

Replaced filePanelFocusType with a simple isFocused boolean field in
filePanel.
isFocused = true → panel is focused
isFocused = false → panel is not focused

This change removes unused constants and simplifies focus handling.




Refs #1033 
Refs #1030 

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

- Refactor
- Simplified panel focus handling to a single, consistent indicator
across navigation, rendering, and key interactions, improving
reliability and consistency in focus behavior.
- Style
  - Minor formatting cleanups for readability without changing behavior.
- Chores
- Consolidated internal variable declarations and adjusted logging to
reflect the updated focus indicator.

No user-facing features changed; interactions should feel more
consistent and stable, especially when switching panels and using the
sidebar or process bar.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->

---------

Co-authored-by: lazysegtree <59679977+lazysegtree@users.noreply.github.com>

Author: faisal-990

src/internal/function.go

@@ -55,11 +55,8 @@ func isExternalDiskPath(path string) bool {
 		strings.HasPrefix(path, "/Volumes")
 }
 
-func returnFocusType(focusPanel focusPanelType) filePanelFocusType {
-	if focusPanel == nonePanelFocus {
-		return focus
-	}
-	return secondFocus
+func returnFocusType(focusPanel focusPanelType) bool {
+	return focusPanel == nonePanelFocus
 }
 
 // TODO : Take common.Config.CaseSensitiveSort as a function parameter
@@ -86,7 +83,8 @@ func returnDirElement(location string, displayDotFile bool, sortOptions sortOpti
 }
 
 func returnDirElementBySearchString(location string, displayDotFile bool, searchString string,
-	sortOptions sortOptionsModelData) []element {
+	sortOptions sortOptionsModelData,
+) []element {
 	items, err := os.ReadDir(location)
 	if err != nil {
 		slog.Error("Error while return folder element function", "error", err)
@@ -355,7 +353,8 @@ func processCmdToTeaCmd(cmd processbar.Cmd) tea.Cmd {
 	}
 	return func() tea.Msg {
 		updateMsg := cmd()
-		return ProcessBarUpdateMsg{pMsg: updateMsg,
+		return ProcessBarUpdateMsg{
+			pMsg: updateMsg,
 			BaseMessage: BaseMessage{
 				reqID: updateMsg.GetReqID(),
 			},

src/internal/handle_panel_movement.go

@@ -118,7 +118,7 @@ func (m *model) sidebarSelectDirectory() {
 	if err != nil {
 		slog.Error("Error switching to sidebar directory", "error", err)
 	}
-	panel.focusType = focus
+	panel.isFocused = true
 }
 
 // Select all item in the file panel (only work on select mode)

src/internal/handle_panel_navigation.go

@@ -41,11 +41,10 @@ func (m *model) createNewFilePanel(location string) error {
 	}
 
 	m.fileModel.filePanels = append(m.fileModel.filePanels, filePanel{
-
 		location:         location,
 		sortOptions:      m.fileModel.filePanels[m.filePanelFocusIndex].sortOptions,
 		panelMode:        browserMode,
-		focusType:        secondFocus,
+		isFocused:        false,
 		directoryRecords: make(map[string]directoryRecord),
 		searchBar:        common.GenerateSearchBar(),
 	})
@@ -60,8 +59,8 @@ func (m *model) createNewFilePanel(location string) error {
 		}
 	}
 
-	m.fileModel.filePanels[m.filePanelFocusIndex].focusType = noneFocus
-	m.fileModel.filePanels[m.filePanelFocusIndex+1].focusType = returnFocusType(m.focusPanel)
+	m.fileModel.filePanels[m.filePanelFocusIndex].isFocused = false
+	m.fileModel.filePanels[m.filePanelFocusIndex+1].isFocused = returnFocusType(m.focusPanel)
 	m.fileModel.width = (m.fullWidth - common.Config.SidebarWidth - m.fileModel.filePreview.GetWidth() -
 		(4 + (len(m.fileModel.filePanels)-1)*2)) / len(m.fileModel.filePanels)
 	m.filePanelFocusIndex++
@@ -99,7 +98,7 @@ func (m *model) closeFilePanel() {
 
 	m.fileModel.width = (m.fullWidth - common.Config.SidebarWidth - m.fileModel.filePreview.GetWidth() -
 		(4 + (len(m.fileModel.filePanels)-1)*2)) / len(m.fileModel.filePanels)
-	m.fileModel.filePanels[m.filePanelFocusIndex].focusType = returnFocusType(m.focusPanel)
+	m.fileModel.filePanels[m.filePanelFocusIndex].isFocused = returnFocusType(m.focusPanel)
 
 	m.fileModel.maxFilePanel = (m.fullWidth - common.Config.SidebarWidth - m.fileModel.filePreview.GetWidth()) / 20
 
@@ -134,26 +133,26 @@ func (m *model) toggleFilePreviewPanel() {
 
 // Focus on next file panel
 func (m *model) nextFilePanel() {
-	m.fileModel.filePanels[m.filePanelFocusIndex].focusType = noneFocus
+	m.fileModel.filePanels[m.filePanelFocusIndex].isFocused = false
 	if m.filePanelFocusIndex == (len(m.fileModel.filePanels) - 1) {
 		m.filePanelFocusIndex = 0
 	} else {
 		m.filePanelFocusIndex++
 	}
 
-	m.fileModel.filePanels[m.filePanelFocusIndex].focusType = returnFocusType(m.focusPanel)
+	m.fileModel.filePanels[m.filePanelFocusIndex].isFocused = returnFocusType(m.focusPanel)
 }
 
 // Focus on previous file panel
 func (m *model) previousFilePanel() {
-	m.fileModel.filePanels[m.filePanelFocusIndex].focusType = noneFocus
+	m.fileModel.filePanels[m.filePanelFocusIndex].isFocused = false
 	if m.filePanelFocusIndex == 0 {
 		m.filePanelFocusIndex = (len(m.fileModel.filePanels) - 1)
 	} else {
 		m.filePanelFocusIndex--
 	}
 
-	m.fileModel.filePanels[m.filePanelFocusIndex].focusType = returnFocusType(m.focusPanel)
+	m.fileModel.filePanels[m.filePanelFocusIndex].isFocused = returnFocusType(m.focusPanel)
 }
 
 // Focus on sidebar
@@ -163,10 +162,10 @@ func (m *model) focusOnSideBar() {
 	}
 	if m.focusPanel == sidebarFocus {
 		m.focusPanel = nonePanelFocus
-		m.fileModel.filePanels[m.filePanelFocusIndex].focusType = focus
+		m.fileModel.filePanels[m.filePanelFocusIndex].isFocused = true
 	} else {
 		m.focusPanel = sidebarFocus
-		m.fileModel.filePanels[m.filePanelFocusIndex].focusType = secondFocus
+		m.fileModel.filePanels[m.filePanelFocusIndex].isFocused = false
 	}
 }
 
@@ -178,10 +177,10 @@ func (m *model) focusOnProcessBar() {
 
 	if m.focusPanel == processBarFocus {
 		m.focusPanel = nonePanelFocus
-		m.fileModel.filePanels[m.filePanelFocusIndex].focusType = focus
+		m.fileModel.filePanels[m.filePanelFocusIndex].isFocused = true
 	} else {
 		m.focusPanel = processBarFocus
-		m.fileModel.filePanels[m.filePanelFocusIndex].focusType = secondFocus
+		m.fileModel.filePanels[m.filePanelFocusIndex].isFocused = false
 	}
 }
 
@@ -193,9 +192,9 @@ func (m *model) focusOnMetadata() {
 
 	if m.focusPanel == metadataFocus {
 		m.focusPanel = nonePanelFocus
-		m.fileModel.filePanels[m.filePanelFocusIndex].focusType = focus
+		m.fileModel.filePanels[m.filePanelFocusIndex].isFocused = true
 	} else {
 		m.focusPanel = metadataFocus
-		m.fileModel.filePanels[m.filePanelFocusIndex].focusType = secondFocus
+		m.fileModel.filePanels[m.filePanelFocusIndex].isFocused = false
 	}
 }

src/internal/key_function.go

@@ -131,7 +131,7 @@ func (m *model) mainKey(msg string) tea.Cmd { //nolint: gocyclo,cyclop,funlen //
 
 func (m *model) normalAndBrowserModeKey(msg string) tea.Cmd {
 	// if not focus on the filepanel return
-	if m.getFocusedFilePanel().focusType != focus {
+	if !m.getFocusedFilePanel().isFocused {
 		if m.focusPanel == sidebarFocus && slices.Contains(common.Hotkeys.Confirm, msg) {
 			m.sidebarSelectDirectory()
 		}

src/internal/model.go

@@ -27,8 +27,10 @@ import (
 )
 
 // These represent model's state information, its not a global preperty
-var LastTimeCursorMove = [2]int{int(time.Now().UnixMicro()), 0} //nolint: gochecknoglobals // TODO: Move to model struct
-var et *exiftool.Exiftool                                       //nolint: gochecknoglobals // TODO: Move to model struct
+var (
+	LastTimeCursorMove = [2]int{int(time.Now().UnixMicro()), 0} //nolint: gochecknoglobals // TODO: Move to model struct
+	et                 *exiftool.Exiftool                       //nolint: gochecknoglobals // TODO: Move to model struct
+)
 
 // Initialize and return model with default configs
 // It returns only tea.Model because when it used in main, the return value
@@ -325,7 +327,7 @@ func (m *model) handleKeyInput(msg tea.KeyMsg) tea.Cmd {
 		"alt", msg.Alt)
 	slog.Debug("model.handleKeyInput. model info. ",
 		"filePanelFocusIndex", m.filePanelFocusIndex,
-		"filePanel.focusType", m.fileModel.filePanels[m.filePanelFocusIndex].focusType,
+		"filePanel.isFocused", m.fileModel.filePanels[m.filePanelFocusIndex].isFocused,
 		"filePanel.panelMode", m.fileModel.filePanels[m.filePanelFocusIndex].panelMode,
 		"typingModal.open", m.typingModal.open,
 		"notifyModel.open", m.notifyModel.IsOpen(),
@@ -689,7 +691,7 @@ func (m *model) getFilePanelItems() {
 		var fileElement []element
 		nowTime := time.Now()
 		// Check last time each element was updated, if less then 3 seconds ignore
-		if filePanel.focusType == noneFocus && nowTime.Sub(filePanel.lastTimeGetElement) < 3*time.Second {
+		if !filePanel.isFocused && nowTime.Sub(filePanel.lastTimeGetElement) < 3*time.Second {
 			// TODO : revisit this. This feels like a duct tape solution of an actual
 			// deep rooted problem. This feels very hacky.
 			if !m.updatedToggleDotFile {
@@ -709,7 +711,7 @@ func (m *model) getFilePanelItems() {
 
 		reRenderTime := int(float64(len(filePanel.element)) / 100)
 
-		if filePanel.focusType != noneFocus && !focusPanelReRender &&
+		if filePanel.isFocused && !focusPanelReRender &&
 			nowTime.Sub(filePanel.lastTimeGetElement) < time.Duration(reRenderTime)*time.Second {
 			continue
 		}
@@ -744,7 +746,7 @@ func (m *model) quitSuperfile(cdOnQuit bool) {
 	if cdOnQuit {
 		// escape single quote
 		currentDir = strings.ReplaceAll(currentDir, "'", "'\\''")
-		err := os.WriteFile(variable.LastDirFile, []byte("cd '"+currentDir+"'"), 0755)
+		err := os.WriteFile(variable.LastDirFile, []byte("cd '"+currentDir+"'"), 0o755)
 		if err != nil {
 			slog.Error("Error during writing lastdir file", "error", err)
 		}

src/internal/model_render.go

@@ -55,7 +55,7 @@ func (m *model) filePanelRender() string {
 			filePanelWidth = m.fileModel.width
 		}
 
-		f[i] = filePanel.Render(m.mainPanelHeight, filePanelWidth, filePanel.focusType != noneFocus)
+		f[i] = filePanel.Render(m.mainPanelHeight, filePanelWidth, filePanel.isFocused)
 	}
 	return lipgloss.JoinHorizontal(lipgloss.Top, f...)
 }

src/internal/type.go

@@ -20,9 +20,6 @@ import (
 // Type representing the mode of the panel
 type panelMode uint
 
-// Type representing the focus type of the file panel
-type filePanelFocusType uint
-
 // Type representing the type of focused panel
 type focusPanelType int
 
@@ -47,13 +44,6 @@ const (
 	metadataFocus
 )
 
-// Constants for file panel with no focus
-const (
-	noneFocus filePanelFocusType = iota
-	secondFocus
-	focus
-)
-
 // Constants for select mode or browser mode
 const (
 	selectMode panelMode = iota
@@ -165,7 +155,7 @@ type fileModel struct {
 type filePanel struct {
 	cursor             int
 	render             int
-	focusType          filePanelFocusType
+	isFocused          bool
 	location           string
 	sortOptions        sortOptionsModel
 	panelMode          panelMode

src/internal/type_utils.go

@@ -39,18 +39,14 @@ func (m *model) validateLayout() error {
 func filePanelSlice(dir []string) []filePanel {
 	res := make([]filePanel, len(dir))
 	for i := range dir {
-		// Making the first panel as the default focus panel
-		// while others remain secondFocus
-		focusType := secondFocus
-		if i == 0 {
-			focusType = focus
-		}
-		res[i] = defaultFilePanel(dir[i], focusType)
+		// Making the first panel as the focussed
+		isFocus := i == 0
+		res[i] = defaultFilePanel(dir[i], isFocus)
 	}
 	return res
 }
 
-func defaultFilePanel(dir string, currentFocusType filePanelFocusType) filePanel {
+func defaultFilePanel(dir string, focused bool) filePanel {
 	return filePanel{
 		render:   0,
 		cursor:   0,
@@ -70,7 +66,7 @@ func defaultFilePanel(dir string, currentFocusType filePanelFocusType) filePanel
 			},
 		},
 		panelMode:        browserMode,
-		focusType:        currentFocusType,
+		isFocused:        focused,
 		directoryRecords: make(map[string]directoryRecord),
 		searchBar:        common.GenerateSearchBar(),
 	}
@@ -93,19 +89,6 @@ func (f focusPanelType) String() string {
 	}
 }
 
-func (f filePanelFocusType) String() string {
-	switch f {
-	case noneFocus:
-		return "noneFocus"
-	case secondFocus:
-		return "secondFocus"
-	case focus:
-		return "focus"
-	default:
-		return invalidTypeString
-	}
-}
-
 func (p panelMode) String() string {
 	switch p {
 	case selectMode: