Merge branch 'router-2' of github.com:TeFiLeDo/dioxus into router-2

packages/router/examples/simple.rs

@@ -2,6 +2,7 @@
 
 use dioxus::prelude::*;
 use dioxus_router::prelude::*;
+use dioxus_router_core::history::MemoryHistory;
 
 fn main() {
     dioxus_desktop::launch(App);
@@ -11,19 +12,44 @@ fn App(cx: Scope) -> Element {
     use_router(
         &cx,
         &|| RouterConfiguration {
+            // history: Box::new(MemoryHistory::with_initial_path("/apple").unwrap()),
             ..Default::default()
         },
-        &|| Segment::content(comp(RootIndex)),
+        &|| Segment::content(comp(RootIndex)).fixed("apple", comp(Apple)),
     );
 
     render! {
-        h1 { "hi" }
+        h1 { "Simple Example App" }
+        nav {
+            Link {
+                target: named::<RootIndex>(),
+                "Go to root"
+            }
+        }
         Outlet { }
     }
 }
 
 fn RootIndex(cx: Scope) -> Element {
     render! {
-        h1 { "Simple Example App" }
+        h2 { "Root Index" }
+        ul {
+            li {
+                Link {
+                    target: "/apple",
+                    "Read about apples…"
+                }
+            }
+        }
+    }
+}
+
+fn Apple(cx: Scope) -> Element {
+    render! {
+        h2 { "Apple" }
+        p {
+            "An apple is a tasty fruit. It grows on trees and many varieties are either red or "
+            "green."
+        }
     }
 }

packages/router/src/components/outlet.rs

@@ -56,6 +56,6 @@ pub fn Outlet(cx: Scope<OutletProps>) -> Element {
             let X = content.0;
             rsx! { X { } }
         }
-        None => rsx! { Fragment { } },
+        None => rsx! { div { } },
     })
 }