Finish Navigator Filter Bar & Tab Bar Work

thecoolwinter · thecoolwinter · commit 2236d0d020ae · 2025-09-04T10:03:59.000-05:00
diff --git a/CodeEdit/Features/CodeEditUI/Views/WorkspacePanel/WorkspacePanelTabBar+IconButton.swift b/CodeEdit/Features/CodeEditUI/Views/WorkspacePanel/WorkspacePanelTabBar+IconButton.swift
@@ -17,13 +17,21 @@ extension WorkspacePanelTabBar {
 
         @Binding var selection: Tab?
 
+        var symbolVariant: SymbolVariants {
+            if #unavailable(macOS 26), selection == tab {
+                .fill
+            } else {
+                .none
+            }
+        }
+
         var body: some View {
             Button {
                 selection = tab
             } label: {
                 getSafeImage(named: tab.systemImage, accessibilityDescription: tab.title)
                     .font(.system(size: 13))
-                    .symbolVariant(tab == selection ? .fill : .none)
+                    .symbolVariant(symbolVariant)
                     .help(tab.title)
                     .frame(maxWidth: .infinity)
             }
diff --git a/CodeEdit/Features/CodeEditUI/Views/WorkspacePanel/WorkspacePanelTabBar.swift b/CodeEdit/Features/CodeEditUI/Views/WorkspacePanel/WorkspacePanelTabBar.swift
@@ -146,8 +146,12 @@ struct WorkspacePanelTabBar<Tab: WorkspacePanelTab>: View {
                 }
             }
     }
+}
+
+// MARK: - Drag Gesture
 
