tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 'allow spaces when tagging' into release_1.10

Browse Source 
Daniel D’Aquino (1):
      Improve handling of escape characters of mention suggestion menu
This commit is contained in:
William Casarin
2024-08-28 12:16:12 +03:00
parent bfcb3e4c88 c67a75d740
commit c69ddd7241
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
damus/Views/TextViewWrapper.swift
View File

@@ -90,6 +90,7 @@ struct TextViewWrapper: UIViewRepresentable {
let updateCursorPosition: ((Int) -> Void) let updateCursorPosition: ((Int) -> Void)
let initialTextSuffix: String? let initialTextSuffix: String?
var initialTextSuffixWasAdded: Bool = false var initialTextSuffixWasAdded: Bool = false
static let ESCAPE_SEQUENCES = ["\n", "@", " ", ", ", ". ", "! ", "? ", "; "]
init(attributedText: Binding<NSMutableAttributedString>, init(attributedText: Binding<NSMutableAttributedString>,
getFocusWordForMention: ((String?, NSRange?) -> Void)?, getFocusWordForMention: ((String?, NSRange?) -> Void)?,
@@ -142,17 +143,27 @@ struct TextViewWrapper: UIViewRepresentable {
while startPosition != textView.beginningOfDocument { while startPosition != textView.beginningOfDocument {
guard let previousPosition = textView.position(from: startPosition, offset: -1), guard let previousPosition = textView.position(from: startPosition, offset: -1),
let range = textView.textRange(from: previousPosition, to: startPosition), let range = textView.textRange(from: previousPosition, to: position),
let text = textView.text(in: range), !text.isEmpty, let text = textView.text(in: range), !text.isEmpty else {
let lastChar = text.last else {
break
}
if [" ", "\n", "@"].contains(lastChar) {
break break
} }
startPosition = previousPosition startPosition = previousPosition
if let styling = textView.textStyling(at: previousPosition, in: .backward),
styling[NSAttributedString.Key.link] != nil {
break
}
var found_escape_sequence = false
for escape_sequence in Self.ESCAPE_SEQUENCES {
if text.contains(escape_sequence) {
startPosition = textView.position(from: startPosition, offset: escape_sequence.count) ?? startPosition
found_escape_sequence = true
break
}
}
if found_escape_sequence { break }
} }
return startPosition == position ? nil : textView.textRange(from: startPosition, to: position) return startPosition == position ? nil : textView.textRange(from: startPosition, to: position)