feat(web): using None instead of Element (#3012)

Can mount the Dioxus component into every node.
As `Element` and `ShadowRoot` are `Node` we can
now mount a dioxus component into a shadow root.
This commit is contained in:
igor authored and GitHub committed 2024-09-30 07:02:06 -05:00
1 parent 9f22e9043c
commit d3e1ba415f
3 files changed
+17 -7

No files matched your search

+12 -2
View File
@@ -1,3 +1,5 @@
use wasm_bindgen::JsCast as _;
/// Configuration for the WebSys renderer for the Dioxus VirtualDOM.
///
/// This struct helps configure the specifics of hydration and render destination for WebSys.
@@ -15,7 +17,7 @@ pub struct Config {
pub(crate) enum ConfigRoot {
RootName(String),
RootElement(web_sys::Element),
RootNode(web_sys::Node),
}
impl Config {
@@ -52,7 +54,15 @@ impl Config {
///
/// This is akin to calling React.render() on the given element.
pub fn rootelement(mut self, elem: web_sys::Element) -> Self {
self.root = ConfigRoot::RootElement(elem);
self.root = ConfigRoot::RootNode(elem.unchecked_into());
self
}
/// Set the node that Dioxus will use as root.
///
/// This is akin to calling React.render() on the given element.
pub fn rootnode(mut self, node: web_sys::Node) -> Self {
self.root = ConfigRoot::RootNode(node);
self
}
+4 -4
View File
@@ -13,13 +13,13 @@ use dioxus_core::{ElementId, Template};
use dioxus_interpreter_js::unified_bindings::Interpreter;
use rustc_hash::FxHashMap;
use wasm_bindgen::{closure::Closure, JsCast};
use web_sys::{Document, Element, Event, Node};
use web_sys::{Document, Event, Node};
use crate::{load_document, virtual_event_from_websys_event, Config, WebEventConverter};
pub struct WebsysDom {
#[allow(dead_code)]
pub(crate) root: Element,
pub(crate) root: Node,
pub(crate) document: Document,
pub(crate) templates: FxHashMap<Template, u16>,
pub(crate) interpreter: Interpreter,
@@ -67,9 +67,9 @@ impl WebsysDom {
document.create_element("body").ok().unwrap()
}
};
(document, root)
(document, root.unchecked_into())
}
crate::cfg::ConfigRoot::RootElement(root) => {
crate::cfg::ConfigRoot::RootNode(root) => {
let document = match root.owner_document() {
Some(document) => document,
None => load_document(),
+1 -1
View File
@@ -218,7 +218,7 @@ impl WebsysDom {
// Rehydrate the root scope that was rendered on the server. We will likely run into suspense boundaries.
// Any suspense boundaries we run into are stored for hydration later.
self.start_hydration_at_scope(vdom.base_scope(), vdom, vec![self.root.clone().into()])?;
self.start_hydration_at_scope(vdom.base_scope(), vdom, vec![self.root.clone()])?;
Ok(rx)
}