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

Clear the composing range when selecting text. (#3635)

Browse Source 
This fixes a bug where editing the selected text on Android would delete
the wrong block of text.

BUG=https://github.com/flutter/flutter/issues/3567
This commit is contained in:
Matt Perry 2016-04-29 14:02:56 -04:00
parent 60755f6d9c
commit f93ea0ead1
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packages/flutter/lib/src/widgets/editable.dart
View File

@ -303,16 +303,16 @@ class RawInputLineState extends ScrollableState<RawInputLine> {
// EditableLineWidget, not just changes triggered by user gestures.
requestKeyboard();
InputValue newInput = new InputValue(text: _keyboardClient.inputValue.text, selection: selection);
if (config.onChanged != null)
config.onChanged(_keyboardClient.inputValue.copyWith(selection: selection));
config.onChanged(newInput);
if (_selectionHandles != null) {
_selectionHandles.hide();
_selectionHandles = null;
}
if (_selectionHandles == null &&
_keyboardClient.inputValue.text.isNotEmpty &&
if (_keyboardClient.inputValue.text.isNotEmpty &&
config.selectionHandleBuilder != null) {
_selectionHandles = new TextSelectionHandles(
selection: selection,
@ -325,8 +325,9 @@ class RawInputLineState extends ScrollableState<RawInputLine> {
}
void _handleSelectionHandleChanged(TextSelection selection) {
InputValue newInput = new InputValue(text: _keyboardClient.inputValue.text, selection: selection);
if (config.onChanged != null)
config.onChanged(_keyboardClient.inputValue.copyWith(selection: selection));
config.onChanged(newInput);
}
/// Whether the blinking cursor is actually visible at this precise moment
@ -381,10 +382,14 @@ class RawInputLineState extends ScrollableState<RawInputLine> {
else if (_cursorTimer != null && (!focused || !config.value.selection.isCollapsed))
_stopCursorTimer();
if (_selectionHandles != null && !focused) {
scheduleMicrotask(() { // can't hide while disposing, since it triggers a rebuild
_selectionHandles.hide();
_selectionHandles = null;
if (_selectionHandles != null) {
scheduleMicrotask(() { // can't update while disposing, since it triggers a rebuild
if (focused) {
_selectionHandles.update(config.value.selection);
} else {
_selectionHandles.hide();
_selectionHandles = null;
}
});
}