Use Constraint For Minimap ContentView Height

Author: thecoolwinter

Example/CodeEditSourceEditorExample/CodeEditSourceEditorExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -17,7 +17,7 @@ let package = Package(
         // A fast, efficient, text view for code.
         .package(
             url: "https://github.com/CodeEditApp/CodeEditTextView.git",
-            from: "0.10.0"
+            from: "0.10.1"
         ),
         // tree-sitter languages
         .package(

Package.resolved

@@ -69,7 +69,7 @@ extension TextViewController {
     func setUpConstraints() {
         guard let findViewController else { return }
 
-        let maxWidthConstraint = minimapView.widthAnchor.constraint(lessThanOrEqualToConstant: 140)
+        let maxWidthConstraint = minimapView.widthAnchor.constraint(lessThanOrEqualToConstant: MinimapView.maxWidth)
         let relativeWidthConstraint = minimapView.widthAnchor.constraint(
             equalTo: view.widthAnchor,
             multiplier: 0.17

Package.swift

@@ -25,6 +25,8 @@ import CodeEditTextView
 ///
 /// The minimap can be styled using an ``EditorTheme``. See ``setTheme(_:)`` for use and colors used by this view.
 public class MinimapView: FlippedNSView {
+    static let maxWidth: CGFloat = 140.0
+
     weak var textView: TextView?
 
     /// The container scrollview for the minimap contents.
@@ -38,6 +40,7 @@ public class MinimapView: FlippedNSView {
 
     /// Responder for a drag gesture on the ``documentVisibleView``.
     var documentVisibleViewPanGesture: NSPanGestureRecognizer?
+    var contentViewHeightConstraint: NSLayoutConstraint?
 
     /// The layout manager that uses the ``lineRenderer`` to render and layout lines.
     var layoutManager: TextLayoutManager?
@@ -162,6 +165,8 @@ public class MinimapView: FlippedNSView {
     // MARK: - Constraints
 
     private func setUpConstraints() {
+        let contentViewHeightConstraint = contentView.heightAnchor.constraint(equalToConstant: 1.0)
+        self.contentViewHeightConstraint = contentViewHeightConstraint
         NSLayoutConstraint.activate([
             // Constrain to all sides
             scrollView.topAnchor.constraint(equalTo: topAnchor),
@@ -172,6 +177,7 @@ public class MinimapView: FlippedNSView {
             // Scrolling, but match width
             contentView.leadingAnchor.constraint(equalTo: leadingAnchor),
             contentView.trailingAnchor.constraint(equalTo: trailingAnchor),
+            contentViewHeightConstraint,
 
             // Y position set manually
             documentVisibleView.leadingAnchor.constraint(equalTo: leadingAnchor),
@@ -272,7 +278,8 @@ public class MinimapView: FlippedNSView {
     /// cached height.
     func updateContentViewHeight() {
         guard let estimatedContentHeight = layoutManager?.estimatedHeight(),
-              let editorEstimatedHeight = textView?.layoutManager.estimatedHeight() else {
+              let editorEstimatedHeight = textView?.layoutManager.estimatedHeight(),
+              let contentViewHeightConstraint else {
             return
         }
         let overscrollAmount = textView?.overscrollAmount ?? 0.0
@@ -286,9 +293,12 @@ public class MinimapView: FlippedNSView {
         ).pixelAligned
 
         // Only update a frame if needed
-        if contentView.frame.height != newFrame.height && height.isFinite && height < (textView?.frame.height ?? 0.0) {
-            contentView.frame = newFrame
-            layout()
+        if contentViewHeightConstraint.constant != newFrame.height
+            && height.isFinite
+            && height < (textView?.frame.height ?? 0.0) {
+            contentViewHeightConstraint.constant = newFrame.height
+            contentViewHeightConstraint.isActive = true
+            updateConstraints()
         }
     }
 

Sources/CodeEditSourceEditor/Controller/TextViewController+LoadView.swift

@@ -36,6 +36,8 @@ final class TextViewControllerTests: XCTestCase {
         )
 
         controller.loadView()
+        controller.view.frame = NSRect(x: 0, y: 0, width: 1000, height: 1000)
+        controller.view.layoutSubtreeIfNeeded()
     }
 
     // MARK: Capture Names
@@ -445,14 +447,18 @@ final class TextViewControllerTests: XCTestCase {
     // MARK: - Minimap
 
     func test_minimapToggle() {
-        controller.view.frame = NSRect(x: 0, y: 0, width: 1000, height: 1000)
         XCTAssertFalse(controller.minimapView.isHidden)
+        XCTAssertEqual(controller.minimapView.frame.width, MinimapView.maxWidth)
+        XCTAssertEqual(controller.textViewInsets.right, MinimapView.maxWidth)
 
         controller.showMinimap = false
         XCTAssertTrue(controller.minimapView.isHidden)
+        XCTAssertEqual(controller.textViewInsets.right, 0)
 
         controller.showMinimap = true
         XCTAssertFalse(controller.minimapView.isHidden)
+        XCTAssertEqual(controller.minimapView.frame.width, MinimapView.maxWidth)
+        XCTAssertEqual(controller.textViewInsets.right, MinimapView.maxWidth)
     }
 }
 // swiftlint:enable all