Revert "fix On iOS, dialog titles are announced twice (flutter#19826)" (flutter#21714)

Author: gaaclarke

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

@@ -93,7 +93,7 @@ constexpr int32_t kRootNodeId = 0;
 - (BOOL)nodeWillCauseScroll:(const flutter::SemanticsNode*)node;
 - (BOOL)nodeShouldTriggerAnnouncement:(const flutter::SemanticsNode*)node;
 - (void)collectRoutes:(NSMutableArray<SemanticsObject*>*)edges;
-- (SemanticsObject*)routeFocusObject;
+- (NSString*)routeName;
 - (BOOL)onCustomAccessibilityAction:(FlutterCustomAccessibilityAction*)action;
 
 @end

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

@@ -282,21 +282,20 @@ - (BOOL)onCustomAccessibilityAction:(FlutterCustomAccessibilityAction*)action {
   return YES;
 }
 
-- (SemanticsObject*)routeFocusObject {
-  // Returns the first SemanticObject in this branch that has
-  // the NamesRoute flag with a non-nil semantic label. Otherwise
-  // returns nil.
+- (NSString*)routeName {
+  // Returns the first non-null and non-empty semantic label of a child
+  // with an NamesRoute flag. Otherwise returns nil.
   if ([self node].HasFlag(flutter::SemanticsFlags::kNamesRoute)) {
     NSString* newName = [self accessibilityLabel];
     if (newName != nil && [newName length] > 0) {
-      return self;
+      return newName;
     }
   }
   if ([self hasChildren]) {
     for (SemanticsObject* child in self.children) {
-      SemanticsObject* focusObject = [child routeFocusObject];
-      if (focusObject != nil) {
-        return focusObject;
+      NSString* newName = [child routeName];
+      if (newName != nil && [newName length] > 0) {
+        return newName;
       }
     }
   }

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

@@ -198,12 +198,9 @@ void PostAccessibilityNotification(UIAccessibilityNotifications notification,
   // We should send out only one notification per semantics update.
   if (routeChanged) {
     if (!ios_delegate_->IsFlutterViewControllerPresentingModalViewController(view_controller_)) {
-      SemanticsObject* nextToFocus = [lastAdded routeFocusObject];
-      if (!nextToFocus && root) {
-        nextToFocus = FindFirstFocusable(root);
-      }
+      NSString* routeName = [lastAdded routeName];
       ios_delegate_->PostAccessibilityNotification(UIAccessibilityScreenChangedNotification,
-                                                   nextToFocus);
+                                                   routeName);
     }
   } else if (layoutChanged) {
     SemanticsObject* nextToFocus = nil;

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

@@ -328,9 +328,7 @@ - (void)testAnnouncesRouteChanges {
   bridge->UpdateSemantics(/*nodes=*/nodes, /*actions=*/actions);
 
   XCTAssertEqual([accessibility_notifications count], 1ul);
-  SemanticsObject* focusObject = accessibility_notifications[0][@"argument"];
-  XCTAssertEqual([focusObject uid], 3);
-  XCTAssertEqualObjects([focusObject accessibilityLabel], @"node3");
+  XCTAssertEqualObjects(accessibility_notifications[0][@"argument"], @"node3");
   XCTAssertEqual([accessibility_notifications[0][@"notification"] unsignedIntValue],
                  UIAccessibilityScreenChangedNotification);
 }
@@ -373,7 +371,8 @@ - (void)testAnnouncesRouteChangesWhenNoNamesRoute {
   flutter::SemanticsNode node1;
   node1.id = 1;
   node1.label = "node1";
-  node1.flags = static_cast<int32_t>(flutter::SemanticsFlags::kScopesRoute);
+  node1.flags = static_cast<int32_t>(flutter::SemanticsFlags::kScopesRoute) |
+                static_cast<int32_t>(flutter::SemanticsFlags::kNamesRoute);
   node1.childrenInTraversalOrder = {2, 3};
   node1.childrenInHitTestOrder = {2, 3};
   nodes[node1.id] = node1;
@@ -394,9 +393,9 @@ - (void)testAnnouncesRouteChangesWhenNoNamesRoute {
 
   // Notification should focus first focusable node, which is node1.
   XCTAssertEqual([accessibility_notifications count], 1ul);
-  SemanticsObject* focusObject = accessibility_notifications[0][@"argument"];
-  XCTAssertEqual([focusObject uid], 2);
-  XCTAssertEqualObjects([focusObject accessibilityLabel], @"node2");
+  id focusObject = accessibility_notifications[0][@"argument"];
+  XCTAssertTrue([focusObject isKindOfClass:[NSString class]]);
+  XCTAssertEqualObjects(focusObject, @"node1");
   XCTAssertEqual([accessibility_notifications[0][@"notification"] unsignedIntValue],
                  UIAccessibilityScreenChangedNotification);
 }