manuelcillero/pagetop
manuelcillero/pagetop
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

♻️ Cambia en prepare_component() el tipo devuelto

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

28
extensions/pagetop-bootsier/src/theme/container/component.rs
View file

@ -33,10 +33,10 @@ impl Component for Container {
self.alter_classes(ClassesOp::Prepend, self.container_width().to_class());
}
fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup {
fn prepare_component(&self, cx: &mut Context) -> Markup {
let output = self.children().render(cx);
if output.is_empty() {
return PrepareMarkup::None;
return html! {};
}
let style = match self.container_width() {
container::Width::FluidMax(w) if w.is_measurable() => {
@ -45,36 +45,36 @@ impl Component for Container {
_ => None,
};
match self.container_kind() {
container::Kind::Default => PrepareMarkup::With(html! {
container::Kind::Default => html! {
div id=[self.id()] class=[self.classes().get()] style=[style] {
(output)
}
}),
container::Kind::Main => PrepareMarkup::With(html! {
},
container::Kind::Main => html! {
main id=[self.id()] class=[self.classes().get()] style=[style] {
(output)
}
}),
container::Kind::Header => PrepareMarkup::With(html! {
},
container::Kind::Header => html! {
header id=[self.id()] class=[self.classes().get()] style=[style] {
(output)
}
}),
container::Kind::Footer => PrepareMarkup::With(html! {
},
container::Kind::Footer => html! {
footer id=[self.id()] class=[self.classes().get()] style=[style] {
(output)
}
}),
container::Kind::Section => PrepareMarkup::With(html! {
},
container::Kind::Section => html! {
section id=[self.id()] class=[self.classes().get()] style=[style] {
(output)
}
}),
container::Kind::Article => PrepareMarkup::With(html! {
},
container::Kind::Article => html! {
article id=[self.id()] class=[self.classes().get()] style=[style] {
(output)
}
}),
},
}
}
}

8
extensions/pagetop-bootsier/src/theme/dropdown/component.rs
View file

@ -63,17 +63,17 @@ impl Component for Dropdown {
);
}
fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup {
fn prepare_component(&self, cx: &mut Context) -> Markup {
// Si no hay elementos en el menú, no se prepara.
let items = self.items().render(cx);
if items.is_empty() {
return PrepareMarkup::None;
return html! {};
}
// Título opcional para el menú desplegable.
let title = self.title().using(cx);
PrepareMarkup::With(html! {
html! {
div id=[self.id()] class=[self.classes().get()] {
@if !title.is_empty() {
@let mut btn_classes = Classes::new({
@ -156,7 +156,7 @@ impl Component for Dropdown {
ul class="dropdown-menu" { (items) }
}
}
})
}
}
}

24
extensions/pagetop-bootsier/src/theme/dropdown/item.rs
View file

@ -62,17 +62,17 @@ impl Component for Item {
self.id.get()
}
fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup {
fn prepare_component(&self, cx: &mut Context) -> Markup {
match self.item_kind() {
ItemKind::Void => PrepareMarkup::None,
ItemKind::Void => html! {},
ItemKind::Label(label) => PrepareMarkup::With(html! {
ItemKind::Label(label) => html! {
li id=[self.id()] class=[self.classes().get()] {
span class="dropdown-item-text" {
(label.using(cx))
}
}
}),
},
ItemKind::Link {
label,
@ -100,7 +100,7 @@ impl Component for Item {
let aria_disabled = disabled.then_some("true");
let tabindex = disabled.then_some("-1");
PrepareMarkup::With(html! {
html! {
li id=[self.id()] class=[self.classes().get()] {
a
class=(classes)
@ -114,7 +114,7 @@ impl Component for Item {
(label.using(cx))
}
}
})
}
}
ItemKind::Button { label, disabled } => {
@ -126,7 +126,7 @@ impl Component for Item {
let aria_disabled = disabled.then_some("true");
let disabled_attr = disabled.then_some("disabled");
PrepareMarkup::With(html! {
html! {
li id=[self.id()] class=[self.classes().get()] {
button
class=(classes)
@ -137,20 +137,20 @@ impl Component for Item {
(label.using(cx))
}
}
})
}
}
ItemKind::Header(label) => PrepareMarkup::With(html! {
ItemKind::Header(label) => html! {
li id=[self.id()] class=[self.classes().get()] {
h6 class="dropdown-header" {
(label.using(cx))
}
}
}),
},
ItemKind::Divider => PrepareMarkup::With(html! {
ItemKind::Divider => html! {
li id=[self.id()] class=[self.classes().get()] { hr class="dropdown-divider" {} }
}),
},
}
}
}

6
extensions/pagetop-bootsier/src/theme/form/component.rs
View file

@ -52,12 +52,12 @@ impl Component for Form {
self.alter_classes(ClassesOp::Prepend, "form");
}
fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup {
fn prepare_component(&self, cx: &mut Context) -> Markup {
let method = match self.method() {
form::Method::Post => Some("post"),
form::Method::Get => None,
};
PrepareMarkup::With(html! {
html! {
form
id=[self.id()]
class=[self.classes().get()]
@ -67,7 +67,7 @@ impl Component for Form {
{
(self.children().render(cx))
}
})
}
}
}

6
extensions/pagetop-bootsier/src/theme/form/fieldset.rs
View file

@ -22,15 +22,15 @@ impl Component for Fieldset {
self.id.get()
}
fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup {
PrepareMarkup::With(html! {
fn prepare_component(&self, cx: &mut Context) -> Markup {
html! {
fieldset id=[self.id()] class=[self.classes().get()] disabled[*self.disabled()] {
@if let Some(legend) = self.legend().lookup(cx) {
legend { (legend) }
}
(self.children().render(cx))
}
})
}
}
}

6
extensions/pagetop-bootsier/src/theme/form/input.rs
View file

@ -36,9 +36,9 @@ impl Component for Input {
);
}
fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup {
fn prepare_component(&self, cx: &mut Context) -> Markup {
let id = self.name().get().map(|name| util::join!("edit-", name));
PrepareMarkup::With(html! {
html! {
div class=[self.classes().get()] {
@if let Some(label) = self.label().lookup(cx) {
label for=[&id] class="form-label" {
@ -72,7 +72,7 @@ impl Component for Input {
div class="form-text" { (description) }
}
}
})
}
}
}

12
extensions/pagetop-bootsier/src/theme/icon.rs
View file

@ -35,26 +35,26 @@ impl Component for Icon {
}
}
fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup {
fn prepare_component(&self, cx: &mut Context) -> Markup {
match self.icon_kind() {
IconKind::None => PrepareMarkup::None,
IconKind::None => html! {},
IconKind::Font(_) => {
let aria_label = self.aria_label().lookup(cx);
let has_label = aria_label.is_some();
PrepareMarkup::With(html! {
html! {
i
class=[self.classes().get()]
role=[has_label.then_some("img")]
aria-label=[aria_label]
aria-hidden=[(!has_label).then_some("true")]
{}
})
}
}
IconKind::Svg { shapes, viewbox } => {
let aria_label = self.aria_label().lookup(cx);
let has_label = aria_label.is_some();
let viewbox = viewbox.get().unwrap_or_else(|| DEFAULT_VIEWBOX.to_string());
PrepareMarkup::With(html! {
html! {
svg
xmlns="http://www.w3.org/2000/svg"
viewBox=(viewbox)
@ -67,7 +67,7 @@ impl Component for Icon {
{
(shapes)
}
})
}
}
}
}

10
extensions/pagetop-bootsier/src/theme/image/component.rs
View file

@ -36,13 +36,13 @@ impl Component for Image {
self.alter_classes(ClassesOp::Prepend, self.source().to_class());
}
fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup {
fn prepare_component(&self, cx: &mut Context) -> Markup {
let dimensions = self.size().to_style();
let alt_text = self.alternative().lookup(cx).unwrap_or_default();
let is_decorative = alt_text.is_empty();
let source = match self.source() {
image::Source::Logo(logo) => {
return PrepareMarkup::With(html! {
return html! {
span
id=[self.id()]
class=[self.classes().get()]
@ -53,20 +53,20 @@ impl Component for Image {
{
(logo.render(cx))
}
})
}
}
image::Source::Responsive(source) => Some(source),
image::Source::Thumbnail(source) => Some(source),
image::Source::Plain(source) => Some(source),
};
PrepareMarkup::With(html! {
html! {
img
src=[source]
alt=(alt_text)
id=[self.id()]
class=[self.classes().get()]
style=[dimensions] {}
})
}
}
}

8
extensions/pagetop-bootsier/src/theme/nav/component.rs
View file

@ -42,17 +42,17 @@ impl Component for Nav {
});
}
fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup {
fn prepare_component(&self, cx: &mut Context) -> Markup {
let items = self.items().render(cx);
if items.is_empty() {
return PrepareMarkup::None;
return html! {};
}
PrepareMarkup::With(html! {
html! {
ul id=[self.id()] class=[self.classes().get()] {
(items)
}
})
}
}
}

24
extensions/pagetop-bootsier/src/theme/nav/item.rs
View file

@ -99,17 +99,17 @@ impl Component for Item {
self.alter_classes(ClassesOp::Prepend, self.item_kind().to_class());
}
fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup {
fn prepare_component(&self, cx: &mut Context) -> Markup {
match self.item_kind() {
ItemKind::Void => PrepareMarkup::None,
ItemKind::Void => html! {},
ItemKind::Label(label) => PrepareMarkup::With(html! {
ItemKind::Label(label) => html! {
li id=[self.id()] class=[self.classes().get()] {
span class="nav-link disabled" aria-disabled="true" {
(label.using(cx))
}
}
}),
},
ItemKind::Link {
label,
@ -136,7 +136,7 @@ impl Component for Item {
let aria_current = (href.is_some() && is_current).then_some("page");
let aria_disabled = (*disabled).then_some("true");
PrepareMarkup::With(html! {
html! {
li id=[self.id()] class=[self.classes().get()] {
a
class=(classes)
@ -149,27 +149,27 @@ impl Component for Item {
(label.using(cx))
}
}
})
}
}
ItemKind::Html(html) => PrepareMarkup::With(html! {
ItemKind::Html(html) => html! {
li id=[self.id()] class=[self.classes().get()] {
(html.render(cx))
}
}),
},
ItemKind::Dropdown(menu) => {
if let Some(dd) = menu.borrow() {
let items = dd.items().render(cx);
if items.is_empty() {
return PrepareMarkup::None;
return html! {};
}
let title = dd.title().lookup(cx).unwrap_or_else(|| {
L10n::t("dropdown", &LOCALES_BOOTSIER)
.lookup(cx)
.unwrap_or_else(|| "Dropdown".to_string())
});
PrepareMarkup::With(html! {
html! {
li id=[self.id()] class=[self.classes().get()] {
a
class="nav-link dropdown-toggle"
@ -184,9 +184,9 @@ impl Component for Item {
(items)
}
}
})
}
} else {
PrepareMarkup::None
html! {}
}
}
}

8
extensions/pagetop-bootsier/src/theme/navbar/brand.rs
View file

@ -36,20 +36,20 @@ impl Component for Brand {
self.id.get()
}
fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup {
fn prepare_component(&self, cx: &mut Context) -> Markup {
let image = self.image().render(cx);
let title = self.title().using(cx);
if title.is_empty() && image.is_empty() {
return PrepareMarkup::None;
return html! {};
}
let slogan = self.slogan().using(cx);
PrepareMarkup::With(html! {
html! {
@if let Some(route) = self.route() {
a class="navbar-brand" href=(route(cx)) { (image) (title) (slogan) }
} @else {
span class="navbar-brand" { (image) (title) (slogan) }
}
})
}
}
}

8
extensions/pagetop-bootsier/src/theme/navbar/component.rs
View file

@ -48,7 +48,7 @@ impl Component for Navbar {
});
}
fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup {
fn prepare_component(&self, cx: &mut Context) -> Markup {
// Botón de despliegue (colapso u offcanvas) para la barra.
fn button(cx: &mut Context, data_bs_toggle: &str, id_content: &str) -> Markup {
let id_content_target = util::join!("#", id_content);
@ -75,13 +75,13 @@ impl Component for Navbar {
// Si no hay contenidos, no tiene sentido mostrar una barra vacía.
let items = self.items().render(cx);
if items.is_empty() {
return PrepareMarkup::None;
return html! {};
}
// Asegura que la barra tiene un `id` para poder asociarlo al colapso/offcanvas.
let id = cx.required_id::<Self>(self.id());
PrepareMarkup::With(html! {
html! {
nav id=(id) class=[self.classes().get()] {
div class="container-fluid" {
@match self.layout() {
@ -162,7 +162,7 @@ impl Component for Navbar {
}
}
}
})
}
}
}

18
extensions/pagetop-bootsier/src/theme/navbar/item.rs
View file

@ -46,30 +46,30 @@ impl Component for Item {
}
}
fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup {
fn prepare_component(&self, cx: &mut Context) -> Markup {
match self {
Self::Void => PrepareMarkup::None,
Self::Brand(brand) => PrepareMarkup::With(html! { (brand.render(cx)) }),
Self::Void => html! {},
Self::Brand(brand) => html! { (brand.render(cx)) },
Self::Nav(nav) => {
if let Some(nav) = nav.borrow() {
let items = nav.items().render(cx);
if items.is_empty() {
return PrepareMarkup::None;
return html! {};
}
PrepareMarkup::With(html! {
html! {
ul id=[nav.id()] class=[nav.classes().get()] {
(items)
}
})
}
} else {
PrepareMarkup::None
html! {}
}
}
Self::Text(text) => PrepareMarkup::With(html! {
Self::Text(text) => html! {
span class="navbar-text" {
(text.using(cx))
}
}),
},
}
}
}

4
extensions/pagetop-bootsier/src/theme/offcanvas/component.rs
View file

@ -62,8 +62,8 @@ impl Component for Offcanvas {
});
}
fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup {
PrepareMarkup::With(self.render_offcanvas(cx, None))
fn prepare_component(&self, cx: &mut Context) -> Markup {
self.render_offcanvas(cx, None)
}
}