nits

Author: hellohuanlin

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

@@ -990,20 +990,19 @@ - (void)flutterTextInputViewDidResignFirstResponder:(FlutterTextInputView*)textI
   // Platform view's first responder detection logic
   //
   // All text input widgets (e.g. EditableText) are backed by a dummy UITextInput view
-  // in the text input plugin. When this dummy UITextInput view resigns first responder,
+  // in the TextInputPlugin. When this dummy UITextInput view resigns first responder,
   // check if any platform view becomes first responder. If any platform view becomes
   // first responder, send a "viewFocused" channel message to inform the framework to un-focus
   // the previously focused text input.
   //
   // Caveat:
   // 1. This detection logic does not cover the scenario when a platform view becomes
   // first responder without any flutter text input resigning its first responder status
-  // (e.g. user tapping on platform view first). For now it works fine because there can only be
-  // one first responder in iOS, so we do not need to keep platform view's first responder status
-  // in the text input plugin (which is different from Android implementation).
+  // (e.g. user tapping on platform view first). For now it works fine because the TextInputPlugin
+  // does not track the focused platform view id (which is different from Android implementation).
   //
   // 2. This detection logic assumes that all text input widgets are backed by a dummy
-  // UITextInput view in the text input plugin, which may not hold true in the future.
+  // UITextInput view in the TextInputPlugin, which may not hold true in the future.
 
   // Have to check in the next run loop, because iOS requests the previous first responder to
   // resign before requesting the next view to become first responder.

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

@@ -20,12 +20,12 @@
 #import "flutter/shell/platform/darwin/ios/ios_surface_gl.h"
 
 @implementation UIView (FirstResponder)
