Skip to content

F
Front-End
Unverified Commit e8670de0 authored by gaaclarke's avatar gaaclarke Committed by GitHub
Browse files
Options

Revert "Tweaking Material Chip a11y semantics to match buttons (#60141)" (#60645)

parent d30c987c
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 151 deletions
packages/flutter/lib/src/material/chip.dart
View file @ e8670de0
...@@ -1944,10 +1944,9 @@ class _RawChipState extends State<RawChip> with TickerProviderStateMixin<RawChip ...@@ -1944,10 +1944,9 @@ class _RawChipState extends State<RawChip> with TickerProviderStateMixin<RawChip
), ),
); );
return Semantics( return Semantics(
button: widget.tapEnabled,
container: true, container: true,
selected: widget.selected, selected: widget.selected,
enabled: widget.tapEnabled ? canTap : null, enabled: canTap ? widget.isEnabled : null,
child: result, child: result,
); );
} }
......
packages/flutter/test/material/chip_test.dart
View file @ e8670de0
...@@ -1624,10 +1624,6 @@ void main() { ...@@ -1624,10 +1624,6 @@ void main() {
TestSemantics( TestSemantics(
label: 'test', label: 'test',
textDirection: TextDirection.ltr, textDirection: TextDirection.ltr,
flags: <SemanticsFlag>[
SemanticsFlag.hasEnabledState,
SemanticsFlag.isButton,
],
), ),
], ],
), ),
...@@ -1666,10 +1662,6 @@ void main() { ...@@ -1666,10 +1662,6 @@ void main() {
TestSemantics( TestSemantics(
label: 'test', label: 'test',
textDirection: TextDirection.ltr, textDirection: TextDirection.ltr,
flags: <SemanticsFlag>[
SemanticsFlag.hasEnabledState,
SemanticsFlag.isButton,
],
children: <TestSemantics>[ children: <TestSemantics>[
TestSemantics( TestSemantics(
label: 'Delete', label: 'Delete',
...@@ -1720,7 +1712,6 @@ void main() { ...@@ -1720,7 +1712,6 @@ void main() {
textDirection: TextDirection.ltr, textDirection: TextDirection.ltr,
flags: <SemanticsFlag>[ flags: <SemanticsFlag>[
SemanticsFlag.hasEnabledState, SemanticsFlag.hasEnabledState,
SemanticsFlag.isButton,
SemanticsFlag.isEnabled, SemanticsFlag.isEnabled,
SemanticsFlag.isFocusable, SemanticsFlag.isFocusable,
], ],
...@@ -1772,7 +1763,6 @@ void main() { ...@@ -1772,7 +1763,6 @@ void main() {
textDirection: TextDirection.ltr, textDirection: TextDirection.ltr,
flags: <SemanticsFlag>[ flags: <SemanticsFlag>[
SemanticsFlag.hasEnabledState, SemanticsFlag.hasEnabledState,
SemanticsFlag.isButton,
SemanticsFlag.isEnabled, SemanticsFlag.isEnabled,
SemanticsFlag.isFocusable, SemanticsFlag.isFocusable,
], ],
...@@ -1818,7 +1808,6 @@ void main() { ...@@ -1818,7 +1808,6 @@ void main() {
textDirection: TextDirection.ltr, textDirection: TextDirection.ltr,
flags: <SemanticsFlag>[ flags: <SemanticsFlag>[
SemanticsFlag.hasEnabledState, SemanticsFlag.hasEnabledState,
SemanticsFlag.isButton,
SemanticsFlag.isEnabled, SemanticsFlag.isEnabled,
SemanticsFlag.isFocusable, SemanticsFlag.isFocusable,
SemanticsFlag.isSelected, SemanticsFlag.isSelected,
...@@ -1864,10 +1853,7 @@ void main() { ...@@ -1864,10 +1853,7 @@ void main() {
TestSemantics( TestSemantics(
label: 'test', label: 'test',
textDirection: TextDirection.ltr, textDirection: TextDirection.ltr,
flags: <SemanticsFlag>[ flags: <SemanticsFlag>[],
SemanticsFlag.hasEnabledState,
SemanticsFlag.isButton,
],
actions: <SemanticsAction>[], actions: <SemanticsAction>[],
), ),
], ],
...@@ -1881,140 +1867,6 @@ void main() { ...@@ -1881,140 +1867,6 @@ void main() {
semanticsTester.dispose(); semanticsTester.dispose();
}); });
testWidgets('tapEnabled explicitly false', (WidgetTester tester) async {
final SemanticsTester semanticsTester = SemanticsTester(tester);
await tester.pumpWidget(const MaterialApp(
home: Material(
child: RawChip(
tapEnabled: false,
label: Text('test'),
),
),
));
expect(semanticsTester, hasSemantics(
TestSemantics.root(
children: <TestSemantics>[
TestSemantics(
textDirection: TextDirection.ltr,
children: <TestSemantics>[
TestSemantics(
children: <TestSemantics>[
TestSemantics(
flags: <SemanticsFlag>[SemanticsFlag.scopesRoute],
children: <TestSemantics>[
TestSemantics(
label: 'test',
textDirection: TextDirection.ltr,
flags: <SemanticsFlag>[], // Must not be a button when tapping is disabled.
actions: <SemanticsAction>[],
),
],
),
],
),
],
),
],
), ignoreTransform: true, ignoreId: true, ignoreRect: true));
semanticsTester.dispose();
});
testWidgets('enabled when tapEnabled and canTap', (WidgetTester tester) async {
final SemanticsTester semanticsTester = SemanticsTester(tester);
// These settings make a Chip which can be tapped, both in general and at this moment.
await tester.pumpWidget(MaterialApp(
home: Material(
child: RawChip(
isEnabled: true,
tapEnabled: true,
onPressed: () {},
label: const Text('test'),
),
),
));
expect(semanticsTester, hasSemantics(
TestSemantics.root(
children: <TestSemantics>[
TestSemantics(
textDirection: TextDirection.ltr,
children: <TestSemantics>[
TestSemantics(
children: <TestSemantics>[
TestSemantics(
flags: <SemanticsFlag>[SemanticsFlag.scopesRoute],
children: <TestSemantics>[
TestSemantics(
label: 'test',
textDirection: TextDirection.ltr,
flags: <SemanticsFlag>[
SemanticsFlag.hasEnabledState,
SemanticsFlag.isButton,
SemanticsFlag.isEnabled,
SemanticsFlag.isFocusable,
],
actions: <SemanticsAction>[SemanticsAction.tap],
),
],
),
],
),
],
),
],
), ignoreTransform: true, ignoreId: true, ignoreRect: true));
semanticsTester.dispose();
});
testWidgets('disabled when tapEnabled but not canTap', (WidgetTester tester) async {
final SemanticsTester semanticsTester = SemanticsTester(tester);
// These settings make a Chip which _could_ be tapped, but not currently (ensures `canTap == false`).
await tester.pumpWidget(const MaterialApp(
home: Material(
child: RawChip(
isEnabled: true,
tapEnabled: true,
label: Text('test'),
),
),
));
expect(semanticsTester, hasSemantics(
TestSemantics.root(
children: <TestSemantics>[
TestSemantics(
textDirection: TextDirection.ltr,
children: <TestSemantics>[
TestSemantics(
children: <TestSemantics>[
TestSemantics(
flags: <SemanticsFlag>[SemanticsFlag.scopesRoute],
children: <TestSemantics>[
TestSemantics(
label: 'test',
textDirection: TextDirection.ltr,
flags: <SemanticsFlag>[
SemanticsFlag.hasEnabledState,
SemanticsFlag.isButton,
],
),
],
),
],
),
],
),
],
), ignoreTransform: true, ignoreId: true, ignoreRect: true));
semanticsTester.dispose();
});
}); });
testWidgets('can be tapped outside of chip delete icon', (WidgetTester tester) async { testWidgets('can be tapped outside of chip delete icon', (WidgetTester tester) async {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab