refactor(inspector): extract testable window-minimum application and simplify pane collapse

Author: datlechin

TablePro/Core/Services/Infrastructure/MainSplitViewController.swift

@@ -280,31 +280,31 @@ internal final class MainSplitViewController: NSSplitViewController, InspectorVi
             dividerThickness: splitView.dividerThickness
         )
 
-        if window.contentMinSize != resolvedMinSize {
-            window.contentMinSize = resolvedMinSize
+        Self.applyContentMinimum(resolvedMinSize, to: window)
+    }
+
+    internal static func applyContentMinimum(_ minimumSize: NSSize, to window: NSWindow) {
+        if window.contentMinSize != minimumSize {
+            window.contentMinSize = minimumSize
         }
 
         let currentContentSize = window.contentRect(forFrameRect: window.frame).size
-        guard currentContentSize.width < resolvedMinSize.width || currentContentSize.height < resolvedMinSize.height else { return }
+        guard currentContentSize.width < minimumSize.width || currentContentSize.height < minimumSize.height else { return }
         window.setContentSize(NSSize(
-            width: max(currentContentSize.width, resolvedMinSize.width),
-            height: max(currentContentSize.height, resolvedMinSize.height)
+            width: max(currentContentSize.width, minimumSize.width),
+            height: max(currentContentSize.height, minimumSize.height)
         ))
     }
 
-    private func setCollapsed(
-        _ isCollapsed: Bool,
-        for splitItem: NSSplitViewItem?,
-        prepareWindowMinimumSize: (() -> Void)? = nil
-    ) {
+    private func setCollapsed(_ isCollapsed: Bool, for splitItem: NSSplitViewItem?) {
         guard let splitItem else { return }
 
         if splitItem.isCollapsed == isCollapsed {
             recomputeWindowMinimumSize()
             return
         }
 
-        prepareWindowMinimumSize?()
+        prepareWindowMinimum(forTogglingPane: splitItem, toCollapsed: isCollapsed)
 
         guard view.window?.isVisible == true else {
             splitItem.isCollapsed = isCollapsed
@@ -319,6 +319,16 @@ internal final class MainSplitViewController: NSSplitViewController, InspectorVi
         }
     }
 
+    private func prepareWindowMinimum(forTogglingPane splitItem: NSSplitViewItem, toCollapsed isCollapsed: Bool) {
+        if splitItem === sidebarSplitItem {
+            recomputeWindowMinimumSize(sidebarCollapsed: isCollapsed)
+        } else if splitItem === inspectorSplitItem {
+            recomputeWindowMinimumSize(inspectorCollapsed: isCollapsed)
+        } else {
+            recomputeWindowMinimumSize()
+        }
+    }
+
     override func viewWillAppear() {
         super.viewWillAppear()
         guard let window = view.window else { return }
@@ -435,10 +445,7 @@ internal final class MainSplitViewController: NSSplitViewController, InspectorVi
         }
 
         let collapseSidebar = newSession.driver == nil
-        setCollapsed(collapseSidebar, for: sidebarSplitItem) { [weak self] in
-            guard !collapseSidebar else { return }
-            self?.recomputeWindowMinimumSize(sidebarCollapsed: false)
-        }
+        setCollapsed(collapseSidebar, for: sidebarSplitItem)
         rebuildPanes()
     }
 
@@ -604,16 +611,12 @@ internal final class MainSplitViewController: NSSplitViewController, InspectorVi
 
     func showInspector() {
         materializeInspectorIfNeeded()
-        setCollapsed(false, for: inspectorSplitItem) { [weak self] in
-            self?.recomputeWindowMinimumSize(inspectorCollapsed: false)
-        }
+        setCollapsed(false, for: inspectorSplitItem)
         UserDefaults.standard.set(true, forKey: Self.inspectorPresentedKey)
     }
 
     func hideInspector() {
-        setCollapsed(true, for: inspectorSplitItem) { [weak self] in
-            self?.recomputeWindowMinimumSize(inspectorCollapsed: true)
-        }
+        setCollapsed(true, for: inspectorSplitItem)
         UserDefaults.standard.set(false, forKey: Self.inspectorPresentedKey)
     }
 
@@ -640,9 +643,7 @@ internal final class MainSplitViewController: NSSplitViewController, InspectorVi
 
         if sidebarSplitItem?.isCollapsed == true {
             sidebarState.selectedSidebarTab = tab
-            setCollapsed(false, for: sidebarSplitItem) { [weak self] in
-                self?.recomputeWindowMinimumSize(sidebarCollapsed: false)
-            }
+            setCollapsed(false, for: sidebarSplitItem)
         } else if sidebarState.selectedSidebarTab == tab {
             setCollapsed(true, for: sidebarSplitItem)
         } else {

TableProTests/Core/Services/Infrastructure/MainSplitViewControllerWindowMinimumSizeTests.swift

@@ -136,4 +136,49 @@ struct MainSplitViewControllerWindowMinimumSizeTests {
         #expect(allPanesVisible.width == 954)
         #expect(allPanesVisible.height == MainSplitViewController.baseContentMinHeight)
     }
+
+    // MARK: - Applying the floor to a window
+
+    private func makeWindow(width: CGFloat, height: CGFloat) -> NSWindow {
+        NSWindow(
+            contentRect: NSRect(x: 0, y: 0, width: width, height: height),
+            styleMask: [.titled, .resizable],
+            backing: .buffered,
+            defer: true
+        )
+    }
+
+    @Test("applyContentMinimum sets the window content minimum size")
+    func applyContentMinimumSetsFloor() {
+        let window = makeWindow(width: 900, height: 600)
+        MainSplitViewController.applyContentMinimum(NSSize(width: 800, height: 500), to: window)
+        #expect(window.contentMinSize == NSSize(width: 800, height: 500))
+    }
+
+    @Test("applyContentMinimum grows a window whose content is below the floor")
+    func applyContentMinimumGrowsWhenTooSmall() {
+        let window = makeWindow(width: 600, height: 400)
+        MainSplitViewController.applyContentMinimum(NSSize(width: 800, height: 500), to: window)
+        let content = window.contentRect(forFrameRect: window.frame).size
+        #expect(content.width == 800)
+        #expect(content.height == 500)
+    }
+
+    @Test("applyContentMinimum never shrinks a window already above the floor")
+    func applyContentMinimumDoesNotShrink() {
+        let window = makeWindow(width: 1_000, height: 700)
+        MainSplitViewController.applyContentMinimum(NSSize(width: 800, height: 500), to: window)
+        let content = window.contentRect(forFrameRect: window.frame).size
+        #expect(content.width == 1_000)
+        #expect(content.height == 700)
+    }
+
+    @Test("applyContentMinimum grows only the deficient dimension")
+    func applyContentMinimumGrowsOnlyDeficientDimension() {
+        let window = makeWindow(width: 1_000, height: 400)
+        MainSplitViewController.applyContentMinimum(NSSize(width: 800, height: 500), to: window)
+        let content = window.contentRect(forFrameRect: window.frame).size
+        #expect(content.width == 1_000)
+        #expect(content.height == 500)
+    }
 }