-- (BOOL)hasFirstResponderInViewHierarchySubtree {
+- (BOOL)flt_hasFirstResponderInViewHierarchySubtree {
   if (self.isFirstResponder) {
     return YES;
   }
   for (UIView* subview in self.subviews) {
-    if (subview.hasFirstResponderInViewHierarchySubtree) {
+    if (subview.flt_hasFirstResponderInViewHierarchySubtree) {
       return YES;
     }
   }
@@ -344,7 +344,7 @@ - (BOOL)hasFirstResponderInViewHierarchySubtree {
 
 long FlutterPlatformViewsController::FindFirstResponderPlatformViewId() {
   for (auto const& [id, root_view] : root_views_) {
-    if ([(UIView*)root_view.get() hasFirstResponderInViewHierarchySubtree]) {
+    if ((UIView*)(root_view.get()).flt_hasFirstResponderInViewHierarchySubtree) {
       return id;
     }
   }

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

@@ -1113,10 +1113,10 @@ - (void)testHasFirstResponderInViewHierarchySubtree_viewItselfBecomesFirstRespon
 
   [textField becomeFirstResponder];
   XCTAssertTrue(textField.isFirstResponder);
-  XCTAssertTrue(textField.hasFirstResponderInViewHierarchySubtree);
+  XCTAssertTrue(textField.flt_hasFirstResponderInViewHierarchySubtree);
   [textField resignFirstResponder];
   XCTAssertFalse(textField.isFirstResponder);
-  XCTAssertFalse(textField.hasFirstResponderInViewHierarchySubtree);
+  XCTAssertFalse(textField.flt_hasFirstResponderInViewHierarchySubtree);
 }
 
 - (void)testHasFirstResponderInViewHierarchySubtree_descendantViewBecomesFirstResponder {
@@ -1131,10 +1131,10 @@ - (void)testHasFirstResponderInViewHierarchySubtree_descendantViewBecomesFirstRe
 
   [textField becomeFirstResponder];
   XCTAssertTrue(textField.isFirstResponder);
-  XCTAssertTrue(view.hasFirstResponderInViewHierarchySubtree);
+  XCTAssertTrue(view.flt_hasFirstResponderInViewHierarchySubtree);
   [textField resignFirstResponder];
   XCTAssertFalse(textField.isFirstResponder);
-  XCTAssertFalse(view.hasFirstResponderInViewHierarchySubtree);
+  XCTAssertFalse(view.flt_hasFirstResponderInViewHierarchySubtree);
 }
 
 @end

shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h

@@ -335,7 +335,7 @@ class FlutterPlatformViewsController {
 
 @interface UIView (FirstResponder)
 // Returns YES if a view or any of its descendant view is the first responder. Returns NO otherwise.
-@property(nonatomic, readonly) BOOL hasFirstResponderInViewHierarchySubtree;
+@property(nonatomic, readonly) BOOL flt_hasFirstResponderInViewHierarchySubtree;
 @end
 
 #endif  // FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERPLATFORMVIEWS_INTERNAL_H_

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

@@ -2081,7 +2081,8 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
     [self setTextInputClient:[args[0] intValue] withConfiguration:args[1]];
     result(nil);
   } else if ([method isEqualToString:kSetPlatformViewClientMethod]) {
-    [self setPlatformViewTextInputClient:[args[@"platformViewId"] longValue]];
+    // This method call has a `platformViewId` argument, but we do not need it for iOS for now.
+    [self setPlatformViewTextInputClient];
     result(nil);
   } else if ([method isEqualToString:kSetEditingStateMethod]) {
     [self setTextInputEditingState:args];
@@ -2199,10 +2200,10 @@ - (void)triggerAutofillSave:(BOOL)saveEntries {
   [self addToInputParentViewIfNeeded:_activeView];
 }
 
-- (void)setPlatformViewTextInputClient:(long)platformViewID {
-  // No need to track the platformViewID for now (unlike in Android), because in iOS there can
-  // only be one single first responder. When a platform view becomes first responder, hide
-  // this dummy text input view (`_activeView`) for the previously focused widget.
+- (void)setPlatformViewTextInputClient {
+  // No need to track the platformViewID (unlike in Android). When a platform view
+  // becomes the first responder, simply hide this dummy text input view (`_activeView`)
+  // for the previously focused widget.
   [self removeEnableFlutterTextInputViewAccessibilityTimer];
   _activeView.accessibilityEnabled = NO;
   [_activeView removeFromSuperview];

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

@@ -88,7 +88,7 @@ - (void)setUp {
 
   textInputPlugin = [[FlutterTextInputPlugin alloc] initWithDelegate:engine];
 
-  viewController = [FlutterViewController new];
+  viewController = [[FlutterViewController alloc] init];
   textInputPlugin.viewController = viewController;
 
   // Clear pasteboard between tests.
@@ -167,7 +167,7 @@ - (FlutterTextRange*)getLineRangeFromTokenizer:(id<UITextInputTokenizer>)tokeniz
 #pragma mark - Tests
 - (void)testNoDanglingEnginePointer {
   __weak FlutterTextInputPlugin* weakFlutterTextInputPlugin;
-  FlutterViewController* flutterViewController = [FlutterViewController new];
+  FlutterViewController* flutterViewController = [[FlutterViewController alloc] init];
   __weak FlutterEngine* weakFlutterEngine;
 
   FlutterTextInputView* currentView;
@@ -1825,7 +1825,7 @@ - (void)testFlutterTokenizerCanParseLines {
 }
 
 - (void)testFlutterTextInputPluginRetainsFlutterTextInputView {
-  FlutterViewController* flutterViewController = [FlutterViewController new];
+  FlutterViewController* flutterViewController = [[FlutterViewController alloc] init];
   FlutterTextInputPlugin* myInputPlugin = [[FlutterTextInputPlugin alloc] initWithDelegate:engine];
   myInputPlugin.viewController = flutterViewController;
 
@@ -1858,7 +1858,7 @@ - (void)testFlutterTextInputPluginHostViewNilCrash {
 }
 
 - (void)testFlutterTextInputPluginHostViewNotNil {
-  FlutterViewController* flutterViewController = [FlutterViewController new];
+  FlutterViewController* flutterViewController = [[FlutterViewController alloc] init];
   FlutterEngine* flutterEngine = [[FlutterEngine alloc] init];
   [flutterEngine runWithEntrypoint:nil];
   flutterEngine.viewController = flutterViewController;
@@ -1867,30 +1867,25 @@ - (void)testFlutterTextInputPluginHostViewNotNil {
 }
 
 - (void)testSetPlatformViewClient {
-  FlutterViewController* flutterViewController = [FlutterViewController new];
+  FlutterViewController* flutterViewController = [[FlutterViewController alloc] init];
   FlutterTextInputPlugin* myInputPlugin = [[FlutterTextInputPlugin alloc] initWithDelegate:engine];
   myInputPlugin.viewController = flutterViewController;
 
-  __weak UIView* activeView;
-  @autoreleasepool {
-    FlutterMethodCall* setClientCall = [FlutterMethodCall
-        methodCallWithMethodName:@"TextInput.setClient"
-                       arguments:@[
-                         [NSNumber numberWithInt:123], self.mutablePasswordTemplateCopy
-                       ]];
-    [myInputPlugin handleMethodCall:setClientCall
-                             result:^(id _Nullable result){
-                             }];
-    activeView = myInputPlugin.textInputView;
-    XCTAssertNotNil(activeView.superview, @"activeView must be added to the view hierarchy.");
-    FlutterMethodCall* setPlatformViewClientCall = [FlutterMethodCall
-        methodCallWithMethodName:@"TextInput.setPlatformViewClient"
-                       arguments:@{@"platformViewId" : [NSNumber numberWithLong:456]}];
-    [myInputPlugin handleMethodCall:setPlatformViewClientCall
-                             result:^(id _Nullable result){
-                             }];
-    XCTAssertNil(activeView.superview, @"activeView must be removed from view hierarchy.");
-  }
+  FlutterMethodCall* setClientCall = [FlutterMethodCall
+      methodCallWithMethodName:@"TextInput.setClient"
+                     arguments:@[ [NSNumber numberWithInt:123], self.mutablePasswordTemplateCopy ]];
+  [myInputPlugin handleMethodCall:setClientCall
+                           result:^(id _Nullable result){
+                           }];
+  UIView* activeView = myInputPlugin.textInputView;
+  XCTAssertNotNil(activeView.superview, @"activeView must be added to the view hierarchy.");
+  FlutterMethodCall* setPlatformViewClientCall = [FlutterMethodCall
+      methodCallWithMethodName:@"TextInput.setPlatformViewClient"
+                     arguments:@{@"platformViewId" : [NSNumber numberWithLong:456]}];
+  [myInputPlugin handleMethodCall:setPlatformViewClientCall
+                           result:^(id _Nullable result){
+                           }];
+  XCTAssertNil(activeView.superview, @"activeView must be removed from view hierarchy.");
 }
 
 @end