Revert back

danielsaidi · Feb 22, 2024 · f525669 · f525669
1 parent a836467
commit f525669
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 12 deletions.
diff --git a/Sources/RichTextKit/Component/RichTextViewComponent+Alignment.swift b/Sources/RichTextKit/Component/RichTextViewComponent+Alignment.swift
@@ -15,7 +15,11 @@ import AppKit
 #endif
 
 public extension RichTextViewComponent {
-
+    public var richTextAlignment: RichTextAlignment? {
+        guard let style = richTextParagraphStyle else { return nil }
+        return RichTextAlignment(style.alignment)
+    }
+
     /// Set the text alignment.
     func setRichTextAlignment(_ alignment: RichTextAlignment) {
         if richTextAlignment == alignment { return }

diff --git a/Sources/RichTextKit/Component/RichTextViewComponent+Paragraph.swift b/Sources/RichTextKit/Component/RichTextViewComponent+Paragraph.swift
@@ -19,8 +19,11 @@ import AppKit
 public extension RichTextViewComponent {
 
     /// Get the paragraph style.
-    var richTextParagraphStyle: NSMutableParagraphStyle? {
-        richTextAttribute(.paragraphStyle)
+    /// We need to get paragraph style from text storage because attributed string
+    /// doesn't inherit those attributes from storage. It simply doesnt mirror.
+    /// Appears like a bug on Apples side.
+    public var richTextParagraphStyle: NSMutableParagraphStyle? {
+        textStorageWrapper?.richTextParagraphStyle(at: selectedRange)
     }
 
     /// Set the paragraph style.
@@ -29,8 +32,6 @@ public extension RichTextViewComponent {
     /// selected paragraphs. If many paragraphs are selected,
     /// it will only affect the first one.
     func setRichTextParagraphStyle(_ style: NSParagraphStyle) {
-        defer { richTextAlignment = RichTextAlignment(style.alignment) }
-
         let range: NSRange
         if multipleSelectedLines() {
             range = safeRange(for: selectedRange)

diff --git a/Sources/RichTextKit/Component/RichTextViewComponent.swift b/Sources/RichTextKit/Component/RichTextViewComponent.swift
@@ -62,7 +62,7 @@ public protocol RichTextViewComponent: AnyObject,
     var mutableAttributedString: NSMutableAttributedString? { get }
 
     /// Get the text alignment.
-    var richTextAlignment: RichTextAlignment? { get set }
+    var richTextAlignment: RichTextAlignment? { get }
 
     /// The spacing between the text view's edge and its text.
     var textContentInset: CGSize { get set }

diff --git a/Sources/RichTextKit/RichTextView_AppKit.swift b/Sources/RichTextKit/RichTextView_AppKit.swift
@@ -39,9 +39,6 @@ open class RichTextView: NSTextView, RichTextViewComponent {
     /// The image configuration to use by the rich text view.
     public var imageConfiguration: RichTextImageConfiguration = .disabled
 
-    /// Get the text alignment.
-    public var richTextAlignment: RichTextAlignment?
-
     // MARK: - Overrides
 
     /// Paste the current pasteboard content into the view.

diff --git a/Sources/RichTextKit/RichTextView_UIKit.swift b/Sources/RichTextKit/RichTextView_UIKit.swift
@@ -101,9 +101,6 @@ open class RichTextView: UITextView, RichTextViewComponent {
     /// Keeps track of the data format used by the view.
     private var richTextDataFormat: RichTextDataFormat = .archivedData
 
-    /// Get the text alignment.
-    public var richTextAlignment: RichTextAlignment?
-
     // MARK: - Overrides
 
     /**