From 79893514c82a0afab28b55e6a929666a63dfebba Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Thu, 5 Dec 2024 08:24:26 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A7=20Trabajando=20en=20las=20acciones?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pagetop/src/base/action/component.rs | 8 ++++---- ...re_component.rs => after_render_component.rs} | 8 ++++---- ...e_component.rs => before_render_component.rs} | 8 ++++---- pagetop/src/base/action/layout.rs | 8 ++++---- ...re_component.rs => after_render_component.rs} | 8 ++++---- ...e_component.rs => before_render_component.rs} | 8 ++++---- pagetop/src/core/component/definition.rs | 16 ++++++++-------- 7 files changed, 32 insertions(+), 32 deletions(-) rename pagetop/src/base/action/component/{after_prepare_component.rs => after_render_component.rs} (90%) rename pagetop/src/base/action/component/{before_prepare_component.rs => before_render_component.rs} (89%) rename pagetop/src/base/action/layout/{after_prepare_component.rs => after_render_component.rs} (85%) rename pagetop/src/base/action/layout/{before_prepare_component.rs => before_render_component.rs} (85%) diff --git a/pagetop/src/base/action/component.rs b/pagetop/src/base/action/component.rs index 03eedf26..28555712 100644 --- a/pagetop/src/base/action/component.rs +++ b/pagetop/src/base/action/component.rs @@ -1,8 +1,8 @@ mod is_renderable; pub use is_renderable::*; -mod before_prepare_component; -pub use before_prepare_component::*; +mod before_render_component; +pub use before_render_component::*; -mod after_prepare_component; -pub use after_prepare_component::*; +mod after_render_component; +pub use after_render_component::*; diff --git a/pagetop/src/base/action/component/after_prepare_component.rs b/pagetop/src/base/action/component/after_render_component.rs similarity index 90% rename from pagetop/src/base/action/component/after_prepare_component.rs rename to pagetop/src/base/action/component/after_render_component.rs index 233c1a7b..3f522f75 100644 --- a/pagetop/src/base/action/component/after_prepare_component.rs +++ b/pagetop/src/base/action/component/after_render_component.rs @@ -2,14 +2,14 @@ use crate::prelude::*; use crate::base::action::FnActionWithComponent; -pub struct AfterPrepare { +pub struct AfterRender { f: FnActionWithComponent, referer_type_id: Option, referer_id: OptionId, weight: Weight, } -impl ActionTrait for AfterPrepare { +impl ActionTrait for AfterRender { fn referer_type_id(&self) -> Option { self.referer_type_id } @@ -23,9 +23,9 @@ impl ActionTrait for AfterPrepare { } } -impl AfterPrepare { +impl AfterRender { pub fn new(f: FnActionWithComponent) -> Self { - AfterPrepare { + AfterRender { f, referer_type_id: Some(TypeId::of::()), referer_id: OptionId::default(), diff --git a/pagetop/src/base/action/component/before_prepare_component.rs b/pagetop/src/base/action/component/before_render_component.rs similarity index 89% rename from pagetop/src/base/action/component/before_prepare_component.rs rename to pagetop/src/base/action/component/before_render_component.rs index cedc45db..5f3d6f6e 100644 --- a/pagetop/src/base/action/component/before_prepare_component.rs +++ b/pagetop/src/base/action/component/before_render_component.rs @@ -2,14 +2,14 @@ use crate::prelude::*; use crate::base::action::FnActionWithComponent; -pub struct BeforePrepare { +pub struct BeforeRender { f: FnActionWithComponent, referer_type_id: Option, referer_id: OptionId, weight: Weight, } -impl ActionTrait for BeforePrepare { +impl ActionTrait for BeforeRender { fn referer_type_id(&self) -> Option { self.referer_type_id } @@ -23,9 +23,9 @@ impl ActionTrait for BeforePrepare { } } -impl BeforePrepare { +impl BeforeRender { pub fn new(f: FnActionWithComponent) -> Self { - BeforePrepare { + BeforeRender { f, referer_type_id: Some(TypeId::of::()), referer_id: OptionId::default(), diff --git a/pagetop/src/base/action/layout.rs b/pagetop/src/base/action/layout.rs index 8f307d98..495b2a1f 100644 --- a/pagetop/src/base/action/layout.rs +++ b/pagetop/src/base/action/layout.rs @@ -1,8 +1,8 @@ -mod before_prepare_component; -pub use before_prepare_component::*; +mod before_render_component; +pub use before_render_component::*; -mod after_prepare_component; -pub use after_prepare_component::*; +mod after_render_component; +pub use after_render_component::*; mod render_component; pub use render_component::*; diff --git a/pagetop/src/base/action/layout/after_prepare_component.rs b/pagetop/src/base/action/layout/after_render_component.rs similarity index 85% rename from pagetop/src/base/action/layout/after_prepare_component.rs rename to pagetop/src/base/action/layout/after_render_component.rs index 62adfa21..10090e56 100644 --- a/pagetop/src/base/action/layout/after_prepare_component.rs +++ b/pagetop/src/base/action/layout/after_render_component.rs @@ -2,13 +2,13 @@ use crate::prelude::*; use crate::base::action::FnActionWithComponent; -pub struct AfterPrepare { +pub struct AfterRender { f: FnActionWithComponent, layout_type_id: Option, referer_type_id: Option, } -impl ActionTrait for AfterPrepare { +impl ActionTrait for AfterRender { fn layout_type_id(&self) -> Option { self.layout_type_id } @@ -18,9 +18,9 @@ impl ActionTrait for AfterPrepare { } } -impl AfterPrepare { +impl AfterRender { pub fn new(layout: LayoutRef, f: FnActionWithComponent) -> Self { - AfterPrepare { + AfterRender { f, layout_type_id: Some(layout.type_id()), referer_type_id: Some(TypeId::of::()), diff --git a/pagetop/src/base/action/layout/before_prepare_component.rs b/pagetop/src/base/action/layout/before_render_component.rs similarity index 85% rename from pagetop/src/base/action/layout/before_prepare_component.rs rename to pagetop/src/base/action/layout/before_render_component.rs index 1ab35bba..5102c1fb 100644 --- a/pagetop/src/base/action/layout/before_prepare_component.rs +++ b/pagetop/src/base/action/layout/before_render_component.rs @@ -2,13 +2,13 @@ use crate::prelude::*; use crate::base::action::FnActionWithComponent; -pub struct BeforePrepare { +pub struct BeforeRender { f: FnActionWithComponent, layout_type_id: Option, referer_type_id: Option, } -impl ActionTrait for BeforePrepare { +impl ActionTrait for BeforeRender { fn layout_type_id(&self) -> Option { self.layout_type_id } @@ -18,9 +18,9 @@ impl ActionTrait for BeforePrepare { } } -impl BeforePrepare { +impl BeforeRender { pub fn new(layout: LayoutRef, f: FnActionWithComponent) -> Self { - BeforePrepare { + BeforeRender { f, layout_type_id: Some(layout.type_id()), referer_type_id: Some(TypeId::of::()), diff --git a/pagetop/src/core/component/definition.rs b/pagetop/src/core/component/definition.rs index 315b5de9..a58d6958 100644 --- a/pagetop/src/core/component/definition.rs +++ b/pagetop/src/core/component/definition.rs @@ -40,11 +40,11 @@ impl ComponentBase for C { // Comprueba el componente antes de prepararlo. self.setup_before_prepare(cx); - // Acciones del diseño antes de preparar el componente. - action::layout::BeforePrepare::dispatch(self, cx); + // Acciones del diseño antes de renderizar el componente. + action::layout::BeforeRender::dispatch(self, cx); - // Acciones de los módulos antes de preparar el componente. - action::component::BeforePrepare::dispatch(self, cx); + // Acciones de los paquetes antes de renderizar el componente. + action::component::BeforeRender::dispatch(self, cx); // Renderiza el componente. let markup = match action::layout::RenderComponent::dispatch(self, cx) { @@ -52,11 +52,11 @@ impl ComponentBase for C { None => self.prepare_component(cx).render(), }; - // Acciones del diseño después de preparar el componente. - action::layout::AfterPrepare::dispatch(self, cx); + // Acciones del diseño después de renderizar el componente. + action::layout::AfterRender::dispatch(self, cx); - // Acciones de los módulos después de preparar el componente. - action::component::AfterPrepare::dispatch(self, cx); + // Acciones de los paquetes después de renderizar el componente. + action::component::AfterRender::dispatch(self, cx); markup } else {