mirror of
https://github.com/RGBCube/serenity
synced 2025-07-23 17:17:42 +00:00
LibWeb: Join start and end after deleting selection.
This commit is contained in:
parent
a94a1d9f9e
commit
4df0eeaa3d
1 changed files with 38 additions and 27 deletions
|
@ -38,46 +38,57 @@
|
||||||
|
|
||||||
namespace Web {
|
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* start = downcast<DOM::Text>(range.start().node());
|
||||||
auto* end = downcast<DOM::Text>(range.end().node());
|
auto* end = downcast<DOM::Text>(range.end().node());
|
||||||
|
|
||||||
// Remove all the nodes that are fully enclosed in the range.
|
if (start == end) {
|
||||||
HashTable<DOM::Node*> queued_for_deletion;
|
|
||||||
for (auto* node = start->next_in_pre_order(); node; node = node->next_in_pre_order()) {
|
|
||||||
if (node == end)
|
|
||||||
break;
|
|
||||||
|
|
||||||
queued_for_deletion.set(node);
|
|
||||||
}
|
|
||||||
for (auto* parent = start->parent(); parent; parent = parent->parent())
|
|
||||||
queued_for_deletion.remove(parent);
|
|
||||||
for (auto* parent = end->parent(); parent; parent = parent->parent())
|
|
||||||
queued_for_deletion.remove(parent);
|
|
||||||
for (auto* node : queued_for_deletion)
|
|
||||||
node->parent()->remove_child(*node);
|
|
||||||
|
|
||||||
if (start == end || start->next_sibling() == end) {
|
|
||||||
// If the start and end text nodes are now immediate siblings, merge the remainders into one.
|
|
||||||
|
|
||||||
StringBuilder builder;
|
StringBuilder builder;
|
||||||
builder.append(start->data().substring_view(0, range.start().offset()));
|
builder.append(start->data().substring_view(0, range.start().offset()));
|
||||||
builder.append(end->data().substring_view(range.end().offset()));
|
builder.append(end->data().substring_view(range.end().offset()));
|
||||||
|
|
||||||
start->set_data(builder.to_string());
|
start->set_data(builder.to_string());
|
||||||
start->invalidate_style();
|
|
||||||
|
|
||||||
if (start != end)
|
|
||||||
start->parent()->remove_child(*end);
|
|
||||||
} else {
|
} else {
|
||||||
// Otherwise, remove parts from both nodes.
|
// Remove all the nodes that are fully enclosed in the range.
|
||||||
|
HashTable<DOM::Node*> queued_for_deletion;
|
||||||
|
for (auto* node = start->next_in_pre_order(); node; node = node->next_in_pre_order()) {
|
||||||
|
if (node == end)
|
||||||
|
break;
|
||||||
|
|
||||||
start->set_data(start->data().substring_view(0, range.start().offset()));
|
queued_for_deletion.set(node);
|
||||||
start->invalidate_style();
|
}
|
||||||
|
for (auto* parent = start->parent(); parent; parent = parent->parent())
|
||||||
|
queued_for_deletion.remove(parent);
|
||||||
|
for (auto* parent = end->parent(); parent; parent = parent->parent())
|
||||||
|
queued_for_deletion.remove(parent);
|
||||||
|
for (auto* node : queued_for_deletion)
|
||||||
|
node->parent()->remove_child(*node);
|
||||||
|
|
||||||
end->set_data(end->data().substring_view(range.end().offset()));
|
// Join the parent nodes of start and end.
|
||||||
end->invalidate_style();
|
DOM::Node *insert_after = start, *remove_from = end, *parent_of_end = end->parent();
|
||||||
|
while (remove_from) {
|
||||||
|
auto* next_sibling = remove_from->next_sibling();
|
||||||
|
|
||||||
|
remove_from->parent()->remove_child(*remove_from);
|
||||||
|
insert_after->parent()->insert_before(*remove_from, *insert_after);
|
||||||
|
|
||||||
|
insert_after = remove_from;
|
||||||
|
remove_from = next_sibling;
|
||||||
|
}
|
||||||
|
if (!parent_of_end->has_children()) {
|
||||||
|
if (parent_of_end->parent())
|
||||||
|
parent_of_end->parent()->remove_child(*parent_of_end);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 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()));
|
||||||
|
|
||||||
|
start->set_data(builder.to_string());
|
||||||
|
start->parent()->remove_child(*end);
|
||||||
}
|
}
|
||||||
|
|
||||||
// FIXME: When nodes are removed from the DOM, the associated layout nodes become stale and still
|
// FIXME: When nodes are removed from the DOM, the associated layout nodes become stale and still
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue