An ever Increasing Component ID (#2537)

* Bring changes to this branch.

* Child components always render after parents.

* Cleanup residual Portal references.

* Fix after merge.

* Fix trybuild.

* Opt for usize.

* Strip Generics.

* take instead of replace, first instead of front.

packages/yew/Cargo.toml

@@ -79,13 +79,13 @@ trybuild = "1"
 [features]
 ssr = ["futures", "html-escape"]
 csr = []
-doc_test = ["csr"]
+doc_test = ["csr", "ssr"]
 wasm_test = ["csr"]
 default = []
 
 [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
 tokio = { version = "1.15.0", features = ["full"] }
 
 [package.metadata.docs.rs]
-features = ["doc_test", "ssr"]
+features = ["doc_test"]
 rustdoc-args = ["--cfg", "documenting"]

packages/yew/src/html/component/lifecycle.rs

@@ -153,9 +153,7 @@ pub(crate) struct ComponentState {
 
     suspension: Option<Suspension>,
 
-    // Used for debug logging
-    #[cfg(debug_assertions)]
-    pub(crate) vcomp_id: usize,
+    pub(crate) comp_id: usize,
 }
 
 impl ComponentState {
@@ -164,8 +162,7 @@ impl ComponentState {
         scope: Scope<COMP>,
         props: Rc<COMP::Properties>,
     ) -> Self {
-        #[cfg(debug_assertions)]
-        let vcomp_id = scope.vcomp_id;
+        let comp_id = scope.id;
         let context = Context { scope, props };
 
         let inner = Box::new(CompStateInner {
@@ -181,8 +178,7 @@ impl ComponentState {
             #[cfg(feature = "csr")]
             has_rendered: false,
 
-            #[cfg(debug_assertions)]
-            vcomp_id,
+            comp_id,
         }
     }
 
@@ -208,7 +204,7 @@ impl<COMP: BaseComponent> Runnable for CreateRunner<COMP> {
         let mut current_state = self.scope.state.borrow_mut();
         if current_state.is_none() {
             #[cfg(debug_assertions)]
-            super::log_event(self.scope.vcomp_id, "create");
+            super::log_event(self.scope.id, "create");
 
             *current_state = Some(ComponentState::new(
                 self.initial_render_state,
@@ -240,6 +236,7 @@ impl Runnable for UpdateRunner {
         if let Some(state) = self.state.borrow_mut().as_mut() {
             let schedule_render = match self.event {
                 UpdateEvent::Message => state.inner.flush_messages(),
+
                 #[cfg(feature = "csr")]
                 UpdateEvent::Properties(props, next_node_ref, next_sibling) => {
                     match state.render_state {
@@ -297,16 +294,16 @@ impl Runnable for UpdateRunner {
 
             #[cfg(debug_assertions)]
             super::log_event(
-                state.vcomp_id,
+                state.comp_id,
                 format!("update(schedule_render={})", schedule_render),
             );
 
             if schedule_render {
                 scheduler::push_component_render(
-                    self.state.as_ptr() as usize,
-                    RenderRunner {
+                    state.comp_id,
+                    Box::new(RenderRunner {
                         state: self.state.clone(),
-                    },
+                    }),
                 );
                 // Only run from the scheduler, so no need to call `scheduler::start()`
             }
@@ -325,7 +322,7 @@ impl Runnable for DestroyRunner {
     fn run(self: Box<Self>) {
         if let Some(mut state) = self.state.borrow_mut().take() {
             #[cfg(debug_assertions)]
-            super::log_event(state.vcomp_id, "destroy");
+            super::log_event(state.comp_id, "destroy");
 
             state.inner.destroy();
 
@@ -357,7 +354,7 @@ impl Runnable for RenderRunner {
     fn run(self: Box<Self>) {
         if let Some(state) = self.state.borrow_mut().as_mut() {
             #[cfg(debug_assertions)]
-            super::log_event(state.vcomp_id, "render");
+            super::log_event(state.comp_id, "render");
 
             match state.inner.view() {
                 Ok(m) => self.render(state, m),
@@ -373,14 +370,16 @@ impl RenderRunner {
         // suspension to parent element.
         let shared_state = self.state.clone();
 
+        let comp_id = state.comp_id;
+
         if suspension.resumed() {
             // schedule a render immediately if suspension is resumed.
 
             scheduler::push_component_render(
-                shared_state.as_ptr() as usize,
-                RenderRunner {
+                state.comp_id,
+                Box::new(RenderRunner {
                     state: shared_state,
-                },
+                }),
             );
         } else {
             // We schedule a render after current suspension is resumed.
@@ -393,10 +392,10 @@ impl RenderRunner {
 
             suspension.listen(Callback::from(move |_| {
                 scheduler::push_component_render(
-                    shared_state.as_ptr() as usize,
-                    RenderRunner {
+                    comp_id,
+                    Box::new(RenderRunner {
                         state: shared_state.clone(),
-                    },
+                    }),
                 );
                 scheduler::start();
             }));
@@ -442,11 +441,11 @@ impl RenderRunner {
                 state.has_rendered = true;
 
                 scheduler::push_component_rendered(
-                    self.state.as_ptr() as usize,
-                    RenderedRunner {
+                    state.comp_id,
+                    Box::new(RenderedRunner {
                         state: self.state.clone(),
                         first_render,
-                    },
+                    }),
                     first_render,
                 );
             }
@@ -474,7 +473,7 @@ mod feat_csr {
         fn run(self: Box<Self>) {
             if let Some(state) = self.state.borrow_mut().as_mut() {
                 #[cfg(debug_assertions)]
-                super::super::log_event(state.vcomp_id, "rendered");
+                super::super::log_event(state.comp_id, "rendered");
 
                 if state.suspension.is_none() {
                     state.inner.rendered(self.first_render);

packages/yew/src/html/component/mod.rs

@@ -14,46 +14,36 @@ pub(crate) use scope::Scoped;
 pub use scope::{AnyScope, Scope, SendAsMessage};
 use std::rc::Rc;
 
+#[cfg(debug_assertions)]
 #[cfg(any(feature = "csr", feature = "ssr"))]
 mod feat_csr_ssr {
-    #[cfg(debug_assertions)]
     thread_local! {
          static EVENT_HISTORY: std::cell::RefCell<std::collections::HashMap<usize, Vec<String>>>
             = Default::default();
-        static COMP_ID_COUNTER: AtomicUsize = AtomicUsize::new(0);
     }
 
     /// Push [Component] event to lifecycle debugging registry
-    #[cfg(debug_assertions)]
-    pub(crate) fn log_event(vcomp_id: usize, event: impl ToString) {
+    pub(crate) fn log_event(comp_id: usize, event: impl ToString) {
         EVENT_HISTORY.with(|h| {
             h.borrow_mut()
-                .entry(vcomp_id)
+                .entry(comp_id)
                 .or_default()
                 .push(event.to_string())
         });
     }
 
     /// Get [Component] event log from lifecycle debugging registry
-    #[cfg(debug_assertions)]
     #[allow(dead_code)]
-    pub(crate) fn get_event_log(vcomp_id: usize) -> Vec<String> {
+    pub(crate) fn get_event_log(comp_id: usize) -> Vec<String> {
         EVENT_HISTORY.with(|h| {
             h.borrow()
-                .get(&vcomp_id)
+                .get(&comp_id)
                 .map(|l| (*l).clone())
                 .unwrap_or_default()
         })
     }
-
-    #[cfg(debug_assertions)]
-    pub(crate) fn next_id() -> usize {
-        COMP_ID_COUNTER.with(|m| m.fetch_add(1, Ordering::Relaxed))
-    }
-
-    #[cfg(debug_assertions)]
-    use std::sync::atomic::{AtomicUsize, Ordering};
 }
+
 #[cfg(debug_assertions)]
 #[cfg(any(feature = "csr", feature = "ssr"))]
 pub(crate) use feat_csr_ssr::*;

packages/yew/src/html/component/scope.rs

@@ -8,6 +8,7 @@ use std::cell::RefCell;
 #[cfg(any(feature = "csr", feature = "ssr"))]
 use super::lifecycle::{ComponentState, UpdateEvent, UpdateRunner};
 use super::BaseComponent;
+
 use crate::callback::Callback;
 use crate::context::{ContextHandle, ContextProvider};
 use crate::html::IntoComponent;
@@ -112,8 +113,7 @@ pub struct Scope<COMP: BaseComponent> {
     #[cfg(any(feature = "csr", feature = "ssr"))]
     pub(crate) state: Shared<Option<ComponentState>>,
 
-    #[cfg(debug_assertions)]
-    pub(crate) vcomp_id: usize,
+    pub(crate) id: usize,
 }
 
 impl<COMP: BaseComponent> fmt::Debug for Scope<COMP> {
@@ -134,8 +134,7 @@ impl<COMP: BaseComponent> Clone for Scope<COMP> {
             #[cfg(any(feature = "csr", feature = "ssr"))]
             state: self.state.clone(),
 
-            #[cfg(debug_assertions)]
-            vcomp_id: self.vcomp_id,
+            id: self.id,
         }
     }
 }
@@ -211,14 +210,15 @@ mod feat_ssr {
             let state = ComponentRenderState::Ssr { sender: Some(tx) };
 
             scheduler::push_component_create(
-                CreateRunner {
+                self.id,
+                Box::new(CreateRunner {
                     initial_render_state: state,
                     props,
                     scope: self.clone(),
-                },
-                RenderRunner {
+                }),
+                Box::new(RenderRunner {
                     state: self.state.clone(),
-                },
+                }),
             );
             scheduler::start();
 
@@ -227,12 +227,12 @@ mod feat_ssr {
             let self_any_scope = AnyScope::from(self.clone());
             html.render_to_string(w, &self_any_scope).await;
 
-            scheduler::push_component_destroy(DestroyRunner {
+            scheduler::push_component_destroy(Box::new(DestroyRunner {
                 state: self.state.clone(),
 
                 #[cfg(feature = "csr")]
                 parent_to_detach: false,
-            });
+            }));
             scheduler::start();
         }
     }
@@ -269,6 +269,7 @@ mod feat_csr_ssr {
     use super::*;
     use crate::scheduler::{self, Shared};
     use std::cell::Ref;
+    use std::sync::atomic::{AtomicUsize, Ordering};
 
     #[derive(Debug)]
     pub(crate) struct MsgQueue<Msg>(Shared<Vec<Msg>>);
@@ -308,6 +309,8 @@ mod feat_csr_ssr {
         }
     }
 
+    static COMP_ID_COUNTER: AtomicUsize = AtomicUsize::new(0);
+
     impl<COMP: BaseComponent> Scope<COMP> {
         /// Crate a scope with an optional parent scope
         pub(crate) fn new(parent: Option<AnyScope>) -> Self {
@@ -325,8 +328,7 @@ mod feat_csr_ssr {
                 state,
                 parent,
 
-                #[cfg(debug_assertions)]
-                vcomp_id: super::super::next_id(),
+                id: COMP_ID_COUNTER.fetch_add(1, Ordering::SeqCst),
             }
         }
 
@@ -345,10 +347,10 @@ mod feat_csr_ssr {
         }
 
         pub(super) fn push_update(&self, event: UpdateEvent) {
-            scheduler::push_component_update(UpdateRunner {
+            scheduler::push_component_update(Box::new(UpdateRunner {
                 state: self.state.clone(),
                 event,
-            });
+            }));
             // Not guaranteed to already have the scheduler started
             scheduler::start();
         }
@@ -415,14 +417,15 @@ mod feat_csr {
             };
 
             scheduler::push_component_create(
-                CreateRunner {
+                self.id,
+                Box::new(CreateRunner {
                     initial_render_state: state,
                     props,
                     scope: self.clone(),
-                },
-                RenderRunner {
+                }),
+                Box::new(RenderRunner {
                     state: self.state.clone(),
-                },
+                }),
             );
             // Not guaranteed to already have the scheduler started
             scheduler::start();
@@ -435,7 +438,7 @@ mod feat_csr {
             next_sibling: NodeRef,
         ) {
             #[cfg(debug_assertions)]
-            super::super::log_event(self.vcomp_id, "reuse");
+            super::super::log_event(self.id, "reuse");
 
             self.push_update(UpdateEvent::Properties(props, node_ref, next_sibling));
         }
@@ -470,10 +473,10 @@ mod feat_csr {
 
         /// Process an event to destroy a component
         fn destroy(self, parent_to_detach: bool) {
-            scheduler::push_component_destroy(DestroyRunner {
+            scheduler::push_component_destroy(Box::new(DestroyRunner {
                 state: self.state,
                 parent_to_detach,
-            });
+            }));
             // Not guaranteed to already have the scheduler started
             scheduler::start();
         }
@@ -483,10 +486,10 @@ mod feat_csr {
         }
 
         fn shift_node(&self, parent: Element, next_sibling: NodeRef) {
-            scheduler::push_component_update(UpdateRunner {
+            scheduler::push_component_update(Box::new(UpdateRunner {
                 state: self.state.clone(),
                 event: UpdateEvent::Shift(parent, next_sibling),
-            })
+            }))
         }
     }
 }