fix: lib.rs adapted to Seed 0.5.0

Author: MartinKavik

crate/src/lib.rs

@@ -22,6 +22,18 @@ const USER_AGENT_FOR_PRERENDERING: &str = "ReactSnap";
 const STATIC_PATH: &str = "static";
 const IMAGES_PATH: &str = "static/images";
 
+// ------ ------
+// Before Mount
+// ------ ------
+
+fn before_mount(_: Url) -> BeforeMount {
+    BeforeMount::new().mount_type(MountType::Takeover)
+}
+
+// ------ ------
+//     Model
+// ------ ------
+
 #[derive(Clone, Copy, Eq, PartialEq)]
 pub enum Visibility {
     Visible,
@@ -37,10 +49,6 @@ impl Visibility {
     }
 }
 
-// ------ ------
-//     Model
-// ------ ------
-
 // We need at least 3 last values to detect scroll direction,
 // because neighboring ones are sometimes equal.
 type ScrollHistory = FixedVecDeque<[i32; 3]>;
@@ -52,6 +60,8 @@ pub struct Model {
     pub in_prerendering: bool,
 }
 
+// ------ Page ------
+
 #[derive(Clone, Copy, Eq, PartialEq)]
 pub enum Page {
     Home,
@@ -80,10 +90,10 @@ impl From<Url> for Page {
 }
 
 // ------ ------
-//     Init
+//  After Mount
 // ------ ------
 
-pub fn init(url: Url, orders: &mut impl Orders<Msg>) -> Init<Model> {
+fn after_mount(url: Url, orders: &mut impl Orders<Msg>) -> AfterMount<Model> {
     orders.send_msg(Msg::UpdatePageTitle);
 
     let model = Model {
@@ -93,11 +103,7 @@ pub fn init(url: Url, orders: &mut impl Orders<Msg>) -> Init<Model> {
         in_prerendering: is_in_prerendering(),
     };
 
-    Init {
-        model,
-        url_handling: UrlHandling::None,
-        mount_type: MountType::Takeover,
-    }
+    AfterMount::new(model).url_handling(UrlHandling::None)
 }
 
 fn is_in_prerendering() -> bool {
@@ -119,6 +125,25 @@ pub fn routes(url: Url) -> Option<Msg> {
     Some(Msg::RouteChanged(url))
 }
 
+// ------ ------
+// Window Events
+// ------ ------
+
+pub fn window_events(_: &Model) -> Vec<Listener<Msg>> {
+    vec![raw_ev(Ev::Scroll, |_| {
+        // Some browsers use `document.body.scrollTop`
+        // and other ones `document.documentElement.scrollTop`.
+        let mut position = body().scroll_top();
+        if position == 0 {
+            position = document()
+                .document_element()
+                .expect("cannot get document element")
+                .scroll_top()
+        }
+        Msg::Scrolled(position)
+    })]
+}
+
 // ------ ------
 //    Update
 // ------ ------
@@ -199,25 +224,6 @@ pub fn asset_path(asset: &str) -> String {
     format!("{}/{}", STATIC_PATH, asset)
 }
 
-// ------ ------
-// Window Events
-// ------ ------
-
-pub fn window_events(_: &Model) -> Vec<Listener<Msg>> {
-    vec![raw_ev(Ev::Scroll, |_| {
-        // Some browsers use `document.body.scrollTop`
-        // and other ones `document.documentElement.scrollTop`.
-        let mut position = body().scroll_top();
-        if position == 0 {
-            position = document()
-                .document_element()
-                .expect("cannot get document element")
-                .scroll_top()
-        }
-        Msg::Scrolled(position)
-    })]
-}
-
 // ------ ------
 //     Start
 // ------ ------
@@ -226,7 +232,9 @@ pub fn window_events(_: &Model) -> Vec<Listener<Msg>> {
 pub fn run() {
     log!("Starting app...");
 
-    App::build(init, update, view)
+    App::builder(update, view)
+        .before_mount(before_mount)
+        .after_mount(after_mount)
         .routes(routes)
         .window_events(window_events)
         .build_and_start();