Merge pull request #131 from danielsaidi/bugfix/paragraphs

Fix rich text alignment bugs
danielsaidi · Jan 24, 2024 · 2f2acee · 2f2acee
2 parents b410667 + 9a8b7ac
commit 2f2acee
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/Sources/RichTextKit/Attributes/RichTextAttributeWriter+Alignment.swift b/Sources/RichTextKit/Attributes/RichTextAttributeWriter+Alignment.swift
@@ -27,21 +27,23 @@ public extension RichTextAttributeWriter {
         _ alignment: RichTextAlignment,
         at range: NSRange
     ) {
-        let text = richText.string
-
-        // Text view has selected text
-        if range.length > 0 {
-            return setAlignment(alignment, at: range)
+        guard range.length == 0 else {
+            setAlignment(alignment, at: range)
+            return
         }
 
+        let text = richText.string
+
         // The cursor is at the beginning of the text
         if range.location == 0 {
             return setAlignment(alignment, atIndex: 0)
         }
 
         // The cursor is immediately after a newline
         if let char = text.character(at: range.location - 1), char.isNewLineSeparator {
-            return setAlignment(alignment, atIndex: range.location)
+            // We dont want to set attributed string to previous line,
+            // isNewLineSeparator is unfortunately omitted by API.
+            return
         }
 
         // The cursor is immediately before a newline
@@ -55,6 +57,7 @@ public extension RichTextAttributeWriter {
         let location = UInt(range.location)
         let index = text.findIndexOfCurrentParagraph(from: location)
         return setAlignment(alignment, atIndex: index)
+
     }
 }
 
@@ -85,7 +88,7 @@ private extension RichTextAttributeWriter {
         _ alignment: RichTextAlignment,
         atIndex index: Int
     ) {
-        guard let text = mutableRichText else { return }
+        guard let text = mutableRichText, !text.string.isEmpty else { return }
         let range = NSRange(location: index, length: 1)
         let safeRange = safeRange(for: range, isAttributeOperation: true)
         var attributes = text.attributes(at: safeRange.location, effectiveRange: nil)

diff --git a/Sources/RichTextKit/Component/RichTextViewComponent+Alignment.swift b/Sources/RichTextKit/Component/RichTextViewComponent+Alignment.swift
@@ -33,12 +33,13 @@ public extension RichTextViewComponent {
         _ alignment: RichTextAlignment
     ) {
         if richTextAlignment == alignment { return }
-        if !hasTrimmedText {
+        if !hasTrimmedText || !hasSelectedRange {
             let style = NSMutableParagraphStyle()
             style.alignment = alignment.nativeAlignment
             var attributes = richTextAttributes
             attributes[.paragraphStyle] = style
             typingAttributes = attributes
+            setRichTextAlignment(alignment, at: selectedRange)
         } else {
             setRichTextAlignment(alignment, at: selectedRange)
         }

diff --git a/Sources/RichTextKit/Extensions/String+Paragraph.swift b/Sources/RichTextKit/Extensions/String+Paragraph.swift
@@ -59,7 +59,7 @@ public extension String {
      after the newline char, not the newline itself.
      */
 
-    func findIndexOfNextParagraphOrEndofCurrent(from location: UInt) -> UInt {
+    func findIndexOfNextParagraphOrEndOfCurrent(from location: UInt) -> UInt {
         var index = location
         repeat {
             guard let char = character(at: index) else { break }
@@ -80,7 +80,7 @@ public extension String {
     func findLengthOfCurrentParagraph(from location: UInt) -> Int {
         if isEmpty { return 0 }
         let startIndex = findIndexOfCurrentParagraph(from: location)
-        let endIndex = findIndexOfNextParagraphOrEndofCurrent(from: location)
+        let endIndex = findIndexOfNextParagraphOrEndOfCurrent(from: location)
         return Int(endIndex)-Int(startIndex)
     }