diff --git a/Libraries/LibDevTools/Actors/WalkerActor.cpp b/Libraries/LibDevTools/Actors/WalkerActor.cpp index 234ad13070c..2fd245f076d 100644 --- a/Libraries/LibDevTools/Actors/WalkerActor.cpp +++ b/Libraries/LibDevTools/Actors/WalkerActor.cpp @@ -134,6 +134,47 @@ void WalkerActor::handle_message(StringView type, JsonObject const& message) return; } + if (type == "insertAdjacentHTML") { + // FIXME: This message also contains `value` and `position` parameters, containing the HTML to insert and the + // location to insert it. For the "Create New Node" action, this is always "
" and "beforeEnd", + // which is exactly what our WebView implementation currently supports. + auto node = message.get_string("node"sv); + if (!node.has_value()) { + send_missing_parameter_error("node"sv); + return; + } + + if (auto dom_node = WalkerActor::dom_node_for(*this, *node); dom_node.has_value()) { + auto block_token = block_responses(); + + devtools().delegate().create_child_element( + dom_node->tab->description(), dom_node->identifier.id, + [weak_self = make_weak_ptr(), block_token = move(block_token)](ErrorOr node_id) mutable { + if (node_id.is_error()) { + dbgln_if(DEVTOOLS_DEBUG, "Unable to edit DOM node: {}", node_id.error()); + return; + } + + if (auto self = weak_self.strong_ref()) { + JsonArray nodes; + + if (auto actor = self->m_dom_node_id_to_actor_map.get(node_id.value()); actor.has_value()) { + if (auto dom_node = WalkerActor::dom_node_for(self, *actor); dom_node.has_value()) + nodes.must_append(self->serialize_node(dom_node->node)); + } + + JsonObject message; + message.set("from"sv, self->name()); + message.set("newParents"sv, JsonArray {}); + message.set("nodes"sv, move(nodes)); + self->send_message(move(message), move(block_token)); + } + }); + } + + return; + } + if (type == "isInDOMTree"sv) { auto node = message.get_string("node"sv); if (!node.has_value()) { @@ -346,7 +387,7 @@ JsonValue WalkerActor::serialize_node(JsonObject const& node) const serialized.set("containerType"sv, JsonValue {}); serialized.set("displayName"sv, name.to_ascii_lowercase()); serialized.set("displayType"sv, "block"sv); - serialized.set("host"sv, JsonValue {}); + serialized.set("hasEventListeners"sv, false); serialized.set("isAfterPseudoElement"sv, false); serialized.set("isAnonymous"sv, false); serialized.set("isBeforePseudoElement"sv, false); @@ -366,6 +407,9 @@ JsonValue WalkerActor::serialize_node(JsonObject const& node) const serialized.set("shadowRootMode"sv, JsonValue {}); serialized.set("traits"sv, JsonObject {}); + // FIXME: De-duplicate this string. LibDevTools currently cannot depend on LibWeb. + serialized.set("namespaceURI"sv, "http://www.w3.org/1999/xhtml"sv); + if (!is_top_level_document) { if (auto parent = m_dom_node_to_parent_map.get(&node); parent.has_value() && parent.value()) { actor = parent.value()->get_string("actor"sv); diff --git a/Libraries/LibDevTools/DevToolsDelegate.h b/Libraries/LibDevTools/DevToolsDelegate.h index b293c9dd791..6c070227c79 100644 --- a/Libraries/LibDevTools/DevToolsDelegate.h +++ b/Libraries/LibDevTools/DevToolsDelegate.h @@ -46,6 +46,7 @@ public: virtual void set_dom_node_tag(TabDescription const&, Web::UniqueNodeID, String, OnDOMNodeEditComplete) const { } virtual void add_dom_node_attributes(TabDescription const&, Web::UniqueNodeID, Vector, OnDOMNodeEditComplete) const { } virtual void replace_dom_node_attribute(TabDescription const&, Web::UniqueNodeID, String, Vector, OnDOMNodeEditComplete) const { } + virtual void create_child_element(TabDescription const&, Web::UniqueNodeID, OnDOMNodeEditComplete) const { } virtual void remove_dom_node(TabDescription const&, Web::UniqueNodeID, OnDOMNodeEditComplete) const { } using OnScriptEvaluationComplete = Function)>; diff --git a/Libraries/LibWebView/Application.cpp b/Libraries/LibWebView/Application.cpp index 65225494182..523bed44c6a 100644 --- a/Libraries/LibWebView/Application.cpp +++ b/Libraries/LibWebView/Application.cpp @@ -486,6 +486,13 @@ void Application::replace_dom_node_attribute(DevTools::TabDescription const& des }); } +void Application::create_child_element(DevTools::TabDescription const& description, Web::UniqueNodeID node_id, OnDOMNodeEditComplete on_complete) const +{ + edit_dom_node(description, move(on_complete), [&](auto& view) { + view.create_child_element(node_id); + }); +} + void Application::remove_dom_node(DevTools::TabDescription const& description, Web::UniqueNodeID node_id, OnDOMNodeEditComplete on_complete) const { edit_dom_node(description, move(on_complete), [&](auto& view) { diff --git a/Libraries/LibWebView/Application.h b/Libraries/LibWebView/Application.h index 1a49e3f11b9..71a2136c682 100644 --- a/Libraries/LibWebView/Application.h +++ b/Libraries/LibWebView/Application.h @@ -102,6 +102,7 @@ private: virtual void set_dom_node_tag(DevTools::TabDescription const&, Web::UniqueNodeID, String, OnDOMNodeEditComplete) const override; virtual void add_dom_node_attributes(DevTools::TabDescription const&, Web::UniqueNodeID, Vector, OnDOMNodeEditComplete) const override; virtual void replace_dom_node_attribute(DevTools::TabDescription const&, Web::UniqueNodeID, String, Vector, OnDOMNodeEditComplete) const override; + virtual void create_child_element(DevTools::TabDescription const&, Web::UniqueNodeID, OnDOMNodeEditComplete) const override; virtual void remove_dom_node(DevTools::TabDescription const&, Web::UniqueNodeID, OnDOMNodeEditComplete) const override; virtual void evaluate_javascript(DevTools::TabDescription const&, String, OnScriptEvaluationComplete) const override; virtual void listen_for_console_messages(DevTools::TabDescription const&, OnConsoleMessageAvailable, OnReceivedConsoleMessages) const override;