WIP: Chaging approach to how we are modifying thickness and color for dividers

Author: austincondiff

CodeEdit/Features/Editor/Views/EditorLayoutView.swift

@@ -47,43 +47,49 @@ struct EditorLayoutView: View {
     }
 
     struct SubEditorLayoutView: View {
+        @Environment(\.colorScheme)
+        private var colorScheme
+
         @ObservedObject var data: SplitViewData
         @FocusState.Binding var focus: Editor?
 
+        @State private var dividerColor: NSColor = .blue
+
         var body: some View {
-            SplitView(axis: data.axis) {
+            SplitView(
+                axis: data.axis,
+                dividerStyle: .thick(color: dividerColor)
+            ) {
                 splitView
             }
             .edgesIgnoringSafeArea([.top, .bottom])
-        }
-
-        func stackContentsView(index: Int, item: EditorLayout) -> some View {
-            Group {
-                // Add a divider before the editor if it's not the first
-                if index != 0 { PanelDivider() }
-                EditorLayoutView(layout: item, focus: $focus)
-                    .transformEnvironment(\.isAtEdge) { belowToolbar in
-                        calcIsAtEdge(current: &belowToolbar, index: index)
-                    }
-                    .environment(\.splitEditor) { [weak data] edge, newEditor in
-                        data?.split(edge, at: index, new: newEditor)
-                    }
-                // Add a divider after the editor if it's not the last
-                if index != data.editorLayouts.count - 1 { PanelDivider() }
+            .onChange(of: colorScheme) { newValue in
+                print("ColorScheme changed to: \(newValue == .dark ? "dark" : "light")")
+                if newValue == .dark {
+                    dividerColor = .red
+                } else {
+                    dividerColor = .blue
+                }
+            }
+            .onAppear {
+                print("SubEditorLayoutView appeared with colorScheme: \(colorScheme == .dark ? "dark" : "light")")
+                if colorScheme == .dark {
+                    dividerColor = .red
+                } else {
+                    dividerColor = .blue
+                }
             }
         }
 
         var splitView: some View {
             ForEach(Array(data.editorLayouts.enumerated()), id: \.offset) { index, item in
-                if data.axis == .horizontal {
-                    HStack(spacing: 0) {
-                        stackContentsView(index: index, item: item)
-                    }
-                } else {
-                    VStack(spacing: 0) {
-                        stackContentsView(index: index, item: item)
-                    }
-                }
+                EditorLayoutView(layout: item, focus: $focus)
+                   .transformEnvironment(\.isAtEdge) { belowToolbar in
+                       calcIsAtEdge(current: &belowToolbar, index: index)
+                   }
+                   .environment(\.splitEditor) { [weak data] edge, newEditor in
+                       data?.split(edge, at: index, new: newEditor)
+                   }
             }
         }
 

CodeEdit/Features/SplitView/Model/CodeEditDividerStyle.swift

@@ -0,0 +1,22 @@
+//
+//  CodeEditDividerStyle.swift
+//  CodeEdit
+//
+//  Created by Khan Winter on 5/30/25.
+//
+
+import AppKit
+
+enum CodeEditDividerStyle: Equatable {
+    case system(NSSplitView.DividerStyle, color: NSColor? = nil)
+    case thick(color: NSColor? = nil)
+
+    var color: NSColor? {
+        switch self {
+        case .system(_, let color):
+            return color
+        case .thick(let color):
+            return color
+        }
+    }
+}

CodeEdit/Features/SplitView/Views/SplitView.swift

@@ -9,19 +9,26 @@ import SwiftUI
 
 struct SplitView<Content: View>: View {
     var axis: Axis
+    var dividerStyle: CodeEditDividerStyle
     var content: Content
 
-    init(axis: Axis, @ViewBuilder content: () -> Content) {
+    init(axis: Axis, dividerStyle: CodeEditDividerStyle = .system(.thin), @ViewBuilder content: () -> Content) {
         self.axis = axis
+        self.dividerStyle = dividerStyle
         self.content = content()
     }
 
-    @State var viewController: () -> SplitViewController? = { nil }
+    @State private var viewController: () -> SplitViewController? = { nil }
 
     var body: some View {
         VStack {
             content.variadic { children in
-                SplitViewControllerView(axis: axis, children: children, viewController: $viewController)
+                SplitViewControllerView(
+                    axis: axis,
+                    dividerStyle: dividerStyle,
+                    children: children,
+                    viewController: $viewController
+                )
             }
         }
         ._trait(SplitViewControllerLayoutValueKey.self, viewController)

CodeEdit/Features/SplitView/Views/SplitViewControllerView.swift

@@ -10,15 +10,19 @@ import SwiftUI
 struct SplitViewControllerView: NSViewControllerRepresentable {
 
     var axis: Axis
+    var dividerStyle: CodeEditDividerStyle
     var children: _VariadicView.Children
     @Binding var viewController: () -> SplitViewController?
 
     func makeNSViewController(context: Context) -> SplitViewController {
-        context.coordinator
+        let controller = SplitViewController(axis: axis)
+        updateItems(controller: controller)
+        return controller
     }
 
     func updateNSViewController(_ controller: SplitViewController, context: Context) {
         updateItems(controller: controller)
+        controller.setDividerStyle(dividerStyle)
     }
 
     private func updateItems(controller: SplitViewController) {
@@ -61,40 +65,95 @@ struct SplitViewControllerView: NSViewControllerRepresentable {
     }
 
     func makeCoordinator() -> SplitViewController {
-        SplitViewController(parent: self, axis: axis)
+        SplitViewController(axis: axis)
     }
 }
 
 final class SplitViewController: NSSplitViewController {
+    final class CustomSplitView: NSSplitView {
+        @Invalidating(.display)
+        var customDividerStyle: CodeEditDividerStyle = .system(.thin) {
+            didSet {
+                switch customDividerStyle {
+                case .system(let dividerStyle, _):
+                    self.dividerStyle = dividerStyle
+                case .thick:
+                    return
+                }
+            }
+        }
+
+        init() {
+            super.init(frame: .zero)
+            dividerStyle = .thin
+        }
+
+        required init?(coder: NSCoder) {
+            fatalError("init(coder:) has not been implemented")
+        }
+
+        override var dividerColor: NSColor {
+            if let customColor = customDividerStyle.color {
+                return customColor
+            }
+            
+            switch customDividerStyle {
+            case .system:
+                return super.dividerColor
+            case .thick:
+                return NSColor.separatorColor
+            }
+        }
+
+        override var dividerThickness: CGFloat {
+            switch customDividerStyle {
+            case .system:
+                return super.dividerThickness
+            case .thick:
+                return 3.0
+            }
+        }
+    }
 
     var items: [SplitViewItem] = []
     var axis: Axis
-    var parentView: SplitViewControllerView
+    var parentView: SplitViewControllerView?
 
-    init(parent: SplitViewControllerView, axis: Axis = .horizontal) {
+    init(axis: Axis) {
         self.axis = axis
-        self.parentView = parent
         super.init(nibName: nil, bundle: nil)
     }
 
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 
+    override func loadView() {
+        splitView = CustomSplitView()
+        super.loadView()
+    }
+
     override func viewDidLoad() {
+        super.viewDidLoad()
         splitView.isVertical = axis != .vertical
-        splitView.dividerStyle = .thin
         DispatchQueue.main.async { [weak self] in
-            self?.parentView.viewController = { [weak self] in
+            self?.parentView?.viewController = { [weak self] in
                 self
             }
         }
     }
 
-    override func splitView(_ splitView: NSSplitView, shouldHideDividerAt dividerIndex: Int) -> Bool {
+    override func splitView(_ splitView: NSSplitView, canCollapseSubview subview: NSView) -> Bool {
         false
     }
 
+    func setDividerStyle(_ dividerStyle: CodeEditDividerStyle) {
+        guard let splitView = splitView as? CustomSplitView else {
+            return
+        }
+        splitView.customDividerStyle = dividerStyle
+    }
+
     func collapse(for id: AnyHashable, enabled: Bool) {
         items.first { $0.id == id }?.item.animator().isCollapsed = enabled
     }