mirror of
https://github.com/flutter/flutter
synced 2024-10-05 15:59:49 +00:00
Reland [a11y] Add isEnabled semantics flag to text field (#143601)
Reland #143334
This commit is contained in:
parent
2c2fed1dfb
commit
fdb17ab069
|
@ -1574,6 +1574,7 @@ class _TextFieldState extends State<TextField> with RestorationMixin implements
|
|||
animation: controller, // changes the _currentLength
|
||||
builder: (BuildContext context, Widget? child) {
|
||||
return Semantics(
|
||||
enabled: _isEnabled,
|
||||
maxValueLength: semanticsMaxValueLength,
|
||||
currentValueLength: _currentLength,
|
||||
onTap: widget.readOnly ? null : () {
|
||||
|
|
|
@ -529,8 +529,11 @@ void main() {
|
|||
children: <TestSemantics>[
|
||||
TestSemantics(
|
||||
id: 4,
|
||||
flags: <SemanticsFlag>[SemanticsFlag.isTextField,
|
||||
SemanticsFlag.hasEnabledState, SemanticsFlag.isEnabled,],
|
||||
flags: <SemanticsFlag>[
|
||||
SemanticsFlag.isTextField,
|
||||
SemanticsFlag.hasEnabledState,
|
||||
SemanticsFlag.isEnabled,
|
||||
],
|
||||
actions: <SemanticsAction>[SemanticsAction.tap,
|
||||
SemanticsAction.didGainAccessibilityFocus,],
|
||||
textDirection: TextDirection.ltr,
|
||||
|
|
|
@ -279,6 +279,8 @@ void main() {
|
|||
expect(tester.getSemantics(find.byType(EditableText)), matchesSemantics(
|
||||
label: 'Enter Date',
|
||||
isTextField: true,
|
||||
hasEnabledState: true,
|
||||
isEnabled: true,
|
||||
isFocused: true,
|
||||
value: '01/15/2016',
|
||||
hasTapAction: true,
|
||||
|
|
|
@ -670,6 +670,8 @@ void main() {
|
|||
id: 9,
|
||||
flags: <SemanticsFlag>[
|
||||
SemanticsFlag.isTextField,
|
||||
SemanticsFlag.hasEnabledState,
|
||||
SemanticsFlag.isEnabled,
|
||||
SemanticsFlag.isFocused,
|
||||
SemanticsFlag.isHeader,
|
||||
if (debugDefaultTargetPlatformOverride != TargetPlatform.iOS &&
|
||||
|
@ -818,6 +820,8 @@ void main() {
|
|||
id: 11,
|
||||
flags: <SemanticsFlag>[
|
||||
SemanticsFlag.isTextField,
|
||||
SemanticsFlag.hasEnabledState,
|
||||
SemanticsFlag.isEnabled,
|
||||
SemanticsFlag.isFocused,
|
||||
SemanticsFlag.isHeader,
|
||||
if (debugDefaultTargetPlatformOverride != TargetPlatform.iOS &&
|
||||
|
|
|
@ -746,7 +746,7 @@ void main() {
|
|||
children: <TestSemantics>[
|
||||
TestSemantics(
|
||||
id: 4,
|
||||
flags: <SemanticsFlag>[SemanticsFlag.isTextField],
|
||||
flags: <SemanticsFlag>[SemanticsFlag.isTextField, SemanticsFlag.hasEnabledState, SemanticsFlag.isEnabled],
|
||||
actions: <SemanticsAction>[
|
||||
SemanticsAction.tap,
|
||||
SemanticsAction.didGainAccessibilityFocus,
|
||||
|
@ -1856,7 +1856,12 @@ void main() {
|
|||
children: <TestSemantics>[
|
||||
TestSemantics(
|
||||
id: 1,
|
||||
flags: <SemanticsFlag>[SemanticsFlag.isTextField, SemanticsFlag.isFocused],
|
||||
flags: <SemanticsFlag>[
|
||||
SemanticsFlag.isTextField,
|
||||
SemanticsFlag.hasEnabledState,
|
||||
SemanticsFlag.isEnabled,
|
||||
SemanticsFlag.isFocused,
|
||||
],
|
||||
actions: <SemanticsAction>[
|
||||
SemanticsAction.tap,
|
||||
SemanticsAction.moveCursorBackwardByCharacter,
|
||||
|
@ -5189,6 +5194,8 @@ void main() {
|
|||
],
|
||||
flags: <SemanticsFlag>[
|
||||
SemanticsFlag.isTextField,
|
||||
SemanticsFlag.hasEnabledState,
|
||||
SemanticsFlag.isEnabled,
|
||||
],
|
||||
),
|
||||
TestSemantics.rootChild(
|
||||
|
@ -6530,7 +6537,7 @@ void main() {
|
|||
),
|
||||
);
|
||||
|
||||
expect(semantics, includesNodeWith(flags: <SemanticsFlag>[SemanticsFlag.isTextField]));
|
||||
expect(semantics, includesNodeWith(flags: <SemanticsFlag>[SemanticsFlag.isTextField, SemanticsFlag.hasEnabledState, SemanticsFlag.isEnabled]));
|
||||
|
||||
semantics.dispose();
|
||||
});
|
||||
|
@ -6944,7 +6951,7 @@ void main() {
|
|||
);
|
||||
|
||||
expect(semantics, includesNodeWith(
|
||||
flags: <SemanticsFlag>[SemanticsFlag.isTextField],
|
||||
flags: <SemanticsFlag>[SemanticsFlag.isTextField, SemanticsFlag.hasEnabledState, SemanticsFlag.isEnabled],
|
||||
maxValueLength: 10,
|
||||
currentValueLength: 0,
|
||||
));
|
||||
|
@ -6959,7 +6966,12 @@ void main() {
|
|||
await tester.pump();
|
||||
|
||||
expect(semantics, includesNodeWith(
|
||||
flags: <SemanticsFlag>[SemanticsFlag.isTextField, SemanticsFlag.isFocused],
|
||||
flags: <SemanticsFlag>[
|
||||
SemanticsFlag.isTextField,
|
||||
SemanticsFlag.hasEnabledState,
|
||||
SemanticsFlag.isEnabled,
|
||||
SemanticsFlag.isFocused,
|
||||
],
|
||||
maxValueLength: 10,
|
||||
currentValueLength: 3,
|
||||
));
|
||||
|
@ -6985,7 +6997,12 @@ void main() {
|
|||
|
||||
expect(
|
||||
semantics,
|
||||
includesNodeWith(flags: <SemanticsFlag>[SemanticsFlag.isTextField, SemanticsFlag.isReadOnly]),
|
||||
includesNodeWith(flags: <SemanticsFlag>[
|
||||
SemanticsFlag.isTextField,
|
||||
SemanticsFlag.hasEnabledState,
|
||||
SemanticsFlag.isEnabled,
|
||||
SemanticsFlag.isReadOnly,
|
||||
]),
|
||||
);
|
||||
|
||||
semantics.dispose();
|
||||
|
@ -8011,6 +8028,8 @@ void main() {
|
|||
],
|
||||
flags: <SemanticsFlag>[
|
||||
SemanticsFlag.isTextField,
|
||||
SemanticsFlag.hasEnabledState,
|
||||
SemanticsFlag.isEnabled,
|
||||
],
|
||||
),
|
||||
],
|
||||
|
@ -8030,6 +8049,8 @@ void main() {
|
|||
],
|
||||
flags: <SemanticsFlag>[
|
||||
SemanticsFlag.isTextField,
|
||||
SemanticsFlag.hasEnabledState,
|
||||
SemanticsFlag.isEnabled,
|
||||
],
|
||||
),
|
||||
],
|
||||
|
@ -8055,6 +8076,8 @@ void main() {
|
|||
],
|
||||
flags: <SemanticsFlag>[
|
||||
SemanticsFlag.isTextField,
|
||||
SemanticsFlag.hasEnabledState,
|
||||
SemanticsFlag.isEnabled,
|
||||
SemanticsFlag.isFocused,
|
||||
],
|
||||
),
|
||||
|
@ -8083,6 +8106,8 @@ void main() {
|
|||
],
|
||||
flags: <SemanticsFlag>[
|
||||
SemanticsFlag.isTextField,
|
||||
SemanticsFlag.hasEnabledState,
|
||||
SemanticsFlag.isEnabled,
|
||||
SemanticsFlag.isFocused,
|
||||
],
|
||||
),
|
||||
|
@ -8110,6 +8135,8 @@ void main() {
|
|||
],
|
||||
flags: <SemanticsFlag>[
|
||||
SemanticsFlag.isTextField,
|
||||
SemanticsFlag.hasEnabledState,
|
||||
SemanticsFlag.isEnabled,
|
||||
SemanticsFlag.isFocused,
|
||||
],
|
||||
),
|
||||
|
@ -8135,6 +8162,8 @@ void main() {
|
|||
textDirection: TextDirection.ltr,
|
||||
flags: <SemanticsFlag>[
|
||||
SemanticsFlag.isTextField,
|
||||
SemanticsFlag.hasEnabledState,
|
||||
SemanticsFlag.isEnabled,
|
||||
],
|
||||
value: 'Hello',
|
||||
)
|
||||
|
@ -8150,6 +8179,8 @@ void main() {
|
|||
textDirection: TextDirection.ltr,
|
||||
flags: <SemanticsFlag>[
|
||||
SemanticsFlag.isTextField,
|
||||
SemanticsFlag.hasEnabledState,
|
||||
SemanticsFlag.isEnabled,
|
||||
SemanticsFlag.isObscured,
|
||||
],
|
||||
)
|
||||
|
@ -8165,6 +8196,8 @@ void main() {
|
|||
textDirection: TextDirection.ltr,
|
||||
flags: <SemanticsFlag>[
|
||||
SemanticsFlag.isTextField,
|
||||
SemanticsFlag.hasEnabledState,
|
||||
SemanticsFlag.isEnabled,
|
||||
],
|
||||
value: 'Hello',
|
||||
)
|
||||
|
@ -8207,6 +8240,8 @@ void main() {
|
|||
],
|
||||
flags: <SemanticsFlag>[
|
||||
SemanticsFlag.isTextField,
|
||||
SemanticsFlag.hasEnabledState,
|
||||
SemanticsFlag.isEnabled,
|
||||
SemanticsFlag.isFocused,
|
||||
],
|
||||
),
|
||||
|
@ -8242,6 +8277,8 @@ void main() {
|
|||
],
|
||||
flags: <SemanticsFlag>[
|
||||
SemanticsFlag.isTextField,
|
||||
SemanticsFlag.hasEnabledState,
|
||||
SemanticsFlag.isEnabled,
|
||||
],
|
||||
),
|
||||
],
|
||||
|
@ -8268,6 +8305,8 @@ void main() {
|
|||
],
|
||||
flags: <SemanticsFlag>[
|
||||
SemanticsFlag.isTextField,
|
||||
SemanticsFlag.hasEnabledState,
|
||||
SemanticsFlag.isEnabled,
|
||||
SemanticsFlag.isFocused,
|
||||
],
|
||||
),
|
||||
|
@ -8298,6 +8337,8 @@ void main() {
|
|||
],
|
||||
flags: <SemanticsFlag>[
|
||||
SemanticsFlag.isTextField,
|
||||
SemanticsFlag.hasEnabledState,
|
||||
SemanticsFlag.isEnabled,
|
||||
SemanticsFlag.isFocused,
|
||||
],
|
||||
),
|
||||
|
@ -8347,6 +8388,8 @@ void main() {
|
|||
],
|
||||
flags: <SemanticsFlag>[
|
||||
SemanticsFlag.isTextField,
|
||||
SemanticsFlag.hasEnabledState,
|
||||
SemanticsFlag.isEnabled,
|
||||
SemanticsFlag.isFocused,
|
||||
],
|
||||
),
|
||||
|
@ -8395,6 +8438,8 @@ void main() {
|
|||
],
|
||||
flags: <SemanticsFlag>[
|
||||
SemanticsFlag.isTextField,
|
||||
SemanticsFlag.hasEnabledState,
|
||||
SemanticsFlag.isEnabled,
|
||||
SemanticsFlag.isFocused,
|
||||
],
|
||||
),
|
||||
|
@ -8431,7 +8476,7 @@ void main() {
|
|||
children: <TestSemantics>[
|
||||
TestSemantics(
|
||||
id: inputFieldId,
|
||||
flags: <SemanticsFlag>[SemanticsFlag.isTextField],
|
||||
flags: <SemanticsFlag>[SemanticsFlag.isTextField, SemanticsFlag.hasEnabledState, SemanticsFlag.isEnabled],
|
||||
actions: <SemanticsAction>[SemanticsAction.tap],
|
||||
value: textInTextField,
|
||||
textDirection: TextDirection.ltr,
|
||||
|
@ -8451,6 +8496,8 @@ void main() {
|
|||
id: inputFieldId,
|
||||
flags: <SemanticsFlag>[
|
||||
SemanticsFlag.isTextField,
|
||||
SemanticsFlag.hasEnabledState,
|
||||
SemanticsFlag.isEnabled,
|
||||
SemanticsFlag.isFocused,
|
||||
],
|
||||
actions: <SemanticsAction>[
|
||||
|
@ -8504,7 +8551,7 @@ void main() {
|
|||
children: <TestSemantics>[
|
||||
TestSemantics(
|
||||
id: inputFieldId,
|
||||
flags: <SemanticsFlag>[SemanticsFlag.isTextField],
|
||||
flags: <SemanticsFlag>[SemanticsFlag.isTextField, SemanticsFlag.hasEnabledState, SemanticsFlag.isEnabled],
|
||||
actions: <SemanticsAction>[SemanticsAction.tap],
|
||||
value: textInTextField,
|
||||
textDirection: TextDirection.ltr,
|
||||
|
@ -8524,6 +8571,8 @@ void main() {
|
|||
id: inputFieldId,
|
||||
flags: <SemanticsFlag>[
|
||||
SemanticsFlag.isTextField,
|
||||
SemanticsFlag.hasEnabledState,
|
||||
SemanticsFlag.isEnabled,
|
||||
SemanticsFlag.isFocused,
|
||||
],
|
||||
actions: <SemanticsAction>[
|
||||
|
@ -8704,6 +8753,8 @@ void main() {
|
|||
],
|
||||
flags: <SemanticsFlag>[
|
||||
SemanticsFlag.isTextField,
|
||||
SemanticsFlag.hasEnabledState,
|
||||
SemanticsFlag.isEnabled,
|
||||
],
|
||||
children: <TestSemantics>[
|
||||
TestSemantics(
|
||||
|
@ -8739,6 +8790,8 @@ void main() {
|
|||
],
|
||||
flags: <SemanticsFlag>[
|
||||
SemanticsFlag.isTextField,
|
||||
SemanticsFlag.hasEnabledState,
|
||||
SemanticsFlag.isEnabled,
|
||||
SemanticsFlag.isFocused,
|
||||
],
|
||||
children: <TestSemantics>[
|
||||
|
@ -8796,6 +8849,8 @@ void main() {
|
|||
],
|
||||
flags: <SemanticsFlag>[
|
||||
SemanticsFlag.isTextField,
|
||||
SemanticsFlag.hasEnabledState,
|
||||
SemanticsFlag.isEnabled,
|
||||
],
|
||||
children: <TestSemantics>[
|
||||
TestSemantics(
|
||||
|
@ -8843,6 +8898,8 @@ void main() {
|
|||
],
|
||||
flags: <SemanticsFlag>[
|
||||
SemanticsFlag.isTextField,
|
||||
SemanticsFlag.hasEnabledState,
|
||||
SemanticsFlag.isEnabled,
|
||||
],
|
||||
children: <TestSemantics>[
|
||||
TestSemantics(
|
||||
|
|
|
@ -1343,7 +1343,12 @@ void main() {
|
|||
label: 'Hour',
|
||||
value: '07',
|
||||
actions: <SemanticsAction>[SemanticsAction.tap],
|
||||
flags: <SemanticsFlag>[SemanticsFlag.isTextField, SemanticsFlag.isMultiline],
|
||||
flags: <SemanticsFlag>[
|
||||
SemanticsFlag.isTextField,
|
||||
SemanticsFlag.hasEnabledState,
|
||||
SemanticsFlag.isEnabled,
|
||||
SemanticsFlag.isMultiline,
|
||||
],
|
||||
),
|
||||
);
|
||||
expect(
|
||||
|
@ -1352,7 +1357,12 @@ void main() {
|
|||
label: 'Minute',
|
||||
value: '00',
|
||||
actions: <SemanticsAction>[SemanticsAction.tap],
|
||||
flags: <SemanticsFlag>[SemanticsFlag.isTextField, SemanticsFlag.isMultiline],
|
||||
flags: <SemanticsFlag>[
|
||||
SemanticsFlag.isTextField,
|
||||
SemanticsFlag.hasEnabledState,
|
||||
SemanticsFlag.isEnabled,
|
||||
SemanticsFlag.isMultiline,
|
||||
],
|
||||
),
|
||||
);
|
||||
|
||||
|
|
|
@ -883,6 +883,7 @@ void main() {
|
|||
group('simulatedTraversal', () {
|
||||
final List<Matcher> fullTraversalMatchers = <Matcher>[
|
||||
containsSemantics(isHeader: true, label: 'Semantics Test'),
|
||||
containsSemantics(label: 'Text Field'),
|
||||
containsSemantics(isTextField: true),
|
||||
containsSemantics(label: 'Off Switch'),
|
||||
containsSemantics(hasToggledState: true),
|
||||
|
@ -913,7 +914,7 @@ void main() {
|
|||
await tester.pumpWidget(const MaterialApp(home: _SemanticsTestWidget()));
|
||||
|
||||
// We're expecting the traversal to start where the slider is.
|
||||
final List<Matcher> expectedMatchers = <Matcher>[...fullTraversalMatchers]..removeRange(0, 8);
|
||||
final List<Matcher> expectedMatchers = <Matcher>[...fullTraversalMatchers]..removeRange(0, 9);
|
||||
|
||||
expect(
|
||||
tester.semantics.simulatedAccessibilityTraversal(start: find.byType(Slider)),
|
||||
|
@ -988,7 +989,7 @@ void main() {
|
|||
await tester.pumpWidget(const MaterialApp(home: _SemanticsTestWidget()));
|
||||
|
||||
// We're expecting the traversal to end where the slider is, inclusive.
|
||||
final Iterable<Matcher> expectedMatchers = <Matcher>[...fullTraversalMatchers].getRange(0, 9);
|
||||
final Iterable<Matcher> expectedMatchers = <Matcher>[...fullTraversalMatchers].getRange(0, 10);
|
||||
|
||||
expect(
|
||||
tester.semantics.simulatedAccessibilityTraversal(end: find.byType(Slider)),
|
||||
|
@ -1049,7 +1050,7 @@ void main() {
|
|||
await tester.pumpWidget(const MaterialApp(home: _SemanticsTestWidget()));
|
||||
|
||||
// We're expecting the traversal to start at the text field and end at the slider.
|
||||
final Iterable<Matcher> expectedMatchers = <Matcher>[...fullTraversalMatchers].getRange(1, 9);
|
||||
final Iterable<Matcher> expectedMatchers = <Matcher>[...fullTraversalMatchers].getRange(1, 10);
|
||||
|
||||
expect(
|
||||
tester.semantics.simulatedAccessibilityTraversal(
|
||||
|
@ -1777,7 +1778,7 @@ class _SemanticsTestWidget extends StatelessWidget {
|
|||
child: Column(
|
||||
children: <Widget>[
|
||||
const _SemanticsTestCard(
|
||||
label: 'TextField',
|
||||
label: 'Text Field',
|
||||
widget: TextField(),
|
||||
),
|
||||
_SemanticsTestCard(
|
||||
|
|
Loading…
Reference in a new issue