Always insert text when calling insertText(_:) programmatically (#87)

* Always insert text when calling `insertText(_:)` programmatically * Remove trailing white space * Removes alwaysInsert Co-authored-by: Simon Støvring <mail@simonbs.dk>
simonbs · Jun 13, 2022 · 6133cae · 6133cae
1 parent 5e6f666
commit 6133cae
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Sources/Runestone/TextView/TextInput/TextInputView.swift b/Sources/Runestone/TextView/TextInput/TextInputView.swift
@@ -919,7 +919,9 @@ extension TextInputView {
 extension TextInputView {
     func insertText(_ text: String) {
         let preparedText = prepareTextForInsertion(text)
-        guard let selectedRange = markedRange ?? selectedRange, shouldChangeText(in: selectedRange, replacementText: preparedText) else {
+        // If there is no marked range or selected range then we fallback to appending text to the end of our string.
+        let selectedRange = markedRange ?? selectedRange ?? NSRange(location: stringView.string.length, length: 0)
+        guard shouldChangeText(in: selectedRange, replacementText: preparedText) else {
             return
         }
         // If we're inserting text then we can't have a marked range. However, UITextInput doesn't always clear the marked range

diff --git a/Sources/Runestone/TextView/TextView.swift b/Sources/Runestone/TextView/TextView.swift
@@ -715,8 +715,8 @@ public final class TextView: UIScrollView {
         textInputView.setLanguageMode(languageMode, completion: completion)
     }
 
-    /// Inserts text at the location of the caret.
-    /// - Parameter text: A text to insert.
+    /// Inserts text at the location of the caret or, if no selection or caret is present, at the end of the text.
+    /// - Parameter text: A string to insert.
     public func insertText(_ text: String) {
         textInputView.insertText(text)
         // Called in TextView since we only want to force the text selection view to update when editing text programmatically.