fix: drop child key on removal in Option and skip allocating Nodes fo…

…r ()

src/compose/mod.rs

@@ -116,6 +116,8 @@ impl<C: Compose> Compose for Option<C> {
                 rt.pending.borrow_mut().push_back(key);
             }
         } else if let Some(key) = child_key.get() {
+            child_key.set(None);
+
             drop_node(&mut nodes, key);
         }
     }
@@ -129,6 +131,8 @@ fn drop_node(nodes: &mut SlotMap<DefaultKey, Rc<Node>>, key: DefaultKey) {
         parent.children.borrow_mut().retain(|&x| x != key);
     }
 
+    //Runtime::current().pending.borrow_mut().retain(|&x| x != key);
+
     let children = node.children.borrow().clone();
     for key in children {
         drop_node(nodes, key)
@@ -321,10 +325,6 @@ where
     }
 
     unsafe fn any_compose(&self, state: &ScopeData) {
-        if typeid::of::<C>() == typeid::of::<()>() {
-            return;
-        }
-
         // Reset the hook index.
         state.hook_idx.set(0);
 
@@ -354,6 +354,10 @@ where
 
             let child = C::compose(cx);
 
+            if child.data_id() == typeid::of::<()>() {
+                return;
+            }
+
             let child: Box<dyn AnyCompose> = Box::new(child);
             let mut child: Box<dyn AnyCompose> = unsafe { mem::transmute(child) };