Finalize Custom Divider Style API

Author: thecoolwinter

CodeEdit/Features/Editor/Views/EditorLayoutView.swift

@@ -53,32 +53,11 @@ struct EditorLayoutView: View {
         @ObservedObject var data: SplitViewData
         @FocusState.Binding var focus: Editor?
 
-        @State private var dividerColor: NSColor = .blue
-
         var body: some View {
-            SplitView(
-                axis: data.axis,
-                dividerStyle: .thick(color: dividerColor)
-            ) {
+            SplitView(axis: data.axis, dividerStyle: .editorDivider) {
                 splitView
             }
             .edgesIgnoringSafeArea([.top, .bottom])
-            .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 {

CodeEdit/Features/SplitView/Model/CodeEditDividerStyle.swift

@@ -7,16 +7,36 @@
 
 import AppKit
 
+/// The style of divider used by ``SplitView``.
+///
+/// To add a new style, add another case to this enum and fill in the ``customColor`` and ``customThickness``
+/// variables. When passed to ``SplitView``, the custom styles will be used instead of the default styles. Leave
+/// values as `nil` to use default styles.
 enum CodeEditDividerStyle: Equatable {
-    case system(NSSplitView.DividerStyle, color: NSColor? = nil)
-    case thick(color: NSColor? = nil)
+    case system(NSSplitView.DividerStyle)
+    case editorDivider
 
-    var color: NSColor? {
+    var customColor: NSColor? {
         switch self {
-        case .system(_, let color):
-            return color
-        case .thick(let color):
-            return color
+        case .system:
+            return nil
+        case .editorDivider:
+            return NSColor(name: nil) { appearance in
+                if appearance.name == .darkAqua {
+                    NSColor.black
+                } else {
+                    NSColor(white: 203.0 / 255.0, alpha: 1.0)
+                }
+            }
+        }
+    }
+
+    var customThickness: CGFloat? {
+        switch self {
+        case .system:
+            return nil
+        case .editorDivider:
+            return 3.0
         }
     }
 }

CodeEdit/Features/SplitView/Views/SplitViewControllerView.swift

@@ -15,8 +15,9 @@ struct SplitViewControllerView: NSViewControllerRepresentable {
     @Binding var viewController: () -> SplitViewController?
 
     func makeNSViewController(context: Context) -> SplitViewController {
-        let controller = SplitViewController(axis: axis)
-        updateItems(controller: controller)
+        let controller = SplitViewController(axis: axis) { controller in
+            updateItems(controller: controller)
+        }
         return controller
     }
 
@@ -65,7 +66,7 @@ struct SplitViewControllerView: NSViewControllerRepresentable {
     }
 
     func makeCoordinator() -> SplitViewController {
-        SplitViewController(axis: axis)
+        SplitViewController(axis: axis, setUpItems: nil)
     }
 }
 
@@ -75,9 +76,9 @@ final class SplitViewController: NSSplitViewController {
         var customDividerStyle: CodeEditDividerStyle = .system(.thin) {
             didSet {
                 switch customDividerStyle {
-                case .system(let dividerStyle, _):
+                case .system(let dividerStyle):
                     self.dividerStyle = dividerStyle
-                case .thick:
+                case .editorDivider:
                     return
                 }
             }
@@ -93,34 +94,23 @@ final class SplitViewController: NSSplitViewController {
         }
 
         override var dividerColor: NSColor {
-            if let customColor = customDividerStyle.color {
-                return customColor
-            }
-            
-            switch customDividerStyle {
-            case .system:
-                return super.dividerColor
-            case .thick:
-                return NSColor.separatorColor
-            }
+            customDividerStyle.customColor ?? super.dividerColor
         }
 
         override var dividerThickness: CGFloat {
-            switch customDividerStyle {
-            case .system:
-                return super.dividerThickness
-            case .thick:
-                return 3.0
-            }
+            customDividerStyle.customThickness ?? super.dividerThickness
         }
     }
 
     var items: [SplitViewItem] = []
     var axis: Axis
     var parentView: SplitViewControllerView?
 
-    init(axis: Axis) {
+    var setUpItems: ((SplitViewController) -> Void)?
+
+    init(axis: Axis, setUpItems: ((SplitViewController) -> Void)?) {
         self.axis = axis
+        self.setUpItems = setUpItems
         super.init(nibName: nil, bundle: nil)
     }
 
@@ -136,6 +126,7 @@ final class SplitViewController: NSSplitViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         splitView.isVertical = axis != .vertical
+        setUpItems?(self)
         DispatchQueue.main.async { [weak self] in
             self?.parentView?.viewController = { [weak self] in
                 self
@@ -147,6 +138,11 @@ final class SplitViewController: NSSplitViewController {
         false
     }
 
+    override func splitView(_ splitView: NSSplitView, shouldHideDividerAt dividerIndex: Int) -> Bool {
+        guard items.count > 1 else { return false }
+        return super.splitView(splitView, shouldHideDividerAt: dividerIndex)
+    }
+
     func setDividerStyle(_ dividerStyle: CodeEditDividerStyle) {
         guard let splitView = splitView as? CustomSplitView else {
             return