RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 06:37:43 +00:00
Code Issues Activity Actions

LibWeb: Make DOM::Range more suitable for JS.

Browse source
This commit is contained in:
asynts 2020-12-06 19:51:55 +01:00 • committed by Andreas Kling
parent 4df0eeaa3d
commit 10f9c85090
11 changed files with 186 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Libraries/LibWeb/Page/EditEventHandler.cpp
View file

@ -26,6 +26,7 @@
#include <AK/StringBuilder.h>
#include <LibWeb/DOM/Position.h>
#include <LibWeb/DOM/Range.h>
#include <LibWeb/DOM/Text.h>
#include <LibWeb/Layout/LayoutPosition.h>
#include <LibWeb/Page/Frame.h>
@ -39,15 +40,15 @@
namespace Web {
// This method is quite convoluted but this is necessary to make editing feel intuitive.
void EditEventHandler::handle_delete(DOM::Range range)
void EditEventHandler::handle_delete(DOM::Range& range)
{
auto* start = downcast<DOM::Text>(range.start().node());
auto* end = downcast<DOM::Text>(range.end().node());
auto* start = downcast<DOM::Text>(range.start_container());
auto* end = downcast<DOM::Text>(range.end_container());
if (start == end) {
StringBuilder builder;
builder.append(start->data().substring_view(0, range.start().offset()));
builder.append(end->data().substring_view(range.end().offset()));
builder.append(start->data().substring_view(0, range.start_offset()));
builder.append(end->data().substring_view(range.end_offset()));
start->set_data(builder.to_string());
} else {
@ -84,8 +85,8 @@ void EditEventHandler::handle_delete(DOM::Range range)
// Join the start and end nodes.
StringBuilder builder;
builder.append(start->data().substring_view(0, range.start().offset()));
builder.append(end->data().substring_view(range.end().offset()));
builder.append(start->data().substring_view(0, range.start_offset()));
builder.append(end->data().substring_view(range.end_offset()));
start->set_data(builder.to_string());
start->parent()->remove_child(*end);

2
Libraries/LibWeb/Page/EditEventHandler.h
View file

@ -39,7 +39,7 @@ public:
virtual ~EditEventHandler() = default;
virtual void handle_delete(DOM::Range);
virtual void handle_delete(DOM::Range&);
virtual void handle_insert(DOM::Position, u32 code_point);
private:

11
Libraries/LibWeb/Page/EventHandler.cpp
View file

@ -28,6 +28,7 @@
#include <LibGUI/Window.h>
#include <LibJS/Runtime/Value.h>
#include <LibWeb/DOM/Document.h>
#include <LibWeb/DOM/Range.h>
#include <LibWeb/DOM/Text.h>
#include <LibWeb/HTML/HTMLAnchorElement.h>
#include <LibWeb/HTML/HTMLIFrameElement.h>
@ -346,15 +347,15 @@ bool EventHandler::handle_keydown(KeyCode key, unsigned modifiers, u32 code_poin
}
if (layout_root()->selection().is_valid()) {
auto range = layout_root()->selection().to_dom_range().normalized();
auto range = layout_root()->selection().to_dom_range()->normalized();
m_frame.document()->layout_node()->set_selection({});
// FIXME: This doesn't work for some reason?
m_frame.set_cursor_position(range.start());
m_frame.set_cursor_position({ *range->start_container(), range->start_offset() });
if (key == KeyCode::Key_Backspace || key == KeyCode::Key_Delete) {
if (range.start().node()->is_editable()) {
if (range->start_container()->is_editable()) {
m_edit_event_handler->handle_delete(range);
return true;
}
@ -375,7 +376,7 @@ bool EventHandler::handle_keydown(KeyCode key, unsigned modifiers, u32 code_poin
TODO();
m_frame.cursor_position().set_offset(position.offset() - 1);
m_edit_event_handler->handle_delete({ { *position.node(), position.offset() - 1 }, position });
m_edit_event_handler->handle_delete(DOM::Range::create(*position.node(), position.offset() - 1, *position.node(), position.offset()));
return true;
} else if (key == KeyCode::Key_Delete) {
@ -384,7 +385,7 @@ bool EventHandler::handle_keydown(KeyCode key, unsigned modifiers, u32 code_poin
if (position.offset() >= downcast<DOM::Text>(position.node())->data().length())
TODO();
m_edit_event_handler->handle_delete({ position, { *position.node(), position.offset() + 1 } });
m_edit_event_handler->handle_delete(DOM::Range::create(*position.node(), position.offset(), *position.node(), position.offset() + 1));
return true;
} else if (key == KeyCode::Key_Right) {