From 89ac4d51abe20ca5a4a67219f5995f5790c9a31b Mon Sep 17 00:00:00 2001
From: Adrian Wannenmacher <tfld@tfld.dev>
Date: Thu, 8 Dec 2022 23:56:41 +0100
Subject: [PATCH] fix breaks from previous merge

---
 packages/router/src/components/outlet.rs | 17 ++++++++++-------
 packages/router/src/contexts/router.rs   |  2 +-
 packages/router/src/hooks/use_router.rs  |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/packages/router/src/components/outlet.rs b/packages/router/src/components/outlet.rs
index be7ebd183..09728b49d 100644
--- a/packages/router/src/components/outlet.rs
+++ b/packages/router/src/components/outlet.rs
@@ -44,14 +44,17 @@ pub fn Outlet(cx: Scope<OutletProps>) -> Element {
     });
 
     // get content
-    let X: Component = match name {
+    let content = match name {
         None => state.content.get(*depth),
         Some(n) => state.named_content.get(n).and_then(|n| n.get(*depth)),
-    }?
-    .0
-    .clone();
-
-    render! {
-        X { }
     }
+    .cloned();
+
+    cx.render(match content {
+        Some(content) => {
+            let X = content.0;
+            rsx! { X { } }
+        }
+        None => rsx! { Fragment { } },
+    })
 }
diff --git a/packages/router/src/contexts/router.rs b/packages/router/src/contexts/router.rs
index 3755ddc96..063cc8bc8 100644
--- a/packages/router/src/contexts/router.rs
+++ b/packages/router/src/contexts/router.rs
@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use async_rwlock::RwLock;
-use dioxus::prelude::{Component, ScopeId};
+use dioxus::{core::Component, prelude::ScopeId};
 use dioxus_router_core::{RouterMessage, RouterState};
 use futures_channel::mpsc::UnboundedSender;
 
diff --git a/packages/router/src/hooks/use_router.rs b/packages/router/src/hooks/use_router.rs
index ed55e74d1..eb01eea65 100644
--- a/packages/router/src/hooks/use_router.rs
+++ b/packages/router/src/hooks/use_router.rs
@@ -1,5 +1,5 @@
 use async_rwlock::RwLockReadGuard;
-use dioxus::prelude::*;
+use dioxus::{core::Component, prelude::*};
 use dioxus_router_core::{
     history::{HistoryProvider, MemoryHistory},
     routes::{ContentAtom, Segment},