Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 15:23:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix clearing the selection when value is changed

Browse source 
The implementation of adjust_horizontal_to_limit() is written with UI in
mind. As such, when there's a selection and we "adjust horizontal", the
selection will be cleared and the cursor will and up at the start/end of
the previous selection. This is what happens when you have a selection
and you press an arrow key on your keyboard, but it isn't the behaviour
we want when programmatically changing the value.

Instead, we need to first clear the selection, and then move the cursor
to the end. (We also need to reset the selection direction when clearing
the selection.)
This commit is contained in:
Jon Leighton 2017-12-09 21:55:01 +01:00
parent 02883a6f54
commit 648bfbeb02
4 changed files with 11 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/script/dom/htmlinputelement.rs
View file

@ -52,7 +52,7 @@ use std::ops::Range;
use style::attr::AttrValue; use style::attr::AttrValue;
use style::element_state::ElementState; use style::element_state::ElementState;
use style::str::split_commas; use style::str::split_commas;
use textinput::{Direction, Selection, SelectionDirection, TextInput}; use textinput::{SelectionDirection, TextInput};
use textinput::KeyReaction::{DispatchInput, Nothing, RedrawSelection, TriggerDefaultAction}; use textinput::KeyReaction::{DispatchInput, Nothing, RedrawSelection, TriggerDefaultAction};
use textinput::Lines::Single; use textinput::Lines::Single;
@ -563,8 +563,7 @@ impl HTMLInputElementMethods for HTMLInputElement {
self.sanitize_value(); self.sanitize_value();
// Step 5. // Step 5.
if *self.textinput.borrow().single_line_content() != old_value { if *self.textinput.borrow().single_line_content() != old_value {
self.textinput.borrow_mut() self.textinput.borrow_mut().clear_selection_to_limit();
.adjust_horizontal_to_limit(Direction::Forward, Selection::NotSelected);
} }
} }
ValueMode::Default | ValueMode::Default |

4
components/script/dom/htmltextareaelement.rs
View file

@ -35,7 +35,7 @@ use std::default::Default;
use std::ops::Range; use std::ops::Range;
use style::attr::AttrValue; use style::attr::AttrValue;
use style::element_state::ElementState; use style::element_state::ElementState;
use textinput::{Direction, KeyReaction, Lines, Selection, SelectionDirection, TextInput}; use textinput::{KeyReaction, Lines, SelectionDirection, TextInput};
#[dom_struct] #[dom_struct]
pub struct HTMLTextAreaElement { pub struct HTMLTextAreaElement {
@ -257,7 +257,7 @@ impl HTMLTextAreaElementMethods for HTMLTextAreaElement {
if old_value != textinput.get_content() { if old_value != textinput.get_content() {
// Step 4 // Step 4
textinput.adjust_horizontal_to_limit(Direction::Forward, Selection::NotSelected); textinput.clear_selection_to_limit();
} else { } else {
textinput.selection_origin = old_selection; textinput.selection_origin = old_selection;
} }

7
components/script/textinput.rs
View file

@ -513,6 +513,13 @@ impl<T: ClipboardProvider> TextInput<T> {
/// Remove the current selection. /// Remove the current selection.
pub fn clear_selection(&mut self) { pub fn clear_selection(&mut self) {
self.selection_origin = None; self.selection_origin = None;
self.selection_direction = SelectionDirection::None;
}
/// Remove the current selection and set the edit point to the end of the content.
pub fn clear_selection_to_limit(&mut self) {
self.clear_selection();
self.adjust_horizontal_to_limit(Direction::Forward, Selection::NotSelected);
} }
pub fn adjust_horizontal_by_word(&mut self, direction: Direction, select: Selection) { pub fn adjust_horizontal_by_word(&mut self, direction: Direction, select: Selection) {

20
tests/wpt/metadata/html/semantics/forms/textfieldselection/selection-after-content-change.html.ini
View file

@ -1,20 +0,0 @@
[selection-after-content-change.html]
type: testharness
[input out of document: selection must change when setting a different value]
expected: FAIL
[input in document: selection must change when setting a different value]
expected: FAIL
[input in document, with focus: selection must change when setting a different value]
expected: FAIL
[textarea out of document: selection must change when setting a different value]
expected: FAIL
[textarea in document: selection must change when setting a different value]
expected: FAIL
[textarea in document, with focus: selection must change when setting a different value]
expected: FAIL