wip: docs and router

packages/desktop/README.md

@@ -7,7 +7,7 @@ fn main() {
     dioxus::desktop::launch(App, |c| c)
 }
 
-static App: FC<()> = |(cx, props)| {
+static App: FC<()> = |cx, props| {
     let (count, set_count) = use_state(cx, || 0);
 
     cx.render(rsx!(
@@ -34,7 +34,7 @@ Window management, system trays, notifications, and other desktop-related functi
 Managing windows is done by simply rendering content into a `WebviewWindow` component. 
 
 ```rust
-static App: FC<()> = |(cx, props)| {
+static App: FC<()> = |cx, props| {
     rsx!(cx, WebviewWindow { "hello world" } )
 }
 ```
@@ -46,7 +46,7 @@ Notifications also use a declarative approach. Sending a notification has never
 The api has been somewhat modeled after https://github.com/mikaelbr/node-notifier
 
 ```rust
-static Notifications: FC<()> = |(cx, props)| {
+static Notifications: FC<()> = |cx, props| {
     cx.render(rsx!(
         Notification {
             title: "title"
@@ -78,7 +78,7 @@ static Notifications: FC<()> = |(cx, props)| {
 Dioxus Desktop supports app trays, which can be built with native menu groups or with a custom window.
 
 ```rust
-static Tray: FC<()> = |(cx, props)| {
+static Tray: FC<()> = |cx, props| {
     cx.render(rsx!(
         GlobalTray {
             MenuGroup {
@@ -90,7 +90,7 @@ static Tray: FC<()> = |(cx, props)| {
 };
 
 // using a builder
-static Tray: FC<()> = |(cx, props)| {
+static Tray: FC<()> = |cx, props| {
     let menu = MenuGroup::builder(cx)
         .with_items([
             MenuGroupItem::builder()
@@ -107,7 +107,7 @@ static Tray: FC<()> = |(cx, props)| {
 }
 
 // or with a custom window
-static Tray: FC<()> = |(cx, props)| {
+static Tray: FC<()> = |cx, props| {
     rsx!(cx, GlobalTray { div { "custom buttons here" } })
 };
 ```
@@ -116,7 +116,7 @@ static Tray: FC<()> = |(cx, props)| {
 Declaring menus is convenient and cross-platform.
 
 ```rust
-static Menu: FC<()> = |(cx, props)| {
+static Menu: FC<()> = |cx, props| {
     cx.render(rsx!(
         MenuBarMajorItem { title: "File"
             MenuGroup {

packages/desktop/src/index.html

@@ -19,10 +19,9 @@
 
 
 <body>
-    <div id="_dioxusroot">
+    <div id="main">
     </div>
 </body>
-<script type="text/javascript" src="index.js">
-</script>
+<script type="text/javascript" src="index.js"> </script>
 
 </html>

packages/desktop/src/lib.rs

@@ -90,6 +90,8 @@ pub fn run<T: 'static + Send + Sync>(
     let edit_queue = Arc::new(RwLock::new(VecDeque::new()));
     let is_ready: Arc<AtomicBool> = Default::default();
 
+    let mut frame = 0;
+
     event_loop.run(move |window_event, event_loop, control_flow| {
         *control_flow = ControlFlow::Wait;
 
@@ -145,6 +147,9 @@ pub fn run<T: 'static + Send + Sync>(
                         view.evaluate_script(&format!("window.interpreter.handleEdits({})", edit))
                             .unwrap();
                     }
+                } else {
+                    println!("waiting for onload {:?}", frame);
+                    frame += 1;
                 }
             }
             Event::Resumed => {}
@@ -258,6 +263,7 @@ fn create_webview(
             // always driven through eval
             None
         })
+        // .with_initialization_script(include_str!("./index.js"))
         // Any content that that uses the `wry://` scheme will be shuttled through this handler as a "special case"
         // For now, we only serve two pieces of content which get included as bytes into the final binary.
         .with_custom_protocol("wry".into(), move |request| {