beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-26 01:20:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

LibWeb: Implement dispatching of "beforeinput" event

Browse source
This commit is contained in:
Aliaksandr Kalenik 2024-10-20 21:54:32 +02:00 committed by Tim Flynn
parent 0de61b0f65
commit 63f502ab0a
Notes: github-actions[bot] 2024-10-22 12:45:55 +00:00 
Author: https://github.com/kalenikaliaksandr
Commit: https://github.com/LadybirdBrowser/ladybird/commit/63f502ab0ac
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/1903
Reviewed-by: https://github.com/ADKaster
Reviewed-by: https://github.com/trflynn89 ✅
5 changed files with 42 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Tests/LibWeb/Text/expected/Editing/beforeinput-event.txt Normal file
View file

@ -0,0 +1,5 @@
beforeinput data=(r) intputType=(insertText)
beforeinput data=(e) intputType=(insertText)
beforeinput data=(e) intputType=(insertText)
beforeinput data=(e) intputType=(insertText)
Text in input: reee

24
Tests/LibWeb/Text/input/Editing/beforeinput-event.html Normal file
View file

@ -0,0 +1,24 @@
<script src="../include.js"></script>
<style>
#input {
width: 100px;
height: 100px;
border: 1px solid black;
}
</style>
<div id="input" contenteditable="true"></div>
<script>
test(() => {
const input = document.getElementById("input");
input.addEventListener("beforeinput", (e) => {
if (e.data !== 'r' && e.data !== 'e') {
e.preventDefault();
return;
}
println(`beforeinput data=(${e.data}) intputType=(${e.inputType})`);
});
internals.sendText(input, "raebece");
internals.commitText();
println(`Text in input: ${input.textContent}`);
});
</script>

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

@ -997,6 +997,8 @@ EventResult EventHandler::handle_keydown(UIEvents::KeyCode key, u32 modifiers, u
auto& node = *document->cursor_position()->node();
if (key == UIEvents::KeyCode::Key_Backspace && node.is_editable()) {
FIRE(input_event(UIEvents::EventNames::beforeinput, UIEvents::InputTypes::deleteContentBackward, m_navigable, code_point));
if (!document->decrement_cursor_position_offset()) {
// FIXME: Move to the previous node and delete the last character there.
return EventResult::Handled;
@ -1008,6 +1010,8 @@ EventResult EventHandler::handle_keydown(UIEvents::KeyCode key, u32 modifiers, u
}
if (key == UIEvents::KeyCode::Key_Delete && node.is_editable()) {
FIRE(input_event(UIEvents::EventNames::beforeinput, UIEvents::InputTypes::deleteContentForward, m_navigable, code_point));
if (document->cursor_position()->offset_is_at_end_of_node()) {
// FIXME: Move to the next node and delete the first character there.
return EventResult::Handled;
@ -1089,6 +1093,7 @@ EventResult EventHandler::handle_keydown(UIEvents::KeyCode key, u32 modifiers, u
}
if (key == UIEvents::KeyCode::Key_Return && node.is_editable()) {
FIRE(input_event(UIEvents::EventNames::beforeinput, UIEvents::InputTypes::insertParagraph, m_navigable, code_point));
HTML::HTMLInputElement* input_element = nullptr;
if (auto node = document->cursor_position()->node()) {
if (node->is_text()) {
@ -1114,6 +1119,7 @@ EventResult EventHandler::handle_keydown(UIEvents::KeyCode key, u32 modifiers, u
// FIXME: Text editing shortcut keys (copy/paste etc.) should be handled here.
if (!should_ignore_keydown_event(code_point, modifiers) && node.is_editable()) {
FIRE(input_event(UIEvents::EventNames::beforeinput, UIEvents::InputTypes::insertText, m_navigable, code_point));
m_edit_event_handler->handle_insert(document, JS::NonnullGCPtr { *document->cursor_position() }, code_point);
document->increment_cursor_position_offset();
FIRE(input_event(UIEvents::EventNames::input, UIEvents::InputTypes::insertText, m_navigable, code_point));

1
Userland/Libraries/LibWeb/UIEvents/EventNames.h
View file

@ -16,6 +16,7 @@ namespace Web::UIEvents::EventNames {
#define ENUMERATE_UI_EVENTS \
__ENUMERATE_UI_EVENT(auxclick) \
__ENUMERATE_UI_EVENT(beforeinput) \
__ENUMERATE_UI_EVENT(click) \
__ENUMERATE_UI_EVENT(contextmenu) \
__ENUMERATE_UI_EVENT(dblclick) \

7
Userland/Libraries/LibWeb/UIEvents/InputEvent.cpp
View file

@ -14,7 +14,12 @@ JS_DEFINE_ALLOCATOR(InputEvent);
JS::NonnullGCPtr<InputEvent> InputEvent::create_from_platform_event(JS::Realm& realm, FlyString const& event_name, InputEventInit const& event_init)
{
return realm.heap().allocate<InputEvent>(realm, realm, event_name, event_init);
auto event = realm.heap().allocate<InputEvent>(realm, realm, event_name, event_init);
event->set_bubbles(true);
if (event_name == "beforeinput"_fly_string) {
event->set_cancelable(true);
}
return event;
}
WebIDL::ExceptionOr<JS::NonnullGCPtr<InputEvent>> InputEvent::construct_impl(JS::Realm& realm, FlyString const& event_name, InputEventInit const& event_init)