Fix issue #1488 | Utility area sidebar state specific to individual w… (

#1493) * Fix issue #1488 | Utility area sidebar state specific to individual workspaces * Fix issue #1488 | swiftlint violation fix * Fix issue #1488 | swiftlint violation fix
CodeEditApp · Nov 27, 2023 · d5b5181 · d5b5181
1 parent 5f6551f
commit d5b5181
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 7 deletions.
diff --git a/CodeEdit/Features/UtilityArea/DebugUtility/UtilityAreaDebugView.swift b/CodeEdit/Features/UtilityArea/DebugUtility/UtilityAreaDebugView.swift
@@ -8,10 +8,12 @@
 import SwiftUI
 
 struct UtilityAreaDebugView: View {
+    @EnvironmentObject private var model: UtilityAreaViewModel
+
     @State var tabSelection = 0
 
     var body: some View {
-        UtilityAreaTabView { _ in
+        UtilityAreaTabView(model: model.tabViewModel) { _ in
             Text("Nothing to debug")
                 .font(.system(size: 16))
                 .foregroundColor(.secondary)

diff --git a/CodeEdit/Features/UtilityArea/OutputUtility/UtilityAreaOutputView.swift b/CodeEdit/Features/UtilityArea/OutputUtility/UtilityAreaOutputView.swift
@@ -26,7 +26,7 @@ struct UtilityAreaOutputView: View {
     }
 
     var body: some View {
-        UtilityAreaTabView { _ in
+        UtilityAreaTabView(model: model.tabViewModel) { _ in
             Group {
                 if selectedOutputSource == nil {
                     Text("No output")

diff --git a/CodeEdit/Features/UtilityArea/TerminalUtility/UtilityAreaTerminalView.swift b/CodeEdit/Features/UtilityArea/TerminalUtility/UtilityAreaTerminalView.swift
@@ -121,7 +121,7 @@ struct UtilityAreaTerminalView: View {
     }
 
     var body: some View {
-        UtilityAreaTabView { tabState in
+        UtilityAreaTabView(model: model.tabViewModel) { tabState in
             ZStack {
                 if model.selectedTerminals.isEmpty {
                     Text("No Selection")

diff --git a/CodeEdit/Features/UtilityArea/ViewModels/UtilityAreaTabViewModel.swift b/CodeEdit/Features/UtilityArea/ViewModels/UtilityAreaTabViewModel.swift
@@ -15,6 +15,4 @@ class UtilityAreaTabViewModel: ObservableObject {
     @Published var hasLeadingSidebar: Bool = false
 
     @Published var hasTrailingSidebar: Bool = false
-
-    public static let shared: UtilityAreaTabViewModel = .init()
 }
diff --git a/CodeEdit/Features/UtilityArea/ViewModels/UtilityAreaViewModel.swift b/CodeEdit/Features/UtilityArea/ViewModels/UtilityAreaViewModel.swift
@@ -40,6 +40,9 @@ class UtilityAreaViewModel: ObservableObject {
     /// The tab bar items for the DebugAreaView
     @Published var tabItems: [UtilityAreaTab] = UtilityAreaTab.allCases
 
+    /// The tab bar view model for UtilityAreaTabView
+    @Published var tabViewModel = UtilityAreaTabViewModel()
+
     /// Returns the font for status bar items to use
     private(set) var toolbarFont: Font = .system(size: 11, weight: .medium)
 

diff --git a/CodeEdit/Features/UtilityArea/Views/UtilityAreaTabView.swift b/CodeEdit/Features/UtilityArea/Views/UtilityAreaTabView.swift
@@ -8,7 +8,7 @@
 import SwiftUI
 
 struct UtilityAreaTabView<Content: View, LeadingSidebar: View, TrailingSidebar: View>: View {
-    @ObservedObject var model: UtilityAreaTabViewModel = UtilityAreaTabViewModel.shared
+    @ObservedObject var model: UtilityAreaTabViewModel
 
     let content: (UtilityAreaTabViewModel) -> Content
     let leadingSidebar: (UtilityAreaTabViewModel) -> LeadingSidebar?
@@ -18,12 +18,15 @@ struct UtilityAreaTabView<Content: View, LeadingSidebar: View, TrailingSidebar:
     let hasTrailingSidebar: Bool
 
     init(
+        model: UtilityAreaTabViewModel,
         @ViewBuilder content: @escaping (UtilityAreaTabViewModel) -> Content,
         @ViewBuilder leadingSidebar: @escaping (UtilityAreaTabViewModel) -> LeadingSidebar,
         @ViewBuilder trailingSidebar: @escaping (UtilityAreaTabViewModel) -> TrailingSidebar,
         hasLeadingSidebar: Bool = true,
         hasTrailingSidebar: Bool = true
     ) {
+        self.model = model
+
         self.content = content
         self.leadingSidebar = leadingSidebar
         self.trailingSidebar = trailingSidebar
@@ -32,10 +35,14 @@ struct UtilityAreaTabView<Content: View, LeadingSidebar: View, TrailingSidebar:
         self.hasTrailingSidebar = hasTrailingSidebar
     }
 
-    init(@ViewBuilder content: @escaping (UtilityAreaTabViewModel) -> Content) where
+    init(
+        model: UtilityAreaTabViewModel,
+        @ViewBuilder content: @escaping (UtilityAreaTabViewModel) -> Content
+    ) where
         LeadingSidebar == EmptyView,
         TrailingSidebar == EmptyView {
         self.init(
+            model: model,
             content: content,
             leadingSidebar: { _ in EmptyView() },
             trailingSidebar: { _ in EmptyView() },
@@ -45,10 +52,12 @@ struct UtilityAreaTabView<Content: View, LeadingSidebar: View, TrailingSidebar:
     }
 
     init(
+        model: UtilityAreaTabViewModel,
         @ViewBuilder content: @escaping (UtilityAreaTabViewModel) -> Content,
         @ViewBuilder leadingSidebar: @escaping (UtilityAreaTabViewModel) -> LeadingSidebar
     ) where TrailingSidebar == EmptyView {
         self.init(
+            model: model,
             content: content,
             leadingSidebar: leadingSidebar,
             trailingSidebar: { _ in EmptyView() },
@@ -57,10 +66,12 @@ struct UtilityAreaTabView<Content: View, LeadingSidebar: View, TrailingSidebar:
     }
 
     init(
+        model: UtilityAreaTabViewModel,
         @ViewBuilder content: @escaping (UtilityAreaTabViewModel) -> Content,
         @ViewBuilder trailingSidebar: @escaping (UtilityAreaTabViewModel) -> TrailingSidebar
     ) where LeadingSidebar == EmptyView {
         self.init(
+            model: model,
             content: content,
             leadingSidebar: { _ in EmptyView() },
             trailingSidebar: trailingSidebar,