Fix for stdweb

Author: totorigolo

yew/src/virtual_dom/mod.rs

@@ -21,7 +21,7 @@ use std::rc::Rc;
 cfg_if! {
     if #[cfg(feature = "std_web")] {
         use crate::html::EventListener;
-        use stdweb::web::{Element, Node};
+        use stdweb::web::{Element, INode, Node};
     } else if #[cfg(feature = "web_sys")] {
         use gloo::events::EventListener;
         use web_sys::{Element, Node};
@@ -256,23 +256,47 @@ pub(crate) trait VDiff {
     ) -> Node;
 }
 
-fn insert_node(node: &Node, parent: &Node, node_position: &VDiffNodePosition) -> Node {
+#[cfg(feature = "web_sys")]
+fn insert_node(node: &Node, parent: &Element, node_position: &VDiffNodePosition) -> Node {
     match node_position {
         VDiffNodePosition::FirstChild => parent
             .insert_before(&node, parent.first_child().as_ref())
-            .expect("can't insert tag before next sibling"),
+            .expect("failed to insert tag before next sibling"),
         VDiffNodePosition::Before(next_sibling) => parent
             .insert_before(&node, Some(next_sibling))
-            .expect("can't insert tag before next sibling"),
+            .expect("failed to insert tag before next sibling"),
         VDiffNodePosition::After(previous_sibling) => parent
             .insert_before(&node, previous_sibling.next_sibling().as_ref())
-            .expect("can't insert tag before next sibling"),
-        VDiffNodePosition::LastChild => parent
-            .append_child(&node)
-            .expect("can't insert tag before next sibling"),
+            .expect("failed to insert tag before next sibling"),
+        VDiffNodePosition::LastChild => parent.append_child(node).expect("failed to append tag"),
     }
 }
 
+#[cfg(feature = "std_web")]
+fn insert_node(node: &impl INode, parent: &impl INode, node_position: &VDiffNodePosition) -> Node {
+    fn insert_before(node: &impl INode, parent: &impl INode, reference: Option<&Node>) {
+        if let Some(reference) = reference {
+            parent
+                .insert_before(node, reference)
+                .expect("failed to insert tag before next sibling");
+        } else {
+            parent.append_child(node);
+        }
+    }
+
+    match node_position {
+        VDiffNodePosition::FirstChild => {
+            insert_before(node, parent, parent.first_child().as_ref())
+        }
+        VDiffNodePosition::Before(next_sibling) => insert_before(node, parent, Some(next_sibling)),
+        VDiffNodePosition::After(previous_sibling) => {
+            insert_before(node, parent, previous_sibling.next_sibling().as_ref())
+        }
+        VDiffNodePosition::LastChild => parent.append_child(node),
+    }
+    node.as_node().clone()
+}
+
 /// Transform properties to the expected type.
 pub trait Transformer<FROM, TO> {
     /// Transforms one type to another.

yew/src/virtual_dom/vcomp.rs

@@ -214,13 +214,16 @@ impl VDiff for VComp {
             let (mounted, node) = match reform {
                 Reform::Keep(mounted) => {
                     // Send properties update when the component is already rendered.
-                    let node = mounted.node_ref.get().expect("mounted VComp must have a node_ref");
+                    let node = mounted
+                        .node_ref
+                        .get()
+                        .expect("mounted VComp must have a node_ref");
                     (this.replace(mounted), node)
                 }
                 Reform::Replace(position) => {
                     // TODO: Revert dummy text for VComp
                     let dummy_node = document().create_text_node("DUMMY NODE FOR COMPONENT");
-                    let node = (dummy_node.as_ref() as &Node).clone();
+                    let node: Node = dummy_node.clone().into();
 
                     super::insert_node(&dummy_node, parent, &position);
 

yew/src/virtual_dom/vlist.rs

@@ -228,7 +228,7 @@ impl VDiff for VList {
                     "No node position to get node! children.len={}",
                     self.children.len()
                 );
-                (parent.as_ref() as &Node).clone()
+                parent.clone().into()
             }
         }
     }

yew/src/virtual_dom/vnode.rs

@@ -48,7 +48,7 @@ impl VNode {
             VNode::VComp(vcomp) => vcomp.node_ref.get(),
             VNode::VList(_) => None,
             VNode::VRef(node) => Some(node.clone()),
-            VNode::VTag(vtag) => vtag.reference.as_deref().cloned(),
+            VNode::VTag(vtag) => vtag.reference.as_ref().map(|element| element.clone().into()),
             VNode::VText(vtext) => vtext.reference.as_ref().map(|text_node| {
                 cfg_match! {
                     feature = "std_web" => text_node.as_node().clone(),