✨ Add trait fn that can inject custom HTML raw.

celestia-island · Dec 20, 2023 · f452415 · f452415
1 parent 0d5c2e4
commit f452415
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 21 deletions.
diff --git a/packages/macro-types/src/register.rs b/packages/macro-types/src/register.rs
@@ -39,4 +39,29 @@ where
             </>
         }
     }
+
+    fn render_to_string_outside(
+        style_raw: String,
+        html_raw: String,
+        state: &Self::AppStates,
+    ) -> String {
+        let state = ::serde_json::to_string(state).unwrap();
+
+        format!("
+            <!DOCTYPE html>
+            <html>
+                <head>
+                    <meta charset='utf-8'>
+                    <meta name='viewport' content='width=device-width, initial-scale=1'>
+                    <style>{style_raw}</style>
+                </head>
+                <body>
+                    <textarea id='ssr_data' style='display: none;'>{state}</textarea>
+                    <div id='app'>{html_raw}</div>
+                    <script src='/a.js'></script>
+                    <script>(async () => {{await wasm_vendor_entry('/a.wasm');(await (new wasm_vendor_entry.WebHandle())).start();}})()</script>
+                </body>
+            </html>
+        ")
+    }
 }
diff --git a/packages/macro/src/utils/app.rs b/packages/macro/src/utils/app.rs
@@ -156,12 +156,16 @@ pub fn root(input: DeriveApp) -> TokenStream {
                 use ::yew::ServerRenderer;
 
                 let (writer, reader) = render_static();
-                let renderer = ServerRenderer::<HikariServerApp>::with_props(move || {
+
+                let renderer = ServerRenderer::<HikariServerApp>::with_props({
+                    let states  = states.clone();
+                    move || {
                     let style_manager = StyleManager::builder().writer(writer).build().unwrap();
-                    ::hikari_boot::AppContext {
-                        style_manager,
-                        url,
-                        states,
+                        ::hikari_boot::AppContext {
+                            style_manager,
+                            url,
+                            states,
+                        }
                     }
                 });
                 let html_raw = renderer.render().await;
@@ -170,22 +174,7 @@ pub fn root(input: DeriveApp) -> TokenStream {
                 let mut style_raw = String::new();
                 style_data.write_static_markup(&mut style_raw).unwrap();
 
-                format!("
-                    <!DOCTYPE html>
-                    <html lang='en'>
-                        <head>
-                            <meta charset='utf-8'>
-                            <meta name='viewport' content='width=device-width, initial-scale=1'>
-                            <style>{style_raw}</style>
-                        </head>
-                        <body>
-                            <textarea id='ssr_data' style='display: none;'>{{}}</textarea>
-                            <div id='app'>{html_raw}</div>
-                            <script src='/a.js'></script>
-                            <script>(async () => {{await wasm_vendor_entry('/a.wasm');(await (new wasm_vendor_entry.WebHandle())).start();}})()</script>
-                        </body>
-                    </html>
-                ")
+                <#ident as ::hikari_boot::DeclType>::render_to_string_outside(style_raw, html_raw, &states)
             }
         }
     }