Splitview

CodeEdit/Features/AppPreferences/Model/AppPreferencesModel.swift

@@ -32,7 +32,6 @@ final class AppPreferencesModel: ObservableObject {
     var preferences: AppPreferences {
         didSet {
             try? savePreferences()
-            objectWillChange.send()
         }
     }
 

CodeEdit/Features/Breadcrumbs/Views/BreadcrumbsComponent.swift

@@ -6,6 +6,7 @@
 //
 
 import SwiftUI
+import Combine
 
 struct BreadcrumbsComponent: View {
 
@@ -59,14 +60,19 @@ struct BreadcrumbsComponent: View {
     }
 
     struct NSPopUpButtonView<ItemType>: NSViewRepresentable where ItemType: Equatable {
-        @Binding var selection: ItemType
+        @Binding
+        var selection: ItemType
+
         var popupCreator: () -> NSPopUpButton
 
         typealias NSViewType = NSPopUpButton
 
         func makeNSView(context: NSViewRepresentableContext<NSPopUpButtonView>) -> NSPopUpButton {
             let newPopupButton = popupCreator()
             setPopUpFromSelection(newPopupButton, selection: selection)
+            if let menu = newPopupButton.menu {
+                context.coordinator.registerForChanges(in: menu)
+            }
             return newPopupButton
         }
 
@@ -89,24 +95,24 @@ struct BreadcrumbsComponent: View {
         }
 
         class Coordinator: NSObject {
-            var parent: NSPopUpButtonView!
+            var parent: NSPopUpButtonView
+
+            var cancellable: AnyCancellable?
 
             init(_ parent: NSPopUpButtonView) {
-                super.init()
                 self.parent = parent
-                NotificationCenter.default.addObserver(
-                    self,
-                    selector: #selector(dropdownItemSelected),
-                    name: NSMenu.didSendActionNotification,
-                    object: nil
-                )
+                super.init()
             }
 
-            @objc func dropdownItemSelected(_ notification: NSNotification) {
-                let menuItem = (notification.userInfo?["MenuItem"])! as? NSMenuItem
-                if let selection = menuItem?.representedObject as? ItemType {
-                    parent.selection = selection
-                }
+            func registerForChanges(in menu: NSMenu) {
+                cancellable = NotificationCenter.default
+                    .publisher(for: NSMenu.didSendActionNotification, object: menu)
+                    .sink { notification in
+                        if let menuItem = notification.userInfo?["MenuItem"] as? NSMenuItem,
+                           let selection = menuItem as? ItemType {
+                            self.parent.selection = selection
+                        }
+                    }
             }
         }
     }

CodeEdit/Features/Breadcrumbs/Views/BreadcrumbsView.swift

@@ -15,9 +15,14 @@ struct BreadcrumbsView: View {
     @Environment(\.colorScheme)
     private var colorScheme
 
+    @Environment(\.isActiveTabGroup)
+    private var isActiveTabGroup
+
     @Environment(\.controlActiveState)
     private var activeState
 
+    static let height = 27.0
+
     init(
         file: WorkspaceClient.FileItem,
         tappedOpenFile: @escaping (WorkspaceClient.FileItem) -> Void
@@ -51,8 +56,10 @@ struct BreadcrumbsView: View {
             }
             .padding(.horizontal, 10)
         }
-        .frame(height: 27, alignment: .center)
-        .background(EffectView(.headerView).frame(height: 27))
+        .frame(height: Self.height, alignment: .center)
+        .opacity(activeState == .inactive ? 0.8 : 1.0)
+        .grayscale(isActiveTabGroup ? 0.0 : 1.0)
+        .background(EffectView(.headerView).frame(height: Self.height))
     }
 
     private var chevron: some View {

CodeEdit/Features/CodeFile/CodeFileView.swift

@@ -60,6 +60,12 @@ struct CodeFileView: View {
         return AppPreferencesModel.shared.preferences.textEditing.font.current()
     }()
 
+    @Environment(\.edgeInsets)
+    private var edgeInsets
+
+    @EnvironmentObject
+    private var tabgroup: TabGroupData
+
     var body: some View {
         CodeEditTextView(
             $codeFile.content,
@@ -70,7 +76,8 @@ struct CodeFileView: View {
             lineHeight: $prefs.preferences.textEditing.lineHeightMultiple,
             wrapLines: $prefs.preferences.textEditing.wrapLinesToEditorWidth,
             cursorPosition: codeFile.$cursorPosition,
-            useThemeBackground: prefs.preferences.theme.useThemeBackground
+            useThemeBackground: prefs.preferences.theme.useThemeBackground,
+            contentInsets: edgeInsets.nsEdgeInsets
         )
         .id(codeFile.fileURL)
         .background {
@@ -90,7 +97,8 @@ struct CodeFileView: View {
             }
         }
         .disabled(!editable)
-        .frame(maxHeight: .infinity)
+        // minHeight zero fixes a bug where the app would freeze if the contents of the file are empty.
+        .frame(minHeight: .zero, maxHeight: .infinity)
         .onChange(of: ThemeModel.shared.selectedTheme) { newValue in
             guard let theme = newValue else { return }
             self.selectedTheme = theme

CodeEdit/Features/Documents/Controllers/CodeEditWindowController.swift

@@ -71,6 +71,9 @@ final class CodeEditWindowController: NSWindowController, NSToolbarDelegate {
         let splitVC = CodeEditSplitViewController(workspace: workspace, feedbackPerformer: feedbackPerformer)
 
         let navigatorView = NavigatorSidebarView(workspace: workspace)
+            .environmentObject(workspace)
+            .environmentObject(workspace.tabManager)
+
         let navigator = NSSplitViewItem(
             sidebarWithViewController: NSHostingController(rootView: navigatorView)
         )
@@ -80,7 +83,9 @@ final class CodeEditWindowController: NSWindowController, NSToolbarDelegate {
         splitVC.addSplitViewItem(navigator)
 
         let workspaceView = WindowObserver(window: window!) {
-            WorkspaceView(workspace: workspace)
+            WorkspaceView()
+                .environmentObject(workspace)
+                .environmentObject(workspace.tabManager)
         }
 
         let mainContent = NSSplitViewItem(
@@ -90,6 +95,9 @@ final class CodeEditWindowController: NSWindowController, NSToolbarDelegate {
         splitVC.addSplitViewItem(mainContent)
 
         let inspectorView = InspectorSidebarView(workspace: workspace)
+            .environmentObject(workspace)
+            .environmentObject(workspace.tabManager)
+
         let inspector = NSSplitViewItem(
             viewController: NSHostingController(rootView: inspectorView)
         )
@@ -113,12 +121,10 @@ final class CodeEditWindowController: NSWindowController, NSToolbarDelegate {
         if prefs.preferences.general.tabBarStyle == .native {
             // Set titlebar background as transparent by default in order to
             // style the toolbar background in native tab bar style.
-            self.window?.titlebarAppearsTransparent = true
             self.window?.titlebarSeparatorStyle = .none
         } else {
             // In xcode tab bar style, we use default toolbar background with
             // line separator.
-            self.window?.titlebarAppearsTransparent = false
             self.window?.titlebarSeparatorStyle = .automatic
         }
         self.window?.toolbar = toolbar
@@ -234,17 +240,12 @@ final class CodeEditWindowController: NSWindowController, NSToolbarDelegate {
     }
 
     private func getSelectedCodeFile() -> CodeFileDocument? {
-        guard let id = workspace?.selectionState.selectedId else { return nil }
-        guard let item = workspace?.selectionState.openFileItems.first(where: { item in
-            item.tabID == id
-        }) else { return nil }
-        guard let file = workspace?.selectionState.openedCodeFiles[item] else { return nil }
-        return file
+        workspace?.tabManager.activeTabGroup.selected?.fileDocument
     }
 
     @IBAction func saveDocument(_ sender: Any) {
         getSelectedCodeFile()?.save(sender)
-        workspace?.convertTemporaryTab()
+        workspace?.tabManager.activeTabGroup.temporaryTab = nil
     }
 
     @IBAction func openCommandPalette(_ sender: Any) {
@@ -283,11 +284,13 @@ final class CodeEditWindowController: NSWindowController, NSToolbarDelegate {
             } else {
                 let panel = OverlayPanel()
                 self.quickOpenPanel = panel
-                let contentView = QuickOpenView(
-                    state: state,
-                    onClose: { panel.close() },
-                    openFile: workspace.openTab(item:)
-                )
+
+                let contentView = QuickOpenView(state: state) {
+                    panel.close()
+                } openFile: { file in
+                    workspace.tabManager.openTab(item: file)
+                }
+
                 panel.contentView = NSHostingView(rootView: contentView)
                 window?.addChildWindow(panel, ordered: .above)
                 panel.makeKeyAndOrderFront(self)

CodeEdit/Features/Documents/Views/WorkspaceCodeFileView.swift

@@ -9,48 +9,37 @@ import SwiftUI
 import UniformTypeIdentifiers
 
 struct WorkspaceCodeFileView: View {
+
+    @EnvironmentObject
+    private var tabManager: TabManager
+
     @EnvironmentObject
-    private var workspace: WorkspaceDocument
+    private var tabgroup: TabGroupData
+
+    var file: WorkspaceClient.FileItem
 
     @StateObject
     private var prefs: AppPreferencesModel = .shared
 
     @ViewBuilder
     var codeView: some View {
-        ZStack {
-            if let item = workspace.selectionState.openFileItems.first(where: { file in
-                if file.tabID == workspace.selectionState.selectedId {
-                    print("Item loaded is: ", file.url)
+        if let document = file.fileDocument {
+            Group {
+                switch document.typeOfFile {
+                case .some(.text), .some(.data):
+                    CodeFileView(codeFile: document)
+                default:
+                    otherFileView(document, for: file)
                 }
-                return file.tabID == workspace.selectionState.selectedId
-            }) {
-                if let fileItem = workspace.selectionState.openedCodeFiles[item] {
-                    if fileItem.typeOfFile == .text || fileItem.typeOfFile == .data {
-                        codeFileView(fileItem, for: item)
-                    } else {
-                        otherFileView(fileItem, for: item)
-                    }
-                }
-            } else {
-                Text("No Editor")
-                    .font(.system(size: 17))
-                    .foregroundColor(.secondary)
-                    .frame(minHeight: 0)
-                    .clipped()
             }
-        }
-        .frame(maxWidth: .infinity, maxHeight: .infinity)
-    }
-
-    @ViewBuilder
-    private func codeFileView(
-        _ codeFile: CodeFileDocument,
-        for item: WorkspaceClient.FileItem
-    ) -> some View {
-        VStack(spacing: 0) {
-            BreadcrumbsView(file: item, tappedOpenFile: workspace.openTab(item:))
-            Divider()
-            CodeFileView(codeFile: codeFile)
+            .frame(maxWidth: .infinity, maxHeight: .infinity)
+        } else {
+            Spacer()
+            VStack(spacing: 10) {
+                ProgressView()
+                Text("Opening \(file.fileName)...")
+            }
+            Spacer()
         }
     }
 
@@ -60,8 +49,6 @@ struct WorkspaceCodeFileView: View {
         for item: WorkspaceClient.FileItem
     ) -> some View {
         VStack(spacing: 0) {
-            BreadcrumbsView(file: item, tappedOpenFile: workspace.openTab(item:))
-            Divider()
 
             if let url = otherFile.previewItemURL,
                let image = NSImage(contentsOf: url),