-    private func makeAreaTabDragGesture(tab: Tab) -> some Gesture {
+private extension WorkspacePanelTabBar {
+    func makeAreaTabDragGesture(tab: Tab) -> some Gesture {
         DragGesture(minimumDistance: 2, coordinateSpace: .global)
             .onChanged({ value in
                 if draggingTab != tab {
@@ -203,7 +207,7 @@ struct WorkspacePanelTabBar<Tab: WorkspacePanelTab>: View {
             })
     }
 
-    private func initializeDragGesture(value: DragGesture.Value, for tab: Tab) {
+    func initializeDragGesture(value: DragGesture.Value, for tab: Tab) {
         draggingTab = tab
         let initialLocation = position == .top ? value.startLocation.x : value.startLocation.y
         draggingStartLocation = initialLocation
@@ -216,7 +220,7 @@ struct WorkspacePanelTabBar<Tab: WorkspacePanelTab>: View {
     }
 
     // swiftlint:disable:next function_parameter_count
-    private func swapTab(
+    func swapTab(
         tab: Tab,
         currentIndex: Int,
         currentLocation: CGFloat,
@@ -267,7 +271,7 @@ struct WorkspacePanelTabBar<Tab: WorkspacePanelTab>: View {
         }
     }
 
-    private func isWithinPrevTopBounds(
+    func isWithinPrevTopBounds(
         _ curLocation: CGFloat, _ swapLocation: CGRect, _ swapWidth: CGFloat
     ) -> Bool {
         return curLocation < max(
@@ -276,7 +280,7 @@ struct WorkspacePanelTabBar<Tab: WorkspacePanelTab>: View {
         )
     }
 
-    private func isWithinNextTopBounds(
+    func isWithinNextTopBounds(
         _ curLocation: CGFloat, _ swapLocation: CGRect, _ swapWidth: CGFloat, _ curWidth: CGFloat
     ) -> Bool {
         return curLocation > min(
@@ -285,7 +289,7 @@ struct WorkspacePanelTabBar<Tab: WorkspacePanelTab>: View {
         )
     }
 
-    private func isWithinPrevBottomBounds(
+    func isWithinPrevBottomBounds(
         _ curLocation: CGFloat, _ swapLocation: CGRect, _ swapWidth: CGFloat
     ) -> Bool {
         return curLocation < max(
@@ -294,7 +298,7 @@ struct WorkspacePanelTabBar<Tab: WorkspacePanelTab>: View {
         )
     }
 
-    private func isWithinNextBottomBounds(
+    func isWithinNextBottomBounds(
         _ curLocation: CGFloat, _ swapLocation: CGRect, _ swapWidth: CGFloat, _ curWidth: CGFloat
     ) -> Bool {
         return curLocation > min(
@@ -303,7 +307,7 @@ struct WorkspacePanelTabBar<Tab: WorkspacePanelTab>: View {
         )
     }
 
-    private func makeTabItemGeometryReader(tab: Tab) -> some View {
+    func makeTabItemGeometryReader(tab: Tab) -> some View {
         GeometryReader { geometry in
             Rectangle()
                 .foregroundColor(.clear)
diff --git a/CodeEdit/Features/CodeEditUI/Views/WorkspacePanel/WorkspacePanelView.swift b/CodeEdit/Features/CodeEditUI/Views/WorkspacePanel/WorkspacePanelView.swift
@@ -7,7 +7,7 @@
 
 import SwiftUI
 
-struct WorkspacePanelView<Tab: WorkspacePanelTab, ViewModel: ObservableObject>: View {
+struct WorkspacePanelView<Tab: WorkspacePanelTab, ViewModel: ObservableObject, BottomAccessory: View>: View {
     @ObservedObject var viewModel: ViewModel
     @Binding var selectedTab: Tab?
     @Binding var tabItems: [Tab]
@@ -19,6 +19,7 @@ struct WorkspacePanelView<Tab: WorkspacePanelTab, ViewModel: ObservableObject>:
     var darkDivider: Bool
     let padSideItemVertically: Bool
     let sideOnTrailing: Bool
+    let bottomAccessory: BottomAccessory
 
     init(
         viewModel: ViewModel,
@@ -27,7 +28,8 @@ struct WorkspacePanelView<Tab: WorkspacePanelTab, ViewModel: ObservableObject>:
         sidebarPosition: SettingsData.SidebarTabBarPosition,
         darkDivider: Bool = false,
         padSideItemVertically: Bool = false,
-        sideOnTrailing: Bool = false
+        sideOnTrailing: Bool = false,
+        @ViewBuilder bottomAccessory: () -> BottomAccessory
     ) {
         self.viewModel = viewModel
         self._selectedTab = selectedTab
@@ -40,12 +42,41 @@ struct WorkspacePanelView<Tab: WorkspacePanelTab, ViewModel: ObservableObject>:
         } else {
             self.sideOnTrailing = false
         }
+        self.bottomAccessory = bottomAccessory()
+    }
+
+    init(
+        viewModel: ViewModel,
+        selectedTab: Binding<Tab?>,
+        tabItems: Binding<[Tab]>,
+        sidebarPosition: SettingsData.SidebarTabBarPosition,
+        darkDivider: Bool = false,
+        padSideItemVertically: Bool = false,
+        sideOnTrailing: Bool = false,
+    ) where BottomAccessory == EmptyView {
+        self.viewModel = viewModel
+        self._selectedTab = selectedTab
+        self._tabItems = tabItems
+        self.sidebarPosition = sidebarPosition
+        self.darkDivider = darkDivider
+        self.padSideItemVertically = padSideItemVertically
+        if #available(macOS 26, *) {
+            self.sideOnTrailing = sideOnTrailing
+        } else {
+            self.sideOnTrailing = false
+        }
+        self.bottomAccessory = EmptyView()
     }
 
     var body: some View {
         VStack(spacing: 0) {
             if let selection = selectedTab {
                 selection
+                    .safeAreaInset(edge: .bottom, spacing: 0) {
+                        if #unavailable(macOS 26) {
+                            bottomAccessory
+                        }
+                    }
             } else {
                 CEContentUnavailableView("No Selection")
             }
@@ -77,6 +108,11 @@ struct WorkspacePanelView<Tab: WorkspacePanelTab, ViewModel: ObservableObject>:
                 Divider()
             }
         }
+        .safeAreaInset(edge: .bottom, spacing: 0) {
+            if #available(macOS 26, *) {
+                bottomAccessory
+            }
+        }
     }
 
     @ViewBuilder private var sideTabBar: some View {
diff --git a/CodeEdit/Features/NavigatorArea/FindNavigator/FindNavigatorView.swift b/CodeEdit/Features/NavigatorArea/FindNavigator/FindNavigatorView.swift
@@ -86,9 +86,6 @@ struct FindNavigatorView: View {
                 )
             }
         }
-        .safeAreaInset(edge: .bottom, spacing: 0) {
-            FindNavigatorToolbarBottom()
-        }
         .onReceive(state.$searchResult, perform: { value in
             self.foundFilesCount = value.count
         })
diff --git a/CodeEdit/Features/NavigatorArea/Models/NavigatorTab.swift b/CodeEdit/Features/NavigatorArea/Models/NavigatorTab.swift
@@ -60,4 +60,20 @@ enum NavigatorTab: WorkspacePanelTab {
             ExtensionSceneView(with: endpoint, sceneID: data.sceneID)
         }
     }
+
+    @ViewBuilder func bottomView(workspace: WorkspaceDocument) -> some View {
+        switch self {
+        case .project:
+            ProjectNavigatorToolbarBottom()
+        case .sourceControl:
+            if let sourceControlManager = workspace.sourceControlManager {
+                SourceControlNavigatorToolbarBottom()
+                    .environmentObject(sourceControlManager)
+            }
+        case .search:
+            FindNavigatorToolbarBottom()
+        case .uiExtension:
+            EmptyView()
+        }
+    }
 }
diff --git a/CodeEdit/Features/NavigatorArea/ProjectNavigator/ProjectNavigatorView.swift b/CodeEdit/Features/NavigatorArea/ProjectNavigator/ProjectNavigatorView.swift
@@ -17,8 +17,5 @@ import SwiftUI
 struct ProjectNavigatorView: View {
     var body: some View {
         ProjectNavigatorOutlineView()
-            .safeAreaInset(edge: .bottom, spacing: 0) {
-                ProjectNavigatorToolbarBottom()
-            }
     }
 }
diff --git a/CodeEdit/Features/NavigatorArea/SourceControlNavigator/Views/SourceControlNavigatorView.swift b/CodeEdit/Features/NavigatorArea/SourceControlNavigator/Views/SourceControlNavigatorView.swift
@@ -14,7 +14,7 @@ struct SourceControlNavigatorView: View {
     var fetchRefreshServerStatus
 
     var body: some View {
-        if let sourceControlManager = workspace.workspaceFileManager?.sourceControlManager {
+        if let sourceControlManager = workspace.sourceControlManager {
             VStack(spacing: 0) {
                 SourceControlNavigatorTabs()
                     .environmentObject(sourceControlManager)
@@ -31,10 +31,6 @@ struct SourceControlNavigatorView: View {
                         }
                     }
             }
-            .safeAreaInset(edge: .bottom, spacing: 0) {
-                SourceControlNavigatorToolbarBottom()
-                    .environmentObject(sourceControlManager)
-            }
         }
     }
 }
diff --git a/CodeEdit/Features/NavigatorArea/Views/NavigatorAreaView.swift b/CodeEdit/Features/NavigatorArea/Views/NavigatorAreaView.swift
@@ -38,7 +38,10 @@ struct NavigatorAreaView: View {
             viewModel: viewModel,
             selectedTab: $viewModel.selectedTab,
             tabItems: $viewModel.tabItems,
-            sidebarPosition: sidebarPosition
+            sidebarPosition: sidebarPosition,
+            bottomAccessory: {
+                viewModel.selectedTab?.bottomView(workspace: workspace)
+            }
         )
         .environmentObject(workspace)
         .accessibilityElement(children: .contain)

Original file line number	Diff line number	Diff line change
`@@ -146,8 +146,12 @@ struct WorkspacePanelTabBar<Tab: WorkspacePanelTab>: View {`
`146`	`146`	`}`
`147`	`147`	`}`
`148`	`148`	`}`
	`149`	`+}`
	`150`	`+`
	`151`	`+// MARK: - Drag Gesture`
`149`	`152`
`150`		`- private func makeAreaTabDragGesture(tab: Tab) -> some Gesture {`
	`153`	`+private extension WorkspacePanelTabBar {`
	`154`	`+ func makeAreaTabDragGesture(tab: Tab) -> some Gesture {`
`151`	`155`	`DragGesture(minimumDistance: 2, coordinateSpace: .global)`
`152`	`156`	`.onChanged({ value in`
`153`	`157`	`if draggingTab != tab {`
`@@ -203,7 +207,7 @@ struct WorkspacePanelTabBar<Tab: WorkspacePanelTab>: View {`
`203`	`207`	`})`
`204`	`208`	`}`
`205`	`209`
`206`		`- private func initializeDragGesture(value: DragGesture.Value, for tab: Tab) {`
	`210`	`+ func initializeDragGesture(value: DragGesture.Value, for tab: Tab) {`
`207`	`211`	`draggingTab = tab`
`208`	`212`	`let initialLocation = position == .top ? value.startLocation.x : value.startLocation.y`
`209`	`213`	`draggingStartLocation = initialLocation`
`@@ -216,7 +220,7 @@ struct WorkspacePanelTabBar<Tab: WorkspacePanelTab>: View {`
`216`	`220`	`}`
`217`	`221`
`218`	`222`	`// swiftlint:disable:next function_parameter_count`
`219`		`- private func swapTab(`
	`223`	`+ func swapTab(`
`220`	`224`	`tab: Tab,`
`221`	`225`	`currentIndex: Int,`
`222`	`226`	`currentLocation: CGFloat,`
`@@ -267,7 +271,7 @@ struct WorkspacePanelTabBar<Tab: WorkspacePanelTab>: View {`
`267`	`271`	`}`
`268`	`272`	`}`
`269`	`273`
`270`		`- private func isWithinPrevTopBounds(`
	`274`	`+ func isWithinPrevTopBounds(`
`271`	`275`	`_ curLocation: CGFloat, _ swapLocation: CGRect, _ swapWidth: CGFloat`
`272`	`276`	`) -> Bool {`
`273`	`277`	`return curLocation < max(`
`@@ -276,7 +280,7 @@ struct WorkspacePanelTabBar<Tab: WorkspacePanelTab>: View {`
`276`	`280`	`)`
`277`	`281`	`}`
`278`	`282`
`279`		`- private func isWithinNextTopBounds(`
	`283`	`+ func isWithinNextTopBounds(`
`280`	`284`	`_ curLocation: CGFloat, _ swapLocation: CGRect, _ swapWidth: CGFloat, _ curWidth: CGFloat`
`281`	`285`	`) -> Bool {`
`282`	`286`	`return curLocation > min(`
`@@ -285,7 +289,7 @@ struct WorkspacePanelTabBar<Tab: WorkspacePanelTab>: View {`
`285`	`289`	`)`
`286`	`290`	`}`
`287`	`291`
`288`		`- private func isWithinPrevBottomBounds(`
	`292`	`+ func isWithinPrevBottomBounds(`
`289`	`293`	`_ curLocation: CGFloat, _ swapLocation: CGRect, _ swapWidth: CGFloat`
`290`	`294`	`) -> Bool {`
`291`	`295`	`return curLocation < max(`
`@@ -294,7 +298,7 @@ struct WorkspacePanelTabBar<Tab: WorkspacePanelTab>: View {`
`294`	`298`	`)`
`295`	`299`	`}`
`296`	`300`
`297`		`- private func isWithinNextBottomBounds(`
	`301`	`+ func isWithinNextBottomBounds(`
`298`	`302`	`_ curLocation: CGFloat, _ swapLocation: CGRect, _ swapWidth: CGFloat, _ curWidth: CGFloat`
`299`	`303`	`) -> Bool {`
`300`	`304`	`return curLocation > min(`
`@@ -303,7 +307,7 @@ struct WorkspacePanelTabBar<Tab: WorkspacePanelTab>: View {`
`303`	`307`	`)`
`304`	`308`	`}`
`305`	`309`
`306`		`- private func makeTabItemGeometryReader(tab: Tab) -> some View {`
	`310`	`+ func makeTabItemGeometryReader(tab: Tab) -> some View {`
`307`	`311`	`GeometryReader { geometry in`
`308`	`312`	`Rectangle()`
`309`	`313`	`.foregroundColor(.clear)`
Original file line number	Diff line number	Diff line change
`@@ -86,9 +86,6 @@ struct FindNavigatorView: View {`
`86`	`86`	`)`
`87`	`87`	`}`
`88`	`88`	`}`
`89`		`- .safeAreaInset(edge: .bottom, spacing: 0) {`
`90`		`- FindNavigatorToolbarBottom()`
`91`		`- }`
`92`	`89`	`.onReceive(state.$searchResult, perform: { value in`
`93`	`90`	`self.foundFilesCount = value.count`
`94`	`91`	`})`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,5 @@ import SwiftUI`
`17`	`17`	`struct ProjectNavigatorView: View {`
`18`	`18`	`var body: some View {`
`19`	`19`	`ProjectNavigatorOutlineView()`
`20`		`- .safeAreaInset(edge: .bottom, spacing: 0) {`
`21`		`- ProjectNavigatorToolbarBottom()`
`22`		`- }`
`23`	`20`	`}`
`24`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ struct SourceControlNavigatorView: View {`
`14`	`14`	`var fetchRefreshServerStatus`
`15`	`15`
`16`	`16`	`var body: some View {`
`17`		`- if let sourceControlManager = workspace.workspaceFileManager?.sourceControlManager {`
	`17`	`+ if let sourceControlManager = workspace.sourceControlManager {`
`18`	`18`	`VStack(spacing: 0) {`
`19`	`19`	`SourceControlNavigatorTabs()`
`20`	`20`	`.environmentObject(sourceControlManager)`
`@@ -31,10 +31,6 @@ struct SourceControlNavigatorView: View {`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`	`}`
`34`		`- .safeAreaInset(edge: .bottom, spacing: 0) {`
`35`		`- SourceControlNavigatorToolbarBottom()`
`36`		`- .environmentObject(sourceControlManager)`
`37`		`- }`
`38`	`34`	`}`
`39`	`35`	`}`
`40`	`36`	`}`