minor refactor. use default paragraph

krzyzanowskim · Aug 21, 2024 · 6cb3374 · 6cb3374
1 parent 153665b
commit 6cb3374
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/Sources/STTextViewAppKit/STTextLayoutFragment.swift b/Sources/STTextViewAppKit/STTextLayoutFragment.swift
@@ -5,16 +5,16 @@ import AppKit
 import STObjCLandShim
 
 final class STTextLayoutFragment: NSTextLayoutFragment {
-    private let paragraphStyle: NSParagraphStyle
+    private let defaultParagraphStyle: NSParagraphStyle
     var showsInvisibleCharacters: Bool = false
 
     init(textElement: NSTextElement, range rangeInElement: NSTextRange?, paragraphStyle: NSParagraphStyle) {
-        self.paragraphStyle = paragraphStyle
+        self.defaultParagraphStyle = paragraphStyle
         super.init(textElement: textElement, range: rangeInElement)
     }
 
     required init?(coder: NSCoder) {
-        self.paragraphStyle = NSParagraphStyle.default
+        self.defaultParagraphStyle = NSParagraphStyle.default
         self.showsInvisibleCharacters = false
         super.init(coder: coder)
     }
@@ -63,7 +63,7 @@ final class STTextLayoutFragment: NSTextLayoutFragment {
             {
                 paragraphStyle = lineParagraphStyle
             } else {
-                paragraphStyle = self.paragraphStyle
+                paragraphStyle = self.defaultParagraphStyle
             }
 
             if !paragraphStyle.lineHeightMultiple.isAlmostZero() {

diff --git a/Sources/STTextViewAppKit/STTextView+NSTextLayoutManagerDelegate.swift b/Sources/STTextViewAppKit/STTextView+NSTextLayoutManagerDelegate.swift
@@ -9,7 +9,7 @@ extension STTextView: NSTextLayoutManagerDelegate {
         let textLayoutFragment = STTextLayoutFragment(
             textElement: textElement,
             range: textElement.elementRange,
-            paragraphStyle: typingAttributes[.paragraphStyle] as? NSParagraphStyle ?? .default
+            paragraphStyle: _defaultTypingAttributes[.paragraphStyle] as? NSParagraphStyle ?? .default
         )
         return textLayoutFragment
     }

diff --git a/Sources/STTextViewAppKit/STTextView.swift b/Sources/STTextViewAppKit/STTextView.swift
@@ -128,7 +128,7 @@ import AVFoundation
     }
 
     /// Default typing attributes used in place of missing attributes of font, color and paragraph
-    private var _defaultTypingAttributes: [NSAttributedString.Key: Any]
+    internal var _defaultTypingAttributes: [NSAttributedString.Key: Any]
 
     /// The attributes to apply to new text that the user enters.
     ///

diff --git a/Sources/STTextViewUIKit/STTextLayoutFragment.swift b/Sources/STTextViewUIKit/STTextLayoutFragment.swift
@@ -5,16 +5,16 @@ import UIKit
 import STObjCLandShim
 
 final class STTextLayoutFragment: NSTextLayoutFragment {
-    private let paragraphStyle: NSParagraphStyle
+    private let defaultParagraphStyle: NSParagraphStyle
     var showsInvisibleCharacters: Bool = false
 
     init(textElement: NSTextElement, range rangeInElement: NSTextRange?, paragraphStyle: NSParagraphStyle) {
-        self.paragraphStyle = paragraphStyle
+        self.defaultParagraphStyle = paragraphStyle
         super.init(textElement: textElement, range: rangeInElement)
     }
 
     required init?(coder: NSCoder) {
-        self.paragraphStyle = NSParagraphStyle.default
+        self.defaultParagraphStyle = NSParagraphStyle.default
         self.showsInvisibleCharacters = false
         super.init(coder: coder)
     }
@@ -64,7 +64,7 @@ final class STTextLayoutFragment: NSTextLayoutFragment {
             {
                 paragraphStyle = lineParagraphStyle
             } else {
-                paragraphStyle = self.paragraphStyle
+                paragraphStyle = self.defaultParagraphStyle
             }
 
             if !paragraphStyle.lineHeightMultiple.isAlmostZero() {

diff --git a/Sources/STTextViewUIKit/STTextView+NSTextLayoutManagerDelegate.swift b/Sources/STTextViewUIKit/STTextView+NSTextLayoutManagerDelegate.swift
@@ -9,7 +9,7 @@ extension STTextView: NSTextLayoutManagerDelegate {
         STTextLayoutFragment(
             textElement: textElement,
             range: textElement.elementRange,
-            paragraphStyle: typingAttributes[.paragraphStyle] as? NSParagraphStyle ?? .default
+            paragraphStyle: _defaultTypingAttributes[.paragraphStyle] as? NSParagraphStyle ?? .default
         )
     }
 }
diff --git a/Sources/STTextViewUIKit/STTextView.swift b/Sources/STTextViewUIKit/STTextView.swift
@@ -312,7 +312,7 @@ import STTextViewCommon
     }
 
     /// Default typing attributes used in place of missing attributes of font, color and paragraph
-    private var _defaultTypingAttributes: [NSAttributedString.Key: Any]
+    internal var _defaultTypingAttributes: [NSAttributedString.Key: Any]
 
     /// The attributes to apply to new text that the user enters.
     ///