fix: include shared merge and deferred props in the inertia page object

Author: KaioFelps

src/providers/actix_provider/impls.rs

@@ -51,8 +51,17 @@ impl InertiaResponder<HttpResponse, HttpRequest, Redirect> for Inertia {
         &'b self,
         req: &'b HttpRequest,
         component: Component,
-        props: InertiaProps<'b>,
+        mut props: InertiaProps<'b>,
     ) -> Result<HttpResponse, InertiaError> {
+        let shared_props = req
+            .extensions_mut()
+            .remove::<SharedProps>()
+            .map(|shared_props| shared_props.0);
+
+        if let Some(shared_props) = shared_props {
+            props.extend(shared_props);
+        }
+
         let url = req.uri().to_string();
         let req_type: InertiaRequestType = req.get_request_type()?;
 
@@ -63,17 +72,7 @@ impl InertiaResponder<HttpResponse, HttpRequest, Redirect> for Inertia {
         let reset = req.get_merge_props_to_be_reset();
         let deferred_props = get_deferred_props(&props, &req_type);
         let merge_props = get_mergeable_props(&props, reset);
-        let mut props = resolve_props(&props, &req_type).await?;
-
-        let shared_props = req
-            .extensions()
-            .get::<SharedProps>()
-            .map(|shared_props| shared_props.0.clone());
-
-        if let Some(shared_props) = shared_props {
-            let shared_props = resolve_props(&shared_props, &req_type).await?;
-            props.extend(shared_props);
-        }
+        let props = resolve_props(&props, &req_type).await?;
 
         let page = InertiaPage::new(
             component,

tests/test_p_actix.rs

@@ -435,16 +435,16 @@ async fn foo(_baz: &HttpRequest) {}
 
 #[tokio::test]
 async fn test_shared_props() {
-    const TEST_SHARED_PROPERTY_KEY: &str = "sharedProperty";
-    const TEST_SHARED_PROPERTY_VALUE: &str = "Some amazing value!";
-
     let app = actix_web::test::init_service(generate_actix_app().await.wrap(
         InertiaMiddleware::new().with_shared_props(Arc::new(move |req| {
             let req = req.clone();
             async move {
                 foo(&req).await;
                 hashmap![
-                    TEST_SHARED_PROPERTY_KEY => InertiaProp::always(TEST_SHARED_PROPERTY_VALUE),
+                    "sharedProp" => InertiaProp::always("Some amazing value!"),
+                    "deferredSharedProp" => InertiaProp::defer(prop_resolver!({
+                        vec!["foo", "bar", "baz"].into_inertia_value()
+                    }))
                 ]
             }
             .boxed_local()
@@ -468,8 +468,19 @@ async fn test_shared_props() {
     let json_body: InertiaPage = serde_json::from_slice(&body[..]).unwrap();
 
     assert_eq!(
-        TEST_SHARED_PROPERTY_VALUE,
-        json_body.get_props().get(TEST_SHARED_PROPERTY_KEY).unwrap()
+        "Some amazing value!",
+        json_body.get_props().get("sharedProp").unwrap()
+    );
+
+    println!("{:#?}", json_body);
+    assert_eq!(
+        &vec!["deferredSharedProp"],
+        json_body
+            .get_deferred_props()
+            .as_ref()
+            .unwrap()
+            .get("default")
+            .unwrap()
     );
 }