From d662f8c69f654d77068c8877edd9305701bf3997 Mon Sep 17 00:00:00 2001
From: Mouad Debbar <mdebbar@google.com>
Date: Wed, 28 Jan 2026 13:09:17 -0500
Subject: [PATCH 1/4] [web] Re-establish text input connection when system
 refocuses a text field

---
 .../src/engine/text_editing/text_editing.dart | 78 +++++++++++++++++--
 .../flutter/lib/src/services/text_input.dart  | 15 ++++
 .../lib/src/widgets/editable_text.dart        |  9 +++
 3 files changed, 95 insertions(+), 7 deletions(-)

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
index 5d07a5db843..e5e57d8e1e9 100644
--- 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
@@ -31,7 +31,7 @@ import 'text_capitalization.dart';
 bool _debugVisibleTextEditing = false;
 
 /// Set this to `true` to print when text input commands are scheduled and run.
-bool _debugPrintTextInputCommands = false;
+bool _debugPrintTextInputCommands = true;
 
 /// The `keyCode` of the "Enter" key.
 const int _kReturnKeyCode = 13;
@@ -213,6 +213,10 @@ class EngineAutofillForm {
   /// The ID of the view that this form is rendered into.
   final int viewId;
 
+  static bool get _isSafariStrategy =>
+      textEditing.strategy is SafariDesktopTextEditingStrategy ||
+      textEditing.strategy is IOSTextEditingStrategy;
+
   /// Creates an [EngineAutofillFrom] from the JSON representation of a Flutter
   /// framework `TextInputConfiguration` object.
   ///
@@ -241,7 +245,6 @@ class EngineAutofillForm {
     final elements = <String, DomHTMLElement>{};
     final items = <String, AutofillInfo>{};
     final DomHTMLFormElement formElement = createDomHTMLFormElement();
-    final isSafariDesktopStrategy = textEditing.strategy is SafariDesktopTextEditingStrategy;
     DomHTMLElement? insertionReferenceNode;
 
     // Validation is in the framework side.
@@ -253,7 +256,7 @@ class EngineAutofillForm {
     // We need to explicitly disable pointer events on the form in Safari Desktop,
     // so that we don't have pointer event collisions if users hover over or click
     // into the invisible autofill elements within the form.
-    _styleAutofillElements(formElement, shouldDisablePointerEvents: isSafariDesktopStrategy);
+    _styleAutofillElements(formElement, shouldDisablePointerEvents: _isSafariStrategy);
 
     // We keep the ids in a list then sort them later, in case the text fields'
     // locations are re-ordered on the framework side.
@@ -262,6 +265,7 @@ class EngineAutofillForm {
     // The focused text editing element will not be created here.
     final focusedElement = AutofillInfo.fromFrameworkMessage(focusedElementAutofill);
 
+    print('<form>');
     if (fields != null) {
       var fieldIsFocusedElement = false;
       for (final Map<String, dynamic> field in fields.cast<Map<String, dynamic>>()) {
@@ -284,6 +288,10 @@ class EngineAutofillForm {
           autofill.editingState.applyToDomElement(htmlElement);
           autofill.applyToDomElement(htmlElement);
 
+          print(
+            ' ┣━━ <input id="${autofill.uniqueIdentifier}" name="${autofill.autofillHint}" value="${autofill.editingState.text}">',
+          );
+
           // Safari Desktop does not respect elements that are invisible (or
           // have no size) and that leads to issues with autofill only partially
           // working (ref: https://github.com/flutter/flutter/issues/71275).
@@ -292,8 +300,8 @@ class EngineAutofillForm {
           // sized and placed on the DOM, we also have to disable pointer events.
           _styleAutofillElements(
             htmlElement,
-            shouldHideElement: !isSafariDesktopStrategy,
-            shouldDisablePointerEvents: isSafariDesktopStrategy,
+            shouldHideElement: !_isSafariStrategy,
+            shouldDisablePointerEvents: _isSafariStrategy,
           );
 
           items[autofill.uniqueIdentifier] = autofill;
@@ -308,6 +316,7 @@ class EngineAutofillForm {
             fieldIsFocusedElement = false;
           }
         } else {
+          print(' ┣━━ <focused element>');
           // current field is the focused element that we create elsewhere
           fieldIsFocusedElement = true;
         }
@@ -342,6 +351,7 @@ class EngineAutofillForm {
     _styleAutofillElements(submitButton, isOffScreen: true);
     submitButton.className = 'submitBtn';
     submitButton.type = 'submit';
+    print(' ┗━━ <button>');
 
     formElement.append(submitButton);
 
@@ -397,6 +407,15 @@ class EngineAutofillForm {
 
     void addSubscriptionForKey(String key) {
       final DomElement element = elements![key]!;
+      subscriptions.add(
+        DomSubscription(
+          element,
+          'focus',
+          createDomEventListener((DomEvent e) {
+            print('{{{ Autofill focus }}}');
+          }),
+        ),
+      );
       subscriptions.add(
         DomSubscription(
           element,
@@ -419,6 +438,7 @@ class EngineAutofillForm {
 
   void handleChange(DomElement domElement, AutofillInfo autofillInfo) {
     final newEditingState = EditingState.fromDomElement(domElement as DomHTMLElement);
+    print('{{{ Autofill input: "${newEditingState.text}" }}}');
 
     _sendAutofillEditingState(autofillInfo.uniqueIdentifier, newEditingState);
   }
@@ -1812,6 +1832,11 @@ class IOSTextEditingStrategy extends GloballyPositionedTextEditingStrategy {
         activeDomElement,
         'focus',
         createDomEventListener((DomEvent _) {
+          print('IOSTextEditingStrategy: focus event received');
+          if (!owner.isEditing) {
+            print('IOSTextEditingStrategy: refocus {${owner._clientId}}');
+            owner.channel.refocus(owner._clientId);
+          }
           // Cancel previous timer if exists.
           _schedulePlacement();
         }),
@@ -2348,6 +2373,7 @@ class TextEditingChannel {
 
   /// Sends the 'TextInputClient.updateEditingState' message to the framework.
   void updateEditingState(int? clientId, EditingState? editingState) {
+    print('--- TextEditingChannel.updateEditingState("${editingState?.text}")');
     EnginePlatformDispatcher.instance.invokeOnPlatformMessage(
       'flutter/textinput',
       const JSONMethodCodec().encodeMethodCall(
@@ -2387,6 +2413,7 @@ class TextEditingChannel {
 
   /// Sends the 'TextInputClient.onConnectionClosed' message to the framework.
   void onConnectionClosed(int? clientId) {
+    print('--- TextEditingChannel.onConnectionClosed');
     EnginePlatformDispatcher.instance.invokeOnPlatformMessage(
       'flutter/textinput',
       const JSONMethodCodec().encodeMethodCall(
@@ -2395,6 +2422,18 @@ class TextEditingChannel {
       _emptyCallback,
     );
   }
+
+  /// Sends the 'TextInput.refocus' message to the framework.
+  void refocus(int? clientId) {
+    print('--- TextEditingChannel.refocus');
+    EnginePlatformDispatcher.instance.invokeOnPlatformMessage(
+      'flutter/textinput',
+      const JSONMethodCodec().encodeMethodCall(
+        MethodCall('TextInput.refocus', <dynamic>[clientId]),
+      ),
+      _emptyCallback,
+    );
+  }
 }
 
 /// Text editing singleton.
@@ -2421,7 +2460,32 @@ class HybridTextEditing {
   ///
   /// The constructor also decides which text editing strategy to use depending
   /// on the operating system and browser engine.
-  HybridTextEditing();
+  HybridTextEditing() {
+    if (ui_web.browser.operatingSystem == ui_web.OperatingSystem.iOs) {
+      for (final EngineFlutterView view in EnginePlatformDispatcher.instance.views) {
+        _addRefocusListenerToView(view.viewId);
+      }
+      EnginePlatformDispatcher.instance.viewManager.onViewCreated.listen(_addRefocusListenerToView);
+    }
+  }
+
+  void _addRefocusListenerToView(int viewId) {
+    final EngineFlutterView? view = EnginePlatformDispatcher.instance.viewManager[viewId];
+    view!.dom.textEditingHost.addEventListener('focusin', createDomEventListener(_handleRefocus));
+  }
+
+  void _handleRefocus(DomEvent event) {
+    if (isEditing) {
+      return;
+    }
+    final target = event.target as DomElement?;
+    if (target == null) {
+      return;
+    }
+    if (target.classList.contains(HybridTextEditing.textEditingClass)) {
+      channel.refocus(_clientId);
+    }
+  }
 
   late final TextEditingChannel channel = TextEditingChannel(this);
 
@@ -2449,7 +2513,7 @@ class HybridTextEditing {
 
   void acceptCommand(TextInputCommand command, ui.VoidCallback callback) {
     if (_debugPrintTextInputCommands) {
-      print('flutter/textinput channel command: ${command.runtimeType}');
+      print('+++ flutter/textinput channel command: ${command.runtimeType}');
     }
     command.run(this);
     callback();
diff --git a/packages/flutter/lib/src/services/text_input.dart b/packages/flutter/lib/src/services/text_input.dart
index 7a001ef52da..7b9837c08b3 100644
--- a/packages/flutter/lib/src/services/text_input.dart
+++ b/packages/flutter/lib/src/services/text_input.dart
@@ -1369,6 +1369,9 @@ mixin TextInputClient {
   /// This method will only be called on iOS.
   void showAutocorrectionPromptRect(int start, int end);
 
+  /// Requests that this client refocus the text input control.
+  void refocus();
+
   /// Platform notified framework of closed connection.
   ///
   /// [TextInputClient] should cleanup its connection and finalize editing.
@@ -1928,6 +1931,7 @@ class TextInput {
     assert(_debugEnsureInputActionWorksOnPlatform(configuration.inputAction));
     _currentConnection = connection;
     _currentConfiguration = configuration;
+    _lastConnection = connection;
     _setClient(connection._client, configuration);
   }
 
@@ -1957,6 +1961,7 @@ class TextInput {
 
   TextInputConnection? _currentConnection;
   late TextInputConfiguration _currentConfiguration;
+  TextInputConnection? _lastConnection;
 
   final Map<String, ScribbleClient> _scribbleClients = <String, ScribbleClient>{};
   bool _scribbleInProgress = false;
@@ -2028,6 +2033,16 @@ class TextInput {
       case 'TextInputClient.scribbleInteractionFinished':
         _scribbleInProgress = false;
         return;
+      case 'TextInput.refocus':
+        print('=== TextInput.refocus called');
+        final args = methodCall.arguments as List<dynamic>;
+        final clientId = args[0] as int;
+        if (_currentConnection == null &&
+            _lastConnection != null &&
+            _lastConnection!._id == clientId) {
+          _lastConnection!._client.refocus();
+        }
+        return;
     }
     if (_currentConnection == null) {
       return;
diff --git a/packages/flutter/lib/src/widgets/editable_text.dart b/packages/flutter/lib/src/widgets/editable_text.dart
index 1be806a4c7a..f349071f646 100644
--- a/packages/flutter/lib/src/widgets/editable_text.dart
+++ b/packages/flutter/lib/src/widgets/editable_text.dart
@@ -4048,6 +4048,15 @@ class EditableTextState extends State<EditableText>
     }
   }
 
+  @override
+  void refocus() {
+    print('EditableText.refocus called');
+    if (mounted && !_hasFocus) {
+      print('focusNode.requestFocus');
+      widget.focusNode.requestFocus();
+    }
+  }
+
   @override
   void connectionClosed() {
     if (_hasInputConnection) {

From 26de0a040585dbc5c7c762cc282154b97a6b9af6 Mon Sep 17 00:00:00 2001
From: Mouad Debbar <mdebbar@google.com>
Date: Tue, 16 Dec 2025 11:37:44 -0500
Subject: [PATCH 2/4] Reuse autofill form

---
 .../lib/src/engine/platform_dispatcher.dart   |   1 +
 .../src/engine/text_editing/text_editing.dart | 387 +++++++++---------
 .../web_ui/test/engine/text_editing_test.dart |  96 +++--
 .../flutter/lib/src/services/text_input.dart  |   8 +
 4 files changed, 266 insertions(+), 226 deletions(-)

diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/platform_dispatcher.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/platform_dispatcher.dart
index ae09d892d2f..504b8b26e20 100644
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/platform_dispatcher.dart
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/platform_dispatcher.dart
@@ -1174,6 +1174,7 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
   }
 
   void _setAppLifecycleState(ui.AppLifecycleState state) {
+    print('[AppLifecycleState] changed to $state');
     invokeOnPlatformMessage(
       'flutter/lifecycle',
       const StringCodec().encodeMessage(state.toString()),
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
index e5e57d8e1e9..a18c40e2a20 100644
--- 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
@@ -186,20 +186,16 @@ void _insertEditingElementInView(DomElement element, int viewId) {
 class EngineAutofillForm {
   EngineAutofillForm({
     required this.viewId,
-    required this.formElement,
-    this.elements,
-    this.items,
-    this.formIdentifier = '',
-    this.insertionReferenceNode,
+    required this.items,
+    required this.formIdentifier,
+    required this.focusedElementId,
   });
 
-  final DomHTMLFormElement formElement;
+  DomHTMLFormElement? formElement;
 
-  final Map<String, DomHTMLElement>? elements;
+  final elements = <String, DomHTMLElement>{};
 
-  final Map<String, AutofillInfo>? items;
-
-  final DomHTMLElement? insertionReferenceNode;
+  final Map<String, FieldItem> items;
 
   /// Identifier for the form.
   ///
@@ -207,17 +203,19 @@ class EngineAutofillForm {
   /// form.
   ///
   /// It is used for storing the form until submission.
-  /// See [formsOnTheDom].
+  /// See [dormantForms].
   final String formIdentifier;
 
   /// The ID of the view that this form is rendered into.
   final int viewId;
 
-  static bool get _isSafariStrategy =>
+  final String focusedElementId;
+
+  bool get _isSafariStrategy =>
       textEditing.strategy is SafariDesktopTextEditingStrategy ||
       textEditing.strategy is IOSTextEditingStrategy;
 
-  /// Creates an [EngineAutofillFrom] from the JSON representation of a Flutter
+  /// Creates an [EngineAutofillForm] from the JSON representation of a Flutter
   /// framework `TextInputConfiguration` object.
   ///
   /// The `focusedElementAutofill` argument corresponds to the "autofill" field
@@ -239,14 +237,130 @@ class EngineAutofillForm {
       return null;
     }
 
+    final items = <String, FieldItem>{};
+
     // If there is only one text field in the autofill model, `fields` will be
     // null. `focusedElementAutofill` contains the information about the one
     // text field.
-    final elements = <String, DomHTMLElement>{};
-    final items = <String, AutofillInfo>{};
-    final DomHTMLFormElement formElement = createDomHTMLFormElement();
-    DomHTMLElement? insertionReferenceNode;
+    if (fields != null) {
+      for (final Map<String, dynamic> field in fields.cast<Map<String, dynamic>>()) {
+        final autofillInfo = AutofillInfo.fromFrameworkMessage(
+          field.readJson('autofill'),
+          textCapitalization: TextCapitalizationConfig.fromInputConfiguration(
+            field.readString('textCapitalization'),
+          ),
+        );
 
+        final EngineInputType inputType = EngineInputType.fromName(
+          field.readJson('inputType').readString('name'),
+        );
+
+        items[autofillInfo.uniqueIdentifier] = FieldItem(
+          inputType: inputType,
+          autofillInfo: autofillInfo,
+        );
+      }
+    } else {
+      final autofillInfo = AutofillInfo.fromFrameworkMessage(
+        focusedElementAutofill,
+        textCapitalization: TextCapitalizationConfig.fromInputConfiguration(
+          focusedElementAutofill.readString('textCapitalization'),
+        ),
+      );
+
+      // Any `inputType` is okay here since this will not be used to create the focused element
+      // here. The focused element is a special case that is created outside of the
+      // `EngineAutofillForm`.
+      const EngineInputType inputType = EngineInputType.none;
+
+      items[autofillInfo.uniqueIdentifier] = FieldItem(
+        inputType: inputType,
+        autofillInfo: autofillInfo,
+      );
+    }
+
+    return EngineAutofillForm(
+      viewId: viewId,
+      items: items,
+      formIdentifier: _getFormIdentifier(items),
+      focusedElementId: focusedElementAutofill.readString('uniqueIdentifier'),
+    );
+  }
+
+  static String _getFormIdentifier(Map<String, FieldItem> items) {
+    final ids = <String>[];
+    for (final FieldItem item in items.values) {
+      ids.add(item.autofillInfo.uniqueIdentifier);
+    }
+
+    ids.sort();
+    return ids.join('*');
+  }
+
+  /// Wakes up the form with the given focused element.
+  ///
+  /// The [focusedElement] is inserted into the form, replacing the old focused element.
+  void wakeUp(DomHTMLElement focusedElement, AutofillInfo focusedAutofill) {
+    // Since we're disabling pointer events on the form to fix Safari autofill,
+    // we need to explicitly set pointer events on the active input element in
+    // order to calculate the correct pointer event offsets.
+    // See: https://github.com/flutter/flutter/issues/136006
+    if (_isSafariStrategy) {
+      focusedElement.style.pointerEvents = 'all';
+    }
+
+    final EngineAutofillForm? existingForm = dormantForms[formIdentifier];
+
+    if (!identical(this, existingForm)) {
+      assert(formElement == null);
+      assert(elements.isEmpty);
+
+      if (existingForm != null) {
+        // If the form already has a dormant DOM element, let's use it instead of creating a new one.
+        formElement = existingForm.formElement;
+        elements.addAll(existingForm.elements);
+
+        // There's a new focused element that needs to be inserted into the existing form.
+        //
+        // Do not cause DOM disturbance unless necessary. Doing superfluous DOM operations may seem
+        // harmless, but it actually causes focus changes that could break things.
+        if (!formElement!.contains(focusedElement)) {
+          // Find the matching element and replace it with the new focused element.
+          final DomElement oldFocusedElement = elements[focusedAutofill.uniqueIdentifier]!;
+          elements[focusedAutofill.uniqueIdentifier] = focusedElement;
+          oldFocusedElement.replaceWith(focusedElement);
+        }
+      } else {
+        formElement = _createFormElementAndFields(focusedElement, focusedAutofill);
+        _insertEditingElementInView(formElement!, viewId);
+      }
+    }
+
+    _updateFieldValues();
+  }
+
+  /// Makes the form dormant.
+  ///
+  /// A dormant form stays in the DOM and does not interact with the framework until it's woken up.
+  ///
+  /// The form is kept in the DOM to:
+  /// 1. Allow the browser to autofill it.
+  /// 2. Allow submitting the form later.
+  void goDormant() {
+    assert(formElement != null);
+
+    dormantForms[formIdentifier] = this;
+    _styleAutofillElements(formElement!, isOffScreen: true);
+  }
+
+  DomHTMLFormElement _createFormElementAndFields(
+    DomHTMLElement focusedElement,
+    AutofillInfo focusedAutofill,
+  ) {
+    assert(this.formElement == null);
+    assert(elements.isEmpty);
+
+    final DomHTMLFormElement formElement = createDomHTMLFormElement();
     // Validation is in the framework side.
     formElement.noValidate = true;
     formElement.method = 'post';
@@ -258,92 +372,32 @@ class EngineAutofillForm {
     // into the invisible autofill elements within the form.
     _styleAutofillElements(formElement, shouldDisablePointerEvents: _isSafariStrategy);
 
-    // We keep the ids in a list then sort them later, in case the text fields'
-    // locations are re-ordered on the framework side.
-    final ids = List<String>.empty(growable: true);
+    for (final FieldItem field in items.values) {
+      final DomHTMLElement htmlElement;
+      if (field.autofillInfo.uniqueIdentifier == focusedAutofill.uniqueIdentifier) {
+        // Do not create the focused element here since it is created already. Use the provided one.
+        htmlElement = focusedElement;
+      } else {
+        htmlElement = field.inputType.createDomElement();
+        field.autofillInfo.applyToDomElement(htmlElement);
 
-    // The focused text editing element will not be created here.
-    final focusedElement = AutofillInfo.fromFrameworkMessage(focusedElementAutofill);
-
-    print('<form>');
-    if (fields != null) {
-      var fieldIsFocusedElement = false;
-      for (final Map<String, dynamic> field in fields.cast<Map<String, dynamic>>()) {
-        final Map<String, dynamic> autofillInfo = field.readJson('autofill');
-        final autofill = AutofillInfo.fromFrameworkMessage(
-          autofillInfo,
-          textCapitalization: TextCapitalizationConfig.fromInputConfiguration(
-            field.readString('textCapitalization'),
-          ),
+        // Safari does not respect elements that are invisible (or
+        // have no size) and that leads to issues with autofill only partially
+        // working (ref: https://github.com/flutter/flutter/issues/71275).
+        // Thus, we have to make sure that the elements remain invisible to users,
+        // but not to Safari for autofill to work. Since these elements are
+        // sized and placed on the DOM, we also have to disable pointer events.
+        _styleAutofillElements(
+          htmlElement,
+          shouldHideElement: !_isSafariStrategy,
+          shouldDisablePointerEvents: _isSafariStrategy,
         );
-
-        ids.add(autofill.uniqueIdentifier);
-
-        if (autofill.uniqueIdentifier != focusedElement.uniqueIdentifier) {
-          final EngineInputType engineInputType = EngineInputType.fromName(
-            field.readJson('inputType').readString('name'),
-          );
-
-          final DomHTMLElement htmlElement = engineInputType.createDomElement();
-          autofill.editingState.applyToDomElement(htmlElement);
-          autofill.applyToDomElement(htmlElement);
-
-          print(
-            ' ┣━━ <input id="${autofill.uniqueIdentifier}" name="${autofill.autofillHint}" value="${autofill.editingState.text}">',
-          );
-
-          // Safari Desktop does not respect elements that are invisible (or
-          // have no size) and that leads to issues with autofill only partially
-          // working (ref: https://github.com/flutter/flutter/issues/71275).
-          // Thus, we have to make sure that the elements remain invisible to users,
-          // but not to Safari for autofill to work. Since these elements are
-          // sized and placed on the DOM, we also have to disable pointer events.
-          _styleAutofillElements(
-            htmlElement,
-            shouldHideElement: !_isSafariStrategy,
-            shouldDisablePointerEvents: _isSafariStrategy,
-          );
-
-          items[autofill.uniqueIdentifier] = autofill;
-          elements[autofill.uniqueIdentifier] = htmlElement;
-          formElement.append(htmlElement);
-
-          // We want to track the node in the position directly after our focused
-          // element, so we can later insert that element in the correct position
-          // right before this node.
-          if (fieldIsFocusedElement) {
-            insertionReferenceNode = htmlElement;
-            fieldIsFocusedElement = false;
-          }
-        } else {
-          print(' ┣━━ <focused element>');
-          // current field is the focused element that we create elsewhere
-          fieldIsFocusedElement = true;
-        }
       }
-    } else {
-      // There is one input element in the form.
-      ids.add(focusedElement.uniqueIdentifier);
+
+      elements[field.autofillInfo.uniqueIdentifier] = htmlElement;
+      formElement.append(htmlElement);
     }
 
-    ids.sort();
-    final idBuffer = StringBuffer();
-
-    // Add a separator between element identifiers.
-    for (final id in ids) {
-      if (idBuffer.length > 0) {
-        idBuffer.write('*');
-      }
-      idBuffer.write(id);
-    }
-
-    final formIdentifier = idBuffer.toString();
-
-    // If a form with the same Autofill elements is already on the dom, remove
-    // it from DOM.
-    final DomHTMLFormElement? form = formsOnTheDom[formIdentifier];
-    form?.remove();
-
     // In order to submit the form when Framework sends a `TextInput.commit`
     // message, we add a submit button to the form.
     // The -1 tab index value makes this element not reachable by keyboard.
@@ -351,44 +405,19 @@ class EngineAutofillForm {
     _styleAutofillElements(submitButton, isOffScreen: true);
     submitButton.className = 'submitBtn';
     submitButton.type = 'submit';
-    print(' ┗━━ <button>');
-
     formElement.append(submitButton);
 
-    // If the focused node is at the end of the form, we'll default to inserting
-    // it before the submit field.
-    insertionReferenceNode ??= submitButton;
-
-    return EngineAutofillForm(
-      viewId: viewId,
-      formElement: formElement,
-      elements: elements,
-      items: items,
-      formIdentifier: formIdentifier,
-      insertionReferenceNode: insertionReferenceNode,
-    );
+    return formElement;
   }
 
-  void placeForm(DomHTMLElement mainTextEditingElement) {
-    // Since we're disabling pointer events on the form to fix Safari autofill,
-    // we need to explicitly set pointer events on the active input element in
-    // order to calculate the correct pointer event offsets.
-    // See: https://github.com/flutter/flutter/issues/136006
-    if (textEditing.strategy is SafariDesktopTextEditingStrategy) {
-      mainTextEditingElement.style.pointerEvents = 'all';
+  /// Updates the field values in this form.
+  void _updateFieldValues() {
+    for (final String key in elements.keys) {
+      final DomHTMLElement element = elements[key]!;
+      final AutofillInfo autofill = items[key]!.autofillInfo;
+      // Maybe only apply text but not selection?
+      autofill.editingState.applyToDomElement(element);
     }
-
-    // Do not cause DOM disturbance unless necessary. Doing superfluous DOM operations may seem
-    // harmless, but it actually causes focus changes that could break things.
-    if (!formElement.contains(mainTextEditingElement)) {
-      formElement.insertBefore(mainTextEditingElement, insertionReferenceNode);
-    }
-    _insertEditingElementInView(formElement, viewId);
-  }
-
-  void storeForm() {
-    formsOnTheDom[formIdentifier] = formElement;
-    _styleAutofillElements(formElement, isOffScreen: true);
   }
 
   /// Listens to `onInput` event on the form fields.
@@ -402,30 +431,22 @@ class EngineAutofillForm {
   /// [TextEditingStrategy.addEventHandlers] method call and all
   /// listeners are removed during [TextEditingStrategy.disable] method call.
   List<DomSubscription> addInputEventListeners() {
-    final Iterable<String> keys = elements!.keys;
+    final Iterable<String> keys = elements.keys;
     final subscriptions = <DomSubscription>[];
 
     void addSubscriptionForKey(String key) {
-      final DomElement element = elements![key]!;
-      subscriptions.add(
-        DomSubscription(
-          element,
-          'focus',
-          createDomEventListener((DomEvent e) {
-            print('{{{ Autofill focus }}}');
-          }),
-        ),
-      );
+      final DomHTMLElement element = elements[key]!;
       subscriptions.add(
         DomSubscription(
           element,
           'input',
           createDomEventListener((DomEvent e) {
-            if (items![key] == null) {
+            if (items[key] == null) {
               throw StateError('AutofillInfo must have a valid uniqueIdentifier.');
-            } else {
-              final AutofillInfo autofillInfo = items![key]!;
-              handleChange(element, autofillInfo);
+            } else if (key != focusedElementId) {
+              // `input` events on the focused element are handled elsewhere.
+              final AutofillInfo autofillInfo = items[key]!.autofillInfo;
+              _handleChange(element, autofillInfo);
             }
           }),
         ),
@@ -436,21 +457,23 @@ class EngineAutofillForm {
     return subscriptions;
   }
 
-  void handleChange(DomElement domElement, AutofillInfo autofillInfo) {
-    final newEditingState = EditingState.fromDomElement(domElement as DomHTMLElement);
-    print('{{{ Autofill input: "${newEditingState.text}" }}}');
+  void _handleChange(DomHTMLElement domElement, AutofillInfo autofillInfo) {
+    final newEditingState = EditingState.fromDomElement(domElement);
+    print('{{{ Autofill input [${autofillInfo.uniqueIdentifier}]: "${newEditingState.text}" }}}');
 
     _sendAutofillEditingState(autofillInfo.uniqueIdentifier, newEditingState);
   }
 
   /// Sends the 'TextInputClient.updateEditingStateWithTag' message to the framework.
-  void _sendAutofillEditingState(String? tag, EditingState editingState) {
+  void _sendAutofillEditingState(String tag, EditingState editingState) {
+    print('Autofill update:');
+    print('  $tag => "${editingState.text}"');
     EnginePlatformDispatcher.instance.invokeOnPlatformMessage(
       'flutter/textinput',
       const JSONMethodCodec().encodeMethodCall(
         MethodCall('TextInputClient.updateEditingStateWithTag', <dynamic>[
           0,
-          <String?, dynamic>{tag: editingState.toFlutter()},
+          <String, dynamic>{tag: editingState.toFlutter()},
         ]),
       ),
       _emptyCallback,
@@ -458,6 +481,13 @@ class EngineAutofillForm {
   }
 }
 
+class FieldItem {
+  FieldItem({required this.inputType, required this.autofillInfo});
+
+  final EngineInputType inputType;
+  final AutofillInfo autofillInfo;
+}
+
 /// Autofill related values.
 ///
 /// These values are to be used when a text field have autofill enabled.
@@ -987,10 +1017,6 @@ class EditingState {
   /// This should only be used by focused elements only, because only focused
   /// elements can have their text selection range set. Attempting to set
   /// selection range on a non-focused element will cause it to request focus.
-  ///
-  /// See also:
-  ///
-  ///  * [applyTextToDomElement], which is used for non-focused elements.
   void applyToDomElement(DomHTMLElement? domElement) {
     if (domElement != null && domElement.isA<DomHTMLInputElement>()) {
       final element = domElement as DomHTMLInputElement;
@@ -1006,25 +1032,6 @@ class EditingState {
       );
     }
   }
-
-  /// Applies the [text] to the [domElement].
-  ///
-  /// This is used by non-focused elements.
-  ///
-  /// See also:
-  ///
-  ///  * [applyToDomElement], which is used for focused elements.
-  void applyTextToDomElement(DomHTMLElement? domElement) {
-    if (domElement != null && domElement.isA<DomHTMLInputElement>()) {
-      final element = domElement as DomHTMLInputElement;
-      element.value = text;
-    } else if (domElement != null && domElement.isA<DomHTMLTextAreaElement>()) {
-      final element = domElement as DomHTMLTextAreaElement;
-      element.value = text;
-    } else {
-      throw UnsupportedError('Unsupported DOM element type');
-    }
-  }
 }
 
 /// Controls the appearance of the input control being edited.
@@ -1103,6 +1110,7 @@ class InputConfiguration {
 
   final bool enableDeltaModel;
 
+  /// Autofill information for the focused text field.
   final AutofillInfo? autofill;
 
   final EngineAutofillForm? autofillGroup;
@@ -1488,7 +1496,7 @@ abstract class DefaultTextEditingStrategy
     // More details on `TextInput.finishAutofillContext` call.
     if (_appendedToForm && inputConfiguration.autofillGroup?.formElement != null) {
       _styleAutofillElements(activeDomElement, isOffScreen: true);
-      inputConfiguration.autofillGroup?.storeForm();
+      inputConfiguration.autofillGroup?.goDormant();
       EnginePlatformDispatcher.instance.viewManager.safeBlur(activeDomElement);
     } else {
       EnginePlatformDispatcher.instance.viewManager.safeRemove(activeDomElement);
@@ -1510,7 +1518,11 @@ abstract class DefaultTextEditingStrategy
   }
 
   void placeForm() {
-    inputConfiguration.autofillGroup!.placeForm(activeDomElement);
+    inputConfiguration.autofillGroup!.wakeUp(activeDomElement, inputConfiguration.autofill!);
+    // When the form woke up, it should've placed the correct editing state on all fields, including
+    // the focused one. We update `lastEditingState` to reflect that.
+    lastEditingState = EditingState.fromDomElement(activeDomElement);
+
     _appendedToForm = true;
   }
 
@@ -1521,6 +1533,8 @@ abstract class DefaultTextEditingStrategy
     newEditingState = suppressInteractiveSelectionIfNeeded(newEditingState);
     newEditingState = determineCompositionState(newEditingState);
 
+    print('Input => "${newEditingState.text}"');
+
     TextEditingDeltaState? newTextEditingDeltaState;
     if (inputConfiguration.enableDeltaModel) {
       editingDeltaState.composingOffset = newEditingState.composingBaseOffset;
@@ -1832,11 +1846,6 @@ class IOSTextEditingStrategy extends GloballyPositionedTextEditingStrategy {
         activeDomElement,
         'focus',
         createDomEventListener((DomEvent _) {
-          print('IOSTextEditingStrategy: focus event received');
-          if (!owner.isEditing) {
-            print('IOSTextEditingStrategy: refocus {${owner._clientId}}');
-            owner.channel.refocus(owner._clientId);
-          }
           // Cancel previous timer if exists.
           _schedulePlacement();
         }),
@@ -2150,6 +2159,7 @@ class TextInputSetEditingState extends TextInputCommand {
 
   @override
   void run(HybridTextEditing textEditing) {
+    print('Framework.setEditingState => "${state.text}"');
     textEditing.strategy.setEditingState(state);
   }
 }
@@ -2266,8 +2276,8 @@ class TextInputFinishAutofillContext extends TextInputCommand {
 /// Called when the form is finalized with save option `true`.
 /// See: https://github.com/flutter/flutter/blob/bf9f3a3dcfea3022f9cf2dfc3ab10b120b48b19d/packages/flutter/lib/src/services/text_input.dart#L1277
 void saveForms() {
-  formsOnTheDom.forEach((String identifier, DomHTMLFormElement form) {
-    final submitBtn = form.getElementsByClassName('submitBtn').first as DomHTMLInputElement;
+  dormantForms.forEach((String identifier, EngineAutofillForm form) {
+    final submitBtn = form.formElement!.getElementsByClassName('submitBtn').first as DomElement;
     submitBtn.click();
   });
 }
@@ -2276,10 +2286,10 @@ void saveForms() {
 ///
 /// Called when the form is finalized.
 void cleanForms() {
-  for (final DomHTMLFormElement form in formsOnTheDom.values) {
-    form.remove();
+  for (final EngineAutofillForm form in dormantForms.values) {
+    form.formElement?.remove();
   }
-  formsOnTheDom.clear();
+  dormantForms.clear();
 }
 
 /// Translates the message-based communication between the framework and the
@@ -2307,7 +2317,7 @@ class TextEditingChannel {
 
       case 'TextInput.updateConfig':
         // Set configuration eagerly because it contains data about the text
-        // field used to flush the command queue. However, delaye applying the
+        // field used to flush the command queue. However, delay applying the
         // configuration because the strategy may not be available yet.
         implementation.configuration = InputConfiguration.fromFrameworkMessage(
           call.arguments as Map<String, dynamic>,
@@ -2445,7 +2455,7 @@ final HybridTextEditing textEditing = HybridTextEditing();
 /// save or cancel them.
 ///
 /// See: https://github.com/flutter/flutter/blob/bf9f3a3dcfea3022f9cf2dfc3ab10b120b48b19d/packages/flutter/lib/src/services/text_input.dart#L1277
-final Map<String, DomHTMLFormElement> formsOnTheDom = <String, DomHTMLFormElement>{};
+final dormantForms = <String, EngineAutofillForm>{};
 
 /// Should be used as a singleton to provide support for text editing in
 /// Flutter Web.
@@ -2483,6 +2493,7 @@ class HybridTextEditing {
       return;
     }
     if (target.classList.contains(HybridTextEditing.textEditingClass)) {
+      print('<<<focusin>>>');
       channel.refocus(_clientId);
     }
   }
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
index 6c0b258ec00..6e58761d4a7 100644
--- 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
@@ -988,7 +988,7 @@ Future<void> testMain() async {
       // Form elements
       {
         final DomHTMLFormElement formElement =
-            textEditing!.configuration!.autofillGroup!.formElement;
+            textEditing!.configuration!.autofillGroup!.formElement!;
         expect(formElement.style.alignContent, isEmpty);
 
         // Should contain one <input type="text"> and one <input type="submit">
@@ -1201,14 +1201,14 @@ Future<void> testMain() async {
       expect(spy.messages, isEmpty);
       // Form stays on the DOM until autofill context is finalized.
       expect(defaultTextEditingRoot.querySelectorAll('form'), isNotEmpty);
-      expect(formsOnTheDom, hasLength(1));
+      expect(dormantForms, hasLength(1));
 
       const finishAutofillContext = MethodCall('TextInput.finishAutofillContext', false);
       sendFrameworkMessage(codec.encodeMethodCall(finishAutofillContext));
 
       // Form element is removed from DOM.
       expect(defaultTextEditingRoot.querySelectorAll('form'), isEmpty);
-      expect(formsOnTheDom, hasLength(0));
+      expect(dormantForms, hasLength(0));
     });
 
     test('finishAutofillContext with save submits forms', () async {
@@ -1320,7 +1320,7 @@ Future<void> testMain() async {
       await expectLater(await submittedForm.future, isTrue);
       // Form element is removed from DOM.
       expect(defaultTextEditingRoot.querySelectorAll('form'), hasLength(0));
-      expect(formsOnTheDom, hasLength(0));
+      expect(dormantForms, hasLength(0));
     });
 
     test('Moves the focus across input elements', () async {
@@ -1521,7 +1521,7 @@ Future<void> testMain() async {
       expect(spy.messages, isEmpty);
       // Form stays on the DOM until autofill context is finalized.
       expect(defaultTextEditingRoot.querySelectorAll('form'), isNotEmpty);
-      expect(formsOnTheDom, hasLength(1));
+      expect(dormantForms, hasLength(1));
     });
 
     test('singleTextField Autofill setEditableSizeAndTransform preserves'
@@ -1594,7 +1594,7 @@ Future<void> testMain() async {
       expect(spy.messages, isEmpty);
       // Form stays on the DOM until autofill context is finalized.
       expect(defaultTextEditingRoot.querySelectorAll('form'), isNotEmpty);
-      expect(formsOnTheDom, hasLength(1));
+      expect(dormantForms, hasLength(1));
     });
 
     test('multiTextField Autofill: setClient, setEditingState, show, '
@@ -1648,7 +1648,7 @@ Future<void> testMain() async {
       expect(spy.messages, isEmpty);
       // Form stays on the DOM until autofill context is finalized.
       expect(defaultTextEditingRoot.querySelectorAll('form'), isNotEmpty);
-      expect(formsOnTheDom, hasLength(1));
+      expect(dormantForms, hasLength(1));
     });
 
     test('No capitalization: setClient, setEditingState, show', () {
@@ -2792,7 +2792,7 @@ Future<void> testMain() async {
       sendFrameworkMessage(codec.encodeMethodCall(setSizeAndTransform));
 
       final DomElement input = textEditing!.strategy.domElement!;
-      final DomElement form = textEditing!.configuration!.autofillGroup!.formElement;
+      final DomElement form = textEditing!.configuration!.autofillGroup!.formElement!;
 
       // Input and form are appended to the right view.
       expect(view.dom.textEditingHost.contains(input), isTrue);
@@ -2832,7 +2832,7 @@ Future<void> testMain() async {
       sendFrameworkMessage(codec.encodeMethodCall(show));
 
       final DomElement input = textEditing!.strategy.domElement!;
-      final DomElement form = textEditing!.configuration!.autofillGroup!.formElement;
+      final DomElement form = textEditing!.configuration!.autofillGroup!.formElement!;
 
       // Input and form are appended to view1.
       expect(view1.dom.textEditingHost.contains(input), isTrue);
@@ -2955,13 +2955,14 @@ Future<void> testMain() async {
 
       // Number of elements if number of fields sent to the constructor minus
       // one (for the focused text element).
-      expect(autofillForm.elements, hasLength(2));
-      expect(autofillForm.items, hasLength(2));
+      expect(autofillForm.elements, hasLength(3));
+      expect(autofillForm.items, hasLength(3));
       expect(autofillForm.formElement, isNotNull);
 
       expect(autofillForm.formIdentifier, 'field1*field2*field3');
 
-      final DomHTMLFormElement form = autofillForm.formElement;
+      // TODO(mdebbar): Things are different now. DOM elements aren't created immediately like they used to.
+      final DomHTMLFormElement form = autofillForm.formElement!;
       // Note that we also add a submit button. Therefore the form element has
       // 3 child nodes.
       expect(form.childNodes, hasLength(3));
@@ -3020,27 +3021,30 @@ Future<void> testMain() async {
         <String>['username', 'password', 'newPassword'],
         <String>['field1', 'fields2', 'field3'],
       );
+      final Map<String, dynamic> focusedAutofillMap = createAutofillInfo('username', 'field1');
       final EngineAutofillForm autofillForm = EngineAutofillForm.fromFrameworkMessage(
         kImplicitViewId,
-        createAutofillInfo('username', 'field1'),
+        focusedAutofillMap,
         fields,
       )!;
 
       final DomHTMLInputElement testInputElement = createDomHTMLInputElement();
-      autofillForm.placeForm(testInputElement);
+      final focusedAutofill = AutofillInfo.fromFrameworkMessage(focusedAutofillMap);
+      autofillForm.wakeUp(testInputElement, focusedAutofill);
 
       // The focused element is appended to the form, form also has the button
       // so in total it shoould have 4 elements.
-      final DomHTMLFormElement form = autofillForm.formElement;
+      final DomHTMLFormElement form = autofillForm.formElement!;
       expect(form.childNodes, hasLength(4));
 
       final formOnDom = defaultTextEditingRoot.querySelector('form')! as DomHTMLFormElement;
       // Form is attached to the DOM.
       expect(form, equals(formOnDom));
 
-      autofillForm.storeForm();
+      autofillForm.goDormant();
       expect(defaultTextEditingRoot.querySelectorAll('form'), isNotEmpty);
-      expect(formsOnTheDom, hasLength(1));
+      expect(dormantForms, hasLength(1));
+      expect(dormantForms, {autofillForm.formIdentifier: autofillForm});
     });
 
     test('Validate single element form', () {
@@ -3051,16 +3055,20 @@ Future<void> testMain() async {
         fields,
       )!;
 
-      // The focused element is the only field. Form should be empty after
-      // the initialization (focus element is appended later).
-      expect(autofillForm.elements, isEmpty);
-      expect(autofillForm.items, isEmpty);
+      // The focused element is the only field. Form should have a single element after
+      // the initialization.
+      expect(autofillForm.elements, hasLength(1));
+      expect(autofillForm.elements, contains('field1'));
+      expect(autofillForm.items, hasLength(1));
+      expect(autofillForm.items, contains('field1'));
+      expect(autofillForm.items['field1']!.autofillInfo.autofillHint, 'username');
       expect(autofillForm.formElement, isNotNull);
 
-      final DomHTMLFormElement form = autofillForm.formElement;
+      // TODO(mdebbar): Things are different now. DOM elements aren't created immediately like they used to.
+      final DomHTMLFormElement form = autofillForm.formElement!;
       // Submit button is added to the form.
       expect(form.childNodes, isNotEmpty);
-      final inputElement = form.childNodes.toList()[0] as DomHTMLInputElement;
+      final inputElement = form.childNodes.toList().last as DomHTMLInputElement;
       expect(inputElement.type, 'submit');
       expect(inputElement.tabIndex, -1, reason: 'The input should not be reachable by keyboard');
 
@@ -3080,37 +3088,45 @@ Future<void> testMain() async {
     });
 
     test('placeForm() should place element in correct position', () {
+      final Map<String, dynamic> focusedAutofillMap = createAutofillInfo('email', 'field1');
       final List<dynamic> fields = createFieldValues(
         <String>['email', 'username', 'password'],
         <String>['field1', 'field2', 'field3'],
       );
       final EngineAutofillForm autofillForm = EngineAutofillForm.fromFrameworkMessage(
         kImplicitViewId,
-        createAutofillInfo('email', 'field1'),
+        focusedAutofillMap,
         fields,
       )!;
 
       expect(autofillForm.elements, hasLength(2));
 
+      // TODO(mdebbar): Things are different now. DOM elements aren't created immediately like they used to.
       var formChildNodes =
-          autofillForm.formElement.childNodes.toList() as List<DomHTMLInputElement>;
+          autofillForm.formElement!.childNodes.toList() as List<DomHTMLInputElement>;
 
       // Only username, password, submit nodes are created
       expect(formChildNodes, hasLength(3));
       expect(formChildNodes[0].name, 'username');
       expect(formChildNodes[1].name, 'current-password');
       expect(formChildNodes[2].type, 'submit');
-      // insertion point for email should be before username
-      expect(autofillForm.insertionReferenceNode, formChildNodes[0]);
 
       final DomHTMLInputElement testInputElement = createDomHTMLInputElement();
       testInputElement.name = 'email';
-      autofillForm.placeForm(testInputElement);
+      final focusedAutofill = AutofillInfo.fromFrameworkMessage(focusedAutofillMap);
+      autofillForm.wakeUp(testInputElement, focusedAutofill);
+
+      expect(autofillForm.elements['field1'], testInputElement);
+      expect(autofillForm.items['field1'], focusedAutofill);
+
+      formChildNodes = autofillForm.formElement!.childNodes.toList() as List<DomHTMLInputElement>;
 
-      formChildNodes = autofillForm.formElement.childNodes.toList() as List<DomHTMLInputElement>;
       // email node should be placed before username
       expect(formChildNodes, hasLength(4));
+
       expect(formChildNodes[0].name, 'email');
+      expect(formChildNodes[0], testInputElement);
+
       expect(formChildNodes[1].name, 'username');
       expect(formChildNodes[2].name, 'current-password');
       expect(formChildNodes[3].type, 'submit');
@@ -3128,8 +3144,9 @@ Future<void> testMain() async {
           createAutofillInfo('email', 'field1'),
           fields,
         )!;
+        // TODO(mdebbar): Things are different now. DOM elements aren't created immediately like they used to.
         final formChildNodes =
-            autofillForm.formElement.childNodes.toList() as List<DomHTMLInputElement>;
+            autofillForm.formElement!.childNodes.toList() as List<DomHTMLInputElement>;
         final DomHTMLInputElement username = formChildNodes[0];
         final DomHTMLInputElement password = formChildNodes[1];
 
@@ -3141,7 +3158,7 @@ Future<void> testMain() async {
         expect(password.style.width, '0px');
         expect(password.style.height, '0px');
         expect(password.style.pointerEvents, isNot('none'));
-        expect(autofillForm.formElement.style.pointerEvents, isNot('none'));
+        expect(autofillForm.formElement!.style.pointerEvents, isNot('none'));
       },
       skip: isSafari,
     );
@@ -3156,8 +3173,9 @@ Future<void> testMain() async {
         createAutofillInfo('email', 'field1'),
         fields,
       )!;
+      // TODO(mdebbar): Things are different now. DOM elements aren't created immediately like they used to.
       final formChildNodes =
-          autofillForm.formElement.childNodes.toList() as List<DomHTMLInputElement>;
+          autofillForm.formElement!.childNodes.toList() as List<DomHTMLInputElement>;
       final DomHTMLInputElement username = formChildNodes[0];
       final DomHTMLInputElement password = formChildNodes[1];
       expect(username.name, 'username');
@@ -3168,28 +3186,30 @@ Future<void> testMain() async {
       expect(password.style.width, isNot('0px'));
       expect(password.style.height, isNot('0px'));
       expect(password.style.pointerEvents, 'none');
-      expect(autofillForm.formElement.style.pointerEvents, 'none');
+      expect(autofillForm.formElement!.style.pointerEvents, 'none');
     }, skip: !isSafari);
 
     test(
       'the focused element within a form should explicitly set pointer events on Safari',
       () {
+        final Map<String, dynamic> focusedAutofillMap = createAutofillInfo('email', 'field1');
         final List<dynamic> fields = createFieldValues(
           <String>['email', 'username', 'password'],
           <String>['field1', 'field2', 'field3'],
         );
         final EngineAutofillForm autofillForm = EngineAutofillForm.fromFrameworkMessage(
           kImplicitViewId,
-          createAutofillInfo('email', 'field1'),
+          focusedAutofillMap,
           fields,
         )!;
 
         final DomHTMLInputElement testInputElement = createDomHTMLInputElement();
         testInputElement.name = 'email';
-        autofillForm.placeForm(testInputElement);
+        final focusedAutofill = AutofillInfo.fromFrameworkMessage(focusedAutofillMap);
+        autofillForm.wakeUp(testInputElement, focusedAutofill);
 
         final formChildNodes =
-            autofillForm.formElement.childNodes.toList() as List<DomHTMLInputElement>;
+            autofillForm.formElement!.childNodes.toList() as List<DomHTMLInputElement>;
         final DomHTMLInputElement email = formChildNodes[0];
         final DomHTMLInputElement username = formChildNodes[1];
         final DomHTMLInputElement password = formChildNodes[2];
@@ -3199,7 +3219,7 @@ Future<void> testMain() async {
         expect(password.name, 'current-password');
 
         // pointer events are none on the form and all non-focused elements
-        expect(autofillForm.formElement.style.pointerEvents, 'none');
+        expect(autofillForm.formElement!.style.pointerEvents, 'none');
         expect(username.style.pointerEvents, 'none');
         expect(password.style.pointerEvents, 'none');
 
@@ -3972,7 +3992,7 @@ void clearForms() {
   while (defaultTextEditingRoot.querySelectorAll('form').isNotEmpty) {
     defaultTextEditingRoot.querySelectorAll('form').last.remove();
   }
-  formsOnTheDom.clear();
+  dormantForms.clear();
 }
 
 /// Waits until the text strategy closes and moves the focus accordingly.
diff --git a/packages/flutter/lib/src/services/text_input.dart b/packages/flutter/lib/src/services/text_input.dart
index 7b9837c08b3..72996cd1efe 100644
--- a/packages/flutter/lib/src/services/text_input.dart
+++ b/packages/flutter/lib/src/services/text_input.dart
@@ -2067,13 +2067,21 @@ class TextInput {
       final TextInputClient client = _currentConnection!._client;
       final AutofillScope? scope = client.currentAutofillScope;
       final editingValue = args[1] as Map<String, dynamic>;
+      print('[framework] TextInputClient.updateEditingStateWithTag:');
       for (final String tag in editingValue.keys) {
         final textEditingValue = TextEditingValue.fromJSON(
           editingValue[tag] as Map<String, dynamic>,
         );
         final AutofillClient? client = scope?.getAutofillClient(tag);
+        print('  ($tag) => "${textEditingValue.text}"');
         if (client != null && client.textInputConfiguration.autofillConfiguration.enabled) {
+          print('  -> client.autofill(...)');
           client.autofill(textEditingValue);
+        } else {
+          print(
+            '  -> client != null ${client != null}, '
+            'autofill enabled: ${client?.textInputConfiguration.autofillConfiguration.enabled}',
+          );
         }
       }
 

From 0a3a7d26d838b8d405c654283f938bd7172d3b29 Mon Sep 17 00:00:00 2001
From: Mouad Debbar <mdebbar@google.com>
Date: Fri, 6 Feb 2026 10:57:51 -0500
Subject: [PATCH 3/4] no prints

---
 .../lib/src/engine/platform_dispatcher.dart       |  1 -
 .../lib/src/engine/text_editing/text_editing.dart | 15 ++-------------
 packages/flutter/lib/src/services/text_input.dart |  9 ---------
 .../flutter/lib/src/widgets/editable_text.dart    |  2 --
 4 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/platform_dispatcher.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/platform_dispatcher.dart
index 504b8b26e20..ae09d892d2f 100644
--- a/engine/src/flutter/lib/web_ui/lib/src/engine/platform_dispatcher.dart
+++ b/engine/src/flutter/lib/web_ui/lib/src/engine/platform_dispatcher.dart
@@ -1174,7 +1174,6 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
   }
 
   void _setAppLifecycleState(ui.AppLifecycleState state) {
-    print('[AppLifecycleState] changed to $state');
     invokeOnPlatformMessage(
       'flutter/lifecycle',
       const StringCodec().encodeMessage(state.toString()),
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
index a18c40e2a20..8ae993960d9 100644
--- 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
@@ -31,7 +31,7 @@ import 'text_capitalization.dart';
 bool _debugVisibleTextEditing = false;
 
 /// Set this to `true` to print when text input commands are scheduled and run.
-bool _debugPrintTextInputCommands = true;
+bool _debugPrintTextInputCommands = false;
 
 /// The `keyCode` of the "Enter" key.
 const int _kReturnKeyCode = 13;
@@ -459,15 +459,11 @@ class EngineAutofillForm {
 
   void _handleChange(DomHTMLElement domElement, AutofillInfo autofillInfo) {
     final newEditingState = EditingState.fromDomElement(domElement);
-    print('{{{ Autofill input [${autofillInfo.uniqueIdentifier}]: "${newEditingState.text}" }}}');
-
     _sendAutofillEditingState(autofillInfo.uniqueIdentifier, newEditingState);
   }
 
   /// Sends the 'TextInputClient.updateEditingStateWithTag' message to the framework.
   void _sendAutofillEditingState(String tag, EditingState editingState) {
-    print('Autofill update:');
-    print('  $tag => "${editingState.text}"');
     EnginePlatformDispatcher.instance.invokeOnPlatformMessage(
       'flutter/textinput',
       const JSONMethodCodec().encodeMethodCall(
@@ -1533,8 +1529,6 @@ abstract class DefaultTextEditingStrategy
     newEditingState = suppressInteractiveSelectionIfNeeded(newEditingState);
     newEditingState = determineCompositionState(newEditingState);
 
-    print('Input => "${newEditingState.text}"');
-
     TextEditingDeltaState? newTextEditingDeltaState;
     if (inputConfiguration.enableDeltaModel) {
       editingDeltaState.composingOffset = newEditingState.composingBaseOffset;
@@ -2159,7 +2153,6 @@ class TextInputSetEditingState extends TextInputCommand {
 
   @override
   void run(HybridTextEditing textEditing) {
-    print('Framework.setEditingState => "${state.text}"');
     textEditing.strategy.setEditingState(state);
   }
 }
@@ -2383,7 +2376,6 @@ class TextEditingChannel {
 
   /// Sends the 'TextInputClient.updateEditingState' message to the framework.
   void updateEditingState(int? clientId, EditingState? editingState) {
-    print('--- TextEditingChannel.updateEditingState("${editingState?.text}")');
     EnginePlatformDispatcher.instance.invokeOnPlatformMessage(
       'flutter/textinput',
       const JSONMethodCodec().encodeMethodCall(
@@ -2423,7 +2415,6 @@ class TextEditingChannel {
 
   /// Sends the 'TextInputClient.onConnectionClosed' message to the framework.
   void onConnectionClosed(int? clientId) {
-    print('--- TextEditingChannel.onConnectionClosed');
     EnginePlatformDispatcher.instance.invokeOnPlatformMessage(
       'flutter/textinput',
       const JSONMethodCodec().encodeMethodCall(
@@ -2435,7 +2426,6 @@ class TextEditingChannel {
 
   /// Sends the 'TextInput.refocus' message to the framework.
   void refocus(int? clientId) {
-    print('--- TextEditingChannel.refocus');
     EnginePlatformDispatcher.instance.invokeOnPlatformMessage(
       'flutter/textinput',
       const JSONMethodCodec().encodeMethodCall(
@@ -2493,7 +2483,6 @@ class HybridTextEditing {
       return;
     }
     if (target.classList.contains(HybridTextEditing.textEditingClass)) {
-      print('<<<focusin>>>');
       channel.refocus(_clientId);
     }
   }
@@ -2524,7 +2513,7 @@ class HybridTextEditing {
 
   void acceptCommand(TextInputCommand command, ui.VoidCallback callback) {
     if (_debugPrintTextInputCommands) {
-      print('+++ flutter/textinput channel command: ${command.runtimeType}');
+      print('flutter/textinput channel command: ${command.runtimeType}');
     }
     command.run(this);
     callback();
diff --git a/packages/flutter/lib/src/services/text_input.dart b/packages/flutter/lib/src/services/text_input.dart
index 72996cd1efe..b0ec849c924 100644
--- a/packages/flutter/lib/src/services/text_input.dart
+++ b/packages/flutter/lib/src/services/text_input.dart
@@ -2034,7 +2034,6 @@ class TextInput {
         _scribbleInProgress = false;
         return;
       case 'TextInput.refocus':
-        print('=== TextInput.refocus called');
         final args = methodCall.arguments as List<dynamic>;
         final clientId = args[0] as int;
         if (_currentConnection == null &&
@@ -2067,21 +2066,13 @@ class TextInput {
       final TextInputClient client = _currentConnection!._client;
       final AutofillScope? scope = client.currentAutofillScope;
       final editingValue = args[1] as Map<String, dynamic>;
-      print('[framework] TextInputClient.updateEditingStateWithTag:');
       for (final String tag in editingValue.keys) {
         final textEditingValue = TextEditingValue.fromJSON(
           editingValue[tag] as Map<String, dynamic>,
         );
         final AutofillClient? client = scope?.getAutofillClient(tag);
-        print('  ($tag) => "${textEditingValue.text}"');
         if (client != null && client.textInputConfiguration.autofillConfiguration.enabled) {
-          print('  -> client.autofill(...)');
           client.autofill(textEditingValue);
-        } else {
-          print(
-            '  -> client != null ${client != null}, '
-            'autofill enabled: ${client?.textInputConfiguration.autofillConfiguration.enabled}',
-          );
         }
       }
 
diff --git a/packages/flutter/lib/src/widgets/editable_text.dart b/packages/flutter/lib/src/widgets/editable_text.dart
index f349071f646..120e3e6762a 100644
--- a/packages/flutter/lib/src/widgets/editable_text.dart
+++ b/packages/flutter/lib/src/widgets/editable_text.dart
@@ -4050,9 +4050,7 @@ class EditableTextState extends State<EditableText>
 
   @override
   void refocus() {
-    print('EditableText.refocus called');
     if (mounted && !_hasFocus) {
-      print('focusNode.requestFocus');
       widget.focusNode.requestFocus();
     }
   }

From 8a6b584671efa92e3a65eb0480d5b847a092e37a Mon Sep 17 00:00:00 2001
From: Mouad Debbar <mdebbar@google.com>
Date: Fri, 6 Feb 2026 13:54:22 -0500
Subject: [PATCH 4/4] polishing

---
 .../src/engine/text_editing/text_editing.dart | 39 ++++++++++---------
 1 file changed, 21 insertions(+), 18 deletions(-)

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
index 8ae993960d9..e79e8bc6d32 100644
--- 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
@@ -2462,6 +2462,9 @@ class HybridTextEditing {
   /// on the operating system and browser engine.
   HybridTextEditing() {
     if (ui_web.browser.operatingSystem == ui_web.OperatingSystem.iOs) {
+      // In iOS 26, the text field is blurred right before autofill occurs. We need to keep listening
+      // for focus events in order to re-establish the connection with the framework when the text
+      // field is focused again for autofill.
       for (final EngineFlutterView view in EnginePlatformDispatcher.instance.views) {
         _addRefocusListenerToView(view.viewId);
       }
@@ -2469,24 +2472,6 @@ class HybridTextEditing {
     }
   }
 
-  void _addRefocusListenerToView(int viewId) {
-    final EngineFlutterView? view = EnginePlatformDispatcher.instance.viewManager[viewId];
-    view!.dom.textEditingHost.addEventListener('focusin', createDomEventListener(_handleRefocus));
-  }
-
-  void _handleRefocus(DomEvent event) {
-    if (isEditing) {
-      return;
-    }
-    final target = event.target as DomElement?;
-    if (target == null) {
-      return;
-    }
-    if (target.classList.contains(HybridTextEditing.textEditingClass)) {
-      channel.refocus(_clientId);
-    }
-  }
-
   late final TextEditingChannel channel = TextEditingChannel(this);
 
   /// A CSS class name used to identify all elements used for text editing.
@@ -2549,6 +2534,24 @@ class HybridTextEditing {
       channel.onConnectionClosed(_clientId);
     }
   }
+
+  void _addRefocusListenerToView(int viewId) {
+    final EngineFlutterView? view = EnginePlatformDispatcher.instance.viewManager[viewId];
+    view!.dom.textEditingHost.addEventListener('focusin', createDomEventListener(_handleRefocus));
+  }
+
+  void _handleRefocus(DomEvent event) {
+    if (isEditing) {
+      return;
+    }
+    final target = event.target as DomElement?;
+    if (target == null) {
+      return;
+    }
+    if (target.classList.contains(HybridTextEditing.textEditingClass)) {
+      channel.refocus(_clientId);
+    }
+  }
 }
 
 /// Information on the font and alignment of a text editing element.