update

Author: chunhtai

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

@@ -38,7 +38,6 @@ typedef NS_ENUM(NSInteger, FlutterFloatingCursorDragState) {
 - (void)showAutocorrectionPromptRectForStart:(NSUInteger)start
                                          end:(NSUInteger)end
                                   withClient:(int)client;
-- (void)waitForFirstFrame:(NSTimeInterval)timeout callback:(void (^)(BOOL didTimeout))callback;
 @end
 
 #endif  // SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERTEXTINPUTDELEGATE_H_

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

@@ -1134,8 +1134,8 @@ - (void)accessibilityElementDidBecomeFocused {
   }
 }
 
-- (BOOL)isAccessibilityElement {
-  return _accessibilityEnabled;
+- (BOOL)accessibilityElementsHidden {
+  return !_accessibilityEnabled;
 }
 
 @end
@@ -1144,6 +1144,17 @@ - (BOOL)isAccessibilityElement {
  * Hides `FlutterTextInputView` from iOS accessibility system so it
  * does not show up twice, once where it is in the `UIView` hierarchy,
  * and a second time as part of the `SemanticsObject` hierarchy.
+ *
+ * This prevents the `FlutterTextInputView` from receiving the focus
+ * due to swipping gesture.
+ *
+ * There are other cases the `FlutterTextInputView` may receive
+ * focus. One example is during screen changes, the accessibility
+ * tree will undergo a dramatic structural update. The Voiceover may
+ * decide to focus the `FlutterTextInputView` that is not involved
+ * in the structural update instead. If that happens, the
+ * `FlutterTextInputView` will make a best effort to direct the
+ * focus back to the `SemanticsObject`.
  */
 @interface FlutterTextInputViewAccessibilityHider : UIView {
 }
@@ -1154,15 +1165,6 @@ @implementation FlutterTextInputViewAccessibilityHider {
 }
 
 - (BOOL)accessibilityElementsHidden {
-  // We are hiding this accessibility element.
-  // There are 2 accessible elements involved in text entry in 2 different parts of the view
-  // hierarchy. This `FlutterTextInputView` is injected at the top of key window. We use this as a
-  // `UITextInput` protocol to bridge text edit events between Flutter and iOS.
-  //
-  // We also create ur own custom `UIAccessibilityElements` tree with our `SemanticsObject` to
-  // mimic the semantics tree from Flutter. We want the text field to be represented as a
-  // `TextInputSemanticsObject` in that `SemanticsObject` tree rather than in this
-  // `FlutterTextInputView` bridge which doesn't appear above a text field from the Flutter side.
   return YES;
 }
 
@@ -1260,7 +1262,7 @@ - (void)showTextInput {
   // Adds a delay to prevent the text view from receiving accessibility
   // focus in case it is activated during semantics updates.
   //
-  // One comment case is when the app navigating to a page with an auto
+  // One common case is when the app navigates to a page with an auto
   // focused text field. The text field will activate the FlutterTextInputView
   // with a semantics update sent to the engine. The voiceover will focus
   // the newly attached active view while performing accessibility update.

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

@@ -263,7 +263,7 @@ - (NSString*)accessibilityLabel {
   NSString* label = [super accessibilityLabel];
   if (label != nil)
     return label;
-  return _inactive_text_input.accessibilityLabel;
+  return [self textInputSurrogate].accessibilityLabel;
 }
 
 - (NSString*)accessibilityHint {
@@ -291,7 +291,7 @@ - (UIAccessibilityTraits)accessibilityTraits {
   // a keyboard entry control, thus adding support for text editing features, such as
   // pinch to select text, and up/down fling to move cursor.
   UIAccessibilityTraits results = [super accessibilityTraits] |
-                                  _inactive_text_input.accessibilityTraits |
+                                  [self textInputSurrogate].accessibilityTraits |
                                   UIAccessibilityTraitKeyboardKey;
   // We remove an undocumented flag to get rid of a bug where single-tapping
   // a text input field incorrectly says "empty line".