review and add more functional change to match #17493

Author: xster

shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.mm

@@ -865,7 +865,7 @@ - (void)showTextInput {
            @"must be part of the responder chain to function");
   _activeView.textInputDelegate = _textInputDelegate;
 
-  if (!_activeView.window) {
+  if (_activeView.window != keyWindow) {
     [keyWindow addSubview:_activeView];
   }
   [_activeView becomeFirstResponder];
@@ -885,7 +885,7 @@ - (void)setTextInputClient:(int)client withConfiguration:(NSDictionary*)configur
     _activeView = isSecureTextEntry ? _nonAutofillSecureInputView : _nonAutofillInputView;
     [FlutterTextInputPlugin setupInputView:_activeView withConfiguration:configuration];
 
-    if (!_activeView.window) {
+    if (_activeView.window != keyWindow) {
       [keyWindow addSubview:_activeView];
     }
   } else {

shell/platform/darwin/ios/framework/Source/FlutterTextInputPluginTest.m

@@ -38,18 +38,29 @@ - (void)testSecureInput {
                              result:^(id _Nullable result){
                              }];
 
-  // Find all input views in the input hider view.
-  NSArray<FlutterTextInputView*>* inputFields =
-      [[[textInputPlugin textInputView] superview] subviews];
-
-  // Find the inactive autofillable input field.
+  // Find all the FlutterTextInputViews we created.
+  NSArray<FlutterTextInputView*>* inputFields = [[[[textInputPlugin textInputView] superview]
+      subviews]
+      filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"class == %@",
+                                                                   [FlutterTextInputView class]]];
+
+  // There are no autofill and the mock framework requested a secure entry. The first and only
+  // inserted FlutterTextInputView should be a secure text entry one.
   FlutterTextInputView* inputView = inputFields[0];
 
   // Verify secureTextEntry is set to the correct value.
   XCTAssertTrue(inputView.secureTextEntry);
 
-  // Clean up mocks
+  // We should have only ever created one FlutterTextInputView.
+  XCTAssertEqual(inputFields.count, 1);
+
+  // The one FlutterTextInputView we inserted into the view hierarchy should be the text input
+  // plugin's active text input view.
+  XCTAssertEqual(inputView, textInputPlugin.textInputView);
+
+  // Clean up.
   [engine stopMocking];
+  [[[[textInputPlugin textInputView] superview] subviews] makeObjectsPerformSelector: @selector(removeFromSuperview)];
 }
 - (void)testAutofillInputViews {
   // Setup test.
@@ -94,9 +105,11 @@ - (void)testAutofillInputViews {
                              result:^(id _Nullable result){
                              }];
 
-  // Find all input views in the input hider view.
-  NSArray<FlutterTextInputView*>* inputFields =
-      [[[textInputPlugin textInputView] superview] subviews];
+  // Find all the FlutterTextInputViews we created.
+  NSArray<FlutterTextInputView*>* inputFields = [[[[textInputPlugin textInputView] superview]
+      subviews]
+      filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"class == %@",
+                                                                   [FlutterTextInputView class]]];
 
   XCTAssertEqual(inputFields.count, 2);
 
