Text Editing Model Refactor (#86736)

Simplifying and refactoring parts of RenderEditable. Functionality is the same.

packages/flutter/lib/services.dart

@@ -44,3 +44,4 @@ export 'src/services/system_sound.dart';
 export 'src/services/text_editing.dart';
 export 'src/services/text_formatter.dart';
 export 'src/services/text_input.dart';
+export 'src/services/text_layout_metrics.dart';

packages/flutter/lib/src/painting/text_painter.dart

@@ -901,6 +901,7 @@ class TextPainter {
     return _paragraph!.getPositionForOffset(offset);
   }
 
+  /// {@template flutter.painting.TextPainter.getWordBoundary}
   /// Returns the text range of the word at the given offset. Characters not
   /// part of a word, such as spaces, symbols, and punctuation, have word breaks
   /// on both sides. In such cases, this method will return a text range that
@@ -908,6 +909,7 @@ class TextPainter {
   ///
   /// Word boundaries are defined more precisely in Unicode Standard Annex #29
   /// <http://www.unicode.org/reports/tr29/#Word_Boundaries>.
+  /// {@endtemplate}
   TextRange getWordBoundary(TextPosition position) {
     assert(!_needsLayout);
     return _paragraph!.getWordBoundary(position);

packages/flutter/lib/src/services/autofill.dart

@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-
 import 'package:flutter/foundation.dart';
 import 'text_input.dart';
 

packages/flutter/lib/src/services/text_editing.dart

@@ -144,4 +144,82 @@ class TextSelection extends TextRange {
       isDirectional: isDirectional ?? this.isDirectional,
     );
   }
+
+  /// Returns the smallest [TextSelection] that this could expand to in order to
+  /// include the given [TextPosition].
+  ///
+  /// If the given [TextPosition] is already inside of the selection, then
+  /// returns `this` without change.
+  ///
+  /// The returned selection will always be a strict superset of the current
+  /// selection. In other words, the selection grows to include the given
+  /// [TextPosition].
+  ///
+  /// If extentAtIndex is true, then the [TextSelection.extentOffset] will be
+  /// placed at the given index regardless of the original order of it and
+  /// [TextSelection.baseOffset]. Otherwise, their order will be preserved.
+  ///
+  /// ## Difference with [extendTo]
+  /// In contrast with this method, [extendTo] is a pivot; it holds
+  /// [TextSelection.baseOffset] fixed while moving [TextSelection.extentOffset]
+  /// to the given [TextPosition].  It doesn't strictly grow the selection and
+  /// may collapse it or flip its order.
+  TextSelection expandTo(TextPosition position, [bool extentAtIndex = false]) {
+    // If position is already within in the selection, there's nothing to do.
+    if (position.offset >= start && position.offset <= end) {
+      return this;
+    }
+
+    final bool normalized = baseOffset <= extentOffset;
+    if (position.offset <= start) {
+      // Here the position is somewhere before the selection: ..|..[...]....
+      if (extentAtIndex) {
+        return copyWith(
+          baseOffset: end,
+          extentOffset: position.offset,
+          affinity: position.affinity,
+        );
+      }
+      return copyWith(
+        baseOffset: normalized ? position.offset : baseOffset,
+        extentOffset: normalized ? extentOffset : position.offset,
+      );
+    }
+    // Here the position is somewhere after the selection: ....[...]..|..
+    if (extentAtIndex) {
+      return copyWith(
+        baseOffset: start,
+        extentOffset: position.offset,
+        affinity: position.affinity,
+      );
+    }
+    return copyWith(
+      baseOffset: normalized ? baseOffset : position.offset,
+      extentOffset: normalized ? position.offset : extentOffset,
+    );
+  }
+
+  /// Keeping the selection's [TextSelection.baseOffset] fixed, pivot the
+  /// [TextSelection.extentOffset] to the given [TextPosition].
+  ///
+  /// In some cases, the [TextSelection.baseOffset] and
+  /// [TextSelection.extentOffset] may flip during this operation, or the size
+  /// of the selection may shrink.
+  ///
+  /// ## Difference with [expandTo]
+  /// In contrast with this method, [expandTo] is strictly growth; the
+  /// selection is grown to include the given [TextPosition] and will never
+  /// shrink.
+  TextSelection extendTo(TextPosition position) {
+    // If the selection's extent is at the position already, then nothing
+    // happens.
+    if (extent == position) {
+      return this;
+    }
+
+    return copyWith(
+      extentOffset: position.offset,
+      affinity: position.affinity,
+    );
+  }
 }

packages/flutter/lib/src/services/text_input.dart

@@ -9,7 +9,6 @@ import 'dart:ui' show
   Offset,
   Size,
   Rect,
-  TextAffinity,
   TextAlign,
   TextDirection,
   hashValues;
@@ -17,7 +16,7 @@ import 'dart:ui' show
 import 'package:flutter/foundation.dart';
 import 'package:vector_math/vector_math_64.dart' show Matrix4;
 
-import '../../services.dart' show Clipboard, ClipboardData;
+import '../../services.dart' show Clipboard;
 import 'autofill.dart';
 import 'message_codec.dart';
 import 'platform_channel.dart';
@@ -738,19 +737,6 @@ class TextEditingValue {
     );
   }
 
