Merge branch 'upstream' into fix-non-str-attributes

packages/tui/src/lib.rs

@@ -75,7 +75,11 @@ pub fn launch(app: Component<()>) {
 }
 
 pub fn launch_cfg(app: Component<()>, cfg: Config) {
-    let mut dom = VirtualDom::new(app);
+    launch_cfg_with_props(app, (), cfg);
+}
+
+pub fn launch_cfg_with_props<Props: 'static>(app: Component<Props>, props: Props, cfg: Config) {
+    let mut dom = VirtualDom::new_with_props(app, props);
 
     let (handler, state, register_event) = RinkInputHandler::new();
 

packages/tui/src/widgets/mod.rs

@@ -10,8 +10,8 @@ use dioxus_core::{ElementId, RenderReturn, Scope};
 pub use input::*;
 
 pub(crate) fn get_root_id<T>(cx: Scope<T>) -> Option<ElementId> {
-    if let RenderReturn::Sync(Some(sync)) = cx.root_node() {
-        sync.root_ids.get(0).and_then(|id| id.get())
+    if let RenderReturn::Ready(sync) = cx.root_node() {
+        sync.root_ids.get(0)
     } else {
         None
     }