Merge branch 'master' into fix/lang_a11y_on_Text

pedromassango · web-flow · commit 7197a8fa9ce6 · 2025-07-12T00:39:52.000+02:00
diff --git a/packages/flutter/lib/src/material/popup_menu.dart b/packages/flutter/lib/src/material/popup_menu.dart
@@ -450,10 +450,7 @@ class PopupMenuItemState<T, W extends PopupMenuItem<T>> extends State<W> {
     }
 
     return MergeSemantics(
-      child: Semantics(
-        role: SemanticsRole.menuItem,
-        enabled: widget.enabled,
-        button: true,
+      child: buildSemantics(
         child: InkWell(
           onTap: widget.enabled ? handleTap : null,
           canRequestFocus: widget.enabled,
@@ -467,6 +464,25 @@ class PopupMenuItemState<T, W extends PopupMenuItem<T>> extends State<W> {
       ),
     );
   }
+
+  //github.com/ Builds the semantic wrapper for the popup menu item.
+  //github.com/
+  //github.com/ This method creates the [Semantics] widget that provides accessibility
+  //github.com/ information for the menu item. By default, it sets the semantic role to
+  //github.com/ [SemanticsRole.menuItem] and includes the enabled state and button flag.
+  //github.com/
+  //github.com/ Subclasses can override this method to customize the semantic properties.
+  //github.com/ For example, [CheckedPopupMenuItem] overrides this to use
+  //github.com/ [SemanticsRole.menuItemCheckbox] and include checked state information.
+  @protected
+  Widget buildSemantics({required Widget child}) {
+    return Semantics(
+      role: SemanticsRole.menuItem,
+      enabled: widget.enabled,
+      button: true,
+      child: child,
+    );
+  }
 }
 
 //github.com/ An item with a checkmark in a Material Design popup menu.
@@ -607,6 +623,17 @@ class _CheckedPopupMenuItemState<T> extends PopupMenuItemState<T, CheckedPopupMe
     super.handleTap();
   }
 
+  @override
+  Widget buildSemantics({required Widget child}) {
+    return Semantics(
+      role: SemanticsRole.menuItemCheckbox,
+      enabled: widget.enabled,
+      checked: widget.checked,
+      button: true,
+      child: child,
+    );
+  }
+
   @override
   Widget buildChild() {
     final ThemeData theme = Theme.of(context);
diff --git a/packages/flutter/test/material/popup_menu_test.dart b/packages/flutter/test/material/popup_menu_test.dart
@@ -1604,6 +1604,59 @@ void main() {
     semantics.dispose();
   });
 
+  testWidgets('CheckedPopupMenuItem has correct semantics', (WidgetTester tester) async {
+    final SemanticsTester semantics = SemanticsTester(tester);
+    await tester.pumpWidget(
+      MaterialApp(
+        home: Material(
+          child: PopupMenuButton<int>(
+            itemBuilder: (BuildContext context) {
+              return <PopupMenuEntry<int>>[
+                const CheckedPopupMenuItem<int>(
+                  value: 1,
+                  checked: true,
+                  child: Text('Checked Item'),
+                ),
+                const CheckedPopupMenuItem<int>(value: 2, child: Text('Unchecked Item')),
+              ];
+            },
+            child: const SizedBox(height: 100.0, width: 100.0, child: Text('XXX')),
+          ),
+        ),
+      ),
+    );
+    await tester.tap(find.text('XXX'));
+    await tester.pumpAndSettle();
+
+    // Verify that CheckedPopupMenuItem uses SemanticsRole.menuItemCheckbox
+    final Iterable<SemanticsNode> allNodes = semantics.nodesWith();
+    final List<SemanticsNode> menuItemNodes = allNodes
+        .where(
+          (SemanticsNode node) => node.getSemanticsData().role == SemanticsRole.menuItemCheckbox,
+        )
+        .toList();
+    expect(menuItemNodes, hasLength(2));
+
+    // Verify that the checked item has the correct properties
+    final SemanticsNode checkedNode = menuItemNodes.firstWhere(
+      (SemanticsNode node) => node.getSemanticsData().hasFlag(SemanticsFlag.isChecked),
+    );
+    expect(checkedNode.getSemanticsData().role, SemanticsRole.menuItemCheckbox);
+    expect(checkedNode.getSemanticsData().hasFlag(SemanticsFlag.isButton), isTrue);
+    expect(checkedNode.getSemanticsData().hasFlag(SemanticsFlag.hasCheckedState), isTrue);
+
+    // Verify that the unchecked item has the correct properties
+    final SemanticsNode uncheckedNode = menuItemNodes.firstWhere(
+      (SemanticsNode node) => !node.getSemanticsData().hasFlag(SemanticsFlag.isChecked),
+    );
+    expect(uncheckedNode.getSemanticsData().role, SemanticsRole.menuItemCheckbox);
+    expect(uncheckedNode.getSemanticsData().hasFlag(SemanticsFlag.isButton), isTrue);
+    expect(uncheckedNode.getSemanticsData().hasFlag(SemanticsFlag.hasCheckedState), isTrue);
+    expect(uncheckedNode.getSemanticsData().hasFlag(SemanticsFlag.isChecked), isFalse);
+
+    semantics.dispose();
+  });
+
   testWidgets('PopupMenuButton PopupMenuDivider', (WidgetTester tester) async {
     // Regression test for https://github.com/flutter/flutter/issues/27072
 
