♻️ Cambia en prepare_component() el tipo devuelto

Elimina `PrepareMarkup` como tipo de retorno de prepare_component() y de
`FnPrepareRender`, sustituyéndolo directamente por `Markup`. Se elimina
una capa innecesaria, ya que html! {} y html! { ... } cubren todos los
casos que ofrecía `PrepareMarkup`.
This commit is contained in:
Manuel Cillero 2026-03-17 20:04:26 +01:00
parent a5ee0fecb1
commit 3e1bc0fb0e
28 changed files with 241 additions and 335 deletions

View file

@ -6,7 +6,7 @@ use crate::prelude::*;
/// los componentes.
///
/// Recibe una referencia al componente `component` y una referencia mutable al contexto `cx`.
pub type FnPrepareRender<C> = fn(component: &C, cx: &mut Context) -> PrepareMarkup;
pub type FnPrepareRender<C> = fn(component: &C, cx: &mut Context) -> Markup;
/// Ejecuta [`FnPrepareRender`] para preparar el renderizado de un componente.
///
@ -43,8 +43,8 @@ impl<C: Component> PrepareRender<C> {
/// Despacha las acciones. Se detiene en cuanto una renderiza.
#[inline]
pub(crate) fn dispatch(component: &C, cx: &mut Context) -> PrepareMarkup {
let mut render_component = PrepareMarkup::None;
pub(crate) fn dispatch(component: &C, cx: &mut Context) -> Markup {
let mut render_component = html! {};
dispatch_actions(
&ActionKey::new(
UniqueId::of::<Self>(),

View file

@ -29,23 +29,23 @@ impl Component for Block {
self.alter_classes(ClassesOp::Prepend, "block");
}
fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup {
fn prepare_component(&self, cx: &mut Context) -> Markup {
let block_body = self.children().render(cx);
if block_body.is_empty() {
return PrepareMarkup::None;
return html! {};
}
let id = cx.required_id::<Block>(self.id());
PrepareMarkup::With(html! {
html! {
div id=(id) class=[self.classes().get()] {
@if let Some(title) = self.title().lookup(cx) {
h2 class="block__title" { span { (title) } }
}
div class="block__body" { (block_body) }
}
})
}
}
}

View file

@ -42,8 +42,8 @@ impl Component for Html {
Self::default()
}
fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup {
PrepareMarkup::With(self.html(cx))
fn prepare_component(&self, cx: &mut Context) -> Markup {
self.html(cx)
}
}

View file

@ -115,7 +115,7 @@ impl Component for Intro {
));
}
fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup {
fn prepare_component(&self, cx: &mut Context) -> Markup {
if *self.opening() == IntroOpening::PageTop {
cx.alter_assets(ContextOp::AddJavaScript(JavaScript::on_load_async("intro-js", |cx|
util::indoc!(r#"
@ -135,7 +135,7 @@ impl Component for Intro {
)));
}
PrepareMarkup::With(html! {
html! {
div class="intro" {
div class="intro-header" {
section class="intro-header__body" {
@ -206,7 +206,7 @@ impl Component for Intro {
}
}
}
})
}
}
}

View file

@ -25,8 +25,8 @@ impl Component for PoweredBy {
PoweredBy { copyright: Some(c) }
}
fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup {
PrepareMarkup::With(html! {
fn prepare_component(&self, cx: &mut Context) -> Markup {
html! {
div id=[self.id()] class="poweredby" {
@if let Some(c) = self.copyright() {
span class="poweredby__copyright" { (c) "." } " "
@ -35,7 +35,7 @@ impl Component for PoweredBy {
(L10n::l("poweredby_pagetop").with_arg("pagetop_link", LINK).using(cx))
}
}
})
}
}
}