Upgrade to 2.8 (singerdmx#519)

Author: singerdmx

lib/src/utils/diff_delta.dart

@@ -2,35 +2,6 @@ import 'dart:math' as math;
 
 import '../models/quill_delta.dart';
 
-const Set<int> WHITE_SPACE = {
-  0x9,
-  0xA,
-  0xB,
-  0xC,
-  0xD,
-  0x1C,
-  0x1D,
-  0x1E,
-  0x1F,
-  0x20,
-  0xA0,
-  0x1680,
-  0x2000,
-  0x2001,
-  0x2002,
-  0x2003,
-  0x2004,
-  0x2005,
-  0x2006,
-  0x2007,
-  0x2008,
-  0x2009,
-  0x200A,
-  0x202F,
-  0x205F,
-  0x3000
-};
-
 // Diff between two texts - old text and new text
 class Diff {
   Diff(this.start, this.deleted, this.inserted);

lib/src/widgets/editor.dart

@@ -47,13 +47,10 @@ const linkPrefixes = [
   'http'
 ];
 
-abstract class EditorState extends State<RawEditor> {
+abstract class EditorState extends State<RawEditor>
+    implements TextSelectionDelegate {
   ScrollController get scrollController;
 
-  TextEditingValue getTextEditingValue();
-
-  void setTextEditingValue(TextEditingValue value, SelectionChangedCause cause);
-
   RenderEditor? getRenderEditor();
 
   EditorTextSelectionOverlay? getSelectionOverlay();
@@ -64,15 +61,11 @@ abstract class EditorState extends State<RawEditor> {
 
   bool showToolbar();
 
-  void hideToolbar();
-
   void requestKeyboard();
-
-  bool get readOnly;
 }
 
 /// Base interface for editable render objects.
-abstract class RenderAbstractEditor {
+abstract class RenderAbstractEditor implements TextLayoutMetrics {
   TextSelection selectWordAtPosition(TextPosition position);
 
   TextSelection selectLineAtPosition(TextPosition position);
@@ -684,6 +677,7 @@ const EdgeInsets _kFloatingCaretSizeIncrease =
     EdgeInsets.symmetric(horizontal: 0.5, vertical: 1);
 
 class RenderEditor extends RenderEditableContainerBox
+    with RelayoutWhenSystemFontsChangeMixin
     implements RenderAbstractEditor {
   RenderEditor(
       ViewportOffset? offset,
@@ -985,15 +979,8 @@ class RenderEditor extends RenderEditableContainerBox
 
   @override
   TextSelection selectWordAtPosition(TextPosition position) {
-    final child = childAtPosition(position);
-    final nodeOffset = child.getContainer().offset;
-    final localPosition = TextPosition(
-        offset: position.offset - nodeOffset, affinity: position.affinity);
-    final localWord = child.getWordBoundary(localPosition);
-    final word = TextRange(
-      start: localWord.start + nodeOffset,
-      end: localWord.end + nodeOffset,
-    );
+    final word = getWordBoundary(position);
+    // When long-pressing past the end of the text, we want a collapsed cursor.
     if (position.offset >= word.end) {
       return TextSelection.fromPosition(position);
     }
@@ -1002,16 +989,9 @@ class RenderEditor extends RenderEditableContainerBox
 
   @override
   TextSelection selectLineAtPosition(TextPosition position) {
-    final child = childAtPosition(position);
-    final nodeOffset = child.getContainer().offset;
-    final localPosition = TextPosition(
-        offset: position.offset - nodeOffset, affinity: position.affinity);
-    final localLineRange = child.getLineBoundary(localPosition);
-    final line = TextRange(
-      start: localLineRange.start + nodeOffset,
-      end: localLineRange.end + nodeOffset,
-    );
+    final line = getLineAtOffset(position);
 
+    // When long-pressing past the end of the text, we want a collapsed cursor.
     if (position.offset >= line.end) {
       return TextSelection.fromPosition(position);
     }
@@ -1266,7 +1246,126 @@ class RenderEditor extends RenderEditableContainerBox
     _floatingCursorPainter.paint(context.canvas);
   }
 
-// End floating cursor
+  // End floating cursor
+
+  // Start TextLayoutMetrics implementation
+
+  /// Return a [TextSelection] containing the line of the given [TextPosition].
+  @override
+  TextSelection getLineAtOffset(TextPosition position) {
+    final child = childAtPosition(position);
+    final nodeOffset = child.getContainer().offset;
+    final localPosition = TextPosition(
+        offset: position.offset - nodeOffset, affinity: position.affinity);
+    final localLineRange = child.getLineBoundary(localPosition);
+    final line = TextRange(
+      start: localLineRange.start + nodeOffset,
+      end: localLineRange.end + nodeOffset,
+    );
+    return TextSelection(baseOffset: line.start, extentOffset: line.end);
+  }
+
+  @override
+  TextRange getWordBoundary(TextPosition position) {
+    final child = childAtPosition(position);
+    final nodeOffset = child.getContainer().offset;
+    final localPosition = TextPosition(
+        offset: position.offset - nodeOffset, affinity: position.affinity);
+    final localWord = child.getWordBoundary(localPosition);
+    return TextRange(
+      start: localWord.start + nodeOffset,
+      end: localWord.end + nodeOffset,
+    );
+  }
+
+  /// Returns the TextPosition above the given offset into the text.
+  ///
+  /// If the offset is already on the first line, the offset of the first
+  /// character will be returned.
+  @override
+  TextPosition getTextPositionAbove(TextPosition position) {
+    final child = childAtPosition(position);
+    final localPosition = TextPosition(
+        offset: position.offset - child.getContainer().documentOffset);
+
+    var newPosition = child.getPositionAbove(localPosition);
+
+    if (newPosition == null) {
+      // There was no text above in the current child, check the direct
+      // sibling.
+      final sibling = childBefore(child);
+      if (sibling == null) {
+        // reached beginning of the document, move to the
+        // first character
+        newPosition = const TextPosition(offset: 0);
+      } else {
+        final caretOffset = child.getOffsetForCaret(localPosition);
+        final testPosition =
+            TextPosition(offset: sibling.getContainer().length - 1);
+        final testOffset = sibling.getOffsetForCaret(testPosition);
+        final finalOffset = Offset(caretOffset.dx, testOffset.dy);
+        final siblingPosition = sibling.getPositionForOffset(finalOffset);
+        newPosition = TextPosition(
+            offset:
+                sibling.getContainer().documentOffset + siblingPosition.offset);
+      }
+    } else {
+      newPosition = TextPosition(
+          offset: child.getContainer().documentOffset + newPosition.offset);
+    }
+    return newPosition;
+  }
+
+  /// Returns the TextPosition below the given offset into the text.
+  ///
+  /// If the offset is already on the last line, the offset of the last
+  /// character will be returned.
+  @override
+  TextPosition getTextPositionBelow(TextPosition position) {
+    final child = childAtPosition(position);
+    final localPosition = TextPosition(
+        offset: position.offset - child.getContainer().documentOffset);
+
+    var newPosition = child.getPositionBelow(localPosition);
+
+    if (newPosition == null) {
+      // There was no text above in the current child, check the direct
+      // sibling.
+      final sibling = childAfter(child);
+      if (sibling == null) {
+        // reached beginning of the document, move to the
+        // last character
+        newPosition = TextPosition(offset: document.length - 1);
+      } else {
+        final caretOffset = child.getOffsetForCaret(localPosition);
+        const testPosition = TextPosition(offset: 0);
+        final testOffset = sibling.getOffsetForCaret(testPosition);
+        final finalOffset = Offset(caretOffset.dx, testOffset.dy);
+        final siblingPosition = sibling.getPositionForOffset(finalOffset);
+        newPosition = TextPosition(
+            offset:
+                sibling.getContainer().documentOffset + siblingPosition.offset);
+      }
+    } else {
+      newPosition = TextPosition(
+          offset: child.getContainer().documentOffset + newPosition.offset);
+    }
+    return newPosition;
+  }
+
+  // End TextLayoutMetrics implementation
+
+  @override
+  void systemFontsDidChange() {
+    super.systemFontsDidChange();
+    markNeedsLayout();
+  }
+
+  void debugAssertLayoutUpToDate() {
+    // no-op?
+    // this assert was added by Flutter TextEditingActionTarge
+    // so we have to comply here.
+  }
 }
 
 class EditableContainerParentData