Hiding History Inspector when source control is disabled in Settings.

CodeEditApp · Oct 29, 2024 · 78b8184 · 78b8184
1 parent 89ccc14
commit 78b8184
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 21 deletions.
diff --git a/CodeEdit/Features/InspectorArea/Views/InspectorAreaView.swift b/CodeEdit/Features/InspectorArea/Views/InspectorAreaView.swift
@@ -1,10 +1,3 @@
-//
-//  InspectorAreaView.swift
-//  CodeEdit
-//
-//  Created by Austin Condiff on 3/21/22.
-//
-
 import SwiftUI
 
 struct InspectorAreaView: View {
@@ -15,26 +8,17 @@ struct InspectorAreaView: View {
 
     @EnvironmentObject private var editorManager: EditorManager
 
+    @AppSettings(\.sourceControl.general.enableSourceControl)
+    private var enableSourceControl: Bool
+
     @AppSettings(\.general.inspectorTabBarPosition)
     var sidebarPosition: SettingsData.SidebarTabBarPosition
 
     @State private var selection: InspectorTab? = .file
 
     init(viewModel: InspectorAreaViewModel) {
         self.viewModel = viewModel
-
-        viewModel.tabItems = [.file, .gitHistory]
-        viewModel.tabItems += extensionManager
-            .extensions
-            .map { ext in
-                ext.availableFeatures.compactMap {
-                    if case .sidebarItem(let data) = $0, data.kind == .inspector {
-                        return InspectorTab.uiExtension(endpoint: ext.endpoint, data: data)
-                    }
-                    return nil
-                }
-            }
-            .joined()
+        updateTabItems()
     }
 
     func getExtension(_ id: String) -> ExtensionInfo? {
@@ -73,5 +57,28 @@ struct InspectorAreaView: View {
         .formStyle(.grouped)
         .accessibilityElement(children: .contain)
         .accessibilityLabel("inspector")
+        .onChange(of: enableSourceControl) { _ in
+            updateTabItems()
+        }
+    }
+
+    private func updateTabItems() {
+        viewModel.tabItems = [.file] +
+            (enableSourceControl ? [.gitHistory] : []) +
+            extensionManager
+                .extensions
+                .flatMap { ext in
+                    ext.availableFeatures.compactMap {
+                        if case .sidebarItem(let data) = $0, data.kind == .inspector {
+                            return InspectorTab.uiExtension(endpoint: ext.endpoint, data: data)
+                        }
+                        return nil
+                    }
+                }
+        if let selectedTab = selection,
+            !viewModel.tabItems.isEmpty &&
+            !viewModel.tabItems.contains(selectedTab) {
+            selection = viewModel.tabItems[0]
+        }
     }
 }
diff --git a/CodeEdit/Features/NavigatorArea/Views/NavigatorAreaView.swift b/CodeEdit/Features/NavigatorArea/Views/NavigatorAreaView.swift
@@ -73,7 +73,7 @@ struct NavigatorAreaView: View {
                         return nil
                     }
                 }
-        if let selectedTab = viewModel.selectedTab, 
+        if let selectedTab = viewModel.selectedTab,
             !viewModel.tabItems.isEmpty &&
             !viewModel.tabItems.contains(selectedTab) {
             viewModel.selectedTab = viewModel.tabItems[0]