firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Improve text formatter repeat filter logic (#52055)" (#52274)

Browse Source 
This reverts commit 91b0bcf1a8a192e8135a9289310d81deba5824ec.
This commit is contained in:
renyou 2020-03-09 16:26:48 -07:00 committed by GitHub
parent ffcc776513
commit 847280f72f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/flutter/lib/src/widgets/editable_text.dart
View File

@ -1656,23 +1656,15 @@ class EditableTextState extends State<EditableText> with AutomaticKeepAliveClien
// Check if the new value is the same as the current local value, or is the same // Check if the new value is the same as the current local value, or is the same
// as the post-formatting value of the previous pass. // as the post-formatting value of the previous pass.
final bool textChanged = _value?.text != value?.text; final bool textChanged = _value?.text != value?.text;
final bool isRepeatText = value?.text == _lastFormattedUnmodifiedTextEditingValue?.text; final bool isRepeat = value?.text == _lastFormattedUnmodifiedTextEditingValue?.text;
final bool isRepeatSelection = value?.selection == _lastFormattedUnmodifiedTextEditingValue?.selection; if (textChanged && !isRepeat && widget.inputFormatters != null && widget.inputFormatters.isNotEmpty) {
// Only format when the text has changed and there are available formatters. for (final TextInputFormatter formatter in widget.inputFormatters)
if (!isRepeatText && textChanged && widget.inputFormatters != null && widget.inputFormatters.isNotEmpty) {
for (final TextInputFormatter formatter in widget.inputFormatters) {
value = formatter.formatEditUpdate(_value, value); value = formatter.formatEditUpdate(_value, value);
} _value = value;
} _updateRemoteEditingValueIfNeeded();
// If the text has changed or the selection has changed, we should update the } else {
// locally stored TextEditingValue to the new one.
if (!isRepeatText || !isRepeatSelection) {
_value = value; _value = value;
} }
// Always attempt to send the value. If the value has changed, then it will send,
// otherwise, it will short-circuit.
_updateRemoteEditingValueIfNeeded();
if (textChanged && widget.onChanged != null) if (textChanged && widget.onChanged != null)
widget.onChanged(value.text); widget.onChanged(value.text);
_lastFormattedUnmodifiedTextEditingValue = _receivedRemoteTextEditingValue; _lastFormattedUnmodifiedTextEditingValue = _receivedRemoteTextEditingValue;

55
packages/flutter/test/widgets/editable_text_test.dart
View File

@ -4238,61 +4238,6 @@ void main() {
expect(formatter.log, referenceLog); expect(formatter.log, referenceLog);
}); });
testWidgets('formatter logic handles repeat filtering', (WidgetTester tester) async {
final MockTextFormatter formatter = MockTextFormatter();
await tester.pumpWidget(
MediaQuery(
data: const MediaQueryData(devicePixelRatio: 1.0),
child: Directionality(
textDirection: TextDirection.ltr,
child: FocusScope(
node: focusScopeNode,
autofocus: true,
child: EditableText(
backgroundCursorColor: Colors.grey,
controller: controller,
focusNode: focusNode,
maxLines: 1, // Sets text keyboard implicitly.
style: textStyle,
cursorColor: cursorColor,
inputFormatters: <TextInputFormatter>[formatter],
),
),
),
),
);
await tester.tap(find.byType(EditableText));
await tester.showKeyboard(find.byType(EditableText));
controller.text = '';
await tester.idle();
final EditableTextState state =
tester.state<EditableTextState>(find.byType(EditableText));
expect(tester.testTextInput.editingState['text'], equals(''));
expect(state.wantKeepAlive, true);
state.updateEditingValue(const TextEditingValue(text: '01'));
state.updateEditingValue(const TextEditingValue(text: '012'));
state.updateEditingValue(const TextEditingValue(text: '0123')); // Text change causes reformat
state.updateEditingValue(const TextEditingValue(text: '0123')); // Repeat, does not format
state.updateEditingValue(const TextEditingValue(text: '0123')); // Repeat, does not format
state.updateEditingValue(const TextEditingValue(text: '0123', selection: TextSelection.collapsed(offset: 2))); // Selection change does not reformat
state.updateEditingValue(const TextEditingValue(text: '0123', selection: TextSelection.collapsed(offset: 2))); // Repeat, does not format
state.updateEditingValue(const TextEditingValue(text: '0123', selection: TextSelection.collapsed(offset: 2))); // Repeat, does not format
const List<String> referenceLog = <String>[
'[1]: , 01',
'[1]: normal aa',
'[2]: aa, 012',
'[2]: normal aaaa',
'[3]: aaaa, 0123',
'[3]: normal aaaaaa',
];
expect(formatter.log, referenceLog);
});
} }
class MockTextFormatter extends TextInputFormatter { class MockTextFormatter extends TextInputFormatter {