Use usageBoundsForTextContainer to adjust view frame

krzyzanowskim · Oct 9, 2023 · 7771b9a · 7771b9a
1 parent 865b1ab
commit 7771b9a
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 16 deletions.
diff --git a/Package.swift b/Package.swift
@@ -36,6 +36,12 @@ let package = Package(
             dependencies: [
                 .target(name: "STTextView")
             ]
+        ),
+        .testTarget(
+            name: "STTextKitPlusTests",
+            dependencies: [
+                .target(name: "STTextKitPlus")
+            ]
         )
     ]
 )
diff --git a/Sources/STTextView/STTextView.swift b/Sources/STTextView/STTextView.swift
@@ -597,6 +597,7 @@ open class STTextView: NSView, NSTextInput, NSTextContent {
             // textCheckingController.didChangeSelectedRange()
         }
 
+
         usageBoundsForTextContainerObserver = textLayoutManager.observe(\.usageBoundsForTextContainer, options: [.new]) { [weak self] textLayoutManager, change in
             self?.needsUpdateConstraints = true
         }
@@ -975,24 +976,12 @@ open class STTextView: NSView, NSTextInput, NSTextContent {
         } else {
             let endLocation = textLayoutManager.documentRange.endLocation
             textLayoutManager.ensureLayout(for: NSTextRange(location: endLocation))
-            textLayoutManager.enumerateTextLayoutFragments(from: endLocation, options: [.reverse, .ensuresLayout, .ensuresExtraLineFragment]) { layoutFragment in
-                // at times, reported height is way above the final value for the document
-                // it result in "jumping" the scroller, as frame height grow and shrink
-                proposedHeight = max(proposedHeight, layoutFragment.layoutFragmentFrame.maxY)
-                return false // stop
-            }
+            proposedHeight = textLayoutManager.usageBoundsForTextContainer.height
         }
 
         var proposedWidth: CGFloat = viewportBounds.width
         if !textContainer.widthTracksTextView {
-            // TODO: if offset didn't change since last time, it is not necessary to relayout
-            // not necessarly need to layout whole thing, is's enough to enumerate over visible area
-            let startLocation = textLayoutManager.textViewportLayoutController.viewportRange?.location ?? textLayoutManager.documentRange.location
-            let endLocation = textLayoutManager.textViewportLayoutController.viewportRange?.endLocation ?? textLayoutManager.documentRange.endLocation
-            textLayoutManager.enumerateTextLayoutFragments(in: NSTextRange(location: startLocation, end: endLocation)!, options: [.ensuresLayout, .ensuresExtraLineFragment]) { layoutFragment in
-                proposedWidth = max(proposedWidth, layoutFragment.layoutFragmentFrame.maxX)
-                return true
-            }
+            proposedWidth = textLayoutManager.usageBoundsForTextContainer.width
         } else {
             proposedWidth = max(currentSize.width, proposedWidth)
         }
@@ -1004,7 +993,7 @@ open class STTextView: NSView, NSTextInput, NSTextContent {
     }
 
     // Update textContainer width to match textview width if track textview width
-    internal func updateTextContainerSizeIfNeeded() {
+    fileprivate func updateTextContainerSizeIfNeeded() {
         var proposedSize = textContainer.size
 
         if textContainer.widthTracksTextView, !textContainer.size.width.isAlmostEqual(to: visibleRect.width) {
@@ -1262,16 +1251,23 @@ open class STTextView: NSView, NSTextInput, NSTextContent {
 // MARK: - NSViewInvalidating
 
 private extension NSViewInvalidating where Self == NSView.Invalidations.InsertionPoint {
-
     static var insertionPoint: NSView.Invalidations.InsertionPoint {
         NSView.Invalidations.InsertionPoint()
     }
+}
 
+private extension NSViewInvalidating where Self == NSView.Invalidations.CursorRects {
     static var cursorRects: NSView.Invalidations.CursorRects {
         NSView.Invalidations.CursorRects()
     }
 }
 
+private extension NSViewInvalidating where Self == NSView.Invalidations.TextContainer {
+    static var textContainer: NSView.Invalidations.TextContainer {
+        NSView.Invalidations.TextContainer()
+    }
+}
+
 private extension NSView.Invalidations {
 
     struct InsertionPoint: NSViewInvalidating {
@@ -1292,4 +1288,16 @@ private extension NSView.Invalidations {
         }
     }
 
+    struct TextContainer: NSViewInvalidating {
+
+        func invalidate(view: NSView) {
+            guard let textView = view as? STTextView else {
+                return
+            }
+
+            textView.updateTextContainerSizeIfNeeded()
+        }
+
+    }
+
 }
diff --git a/Tests/STTextKitPlusTests/TextLayoutManagerTests.swift b/Tests/STTextKitPlusTests/TextLayoutManagerTests.swift
@@ -0,0 +1,6 @@
+import XCTest
+@testable import STTextView
+
+class TextLayoutManagerTests : XCTestCase {
+    //
+}