From 0cc2d7ee2d01b8eee27cd1feb72a3db603a25a18 Mon Sep 17 00:00:00 2001
From: Manuel Cillero <manuel@cillero.es>
Date: Tue, 23 Apr 2024 23:11:30 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20All=20fn=20...prepare...()=20ret?=
 =?UTF-8?q?urn=20PrepareMarkup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/component/definition.rs |  6 +-----
 src/core/theme/definition.rs     | 14 +++++++-------
 src/html.rs                      | 10 ++++++++++
 src/response/page.rs             |  4 ++--
 4 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/core/component/definition.rs b/src/core/component/definition.rs
index 80a40a09..af33c943 100644
--- a/src/core/component/definition.rs
+++ b/src/core/component/definition.rs
@@ -49,11 +49,7 @@ impl<C: ComponentTrait> ComponentBase for C {
             // Renderiza el componente.
             let markup = match action::theme::RenderComponent::dispatch(self, cx) {
                 Some(html) => html,
-                None => match self.prepare_component(cx) {
-                    PrepareMarkup::None => html! {},
-                    PrepareMarkup::Text(text) => html! { (text) },
-                    PrepareMarkup::With(html) => html,
-                },
+                None => self.prepare_component(cx).render(),
             };
 
             // Acciones del tema después de preparar el componente.
diff --git a/src/core/theme/definition.rs b/src/core/theme/definition.rs
index 549bcd51..376aeae5 100644
--- a/src/core/theme/definition.rs
+++ b/src/core/theme/definition.rs
@@ -1,7 +1,7 @@
 use crate::base::component::*;
 use crate::core::component::{ComponentBase, ComponentTrait};
 use crate::core::package::PackageTrait;
-use crate::html::{html, Favicon, Markup};
+use crate::html::{html, Favicon, PrepareMarkup};
 use crate::locale::L10n;
 use crate::response::page::Page;
 use crate::{concat_string, config};
@@ -25,10 +25,10 @@ pub trait ThemeTrait: PackageTrait + Send + Sync {
     #[allow(unused_variables)]
     fn before_prepare_body(&self, page: &mut Page) {}
 
-    fn prepare_body(&self, page: &mut Page) -> Markup {
+    fn prepare_body(&self, page: &mut Page) -> PrepareMarkup {
         let skip_to_id = page.body_skip_to().get().unwrap_or("content".to_owned());
 
-        html! {
+        PrepareMarkup::With(html! {
             body id=[page.body_id().get()] class=[page.body_classes().get()] {
                 @if let Some(skip) = L10n::l("skip_to_content").using(page.context().langid()) {
                     div class="skip__to_content" {
@@ -66,7 +66,7 @@ pub trait ThemeTrait: PackageTrait + Send + Sync {
                     .add_item(flex::Item::region().with_id("footer"))
                     .render(page.context()))
             }
-        }
+        })
     }
 
     fn after_prepare_body(&self, page: &mut Page) {
@@ -75,9 +75,9 @@ pub trait ThemeTrait: PackageTrait + Send + Sync {
         }
     }
 
-    fn prepare_head(&self, page: &mut Page) -> Markup {
+    fn prepare_head(&self, page: &mut Page) -> PrepareMarkup {
         let viewport = "width=device-width, initial-scale=1, shrink-to-fit=no";
-        html! {
+        PrepareMarkup::With(html! {
             head {
                 meta charset="utf-8";
 
@@ -107,6 +107,6 @@ pub trait ThemeTrait: PackageTrait + Send + Sync {
 
                 (page.context().prepare_assets())
             }
-        }
+        })
     }
 }
diff --git a/src/html.rs b/src/html.rs
index 007a14ef..83de200d 100644
--- a/src/html.rs
+++ b/src/html.rs
@@ -38,3 +38,13 @@ pub enum PrepareMarkup {
     Text(&'static str),
     With(Markup),
 }
+
+impl PrepareMarkup {
+    pub fn render(&self) -> Markup {
+        match self {
+            PrepareMarkup::None => html! {},
+            PrepareMarkup::Text(text) => html! { (text) },
+            PrepareMarkup::With(markup) => html! { (markup) },
+        }
+    }
+}
diff --git a/src/response/page.rs b/src/response/page.rs
index 344c38dc..bcebe827 100644
--- a/src/response/page.rs
+++ b/src/response/page.rs
@@ -196,8 +196,8 @@ impl Page {
         Ok(html! {
             (DOCTYPE)
             html lang=(lang) dir=(dir) {
-                (head)
-                (body)
+                (head.render())
+                (body.render())
             }
         })
     }