use new state handler in RouteHandler

web/src/app_state.rs

@@ -131,10 +131,9 @@ impl MessageMapper<Message, AppState> for StateMachine {
     }
 }
 
-pub fn get_state_handler<'ctx>(
+pub type StateHandler<'ctx> = &'ctx Handler<'ctx, StateMachine, AppState, Message>;
-    cx: Scope<'ctx>,
+
-    initial: AppState,
+pub fn get_state_handler<'ctx>(cx: Scope<'ctx>, initial: AppState) -> StateHandler<'ctx> {
-) -> &'ctx Handler<'ctx, StateMachine, AppState, Message> {
     Handler::new(cx, initial, StateMachine())
 }
 #[derive(Debug)]

web/src/components/header.rs

@@ -14,14 +14,10 @@
 
 use sycamore::prelude::*;
 
-use crate::app_state::{AppState, Message, StateMachine};
+use crate::app_state::StateHandler;
-use sycamore_state::Handler;
 
 #[component]
-pub fn Header<'ctx, G: Html>(
+pub fn Header<'ctx, G: Html>(cx: Scope<'ctx>, h: StateHandler<'ctx>) -> View<G> {
-    cx: Scope<'ctx>,
-    h: &'ctx Handler<'ctx, StateMachine, AppState, Message>,
-) -> View<G> {
     let login = h.get_selector(cx, |sig| match &sig.get().auth {
         Some(id) => id.user_id.clone(),
         None => "Login".to_owned(),

web/src/routing/mod.rs

@@ -12,19 +12,25 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use crate::app_state::StateHandler;
 use sycamore::prelude::*;
 use sycamore_router::{HistoryIntegration, Route, Router};
+
 use tracing::{debug, instrument};
 
 use crate::pages::*;
 
-#[instrument]
+#[instrument(skip_all, fields(?route))]
-fn route_switch<'a, G: Html>(cx: Scope<'a>, route: &'a ReadSignal<Routes>) -> View<G> {
+fn route_switch<'ctx, G: Html>(
+    cx: Scope<'ctx>,
+    sh: StateHandler<'ctx>,
+    route: &'ctx ReadSignal<Routes>,
+) -> View<G> {
     // NOTE(jwall): This needs to not be a dynamic node. The rules around
     // this are somewhat unclear and underdocumented for Sycamore. But basically
     // avoid conditionals in the `view!` macro calls here.
 
-    let switcher = |cx: Scope, route: &Routes| {
+    let switcher = |cx: Scope, sh: StateHandler, route: &Routes| {
         debug!(?route, "Dispatching for route");
         match route {
             Routes::Planning(Plan) => view! {cx,
@@ -65,7 +71,7 @@ fn route_switch<'a, G: Html>(cx: Scope<'a>, route: &'a ReadSignal<Routes>) -> Vi
     };
     use PlanningRoutes::*;
     view! {cx,
-        (switcher(cx, route.get().as_ref()))
+        (switcher(cx, sh, route.get().as_ref()))
     }
 }
 
@@ -117,12 +123,20 @@ pub enum PlanningRoutes {
     NotFound,
 }
 
+#[derive(Props)]
+pub struct HandlerProps<'ctx> {
+    sh: StateHandler<'ctx>,
+}
+
 #[component]
-pub fn Handler<G: Html>(cx: Scope) -> View<G> {
+pub fn Handler<'ctx, G: Html>(cx: Scope<'ctx>, props: HandlerProps<'ctx>) -> View<G> {
+    let HandlerProps { sh } = props;
     view! {cx,
         Router(
             integration=HistoryIntegration::new(),
-            view=route_switch,
+            view=|cx, route| {
+                route_switch(cx, sh, route)
+            },
         )
     }
 }

web/src/web.rs

@@ -34,7 +34,7 @@ pub fn UI<G: Html>(cx: Scope) -> View<G> {
             view.set(view! { cx,
                 div(class="app") {
                     Header(handler)
-                    RouteHandler()
+                    RouteHandler(sh=handler)
                     Footer { }
                 }
             });