remove: sync main

flutter · auto-submit · Jun 3, 2025 · Jan 13, 2025 · Mar 21, 2025 · Mar 21, 2025
commit 3387efa4e3bb9f4d90580b68a2027d762a441f6d
diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/text_editing/composition_aware_mixin.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/text_editing/composition_aware_mixin.dart
@@ -47,9 +47,6 @@ mixin CompositionAwareMixin {
   /// so it is safe to reference it to get the current composingText.
   String? composingText;
 
-  /// Whether the `domElement` is currently composing text.
-  bool get isComposing => composingText != null;
-
   void addCompositionEventHandlers(DomHTMLElement domElement) {
     domElement.addEventListener(_kCompositionStart, _compositionStartListener);
     domElement.addEventListener(_kCompositionUpdate, _compositionUpdateListener);

diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/text_editing/text_editing.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/text_editing/text_editing.dart
@@ -967,25 +967,18 @@ class EditingState {
   /// elements can have their text selection range set. Attempting to set
   /// selection range on a non-focused element will cause it to request focus.
   ///
-  /// If text is in the composing state, the composing range is not updated by
-  /// [updateSelection] being `true`.
-  ///
   /// See also:
   ///
   ///  * [applyTextToDomElement], which is used for non-focused elements.
-  void applyToDomElement(DomHTMLElement? domElement, {bool updateSelection = true}) {
+  void applyToDomElement(DomHTMLElement? domElement) {
     if (domElement != null && domElement.isA<DomHTMLInputElement>()) {
       final DomHTMLInputElement element = domElement as DomHTMLInputElement;
       element.value = text;
-      if (updateSelection) {
-        element.setSelectionRange(minOffset, maxOffset);
-      }
+      element.setSelectionRange(minOffset, maxOffset);
     } else if (domElement != null && domElement.isA<DomHTMLTextAreaElement>()) {
       final DomHTMLTextAreaElement element = domElement as DomHTMLTextAreaElement;
       element.value = text;
-      if (updateSelection) {
-        element.setSelectionRange(minOffset, maxOffset);
-      }
+      element.setSelectionRange(minOffset, maxOffset);
     } else {
       throw UnsupportedError(
         'Unsupported DOM element type: <${domElement?.tagName}> (${domElement.runtimeType})',
@@ -1162,7 +1155,7 @@ class GloballyPositionedTextEditingStrategy extends DefaultTextEditingStrategy {
       // Set the last editing state if it exists, this is critical for a
       // users ongoing work to continue uninterrupted when there is an update to
       // the transform.
-      lastEditingState?.applyToDomElement(domElement, updateSelection: !isComposing);
+      lastEditingState?.applyToDomElement(domElement);
       // On Chrome, when a form is focused, it opens an autofill menu
       // immediately.
       // Flutter framework sends `setEditableSizeAndTransform` for informing
@@ -1213,7 +1206,7 @@ class SafariDesktopTextEditingStrategy extends DefaultTextEditingStrategy {
       // the transform.
       // If domElement is not focused cursor location will not be correct.
       moveFocusToActiveDomElement();
-      lastEditingState?.applyToDomElement(activeDomElement, updateSelection: !isComposing);
+      lastEditingState?.applyToDomElement(activeDomElement);
     }
   }
 
@@ -1471,7 +1464,7 @@ abstract class DefaultTextEditingStrategy
     if (!isEnabled || !editingState!.isValid) {
       return;
     }
-    lastEditingState!.applyToDomElement(domElement, updateSelection: !isComposing);
+    lastEditingState!.applyToDomElement(domElement);
   }
 
   void placeElement() {
@@ -1992,7 +1985,7 @@ class FirefoxTextEditingStrategy extends GloballyPositionedTextEditingStrategy {
     // Set the last editing state if it exists, this is critical for a
     // users ongoing work to continue uninterrupted when there is an update to
     // the transform.
-    lastEditingState?.applyToDomElement(activeDomElement, updateSelection: !isComposing);
+    lastEditingState?.applyToDomElement(activeDomElement);
   }
 }
 

diff --git a/engine/src/flutter/lib/web_ui/test/engine/text_editing_test.dart b/engine/src/flutter/lib/web_ui/test/engine/text_editing_test.dart
@@ -2194,27 +2194,6 @@ Future<void> testMain() async {
       hideKeyboard();
     });
 
-    test('Do not update composingBase and composingExtent while composing Text', () {
-      showKeyboard(inputType: 'text');
-      // 'text' is input as a composing target.
-      editingStrategy!.composingText = 'test';
-      sendFrameworkMessage(
-        codec.encodeMethodCall(
-          const MethodCall('TextInput.setEditingState', <String, dynamic>{
-            'text': 'test',
-            'selectionBase': 4,
-            'selectionExtent': 0,
-          }),
-        ),
-      );
-
-      // 'text' is composed as Japanese, and baseOffset and extentOffset are updated.
-      final EditingState editingState = EditingState(text: 'test', baseOffset: 0, extentOffset: 1);
-      editingStrategy!.setEditingState(editingState);
-
-      checkInputEditingState(textEditing!.strategy.domElement, 'test', 0, 4);
-    });
-
     test('Supports deletion at inverted selection', () async {
       final MethodCall setClient = MethodCall('TextInput.setClient', <dynamic>[
         123,