💥 Cambia renderizar por preparar componentes

pagetop/src/base/action.rs

@@ -1 +1,3 @@
-mod before_render_component;
+mod before_prepare_component;
+
+mod after_prepare_component;

pagetop/src/base/action/after_prepare_component.rs

@@ -1,19 +1,19 @@
 #[macro_export]
-macro_rules! action_before_render_component {
+macro_rules! action_after_prepare_component {
     ( $ACTION_HANDLE:ident for $Component:ty ) => {
         $crate::paste! {
             $crate::use_handle!($ACTION_HANDLE);
 
             type Action = fn(&$Component, &mut RenderContext);
 
-            pub struct [<BeforeRender $Component>] {
+            pub struct [<AfterPrepare $Component>] {
                 action: Option<Action>,
                 weight: isize,
             }
 
-            impl ActionTrait for [<BeforeRender $Component>] {
+            impl ActionTrait for [<AfterPrepare $Component>] {
                 fn new() -> Self {
-                    [<BeforeRender $Component>] {
+                    [<AfterPrepare $Component>] {
                         action: None,
                         weight: 0,
                     }
@@ -32,7 +32,7 @@ macro_rules! action_before_render_component {
                 }
             }
 
-            impl [<BeforeRender $Component>] {
+            impl [<AfterPrepare $Component>] {
                 #[allow(dead_code)]
                 pub fn with_action(mut self, action: Action) -> Self {
                     self.action = Some(action);
@@ -53,12 +53,12 @@ macro_rules! action_before_render_component {
             }
 
             #[inline(always)]
-            pub fn run_actions_before_render_component(
+            pub fn run_actions_after_prepare_component(
                 component: &mut $Component,
                 rcx: &mut RenderContext
             ) {
                 run_actions($ACTION_HANDLE, |action|
-                    action_ref::<[<BeforeRender $Component>]>(&**action)
+                    action_ref::<[<AfterPrepare $Component>]>(&**action)
                         .run(component, rcx)
                 );
             }

pagetop/src/base/action/before_prepare_component.rs

@@ -0,0 +1,67 @@
+#[macro_export]
+macro_rules! action_before_prepare_component {
+    ( $ACTION_HANDLE:ident for $Component:ty ) => {
+        $crate::paste! {
+            $crate::use_handle!($ACTION_HANDLE);
+
+            type Action = fn(&$Component, &mut RenderContext);
+
+            pub struct [<BeforePrepare $Component>] {
+                action: Option<Action>,
+                weight: isize,
+            }
+
+            impl ActionTrait for [<BeforePrepare $Component>] {
+                fn new() -> Self {
+                    [<BeforePrepare $Component>] {
+                        action: None,
+                        weight: 0,
+                    }
+                }
+
+                fn handle(&self) -> Handle {
+                    $ACTION_HANDLE
+                }
+
+                fn weight(&self) -> isize {
+                    self.weight
+                }
+
+                fn as_ref_any(&self) -> &dyn AnyAction {
+                    self
+                }
+            }
+
+            impl [<BeforePrepare $Component>] {
+                #[allow(dead_code)]
+                pub fn with_action(mut self, action: Action) -> Self {
+                    self.action = Some(action);
+                    self
+                }
+
+                #[allow(dead_code)]
+                pub fn with_weight(mut self, weight: isize) -> Self {
+                    self.weight = weight;
+                    self
+                }
+
+                pub fn run(&self, component: &mut $Component, rcx: &mut RenderContext) {
+                    if let Some(action) = self.action {
+                        action(component, rcx)
+                    }
+                }
+            }
+
+            #[inline(always)]
+            pub fn run_actions_before_prepare_component(
+                component: &mut $Component,
+                rcx: &mut RenderContext
+            ) {
+                run_actions($ACTION_HANDLE, |action|
+                    action_ref::<[<BeforePrepare $Component>]>(&**action)
+                        .run(component, rcx)
+                );
+            }
+        }
+    };
+}

pagetop/src/base/component/block.rs

@@ -2,7 +2,7 @@ use crate::prelude::*;
 
 use_handle!(COMPONENT_BLOCK);
 
-action_before_render_component!(ACTION_BEFORE_RENDER_BLOCK for Block);
+action_before_prepare_component!(ACTION_BEFORE_PREPARE_BLOCK for Block);
 
 #[rustfmt::skip]
 #[derive(Default)]
@@ -37,11 +37,11 @@ impl ComponentTrait for Block {
         (self.renderable.check)(rcx)
     }
 
-    fn before_render(&mut self, rcx: &mut RenderContext) {
+    fn before_prepare(&mut self, rcx: &mut RenderContext) {
-        run_actions_before_render_component(self, rcx);
+        run_actions_before_prepare_component(self, rcx);
     }
 
-    fn default_render(&self, rcx: &mut RenderContext) -> Markup {
+    fn prepare_component(&self, rcx: &mut RenderContext) -> Markup {
         let id = rcx.required_id::<Block>(self.id());
         html! {
             div id=(id) class=[self.classes().get()] {
@@ -49,7 +49,7 @@ impl ComponentTrait for Block {
                     h2 class="block-title" { (title) }
                 }
                 div class="block-body" {
-                    (self.components().render(rcx))
+                    (self.components().prepare(rcx))
                 }
             }
         }

pagetop/src/base/component/html.rs

@@ -14,7 +14,7 @@ impl ComponentTrait for Html {
         COMPONENT_HTML
     }
 
-    fn default_render(&self, _: &mut RenderContext) -> Markup {
+    fn prepare_component(&self, _: &mut RenderContext) -> Markup {
         html! { (self.html()) }
     }
 

pagetop/src/base/component/l10n.rs

@@ -28,7 +28,7 @@ impl ComponentTrait for L10n {
         COMPONENT_L10N
     }
 
-    fn default_render(&self, rcx: &mut RenderContext) -> Markup {
+    fn prepare_component(&self, rcx: &mut RenderContext) -> Markup {
         match self.op() {
             L10nOp::None => html! {},
             L10nOp::Text(text) => html! { (text) },

pagetop/src/core/component/bundle.rs

@@ -116,12 +116,12 @@ impl ComponentsBundle {
 
     // ComponentsBundle RENDER.
 
-    pub fn render(&self, rcx: &mut RenderContext) -> Markup {
+    pub fn prepare(&self, rcx: &mut RenderContext) -> Markup {
         let mut components = self.0.clone();
         components.sort_by_key(|c| c.read().unwrap().weight());
         html! {
             @for c in components.iter() {
-                (" ")(c.write().unwrap().render(rcx))(" ")
+                (" ")(c.write().unwrap().prepare(rcx))(" ")
             }
         }
     }

pagetop/src/core/component/definition.rs

@@ -5,7 +5,7 @@ use crate::{util, Handle};
 pub use std::any::Any as AnyComponent;
 
 pub trait BaseComponent {
-    fn render(&mut self, rcx: &mut RenderContext) -> Markup;
+    fn prepare(&mut self, rcx: &mut RenderContext) -> Markup;
 }
 
 pub trait ComponentTrait: AnyComponent + BaseComponent + Send + Sync {
@@ -37,32 +37,44 @@ pub trait ComponentTrait: AnyComponent + BaseComponent + Send + Sync {
     }
 
     #[allow(unused_variables)]
-    fn before_render(&mut self, rcx: &mut RenderContext) {}
+    fn before_prepare(&mut self, rcx: &mut RenderContext) {}
 
     #[allow(unused_variables)]
-    fn default_render(&self, rcx: &mut RenderContext) -> Markup {
+    fn prepare_component(&self, rcx: &mut RenderContext) -> Markup {
         html! {}
     }
 
+    #[allow(unused_variables)]
+    fn after_prepare(&mut self, rcx: &mut RenderContext) {}
+
     fn as_ref_any(&self) -> &dyn AnyComponent;
 
     fn as_mut_any(&mut self) -> &mut dyn AnyComponent;
 }
 
 impl<C: ComponentTrait> BaseComponent for C {
-    fn render(&mut self, rcx: &mut RenderContext) -> Markup {
+    fn prepare(&mut self, rcx: &mut RenderContext) -> Markup {
-        // Acciones del componente antes de renderizar.
+        if self.is_renderable(rcx) {
-        self.before_render(rcx);
+            // Acciones antes de preparar el componente.
+            self.before_prepare(rcx);
 
-        // Acciones del tema antes de renderizar el componente.
+            // Acciones del tema antes de preparar el componente.
-        rcx.theme().before_render_component(self, rcx);
+            rcx.theme().before_prepare_component(self, rcx);
 
-        match self.is_renderable(rcx) {
+            let markup = match rcx.theme().render_component(self, rcx) {
-            true => match rcx.theme().render_component(self, rcx) {
                 Some(html) => html,
-                None => self.default_render(rcx),
+                None => self.prepare_component(rcx),
-            },
+            };
-            false => html! {},
+
+            // Acciones después de preparar el componente.
+            self.after_prepare(rcx);
+
+            // Acciones del tema después de preparar el componente.
+            rcx.theme().after_prepare_component(self, rcx);
+
+            markup
+        } else {
+            html! {}
         }
     }
 }

pagetop/src/core/component/one.rs

@@ -21,16 +21,16 @@ impl<T: ComponentTrait + Default> OneComponent<T> {
 
     // OneComponent RENDER.
 
-    pub fn render(&self, rcx: &mut RenderContext) -> Markup {
+    pub fn prepare(&self, rcx: &mut RenderContext) -> Markup {
         if let Some(component) = &self.0 {
-            return component.write().unwrap().render(rcx);
+            return component.write().unwrap().prepare(rcx);
         }
         html! {}
     }
 
-    pub fn optional_render(&self, rcx: &mut RenderContext) -> Option<Markup> {
+    pub fn prepare_optional(&self, rcx: &mut RenderContext) -> Option<Markup> {
         if let Some(component) = &self.0 {
-            let render = component.write().unwrap().render(rcx).into_string();
+            let render = component.write().unwrap().prepare(rcx).into_string();
             if !render.trim().is_empty() {
                 return Some(html! { (render) });
             }

pagetop/src/core/theme/definition.rs

@@ -80,7 +80,27 @@ pub trait ThemeTrait: ModuleTrait + Send + Sync {
 
     #[rustfmt::skip]
     #[allow(unused_variables)]
-    fn before_render_component(
+    fn before_prepare_component(
+        &self,
+        component: &mut dyn ComponentTrait,
+        rcx: &mut RenderContext,
+    ) {
+        /*
+            Cómo usarlo:
+
+            match component.handle() {
+                BLOCK_COMPONENT => {
+                    let block = component_mut::<Block>(component);
+                    block.alter_title("New title");
+                },
+                _ => {},
+            }
+        */
+    }
+
+    #[rustfmt::skip]
+    #[allow(unused_variables)]
+    fn after_prepare_component(
         &self,
         component: &mut dyn ComponentTrait,
         rcx: &mut RenderContext,

pagetop/src/prelude.rs

@@ -30,7 +30,7 @@ pub use crate::{db, db::*, migration_item, pub_migration};
 
 pub use crate::core::{action::*, component::*, module::*, theme::*};
 
-pub use crate::{action, action_before_render_component};
+pub use crate::{action, action_after_prepare_component, action_before_prepare_component};
 
 pub use crate::base::component::*;
 

pagetop/src/response/fatal_error/error403.rs

@@ -15,7 +15,7 @@ impl ComponentTrait for Error403 {
         ERROR_403
     }
 
-    fn default_render(&self, _rcx: &mut RenderContext) -> Markup {
+    fn prepare_component(&self, _rcx: &mut RenderContext) -> Markup {
         html! {
             div {
                 h1 { ("FORBIDDEN ACCESS") }

pagetop/src/response/fatal_error/error404.rs

@@ -15,7 +15,7 @@ impl ComponentTrait for Error404 {
         ERROR_404
     }
 
-    fn default_render(&self, _rcx: &mut RenderContext) -> Markup {
+    fn prepare_component(&self, _rcx: &mut RenderContext) -> Markup {
         html! {
             div {
                 h1 { ("RESOURCE NOT FOUND") }

pagetop/src/response/page/definition.rs

@@ -121,11 +121,11 @@ impl Page {
     }
 
     pub fn title(&mut self) -> String {
-        self.title.render(&mut self.context).into_string()
+        self.title.prepare(&mut self.context).into_string()
     }
 
     pub fn description(&mut self) -> String {
-        self.description.render(&mut self.context).into_string()
+        self.description.prepare(&mut self.context).into_string()
     }
 
     pub fn metadata(&self) -> &Vec<(&str, &str)> {
@@ -196,7 +196,7 @@ impl Page {
         let render = self
             .regions
             .get_extended_bundle(self.context.theme().single_name(), region)
-            .render(self.context());
+            .prepare(self.context());
         if render.is_empty() {
             None
         } else {