-  /// Returns a representation of this object as a JSON object.
-  Map<String, dynamic> toJSON() {
-    return <String, dynamic>{
-      'text': text,
-      'selectionBase': selection.baseOffset,
-      'selectionExtent': selection.extentOffset,
-      'selectionAffinity': selection.affinity.toString(),
-      'selectionIsDirectional': selection.isDirectional,
-      'composingBase': composing.start,
-      'composingExtent': composing.end,
-    };
-  }
-
   /// The current text being edited.
   final String text;
 
@@ -787,6 +773,19 @@ class TextEditingValue {
   /// programming error.
   bool get isComposingRangeValid => composing.isValid && composing.isNormalized && composing.end <= text.length;
 
+  /// Returns a representation of this object as a JSON object.
+  Map<String, dynamic> toJSON() {
+    return <String, dynamic>{
+      'text': text,
+      'selectionBase': selection.baseOffset,
+      'selectionExtent': selection.extentOffset,
+      'selectionAffinity': selection.affinity.toString(),
+      'selectionIsDirectional': selection.isDirectional,
+      'composingBase': composing.start,
+      'composingExtent': composing.end,
+    };
+  }
+
   @override
   String toString() => '${objectRuntimeType(this, 'TextEditingValue')}(text: \u2524$text\u251C, selection: $selection, composing: $composing)';
 
@@ -902,27 +901,7 @@ mixin TextSelectionDelegate {
   ///
   /// If and only if [cause] is [SelectionChangedCause.toolbar], the toolbar
   /// will be hidden and the current selection will be scrolled into view.
-  void cutSelection(SelectionChangedCause cause) {
-    final TextSelection selection = textEditingValue.selection;
-    final String text = textEditingValue.text;
-    Clipboard.setData(ClipboardData(
-      text: selection.textInside(text),
-    ));
-    userUpdateTextEditingValue(
-      TextEditingValue(
-        text: selection.textBefore(text) + selection.textAfter(text),
-        selection: TextSelection.collapsed(
-          offset: selection.start,
-        ),
-      ),
-      cause,
-    );
-
-    if (cause == SelectionChangedCause.toolbar) {
-      bringIntoView(textEditingValue.selection.extent);
-      hideToolbar();
-    }
-  }
+  void cutSelection(SelectionChangedCause cause);
 
   /// Paste text from [Clipboard].
   ///
@@ -930,84 +909,19 @@ mixin TextSelectionDelegate {
   ///
   /// If and only if [cause] is [SelectionChangedCause.toolbar], the toolbar
   /// will be hidden and the current selection will be scrolled into view.
-  Future<void> pasteText(SelectionChangedCause cause) async {
-    final TextEditingValue value = textEditingValue;
-    // Snapshot the input before using `await`.
-    // See https://github.com/flutter/flutter/issues/11427
-    final ClipboardData? data = await Clipboard.getData(Clipboard.kTextPlain);
-    if (data != null) {
-      userUpdateTextEditingValue(
-        TextEditingValue(
-          text: value.selection.textBefore(value.text)
-              + data.text!
-              + value.selection.textAfter(value.text),
-          selection: TextSelection.collapsed(
-            offset: value.selection.start + data.text!.length,
-          ),
-        ),
-        cause,
-      );
-    }
-    if (cause == SelectionChangedCause.toolbar) {
-      bringIntoView(textEditingValue.selection.extent);
-      hideToolbar();
-    }
-  }
+  Future<void> pasteText(SelectionChangedCause cause);
 
   /// Set the current selection to contain the entire text value.
   ///
   /// If and only if [cause] is [SelectionChangedCause.toolbar], the selection
   /// will be scrolled into view.
-  void selectAll(SelectionChangedCause cause) {
-    userUpdateTextEditingValue(
-      TextEditingValue(
-        text: textEditingValue.text,
-        selection: textEditingValue.selection.copyWith(
-          baseOffset: 0,
-          extentOffset: textEditingValue.text.length,
-        ),
-      ),
-      cause,
-    );
-    if (cause == SelectionChangedCause.toolbar) {
-      bringIntoView(textEditingValue.selection.extent);
-    }
-  }
+  void selectAll(SelectionChangedCause cause);
 
   /// Copy current selection to [Clipboard].
   ///
   /// If [cause] is [SelectionChangedCause.toolbar], the position of
   /// [bringIntoView] to selection will be called and hide toolbar.
-  void copySelection(SelectionChangedCause cause) {
-    final TextEditingValue value = textEditingValue;
-    Clipboard.setData(ClipboardData(
-      text: value.selection.textInside(value.text),
-    ));
-
-    if (cause == SelectionChangedCause.toolbar) {
-      bringIntoView(textEditingValue.selection.extent);
-      hideToolbar(false);
-
-      switch (defaultTargetPlatform) {
-        case TargetPlatform.iOS:
-          break;
-        case TargetPlatform.macOS:
-        case TargetPlatform.android:
-        case TargetPlatform.fuchsia:
-        case TargetPlatform.linux:
-        case TargetPlatform.windows:
-          // Collapse the selection and hide the toolbar and handles.
-          userUpdateTextEditingValue(
-            TextEditingValue(
-              text: value.text,
-              selection: TextSelection.collapsed(offset: value.selection.end),
-            ),
-            cause,
-          );
-          break;
-      }
-    }
-  }
+  void copySelection(SelectionChangedCause cause);
 }
 
 /// An interface to receive information from [TextInput].

packages/flutter/lib/src/services/text_layout_metrics.dart

+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'text_editing.dart';
+
+/// A read-only interface for accessing visual information about the
+/// implementing text.
+abstract class TextLayoutMetrics {
+  // TODO(gspencergoog): replace when we expose this ICU information.
+  /// Check if the given code unit is a white space or separator
+  /// character.
+  ///
+  /// Includes newline characters from ASCII and separators from the
+  /// [unicode separator category](https://www.compart.com/en/unicode/category/Zs)
+  static bool isWhitespace(int codeUnit) {
+    switch (codeUnit) {
+      case 0x9: // horizontal tab
+      case 0xA: // line feed
+      case 0xB: // vertical tab
+      case 0xC: // form feed
+      case 0xD: // carriage return
+      case 0x1C: // file separator
+      case 0x1D: // group separator
+      case 0x1E: // record separator
+      case 0x1F: // unit separator
+      case 0x20: // space
+      case 0xA0: // no-break space
+      case 0x1680: // ogham space mark
+      case 0x2000: // en quad
+      case 0x2001: // em quad
+      case 0x2002: // en space
+      case 0x2003: // em space
+      case 0x2004: // three-per-em space
+      case 0x2005: // four-er-em space
+      case 0x2006: // six-per-em space
+      case 0x2007: // figure space
+      case 0x2008: // punctuation space
+      case 0x2009: // thin space
+      case 0x200A: // hair space
+      case 0x202F: // narrow no-break space
+      case 0x205F: // medium mathematical space
+      case 0x3000: // ideographic space
+        break;
+      default:
+        return false;
+    }
+    return true;
+  }
+
+  /// {@template flutter.services.TextLayoutMetrics.getLineAtOffset}
+  /// Return a [TextSelection] containing the line of the given [TextPosition].
+  /// {@endtemplate}
+  TextSelection getLineAtOffset(TextPosition position);
+
+  /// {@macro flutter.painting.TextPainter.getWordBoundary}
+  TextRange getWordBoundary(TextPosition position);
+
+  /// {@template flutter.services.TextLayoutMetrics.getTextPositionAbove}
+  /// Returns the TextPosition above the given offset into the text.
+  ///
+  /// If the offset is already on the first line, the given offset will be
+  /// returned.
+  /// {@endtemplate}
+  TextPosition getTextPositionAbove(TextPosition position);
+
+  /// {@template flutter.services.TextLayoutMetrics.getTextPositionBelow}
+  /// Returns the TextPosition below the given offset into the text.
+  ///
+  /// If the offset is already on the last line, the given offset will be
+  /// returned.
+  /// {@endtemplate}
+  TextPosition getTextPositionBelow(TextPosition position);
+}

packages/flutter/lib/src/widgets/editable_text.dart

@@ -28,7 +28,7 @@ import 'scroll_controller.dart';
 import 'scroll_physics.dart';
 import 'scrollable.dart';
 import 'text.dart';
-import 'text_editing_action.dart';
+import 'text_editing_action_target.dart';
 import 'text_selection.dart';
 import 'ticker_provider.dart';
 import 'widget_span.dart';
@@ -1453,7 +1453,7 @@ class EditableText extends StatefulWidget {
 }
 
 /// State for a [EditableText].
-class EditableTextState extends State<EditableText> with AutomaticKeepAliveClientMixin<EditableText>, WidgetsBindingObserver, TickerProviderStateMixin<EditableText>, TextSelectionDelegate implements TextInputClient, AutofillClient, TextEditingActionTarget {
+class EditableTextState extends State<EditableText> with AutomaticKeepAliveClientMixin<EditableText>, WidgetsBindingObserver, TickerProviderStateMixin<EditableText>, TextSelectionDelegate, TextEditingActionTarget implements TextInputClient, AutofillClient {
   Timer? _cursorTimer;
   bool _targetCursorVisibility = false;
   final ValueNotifier<bool> _cursorVisibilityNotifier = ValueNotifier<bool>(true);
@@ -1534,6 +1534,133 @@ class EditableTextState extends State<EditableText> with AutomaticKeepAliveClien
     });
   }
 
+  // Start TextEditingActionTarget.
+
+  @override
+  TextLayoutMetrics get textLayoutMetrics => renderEditable;
+
+  @override
+  bool get readOnly => widget.readOnly;
+
+  @override
+  bool get obscureText => widget.obscureText;
+
+  @override
+  bool get selectionEnabled => widget.selectionEnabled;
+
+  @override
+  void debugAssertLayoutUpToDate() => renderEditable.debugAssertLayoutUpToDate();
+
+  /// {@macro flutter.widgets.TextEditingActionTarget.setSelection}
+  @override
+  void setSelection(TextSelection nextSelection, SelectionChangedCause cause) {
+    if (nextSelection == textEditingValue.selection) {
+      return;
+    }
+    if (nextSelection.isValid) {
+      // The nextSelection is calculated based on _plainText, which can be out
+      // of sync with the textSelectionDelegate.textEditingValue by one frame.
+      // This is due to the render editable and editable text handle pointer
+      // event separately. If the editable text changes the text during the
+      // event handler, the render editable will use the outdated text stored in
+      // the _plainText when handling the pointer event.
+      //
+      // If this happens, we need to make sure the new selection is still valid.
+      final int textLength = textEditingValue.text.length;
+      nextSelection = nextSelection.copyWith(
+        baseOffset: math.min(nextSelection.baseOffset, textLength),
+        extentOffset: math.min(nextSelection.extentOffset, textLength),
+      );
+    }
+    _handleSelectionChange(nextSelection, cause);
+    return super.setSelection(nextSelection, cause);
+  }
+
+  /// {@macro flutter.widgets.TextEditingActionTarget.setTextEditingValue}
+  @override
+  void setTextEditingValue(TextEditingValue newValue, SelectionChangedCause cause) {
+    if (newValue == textEditingValue) {
+      return;
+    }
+    textEditingValue = newValue;
+    userUpdateTextEditingValue(newValue, cause);
+  }
+
+  /// {@macro flutter.widgets.TextEditingActionTarget.copySelection}
+  @override
+  void copySelection(SelectionChangedCause cause) {
+    super.copySelection(cause);
+    if (cause == SelectionChangedCause.toolbar) {
+      bringIntoView(textEditingValue.selection.extent);
+      hideToolbar(false);
+
+      switch (defaultTargetPlatform) {
+        case TargetPlatform.iOS:
+          break;
+        case TargetPlatform.macOS:
+        case TargetPlatform.android:
+        case TargetPlatform.fuchsia:
+        case TargetPlatform.linux:
+        case TargetPlatform.windows:
+          // Collapse the selection and hide the toolbar and handles.
+          userUpdateTextEditingValue(
+            TextEditingValue(
+              text: textEditingValue.text,
+              selection: TextSelection.collapsed(offset: textEditingValue.selection.end),
+            ),
+            SelectionChangedCause.toolbar,
+          );
+          break;
+      }
+    }
+  }
+
+  /// {@macro flutter.widgets.TextEditingActionTarget.cutSelection}
+  @override
+  void cutSelection(SelectionChangedCause cause) {
+    super.cutSelection(cause);
+    if (cause == SelectionChangedCause.toolbar) {
+      bringIntoView(textEditingValue.selection.extent);
+      hideToolbar();
+    }
+  }
+
+  /// {@macro flutter.widgets.TextEditingActionTarget.pasteText}
+  @override
+  Future<void> pasteText(SelectionChangedCause cause) async {
+    super.pasteText(cause);
+    if (cause == SelectionChangedCause.toolbar) {
+      bringIntoView(textEditingValue.selection.extent);
+      hideToolbar();
+    }
+  }
+
+  /// Select the entire text value.
+  @override
+  void selectAll(SelectionChangedCause cause) {
+    super.selectAll(cause);
+    if (cause == SelectionChangedCause.toolbar) {
+      bringIntoView(textEditingValue.selection.extent);
+    }
+  }
+
+  // End TextEditingActionTarget.
+
+  void _handleSelectionChange(
+    TextSelection nextSelection,
+    SelectionChangedCause cause,
+  ) {
+    // Changes made by the keyboard can sometimes be "out of band" for listening
+    // components, so always send those events, even if we didn't think it
+    // changed. Also, focusing an empty field is sent as a selection change even
+    // if the selection offset didn't change.
+    final bool focusingEmpty = nextSelection.baseOffset == 0 && nextSelection.extentOffset == 0 && !_hasFocus;
+    if (nextSelection == textEditingValue.selection && cause != SelectionChangedCause.keyboard && !focusingEmpty) {
+      return;
+    }
+    widget.onSelectionChanged?.call(nextSelection, cause);
+  }
+
   // State lifecycle:
 
   @override
@@ -2459,7 +2586,6 @@ class EditableTextState extends State<EditableText> with AutomaticKeepAliveClien
   ///
   /// This property is typically used to notify the renderer of input gestures
   /// when [RenderEditable.ignorePointer] is true.
-  @override
   RenderEditable get renderEditable => _editableKey.currentContext!.findRenderObject()! as RenderEditable;
 
   @override

packages/flutter/lib/src/widgets/text_editing_action.dart

@@ -2,30 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:flutter/rendering.dart' show RenderEditable;
-
 import 'actions.dart';
-import 'editable_text.dart';
 import 'focus_manager.dart';
 import 'framework.dart';
-
-/// The recipient of a [TextEditingAction].
-///
-/// TextEditingActions will only be enabled when an implementer of this class is
-/// focused.
-///
-/// See also:
-///
-///   * [EditableTextState], which implements this and is the most typical
-///     target of a TextEditingAction.
-abstract class TextEditingActionTarget {
-  /// The renderer that handles [TextEditingAction]s.
-  ///
-  /// See also:
-  ///
-  /// * [EditableTextState.renderEditable], which overrides this.
-  RenderEditable get renderEditable;
-}
+import 'text_editing_action_target.dart';
 
 /// An [Action] related to editing text.
 ///
@@ -50,12 +30,14 @@ abstract class TextEditingAction<T extends Intent> extends ContextAction<T> {
   @protected
   TextEditingActionTarget? get textEditingActionTarget {
     // If a TextEditingActionTarget is not focused, then ignore this action.
-    if (primaryFocus?.context == null
-        || primaryFocus!.context! is! StatefulElement
-        || ((primaryFocus!.context! as StatefulElement).state is! TextEditingActionTarget)) {
+    if (primaryFocus?.context == null ||
+        primaryFocus!.context! is! StatefulElement ||
+        ((primaryFocus!.context! as StatefulElement).state
+            is! TextEditingActionTarget)) {
       return null;
     }
-    return (primaryFocus!.context! as StatefulElement).state as TextEditingActionTarget;
+    return (primaryFocus!.context! as StatefulElement).state
+        as TextEditingActionTarget;
   }
 
   @override

packages/flutter/lib/src/widgets/text_selection.dart

@@ -239,6 +239,7 @@ abstract class TextSelectionControls {
   /// by the user.
   void handleSelectAll(TextSelectionDelegate delegate) {
     delegate.selectAll(SelectionChangedCause.toolbar);
+    delegate.bringIntoView(delegate.textEditingValue.selection.extent);
   }
 }
 

packages/flutter/lib/widgets.dart

@@ -121,6 +121,7 @@ export 'src/widgets/status_transitions.dart';
 export 'src/widgets/table.dart';
 export 'src/widgets/text.dart';
 export 'src/widgets/text_editing_action.dart';
+export 'src/widgets/text_editing_action_target.dart';
 export 'src/widgets/text_editing_intents.dart';
 export 'src/widgets/text_selection.dart';
 export 'src/widgets/text_selection_toolbar_layout_delegate.dart';

packages/flutter/test/cupertino/text_field_test.dart

@@ -262,7 +262,7 @@ void main() {
     await tester.tap(find.text('Paste'));
     await tester.pumpAndSettle();
     expect(controller.text, 'blah1 blah2blah1');
-    expect(controller.selection, const TextSelection(baseOffset: 16, extentOffset: 16));
+    expect(controller.selection, const TextSelection(baseOffset: 16, extentOffset: 16, affinity: TextAffinity.upstream));
 
     // Cut the first word.
     await gesture.down(midBlah1);

packages/flutter/test/material/text_field_test.dart

@@ -267,7 +267,7 @@ void main() {
     await tester.tap(find.text('Paste'));
     await tester.pumpAndSettle();
     expect(controller.text, 'blah1 blah2blah1');
-    expect(controller.selection, const TextSelection(baseOffset: 16, extentOffset: 16));
+    expect(controller.selection, const TextSelection(baseOffset: 16, extentOffset: 16, affinity: TextAffinity.upstream));
 
     // Cut the first word.
     await gesture.down(midBlah1);
@@ -642,7 +642,7 @@ void main() {
       actualNewValue,
       const TextEditingValue(
         text: '12',
-        selection: TextSelection.collapsed(offset: 2),
+        selection: TextSelection.collapsed(offset: 2, affinity: TextAffinity.downstream),
       ),
     );
   }, skip: areKeyEventsHandledByPlatform); // [intended] only applies to platforms where we handle key events.
@@ -1266,7 +1266,6 @@ void main() {
     expect(handle.opacity.value, equals(1.0));
   });
 
-
   testWidgets('Long pressing a field with selection 0,0 shows the selection menu', (WidgetTester tester) async {
     await tester.pumpWidget(overlay(
       child: TextField(

packages/flutter/test/material/text_form_field_test.dart

@@ -81,7 +81,7 @@ void main() {
     await tester.tap(find.text('Paste'));
     await tester.pumpAndSettle();
     expect(controller.text, 'blah1 blah2blah1');
-    expect(controller.selection, const TextSelection(baseOffset: 16, extentOffset: 16));
+    expect(controller.selection, const TextSelection(baseOffset: 16, extentOffset: 16, affinity: TextAffinity.upstream));
 
     // Cut the first word.
     await gesture.down(midBlah1);

packages/flutter/test/widgets/editable_text_test.dart

@@ -4693,7 +4693,7 @@ void main() {
       equals(
         const TextSelection.collapsed(
           offset: 0,
-          affinity: TextAffinity.downstream,
+          affinity: TextAffinity.upstream,
         ),
       ),
       reason: 'on $platform',
@@ -4764,7 +4764,7 @@ void main() {
         const TextSelection(
           baseOffset: testText.length,
           extentOffset: 0,
-          affinity: TextAffinity.downstream,
+          affinity: TextAffinity.upstream,
         ),
       ),
       reason: 'on $platform',
@@ -4786,7 +4786,7 @@ void main() {
       equals(
         const TextSelection.collapsed(
           offset: 0,
-          affinity: TextAffinity.downstream,
+          affinity: TextAffinity.upstream,
         ),
       ),
       reason: 'on $platform',
@@ -4810,7 +4810,7 @@ void main() {
         const TextSelection(
           baseOffset: 10,
           extentOffset: 10,
-          affinity: TextAffinity.downstream,
+          affinity: TextAffinity.upstream,
         ),
       ),
       reason: 'on $platform',
@@ -4834,7 +4834,7 @@ void main() {
         const TextSelection(
           baseOffset: 10,
           extentOffset: 7,
-          affinity: TextAffinity.downstream,
+          affinity: TextAffinity.upstream,
         ),
       ),
       reason: 'on $platform',
@@ -4857,7 +4857,7 @@ void main() {
         const TextSelection(
           baseOffset: 10,
           extentOffset: 4,
-          affinity: TextAffinity.downstream,
+          affinity: TextAffinity.upstream,
         ),
       ),
       reason: 'on $platform',
@@ -4880,7 +4880,7 @@ void main() {
         const TextSelection(
           baseOffset: 4,
           extentOffset: 4,
-          affinity: TextAffinity.downstream,
+          affinity: TextAffinity.upstream,
         ),
       ),
       reason: 'on $platform',
@@ -4917,7 +4917,7 @@ void main() {
         const TextSelection(
           baseOffset: 10,
           extentOffset: 10,
-          affinity: TextAffinity.downstream,
+          affinity: TextAffinity.upstream,
         ),
       ),
       reason: 'on $platform',
@@ -4941,7 +4941,7 @@ void main() {
         const TextSelection(
           baseOffset: 0,
           extentOffset: testText.length,
-          affinity: TextAffinity.downstream,
+          affinity: TextAffinity.upstream,
         ),
       ),
       reason: 'on $platform',
@@ -4963,7 +4963,7 @@ void main() {
         const TextSelection(
           baseOffset: 0,
           extentOffset: 0,
-          affinity: TextAffinity.downstream,
+          affinity: TextAffinity.upstream,
         ),
       ),
       reason: 'on $platform',
@@ -5372,43 +5372,8 @@ void main() {
       targetPlatform: defaultTargetPlatform,
     );
 
-    late final int afterHomeOffset;
-    late final int afterEndOffset;
-    switch (defaultTargetPlatform) {
-      // These platforms don't handle shift + home/end at all.
-      case TargetPlatform.android:
-      case TargetPlatform.iOS:
-      case TargetPlatform.fuchsia:
-        afterHomeOffset = 23;
-        afterEndOffset = 23;
-        break;
-
-      // These platforms go to the line start/end.
-      case TargetPlatform.linux:
-      case TargetPlatform.windows:
-        afterHomeOffset = 20;
-        afterEndOffset = 35;
-        break;
-
-      // Mac goes to the start/end of the document.
-      case TargetPlatform.macOS:
-        afterHomeOffset = 0;
-        afterEndOffset = 72;
-        break;
-    }
-
-    expect(
-      selection,
-      equals(
-        TextSelection(
-          baseOffset: 23,
-          extentOffset: afterHomeOffset,
-          affinity: TextAffinity.downstream,
-        ),
-      ),
-      reason: 'on $platform',
-    );
     expect(controller.text, equals(testText), reason: 'on $platform');
+    final TextSelection selectionAfterHome = selection;
 
     // Move back to position 23.
     controller.selection = const TextSelection.collapsed(
@@ -5426,18 +5391,116 @@ void main() {
       targetPlatform: defaultTargetPlatform,
     );
 
-    expect(
-      selection,
-      equals(
-        TextSelection(
-          baseOffset: 23,
-          extentOffset: afterEndOffset,
-          affinity: TextAffinity.downstream,
-        ),
-      ),
-      reason: 'on $platform',
-    );
     expect(controller.text, equals(testText), reason: 'on $platform');
+    final TextSelection selectionAfterEnd = selection;
+
+    switch (defaultTargetPlatform) {
+      // These platforms don't handle shift + home/end at all.
+      case TargetPlatform.android:
+      case TargetPlatform.iOS:
+      case TargetPlatform.fuchsia:
+        expect(
+          selectionAfterHome,
+          equals(
+            const TextSelection(
+              baseOffset: 23,
+              extentOffset: 23,
+              affinity: TextAffinity.downstream,
+            ),
+          ),
+          reason: 'on $platform',
+        );
+        expect(
+          selectionAfterEnd,
+          equals(
+            const TextSelection(
+              baseOffset: 23,
+              extentOffset: 23,
+              affinity: TextAffinity.downstream,
+            ),
+          ),
+          reason: 'on $platform',
+        );
+        break;
+
+      // Linux extends to the line start/end.
+      case TargetPlatform.linux:
+        expect(
+          selectionAfterHome,
+          equals(
+            const TextSelection(
+              baseOffset: 23,
+              extentOffset: 20,
+              affinity: TextAffinity.downstream,
+            ),
+          ),
+          reason: 'on $platform',
+        );
+        expect(
+          selectionAfterEnd,
+          equals(
+            const TextSelection(
+              baseOffset: 23,
+              extentOffset: 35,
+              affinity: TextAffinity.upstream,
+            ),
+          ),
+          reason: 'on $platform',
+        );
+        break;
+
+      // Windows expands to the line start/end.
+      case TargetPlatform.windows:
+        expect(
+          selectionAfterHome,
+          equals(
+            const TextSelection(
+              baseOffset: 23,
+              extentOffset: 20,
+              affinity: TextAffinity.downstream,
+            ),
+          ),
+          reason: 'on $platform',
+        );
+        expect(
+          selectionAfterEnd,
+          equals(
+            const TextSelection(
+              baseOffset: 23,
+              extentOffset: 35,
+              affinity: TextAffinity.downstream,
+            ),
+          ),
+          reason: 'on $platform',
+        );
+        break;
+
+      // Mac goes to the start/end of the document.
+      case TargetPlatform.macOS:
+        expect(
+          selectionAfterHome,
+          equals(
+            const TextSelection(
+              baseOffset: 23,
+              extentOffset: 0,
+              affinity: TextAffinity.upstream,
+            ),
+          ),
+          reason: 'on $platform',
+        );
+        expect(
+          selectionAfterEnd,
+          equals(
+            const TextSelection(
+              baseOffset: 23,
+              extentOffset: 72,
+              affinity: TextAffinity.downstream,
+            ),
+          ),
+          reason: 'on $platform',
+        );
+        break;
+    }
   },
     skip: kIsWeb, // [intended] on web these keys are handled by the browser.
     variant: TargetPlatformVariant.all(),
@@ -8029,8 +8092,8 @@ void main() {
       targetPlatform: defaultTargetPlatform,
     );
     expect(controller.selection.isCollapsed, false);
-    expect(controller.selection.baseOffset, 24);
-    expect(controller.selection.extentOffset, 15);
+    expect(controller.selection.baseOffset, 15);
+    expect(controller.selection.extentOffset, 24);
 
     // Set the caret to the start of a line.
     controller.selection = const TextSelection(
@@ -8125,7 +8188,7 @@ void main() {
         const TextSelection(
           baseOffset: 9,
           extentOffset: 0,
-          affinity: TextAffinity.downstream,
+          affinity: TextAffinity.upstream,
         ),
       ),
       reason: 'on $platform',
@@ -8148,7 +8211,7 @@ void main() {
         const TextSelection(
           baseOffset: 9,
           extentOffset: 0,
-          affinity: TextAffinity.downstream,
+          affinity: TextAffinity.upstream,
         ),
       ),
       reason: 'on $platform',
@@ -8729,7 +8792,7 @@ class _MyMoveSelectionRightTextAction extends TextEditingAction<Intent> {
 
   @override
   Object? invoke(Intent intent, [BuildContext? context]) {
-    textEditingActionTarget!.renderEditable.moveSelectionRight(SelectionChangedCause.keyboard);
+    textEditingActionTarget!.moveSelectionRight(SelectionChangedCause.keyboard);
     onInvoke();
   }
 }

packages/flutter/test/widgets/selectable_text_test.dart

@@ -240,7 +240,7 @@ void main() {
     await tester.tap(find.text('Paste'));
     await tester.pumpAndSettle();
     expect(controller.text, 'blah1 blah2blah1');
-    expect(controller.selection, const TextSelection(baseOffset: 16, extentOffset: 16));
+    expect(controller.selection, const TextSelection(baseOffset: 16, extentOffset: 16, affinity: TextAffinity.upstream));
 
     // Cut the first word.
     await gesture.down(midBlah1);
@@ -1923,10 +1923,9 @@ void main() {
     editableTextWidget = tester.widget(find.byType(EditableText).last);
     c1 = editableTextWidget.controller;
 
-    expect(c1.selection.extentOffset - c1.selection.baseOffset, -6);
+    expect(c1.selection.extentOffset - c1.selection.baseOffset, -10);
   }, variant: KeySimulatorTransitModeVariant.all());
 
-
   testWidgets('Changing focus test', (WidgetTester tester) async {
     final FocusNode focusNode = FocusNode();
     final List<RawKeyEvent> events = <RawKeyEvent>[];