Fixes "Menu Bar Items Not Updating (#1684)"

CodeEdit/Features/Documents/Controllers/CodeEditWindowController.swift

@@ -29,8 +29,9 @@ final class CodeEditWindowController: NSWindowController, NSToolbarDelegate, Obs
 
     internal var cancellables = [AnyCancellable]()
 
-    init(window: NSWindow, workspace: WorkspaceDocument) {
+    init(window: NSWindow?, workspace: WorkspaceDocument?) {
         super.init(window: window)
+        guard let workspace else { return }
         self.workspace = workspace
         self.workspaceSettings = CEWorkspaceSettings(workspaceDocument: workspace)
         setupSplitView(with: workspace)
@@ -46,7 +47,7 @@ final class CodeEditWindowController: NSWindowController, NSToolbarDelegate, Obs
                 self?.navigatorCollapsed = item.isCollapsed
             }),
             splitViewController.splitViewItems.last!.observe(\.isCollapsed, changeHandler: { [weak self] item, _ in
-                self?.navigatorCollapsed = item.isCollapsed
+                self?.inspectorCollapsed = item.isCollapsed
             })
         ]
 

CodeEdit/Features/WindowCommands/ViewCommands.swift

@@ -17,31 +17,17 @@ struct ViewCommands: Commands {
     @AppSettings(\.general.dimEditorsWithoutFocus)
     var dimEditorsWithoutFocus
 
-    @State var windowController: CodeEditWindowController?
+    @State private var windowController: CodeEditWindowController?
 
     private let documentController: CodeEditDocumentController = CodeEditDocumentController()
-    private let statusBarViewModel: UtilityAreaViewModel = UtilityAreaViewModel()
 
     @FocusedBinding(\.navigationSplitViewVisibility)
     var navigationSplitViewVisibility
 
     @FocusedBinding(\.inspectorVisibility)
     var inspectorVisibility
 
-    var navigatorCollapsed: Bool {
-        windowController?.navigatorCollapsed ?? false
-    }
-
-    var inspectorCollapsed: Bool {
-        windowController?.navigatorCollapsed ?? false
-    }
-
-    var toolbarCollapsed: Bool {
-        windowController?.toolbarCollapsed ?? false
-    }
-
     var body: some Commands {
-
         CommandGroup(after: .toolbar) {
             Button("Show Command Palette") {
                 NSApp.sendAction(#selector(CodeEditWindowController.openCommandPalette(_:)), to: nil, from: nil)
@@ -86,32 +72,13 @@ struct ViewCommands: Commands {
 
             Divider()
 
-            Button("\(navigatorCollapsed ? "Show" : "Hide") Navigator") {
-                windowController?.toggleFirstPanel()
-            }
-            .disabled(windowController == nil)
-            .keyboardShortcut("0", modifiers: [.command])
-            .onReceive(NSApp.publisher(for: \.keyWindow)) { window in
-                windowController = window?.windowController as? CodeEditWindowController
-            }
-
-            Button("\(inspectorCollapsed ? "Show" : "Hide") Inspector") {
-                windowController?.toggleLastPanel()
-            }
-            .disabled(windowController == nil)
-            .keyboardShortcut("i", modifiers: [.control, .command])
-
-            Button("\(inspectorCollapsed ? "Show" : "Hide") Utility Area") {
-                CommandManager.shared.executeCommand("open.drawer")
-            }
-            .disabled(windowController == nil)
-            .keyboardShortcut("y", modifiers: [.shift, .command])
-
-            Button("\(navigatorCollapsed ? "Show" : "Hide") Toolbar") {
-                windowController?.toggleToolbar()
-            }
-            .disabled(windowController == nil)
-            .keyboardShortcut("t", modifiers: [.option, .command])
+            HideCommands(
+                windowController: windowController ?? CodeEditWindowController(window: nil, workspace: nil),
+                utilityAreaModel: windowController?.workspace?.utilityAreaModel ?? UtilityAreaViewModel()
+            )
+                .onReceive(NSApp.publisher(for: \.keyWindow)) { window in
+                    windowController = window?.windowController as? CodeEditWindowController
+                }
 
             Divider()
 
@@ -131,6 +98,53 @@ struct ViewCommands: Commands {
     }
 }
 
+struct HideCommands: View {
+    @ObservedObject var windowController: CodeEditWindowController
+    @ObservedObject var utilityAreaModel: UtilityAreaViewModel
+
+    var navigatorCollapsed: Bool {
+        windowController.navigatorCollapsed
+    }
+
+    var inspectorCollapsed: Bool {
+        windowController.inspectorCollapsed
+    }
+
+    var utilityAreaCollapsed: Bool {
+        utilityAreaModel.isCollapsed
+    }
+
+    var toolbarCollapsed: Bool {
+        windowController.toolbarCollapsed
+    }
+
+    var body: some View {
+        Button("\(navigatorCollapsed ? "Show" : "Hide") Navigator") {
+            windowController.toggleFirstPanel()
+        }
+        .disabled(windowController.window == nil)
+        .keyboardShortcut("0", modifiers: [.command])
+
+        Button("\(inspectorCollapsed ? "Show" : "Hide") Inspector") {
+            windowController.toggleLastPanel()
+        }
+        .disabled(windowController.window == nil)
+        .keyboardShortcut("i", modifiers: [.control, .command])
+
+        Button("\(utilityAreaCollapsed ? "Show" : "Hide") Utility Area") {
+            CommandManager.shared.executeCommand("open.drawer")
+        }
+        .disabled(windowController.window == nil)
+        .keyboardShortcut("y", modifiers: [.shift, .command])
+
+        Button("\(toolbarCollapsed ? "Show" : "Hide") Toolbar") {
+            windowController.toggleToolbar()
+        }
+        .disabled(windowController.window == nil)
+        .keyboardShortcut("t", modifiers: [.option, .command])
+    }
+}
+
 extension ViewCommands {
     struct NavigatorCommands: View {
         @ObservedObject var model: NavigatorSidebarViewModel