@@ -108,8 +121,9 @@ - (void)testAutofillInputViews {
   // Verify behavior.
   OCMVerify([engine updateEditingClient:0 withState:[OCMArg isNotNil] withTag:@"field2"]);
 
-  // Clean up mocks
+  // Clean up.
   [engine stopMocking];
+  [[[[textInputPlugin textInputView] superview] subviews] makeObjectsPerformSelector: @selector(removeFromSuperview)];
 }
 
 - (void)testAutocorrectionPromptRectAppears {

shell/platform/darwin/ios/framework/Source/FlutterViewControllerTest.mm

@@ -4,7 +4,7 @@
 
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
-#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
 #import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h"
 

testing/scenario_app/ios/Scenarios/Scenarios/AppDelegate.m

@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "AppDelegate.h"
+#import "AppDelegate.h"
+
 #import "FlutterEngine+ScenariosTest.h"
 #import "ScreenBeforeFlutter.h"
 #import "TextPlatformView.h"

testing/scenario_app/ios/Scenarios/ScenariosUITests/TextSemanticsFocusTest.m

@@ -20,17 +20,17 @@ - (void)testAccessibilityFocusOnTextSemanticsProducesCorrectIosViews {
   // frame.
   XCUIElement* textInputSemanticsObject =
       [[[self.application textFields] matchingIdentifier:@"flutter textfield"] element];
-  XCTAssertTrue([textInputSemanticsObject waitForExistenceWithTimeout:5]);
-  XCTAssertEqual([textInputSemanticsObject valueForKey:@"hasKeyboardFocus"], @(NO));
+  XCTAssertTrue([textInputSemanticsObject waitForExistenceWithTimeout:3]);
+  XCTAssertEqualObjects([textInputSemanticsObject valueForKey:@"hasKeyboardFocus"], @(NO));
 
   // Since the first mock framework text field isn't focused on, it shouldn't produce a UITextInput
   // in the view hierarchy.
   XCUIElement* delegateTextInput = [[self.application textViews] element];
-  XCTAssertFalse([delegateTextInput waitForExistenceWithTimeout:5]);
+  XCTAssertFalse([delegateTextInput waitForExistenceWithTimeout:3]);
 
   // Nor should there be a keyboard for text entry.
   XCUIElement* keyboard = [[self.application keyboards] element];
-  XCTAssertFalse([keyboard waitForExistenceWithTimeout:5]);
+  XCTAssertFalse([keyboard waitForExistenceWithTimeout:3]);
 
   // The tap location doesn't matter. The mock framework just sends a focused text field on tap.
   [textInputSemanticsObject tap];
@@ -39,18 +39,18 @@ - (void)testAccessibilityFocusOnTextSemanticsProducesCorrectIosViews {
   // UI tests on a XCUIElement).
   textInputSemanticsObject =
       [[[self.application textFields] matchingIdentifier:@"focused flutter textfield"] element];
-  XCTAssertTrue([textInputSemanticsObject waitForExistenceWithTimeout:5]);
-  XCTAssertEqual([textInputSemanticsObject valueForKey:@"hasKeyboardFocus"], @(YES));
+  XCTAssertTrue([textInputSemanticsObject waitForExistenceWithTimeout:3]);
+  XCTAssertEqualObjects([textInputSemanticsObject valueForKey:@"hasKeyboardFocus"], @(YES));
 
-  // The delegate UITextInput is also inserted on the window and also has keyboard focus to delegate
-  // real text entry events to the framework.
+  // The delegate UITextInput is also inserted on the window but we make only the
+  // TextInputSemanticsObject visible and not the FlutterTextInputView to avoid confusing
+  // accessibility, it shouldn't be visible to the UI test either.
   delegateTextInput = [[self.application textViews] element];
-  XCTAssertTrue([delegateTextInput waitForExistenceWithTimeout:5]);
-  XCTAssertEqual([delegateTextInput valueForKey:@"hasKeyboardFocus"], @(YES));
+  XCTAssertFalse([delegateTextInput waitForExistenceWithTimeout:3]);
 
-  // Since there is focus, the soft keyboard is visible on the simulator.
+  // But since there is focus, the soft keyboard is visible on the simulator.
   keyboard = [[self.application keyboards] element];
-  XCTAssertTrue([keyboard waitForExistenceWithTimeout:5]);
+  XCTAssertTrue([keyboard waitForExistenceWithTimeout:3]);
 }
 
 @end

testing/scenario_app/lib/src/channel_util.dart

@@ -9,7 +9,7 @@ import 'package:meta/meta.dart';
 
 /// Util method to replicate the behavior of a `MethodChannel` in the Flutter
 /// framework.
-void sendMethodCall({
+void sendJsonMethodCall({
   @required Window window,
   @required String channel,
   @required String method,
@@ -28,4 +28,4 @@ void sendMethodCall({
     ).buffer.asByteData(),
     callback,
   );
-}
+}

testing/scenario_app/lib/src/poppable_screen.dart

@@ -73,7 +73,7 @@ class PoppableScreenScenario extends Scenario with PlatformEchoMixin {
   }
 
   void _pop() {
-    sendMethodCall(
+    sendJsonMethodCall(
       window: window,
       // 'flutter/platform' is the hardcoded name of the 'platform'
       // `SystemChannel` from the `SystemNavigator` API.

testing/scenario_app/lib/src/send_text_focus_semantics.dart

@@ -5,8 +5,9 @@
 import 'dart:typed_data';
 import 'dart:ui';
 
-import 'package:scenario_app/src/channel_util.dart';
+import 'package:vector_math/vector_math_64.dart';
 
+import 'channel_util.dart';
 import 'scenario.dart';
 
 /// A scenario that sends back messages when touches are received.
@@ -54,7 +55,7 @@ class SendTextFocusScemantics extends Scenario {
         currentValueLength: 0,
         scrollChildren: 0,
         scrollIndex: 0,
-        transform: Float64List.fromList(<double>[1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 366.5, 0.0, 1.0]),
+        transform: Matrix4.identity().storage,
         elevation: 0.0,
         thickness: 0.0,
         childrenInTraversalOrder: Int32List(0),
@@ -70,7 +71,19 @@ class SendTextFocusScemantics extends Scenario {
   void onPointerDataPacket(PointerDataPacket packet) {
     // This mimics the framework which shows the FlutterTextInputView before
     // updating the TextInputSemanticsObject.
-    sendMethodCall(
+    sendJsonMethodCall(
+      window: window,
+      channel: 'flutter/textinput',
+      method: 'TextInput.setClient',
+      arguments: <dynamic>[
+        1,
+        // The arguments are text field configurations. It doesn't really matter
+        // since we're just testing text field accessibility here.
+        <String, dynamic>{ 'obscureText': false },
+      ]
+    );
+
+    sendJsonMethodCall(
       window: window,
       channel: 'flutter/textinput',
       method: 'TextInput.show',
@@ -92,7 +105,7 @@ class SendTextFocusScemantics extends Scenario {
         currentValueLength: 0,
         scrollChildren: 0,
         scrollIndex: 0,
-        transform: Float64List.fromList(<double>[1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 231.0, 0.0, 1.0]),
+        transform: Matrix4.identity().storage,
         elevation: 0.0,
         thickness: 0.0,
         childrenInTraversalOrder: Int32List(0),