Reverts "Request focus if SemanticsAction.focus is sent to a focusa…

…ble widget (#142942)" (#149741) Reverts: flutter/flutter#142942 Initiated by: zanderso Reason for reverting: Seems to have affected iOS platform view focus: https://ci.chromium.org/ui/p/flutter/builders/prod/Mac_ios%20native_platform_view_ui_tests_ios/10626/overview Original PR Author: gspencergoog Reviewed By: {yjbanov, goderbauer, chunhtai} This change reverts the following previous change: ## Description This causes the `Focus` widget to request focus on its focus node if the accessibility system (screen reader) focuses a widget via the `SemanticsAction.focus` action. ## Related Issues - flutter/flutter#83809 ## Tests - Added a test to make sure that focus is requested when `SemanticsAction.focus` is sent by the engine.
engine-flutter-autoroll · Jun 5, 2024 · ec9965b · ec9965b
1 parent 63daac2
commit ec9965b
Show file tree

Hide file tree

Showing 58 changed files with 70 additions and 281 deletions.
diff --git a/dev/integration_tests/flutter_gallery/test/demo/material/chip_demo_test.dart b/dev/integration_tests/flutter_gallery/test/demo/material/chip_demo_test.dart
@@ -20,7 +20,6 @@ void main() {
       isEnabled: true,
       isFocusable: true,
       hasTapAction: true,
-      hasFocusAction: true,
       label: 'Update border shape',
     ));
 
@@ -30,7 +29,6 @@ void main() {
       isEnabled: true,
       isFocusable: true,
       hasTapAction: true,
-      hasFocusAction: true,
       label: 'Reset chips',
     ));
 

diff --git a/packages/flutter/lib/src/widgets/focus_scope.dart b/packages/flutter/lib/src/widgets/focus_scope.dart
@@ -671,14 +671,6 @@ class _FocusState extends State<Focus> {
     Widget child = widget.child;
     if (widget.includeSemantics) {
       child = Semantics(
-        // Automatically request the focus for a focusable widget when it
-        // receives an input focus action from the semantics. Nothing is needed
-        // for losing the focus because if focus is lost, that means another
-        // node will gain focus and take focus from this widget.
-        onFocus:
-          _couldRequestFocus
-          ? focusNode.requestFocus
-          : null,
         focusable: _couldRequestFocus,
         focused: _hadPrimaryFocus,
         child: widget.child,

diff --git a/packages/flutter/test/cupertino/checkbox_test.dart b/packages/flutter/test/cupertino/checkbox_test.dart
@@ -34,7 +34,6 @@ void main() {
       hasEnabledState: true,
       isEnabled: true,
       hasTapAction: true,
-      hasFocusAction: true,
       isFocusable: true,
     ));
 
@@ -55,7 +54,6 @@ void main() {
       isChecked: true,
       isEnabled: true,
       hasTapAction: true,
-      hasFocusAction: true,
       isFocusable: true,
     ));
 
@@ -75,7 +73,6 @@ void main() {
       hasEnabledState: true,
       // isFocusable is delayed by 1 frame.
       isFocusable: true,
-      hasFocusAction: true,
     ));
 
     await tester.pump();
@@ -181,7 +178,6 @@ void main() {
       hasEnabledState: true,
       isEnabled: true,
       hasTapAction: true,
-      hasFocusAction: true,
       isFocusable: true,
     ));
     handle.dispose();
@@ -251,7 +247,7 @@ void main() {
         SemanticsFlag.isFocusable,
         SemanticsFlag.isCheckStateMixed,
       ],
-      actions: <SemanticsAction>[SemanticsAction.tap, SemanticsAction.focus],
+      actions: <SemanticsAction>[SemanticsAction.tap],
     ), hasLength(1));
 
     await tester.pumpWidget(
@@ -272,7 +268,7 @@ void main() {
         SemanticsFlag.isChecked,
         SemanticsFlag.isFocusable,
       ],
-      actions: <SemanticsAction>[SemanticsAction.tap, SemanticsAction.focus],
+      actions: <SemanticsAction>[SemanticsAction.tap],
     ), hasLength(1));
 
     await tester.pumpWidget(
@@ -292,7 +288,7 @@ void main() {
         SemanticsFlag.isEnabled,
         SemanticsFlag.isFocusable,
       ],
-      actions: <SemanticsAction>[SemanticsAction.tap, SemanticsAction.focus],
+      actions: <SemanticsAction>[SemanticsAction.tap],
     ), hasLength(1));
 
     semantics.dispose();

diff --git a/packages/flutter/test/cupertino/radio_test.dart b/packages/flutter/test/cupertino/radio_test.dart
@@ -147,7 +147,6 @@ void main() {
         ],
         actions: <SemanticsAction>[
           SemanticsAction.tap,
-          SemanticsAction.focus,
         ],
       ),
     );
@@ -172,7 +171,6 @@ void main() {
       hasEnabledState: true,
       isEnabled: true,
       hasTapAction: true,
-      hasFocusAction: true,
       isFocusable: true,
       isInMutuallyExclusiveGroup: true,
     ));
