修复末尾属性设置错误带来的bug

rztime · Jan 23, 2024 · da0ed34 · da0ed34
1 parent 0f15557
commit da0ed34
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/RZRichTextView/Classes/AttributedStringRich.swift b/RZRichTextView/Classes/AttributedStringRich.swift
@@ -23,16 +23,22 @@ public extension RZRichTextBase where T : NSAttributedString {
         let all = self.allParapraghRange()
         var res: [NSRange] = []
         for (idx, tempRange) in all.enumerated() {
-            if idx == all.count - 1 {
+            if let _ = range.intersection(tempRange) {
+                res.append(tempRange)
+            } else if idx == all.count - 1 {
                 if range.location >= tempRange.location && range.location <= tempRange.rt.maxLength() {
                     res.append(tempRange)
+                } else if range.upperBound >= tempRange.location && range.upperBound <= tempRange.upperBound {
+                    res.append(tempRange)
                 }
             } else if range.location >= tempRange.rt.maxLength() {
 
             } else if range.location >= tempRange.location && range.location <= tempRange.rt.maxLength() {
                 res.append(tempRange)
             } else if range.location < tempRange.location && range.rt.maxLength() > tempRange.location {
                 res.append(tempRange)
+            } else if range.upperBound >= tempRange.location && range.upperBound <= tempRange.upperBound {
+                res.append(tempRange)
             }
         }
         return res

diff --git a/RZRichTextView/Classes/RZRichTextView.swift b/RZRichTextView/Classes/RZRichTextView.swift
@@ -549,7 +549,7 @@ public extension RZRichTextView {
                 self.typingAttributes = self.lastTexttypingAttributes
             }
         }
-        self.lastCursorIsEnd = self.selectedRange.location == self.textStorage.length
+        self.lastCursorIsEnd = self.selectedRange.location == self.textStorage.length || self.selectedRange.upperBound == self.textStorage.length
     }
     /// 获取真实的属性
     func getRealTypingAttributes() -> [NSAttributedString.Key: Any] {