mirrors/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-01-23 01:32:14 -05:00
Code Issues Projects Releases Packages Wiki Activity

LibWeb: Allow modifying non-editable text selections with the keyboard

Browse source 
This permits the user to use shift and the arrow/home/end keys to mutate
the document selection. Arrow key presses on non-editable text without
the shift key held has no effect.

This behavior differs browser-to-browser. The behavior here most closely
matches Firefox, though all browsers support this to some degree.
This commit is contained in:
Timothy Flynn 2024-09-07 17:56:32 -04:00 committed by Andreas Kling
parent fc37c4ad40
commit 16d003c563
Notes: github-actions[bot] 2024-09-08 07:48:28 +00:00 
Author: https://github.com/trflynn89
Commit: https://github.com/LadybirdBrowser/ladybird/commit/16d003c563e
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/1320
1 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
Userland/Libraries/LibWeb/Page/EventHandler.cpp
View file

@ -908,10 +908,10 @@ bool EventHandler::handle_keydown(UIEvents::KeyCode key, u32 modifiers, u32 code
if (!continue_) if (!continue_)
return false; return false;
if (document->cursor_position() && document->cursor_position()->node()->is_editable()) { if (document->cursor_position()) {
auto& node = *document->cursor_position()->node(); auto& node = *document->cursor_position()->node();
if (key == UIEvents::KeyCode::Key_Backspace) { if (key == UIEvents::KeyCode::Key_Backspace && node.is_editable()) {
if (!document->decrement_cursor_position_offset()) { if (!document->decrement_cursor_position_offset()) {
// FIXME: Move to the previous node and delete the last character there. // FIXME: Move to the previous node and delete the last character there.
return true; return true;
@ -920,7 +920,8 @@ bool EventHandler::handle_keydown(UIEvents::KeyCode key, u32 modifiers, u32 code
m_edit_event_handler->handle_delete_character_after(document, *document->cursor_position()); m_edit_event_handler->handle_delete_character_after(document, *document->cursor_position());
return true; return true;
} }
if (key == UIEvents::KeyCode::Key_Delete) {
if (key == UIEvents::KeyCode::Key_Delete && node.is_editable()) {
if (document->cursor_position()->offset_is_at_end_of_node()) { if (document->cursor_position()->offset_is_at_end_of_node()) {
// FIXME: Move to the next node and delete the first character there. // FIXME: Move to the next node and delete the first character there.
return true; return true;
@ -955,16 +956,7 @@ bool EventHandler::handle_keydown(UIEvents::KeyCode key, u32 modifiers, u32 code
return document->increment_cursor_position_to_next_word(); return document->increment_cursor_position_to_next_word();
}; };
if ((modifiers & UIEvents::Mod_Shift) == 0) { if ((modifiers & UIEvents::Mod_Shift) != 0) {
if (selection && range) {
auto cursor_edge = key == UIEvents::KeyCode::Key_Left ? range->start_offset() : range->end_offset();
document->set_cursor_position(DOM::Position::create(document->realm(), node, cursor_edge));
selection->remove_all_ranges();
} else {
increment_or_decrement_cursor();
}
} else {
auto previous_position = document->cursor_position()->offset(); auto previous_position = document->cursor_position()->offset();
auto should_udpdate_selection = increment_or_decrement_cursor(); auto should_udpdate_selection = increment_or_decrement_cursor();
@ -974,6 +966,15 @@ bool EventHandler::handle_keydown(UIEvents::KeyCode key, u32 modifiers, u32 code
(void)selection->set_base_and_extent(node, selection_start, node, selection_end); (void)selection->set_base_and_extent(node, selection_start, node, selection_end);
} }
} else if (node.is_editable()) {
if (selection && range) {
auto cursor_edge = key == UIEvents::KeyCode::Key_Left ? range->start_offset() : range->end_offset();
document->set_cursor_position(DOM::Position::create(document->realm(), node, cursor_edge));
selection->remove_all_ranges();
} else {
increment_or_decrement_cursor();
}
} }
return true; return true;
@ -982,10 +983,7 @@ bool EventHandler::handle_keydown(UIEvents::KeyCode key, u32 modifiers, u32 code
if (key == UIEvents::KeyCode::Key_Home || key == UIEvents::KeyCode::Key_End) { if (key == UIEvents::KeyCode::Key_Home || key == UIEvents::KeyCode::Key_End) {
auto cursor_edge = key == UIEvents::KeyCode::Key_Home ? 0uz : node.length(); auto cursor_edge = key == UIEvents::KeyCode::Key_Home ? 0uz : node.length();
if ((modifiers & UIEvents::Mod_Shift) == 0) { if ((modifiers & UIEvents::Mod_Shift) != 0) {
if (selection && range)
selection->remove_all_ranges();
} else {
auto previous_position = document->cursor_position()->offset(); auto previous_position = document->cursor_position()->offset();
auto should_udpdate_selection = previous_position != cursor_edge; auto should_udpdate_selection = previous_position != cursor_edge;
@ -993,13 +991,16 @@ bool EventHandler::handle_keydown(UIEvents::KeyCode key, u32 modifiers, u32 code
auto selection_start = range ? selection->anchor_offset() : previous_position; auto selection_start = range ? selection->anchor_offset() : previous_position;
(void)selection->set_base_and_extent(node, selection_start, node, cursor_edge); (void)selection->set_base_and_extent(node, selection_start, node, cursor_edge);
} }
} else if (node.is_editable()) {
if (selection && range)
selection->remove_all_ranges();
} }
document->set_cursor_position(DOM::Position::create(realm, node, cursor_edge)); document->set_cursor_position(DOM::Position::create(realm, node, cursor_edge));
return true; return true;
} }
if (key == UIEvents::KeyCode::Key_Return) { if (key == UIEvents::KeyCode::Key_Return && node.is_editable()) {
HTML::HTMLInputElement* input_element = nullptr; HTML::HTMLInputElement* input_element = nullptr;
if (auto node = document->cursor_position()->node()) { if (auto node = document->cursor_position()->node()) {
if (node->is_text()) { if (node->is_text()) {
@ -1022,7 +1023,7 @@ bool EventHandler::handle_keydown(UIEvents::KeyCode key, u32 modifiers, u32 code
} }
// FIXME: Text editing shortcut keys (copy/paste etc.) should be handled here. // FIXME: Text editing shortcut keys (copy/paste etc.) should be handled here.
if (!should_ignore_keydown_event(code_point, modifiers)) { if (!should_ignore_keydown_event(code_point, modifiers) && node.is_editable()) {
m_edit_event_handler->handle_insert(document, JS::NonnullGCPtr { *document->cursor_position() }, code_point); m_edit_event_handler->handle_insert(document, JS::NonnullGCPtr { *document->cursor_position() }, code_point);
document->increment_cursor_position_offset(); document->increment_cursor_position_offset();
return true; return true;