@@ -192,7 +190,6 @@ void main() {
       hasEnabledState: true,
       isEnabled: true,
       hasTapAction: true,
-      hasFocusAction: true,
       isFocusable: true,
       isInMutuallyExclusiveGroup: true,
       isChecked: true,
@@ -213,7 +210,6 @@ void main() {
       hasEnabledState: true,
       isFocusable: true,
       isInMutuallyExclusiveGroup: true,
-      hasFocusAction: true,
     ));
 
     await tester.pump();

diff --git a/packages/flutter/test/cupertino/route_test.dart b/packages/flutter/test/cupertino/route_test.dart
@@ -1945,7 +1945,7 @@ void main() {
     await tester.pumpAndSettle();
 
     expect(semantics, isNot(includesNodeWith(
-      actions: <SemanticsAction>[SemanticsAction.tap, SemanticsAction.focus],
+      actions: <SemanticsAction>[SemanticsAction.tap],
       label: 'Dismiss',
     )));
     debugDefaultTargetPlatformOverride = null;

diff --git a/packages/flutter/test/cupertino/text_field_test.dart b/packages/flutter/test/cupertino/text_field_test.dart
@@ -2621,7 +2621,7 @@ void main() {
       ),
     );
 
-    expect(semantics, isNot(includesNodeWith(actions: <SemanticsAction>[SemanticsAction.tap, SemanticsAction.focus])));
+    expect(semantics, isNot(includesNodeWith(actions: <SemanticsAction>[SemanticsAction.tap])));
 
     semantics.dispose();
   });

diff --git a/packages/flutter/test/material/back_button_test.dart b/packages/flutter/test/material/back_button_test.dart
@@ -215,7 +215,6 @@ void main() {
       hasEnabledState: true,
       isEnabled: true,
       hasTapAction: true,
-      hasFocusAction: true,
       isFocusable: true,
     ));
     handle.dispose();
@@ -259,7 +258,6 @@ void main() {
       hasEnabledState: true,
       isEnabled: true,
       hasTapAction: true,
-      hasFocusAction: true,
       isFocusable: true,
     ));
     handle.dispose();

diff --git a/packages/flutter/test/material/bottom_navigation_bar_test.dart b/packages/flutter/test/material/bottom_navigation_bar_test.dart
@@ -2111,7 +2111,6 @@ void main() {
         isFocusable: true,
         isSelected: true,
         hasTapAction: true,
-        hasFocusAction: true,
       ),
     );
     expect(
@@ -2121,7 +2120,6 @@ void main() {
         textDirection: TextDirection.ltr,
         isFocusable: true,
         hasTapAction: true,
-        hasFocusAction: true,
       ),
     );
     expect(
@@ -2131,7 +2129,6 @@ void main() {
         textDirection: TextDirection.ltr,
         isFocusable: true,
         hasTapAction: true,
-        hasFocusAction: true,
       ),
     );
   });
@@ -2168,7 +2165,6 @@ void main() {
         isFocusable: true,
         isSelected: true,
         hasTapAction: true,
-        hasFocusAction: true,
       ),
     );
     expect(
@@ -2178,7 +2174,6 @@ void main() {
         textDirection: TextDirection.ltr,
         isFocusable: true,
         hasTapAction: true,
-        hasFocusAction: true,
       ),
     );
     expect(
@@ -2188,7 +2183,6 @@ void main() {
         textDirection: TextDirection.ltr,
         isFocusable: true,
         hasTapAction: true,
-        hasFocusAction: true,
       ),
     );
   });
@@ -2521,7 +2515,6 @@ void main() {
         isFocusable: true,
         isSelected: true,
         hasTapAction: true,
-        hasFocusAction: true,
       ),
     );
     expect(
@@ -2531,7 +2524,6 @@ void main() {
         textDirection: TextDirection.ltr,
         isFocusable: true,
         hasTapAction: true,
-        hasFocusAction: true,
       ),
     );
   });
@@ -2566,7 +2558,6 @@ void main() {
         isFocusable: true,
         isSelected: true,
         hasTapAction: true,
-        hasFocusAction: true,
       ),
     );
     expect(
@@ -2576,7 +2567,6 @@ void main() {
         textDirection: TextDirection.ltr,
         isFocusable: true,
         hasTapAction: true,
-        hasFocusAction: true,
       ),
     );
   });
@@ -2757,13 +2747,13 @@ void main() {
                                 SemanticsFlag.isSelected,
                                 SemanticsFlag.isFocusable,
                               ],
-                              actions: <SemanticsAction>[SemanticsAction.tap, SemanticsAction.focus],
+                              actions: <SemanticsAction>[SemanticsAction.tap],
                               label: 'A\nTab 1 of 2',
                               textDirection: TextDirection.ltr,
                             ),
                             TestSemantics(
                               flags: <SemanticsFlag>[SemanticsFlag.isFocusable],
-                              actions: <SemanticsAction>[SemanticsAction.tap, SemanticsAction.focus],
+                              actions: <SemanticsAction>[SemanticsAction.tap],
                               label: 'B\nTab 2 of 2',
                               textDirection: TextDirection.ltr,
                             ),