Move to Under Scroller, Performance Improvements

Author: thecoolwinter

Package.swift

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

Sources/CodeEditSourceEditor/Controller/EditorContainerView.swift

@@ -29,10 +29,9 @@ extension TextViewController {
         )
 
         minimapView = MinimapView(textView: textView, theme: theme)
+        scrollView.addFloatingSubview(minimapView, for: .vertical)
 
-        editorContainer = EditorContainerView(scrollView: scrollView, minimapView: minimapView)
-
-        let findViewController = FindViewController(target: self, childView: editorContainer)
+        let findViewController = FindViewController(target: self, childView: scrollView)
         addChild(findViewController)
         self.findViewController = findViewController
         self.view.addSubview(findViewController.view)
@@ -51,17 +50,11 @@ extension TextViewController {
         setUpHighlighter()
         setUpTextFormation()
 
-        NSLayoutConstraint.activate([
-            findViewController.view.leadingAnchor.constraint(equalTo: view.leadingAnchor),
-            findViewController.view.trailingAnchor.constraint(equalTo: view.trailingAnchor),
-            findViewController.view.topAnchor.constraint(equalTo: view.topAnchor),
-            findViewController.view.bottomAnchor.constraint(equalTo: view.bottomAnchor),
-        ])
-
         if !cursorPositions.isEmpty {
             setCursorPositions(cursorPositions)
         }
 
+        setUpConstraints()
         setUpListeners()
 
         textView.updateFrameIfNeeded()
@@ -72,15 +65,45 @@ extension TextViewController {
         setUpKeyBindings(eventMonitor: &self.localEvenMonitor)
     }
 
+    func setUpConstraints() {
+        guard let findViewController else { return }
+
+        let maxWidthConstraint = minimapView.widthAnchor.constraint(lessThanOrEqualToConstant: 150)
+        let relativeWidthConstraint = minimapView.widthAnchor.constraint(
+            equalTo: view.widthAnchor,
+            multiplier: 0.17
+        )
+        relativeWidthConstraint.priority = .defaultLow
+        let minimapXConstraint = minimapView.trailingAnchor.constraint(
+            equalTo: scrollView.contentView.safeAreaLayoutGuide.trailingAnchor
+        )
+        self.minimapXConstraint = minimapXConstraint
+
+        NSLayoutConstraint.activate([
+            findViewController.view.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+            findViewController.view.trailingAnchor.constraint(equalTo: view.trailingAnchor),
+            findViewController.view.topAnchor.constraint(equalTo: view.topAnchor),
+            findViewController.view.bottomAnchor.constraint(equalTo: view.bottomAnchor),
+
+            minimapView.topAnchor.constraint(equalTo: scrollView.contentView.safeAreaLayoutGuide.topAnchor),
+            minimapView.bottomAnchor.constraint(equalTo: scrollView.contentView.safeAreaLayoutGuide.bottomAnchor),
+            minimapXConstraint,
+            maxWidthConstraint,
+            relativeWidthConstraint,
+        ])
+    }
+
     func setUpListeners() {
         // Layout on scroll change
         NotificationCenter.default.addObserver(
             forName: NSView.boundsDidChangeNotification,
             object: scrollView.contentView,
             queue: .main
-        ) { [weak self] _ in
+        ) { [weak self] notification in
+            guard let clipView = notification.object as? NSClipView else { return }
             self?.textView.updatedViewport(self?.scrollView.documentVisibleRect ?? .zero)
             self?.gutterView.needsDisplay = true
+            self?.minimapXConstraint?.constant = clipView.bounds.origin.x
         }
 
         // Layout on frame change

Sources/CodeEditSourceEditor/Controller/TextViewController+LoadView.swift

@@ -67,6 +67,8 @@ extension TextViewController {
         scrollView.hasVerticalScroller = true
         scrollView.hasHorizontalScroller = !wrapLines
 
+        scrollView.scrollerStyle = .overlay
+
         updateContentInsets()
     }
 

Sources/CodeEditSourceEditor/Controller/TextViewController+StyleViews.swift

@@ -22,19 +22,18 @@ public class TextViewController: NSViewController {
 
     weak var findViewController: FindViewController?
 
-    // Container view for the editor contents (scrolling textview, gutter, and minimap)
-    // Is a child of the find container, so editor contents all move below the find panel when open.
-    var editorContainer: EditorContainerView!
     var scrollView: NSScrollView!
     var textView: TextView!
     var gutterView: GutterView!
     var minimapView: MinimapView!
 
-    internal var _undoManager: CEUndoManager!
-    internal var systemAppearance: NSAppearance.Name?
+    var minimapXConstraint: NSLayoutConstraint?
 
-    package var localEvenMonitor: Any?
-    package var isPostingCursorNotification: Bool = false
+    var _undoManager: CEUndoManager!
+    var systemAppearance: NSAppearance.Name?
+
+    var localEvenMonitor: Any?
+    var isPostingCursorNotification: Bool = false
 
     /// The string contents.
     public var string: String {
@@ -100,6 +99,7 @@ public class TextViewController: NSViewController {
     public var wrapLines: Bool {
         didSet {
             textView.layoutManager.wrapLines = wrapLines
+            minimapView.layoutManager?.wrapLines = wrapLines
             scrollView.hasHorizontalScroller = !wrapLines
             textView.textInsets = textViewInsets
         }
@@ -127,7 +127,7 @@ public class TextViewController: NSViewController {
     /// Optional insets to offset the text view and find panel in the scroll view by.
     public var contentInsets: NSEdgeInsets? {
         didSet {
-            styleScrollView()
+            updateContentInsets()
             findViewController?.topPadding = contentInsets?.top
         }
     }

Sources/CodeEditSourceEditor/Controller/TextViewController.swift

@@ -0,0 +1,20 @@
+//
+//  NSScrollView+percentScrolled.swift
+//  CodeEditSourceEditor
+//
+//  Created by Khan Winter on 4/15/25.
+//
+
+import AppKit
+
+extension NSScrollView {
+    var documentMaxOriginY: CGFloat {
+        let totalHeight = (documentView?.frame.height ?? 0.0) + contentInsets.top
+        return totalHeight - (documentVisibleRect.height - contentInsets.top)
+    }
+
+    var percentScrolled: CGFloat {
+        let currentYPos = documentVisibleRect.origin.y + contentInsets.top
+        return currentYPos / documentMaxOriginY
+    }
+}

Sources/CodeEditSourceEditor/Extensions/NSScrollView+percentScrolled.swift

@@ -7,41 +7,15 @@
 
 import AppKit
 
-extension NSScrollView {
-    var percentScrolled: CGFloat {
-        get {
-            let currentYPos = documentVisibleRect.origin.y + contentInsets.top
-            let totalHeight = (documentView?.frame.height ?? 0.0) + contentInsets.top
-            let goalYPos = totalHeight - (documentVisibleRect.height - contentInsets.top)
-
-            return currentYPos / goalYPos
-        }
-        set {
-            let totalHeight = (documentView?.frame.height ?? 0.0) + contentInsets.top
-            contentView.scroll(
-                to: NSPoint(
-                    x: contentView.frame.origin.x,
-                    y: (newValue * (totalHeight - (documentVisibleRect.height - contentInsets.top))) - contentInsets.top
-                )
-            )
-            reflectScrolledClipView(contentView)
-        }
-    }
-}
-
 extension MinimapView {
     func updateDocumentVisibleViewPosition() {
         guard let textView = textView, let editorScrollView = textView.enclosingScrollView, let layoutManager else {
             return
         }
 
-        let minimapHeight = contentView.frame.height
-        let editorHeight = textView.frame.height
-        let editorToMinimapHeightRatio = minimapHeight / editorHeight
-
-        let containerHeight = editorScrollView.visibleRect.height - editorScrollView.contentInsets.vertical
         let availableHeight = min(minimapHeight, containerHeight)
         let scrollPercentage = editorScrollView.percentScrolled
+        guard scrollPercentage.isFinite else { return }
 
         // Update Visible Pane, should scroll down slowly as the user scrolls the document, following the scroller.
         // Visible pane's height   = scrollview visible height * (minimap line height / editor line height)
@@ -57,9 +31,23 @@ extension MinimapView {
 
         // Minimap scroll offset slowly scrolls down with the visible pane.
         if minimapHeight > containerHeight {
-            scrollView.percentScrolled = scrollPercentage
+            setScrollViewPosition(scrollPercentage: scrollPercentage)
         }
 
         layoutManager.layoutLines()
     }
+
+    private func setScrollViewPosition(scrollPercentage: CGFloat) {
+        let totalHeight = contentView.frame.height + scrollView.contentInsets.top
+        let topInset = scrollView.contentInsets.top
+        scrollView.contentView.scroll(
+            to: NSPoint(
+                x: scrollView.contentView.frame.origin.x,
+                y: (
+                    scrollPercentage * (totalHeight - (scrollView.documentVisibleRect.height - topInset))
+                ) - topInset
+            )
+        )
+        scrollView.reflectScrolledClipView(scrollView.contentView)
+    }
 }