fix breaks from previous merge
This commit is contained in:
3 files changed
+12
-9
No files matched your search
@@ -44,14 +44,17 @@ pub fn Outlet(cx: Scope<OutletProps>) -> Element {
|
|||||||
});
|
});
|
||||||
|
|
||||||
// get content
|
// get content
|
||||||
let X: Component = match name {
|
let content = match name {
|
||||||
None => state.content.get(*depth),
|
None => state.content.get(*depth),
|
||||||
Some(n) => state.named_content.get(n).and_then(|n| n.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 { } },
|
||||||
|
})
|
||||||
}
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
|
||||||
use async_rwlock::RwLock;
|
use async_rwlock::RwLock;
|
||||||
use dioxus::prelude::{Component, ScopeId};
|
use dioxus::{core::Component, prelude::ScopeId};
|
||||||
use dioxus_router_core::{RouterMessage, RouterState};
|
use dioxus_router_core::{RouterMessage, RouterState};
|
||||||
use futures_channel::mpsc::UnboundedSender;
|
use futures_channel::mpsc::UnboundedSender;
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
use async_rwlock::RwLockReadGuard;
|
use async_rwlock::RwLockReadGuard;
|
||||||
use dioxus::prelude::*;
|
use dioxus::{core::Component, prelude::*};
|
||||||
use dioxus_router_core::{
|
use dioxus_router_core::{
|
||||||
history::{HistoryProvider, MemoryHistory},
|
history::{HistoryProvider, MemoryHistory},
|
||||||
routes::{ContentAtom, Segment},
|
routes::{ContentAtom, Segment},
|
||||||
|
|||||||
Reference in new issue
Block a user