Unverified Commit 0fac13b4 authored by auto-submit[bot]'s avatar auto-submit[bot] Committed by GitHub

Reverts "[a11y] Add isEnabled semantics flag to text field (#143334)" (#143494)

Reverts flutter/flutter#143334

Initiated by: hangyujin

Reason for reverting: broke g3 tests

Original PR Author: hangyujin

Reviewed By: {LongCatIsLooong}

This change reverts the following previous change:
Original Description:
Add a semantics flag to   text field to fix https://github.com/flutter/flutter/issues/143337 (in IOS the disabled text field is not read `dimmed`)

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