- Refactor getPlainText (better handling of blank lines and lines with multiple markups) (#700)

lib/src/models/documents/nodes/line.dart

@@ -460,66 +460,53 @@ class Line extends Container<Leaf?> {
 
   /// Returns plain text within the specified text range.
   String getPlainText(int offset, int len) {
-    final res = _getPlainText(offset, len);
+    final plainText = StringBuffer();
-    if (res.length == 1) {
+    _getPlainText(offset, len, plainText);
-      final data = queryChild(offset, true);
+    return plainText.toString();
-      final text = res.single.item2;
-      return text == Embed.kObjectReplacementCharacter
-          ? ''
-          : text.substring(data.offset, data.offset + len);
-    }
-
-    final total = <String>[];
-    // Adjust first node
-    final firstNodeLen = res[1].item1;
-    var text = res[0].item2;
-    if (text != Embed.kObjectReplacementCharacter) {
-      total.add(text.substring(text.length - firstNodeLen));
   }
 
-    var middleNodesLen = 0;
+  int _getNodeText(Leaf node, StringBuffer buffer, int offset, int remaining) {
-    for (var i = 1; i < res.length - 1; i++) {
+    final text = node.toPlainText();
-      if (res[i].item2 != Embed.kObjectReplacementCharacter) {
+    if (text == Embed.kObjectReplacementCharacter) {
-        middleNodesLen += res[i].item1;
+      return remaining - node.length;
-        total.add(res[i].item2);
-      }
     }
 
-    // Adjust last node
+    final end = math.min(offset + remaining, text.length);
-    final lastNodeLen = len - middleNodesLen - res[res.length - 1].item1;
+    buffer.write(text.substring(offset, end));
-    text = res[res.length - 1].item2;
+    return remaining - (end - offset);
-    if (text != Embed.kObjectReplacementCharacter) {
-      total.add(text.substring(0, lastNodeLen));
-    }
-    return total.join();
   }
 
-  List<Tuple2<int, String>> _getPlainText(int offset, int len, {int beg = 0}) {
+  int _getPlainText(int offset, int len, StringBuffer plainText) {
-    final local = math.min(length - offset, len);
+    var _len = len;
-    final result = <Tuple2<int, String>>[];
-
     final data = queryChild(offset, true);
     var node = data.node as Leaf?;
-    if (node != null) {
+
-      var pos = node.length - data.offset;
+    while (_len > 0) {
-      result.add(Tuple2(beg, node.toPlainText()));
+      if (node == null) {
-      while (!node!.isLast && pos < local) {
+        // blank line
+        plainText.write('\n');
+        _len -= 1;
+      }
+      else {
+        _len = _getNodeText(node, plainText, offset, _len);
+
+        while (!node!.isLast && _len > 0) {
           node = node.next as Leaf;
-        result.add(Tuple2(pos + beg, node.toPlainText()));
+          _len = _getNodeText(node, plainText, 0, _len);
-        pos += node.length;
+        }
+
+        if (_len > 0) {
+          // end of this line
+          plainText.write('\n');
+          _len -= 1;
         }
       }
 
-    final remaining = len - local;
+      if (_len > 0) {
-    if (remaining > 0) {
+        _len = nextLine!._getPlainText(0, _len, plainText);
-      final lastElem = result[result.length - 1];
+      }
-      result
-        ..removeLast()
-        ..add(Tuple2(lastElem.item1, '${lastElem.item2}\n'));
-      final rest = nextLine!._getPlainText(0, remaining, beg: local);
-      result.addAll(rest);
     }
 
-    return result;
+    return _len;
   }
 }

lib/src/widgets/raw_editor.dart

@@ -904,9 +904,11 @@ class RawEditorState extends EditorState
 
     if (cause == SelectionChangedCause.toolbar) {
       bringIntoView(textEditingValue.selection.extent);
+      // on iOS, Safari does not hide the selection after copy
+      // however, most other iOS apps do as well as other platforms
+      // so we'll hide toolbar & selection after copy
       hideToolbar(false);
 
-      if (!Platform.isIOS) {
       // Collapse the selection and hide the toolbar and handles.
       userUpdateTextEditingValue(
         TextEditingValue(
@@ -918,7 +920,6 @@ class RawEditorState extends EditorState
       );
     }
   }
-  }
 
   /// Cut current selection to [Clipboard].
   @override
@@ -983,7 +984,11 @@ class RawEditorState extends EditorState
         ReplaceTextIntent(textEditingValue, data.text!, selection, cause));
 
     if (cause == SelectionChangedCause.toolbar) {
+      try {
+        // ignore exception when paste window is at end of document
         bringIntoView(textEditingValue.selection.extent);
+      }
+      catch(_){};
       hideToolbar();
     }
   }