Añade ComponentError con HTML alternativo

`prepare_component()` ahora devuelve `Result<Markup, ComponentError>` en
lugar de `Markup`, para que los componentes señalen fallos durante el
renderizado de forma explícita.

`ComponentError` encapsula un mensaje de error y un marcado HTML
alternativo opcional (`fallback`). Si se produce un error, el ciclo de
renderizado registra la traza y muestra el `fallback` en lugar del
componente fallido, sin interrumpir el resto de la página.

Lo mismo aplica a los errores devueltos por la acción `PrepareRender` de
los temas, que siguen el mismo mecanismo.
This commit is contained in:
Manuel Cillero 2026-03-21 13:15:39 +01:00
parent a0b14aec36
commit 34aeeab2d7
26 changed files with 232 additions and 100 deletions

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) -> Markup {
fn prepare_component(&self, cx: &mut Context) -> Result<Markup, ComponentError> {
let output = self.children().render(cx);
if output.is_empty() {
return html! {};
return Ok(html! {});
}
let style = match self.container_width() {
container::Width::FluidMax(w) if w.is_measurable() => {
@ -44,7 +44,7 @@ impl Component for Container {
}
_ => None,
};
match self.container_kind() {
Ok(match self.container_kind() {
container::Kind::Default => html! {
div id=[self.id()] class=[self.classes().get()] style=[style] {
(output)
@ -75,7 +75,7 @@ impl Component for Container {
(output)
}
},
}
})
}
}

View file

@ -63,17 +63,17 @@ impl Component for Dropdown {
);
}
fn prepare_component(&self, cx: &mut Context) -> Markup {
fn prepare_component(&self, cx: &mut Context) -> Result<Markup, ComponentError> {
// Si no hay elementos en el menú, no se prepara.
let items = self.items().render(cx);
if items.is_empty() {
return html! {};
return Ok(html! {});
}
// Título opcional para el menú desplegable.
let title = self.title().using(cx);
html! {
Ok(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) }
}
}
}
})
}
}

View file

@ -62,8 +62,8 @@ impl Component for Item {
self.id.get()
}
fn prepare_component(&self, cx: &mut Context) -> Markup {
match self.item_kind() {
fn prepare_component(&self, cx: &mut Context) -> Result<Markup, ComponentError> {
Ok(match self.item_kind() {
ItemKind::Void => html! {},
ItemKind::Label(label) => html! {
@ -151,7 +151,7 @@ impl Component for Item {
ItemKind::Divider => html! {
li id=[self.id()] class=[self.classes().get()] { hr class="dropdown-divider" {} }
},
}
})
}
}

View file

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

View file

@ -22,15 +22,15 @@ impl Component for Fieldset {
self.id.get()
}
fn prepare_component(&self, cx: &mut Context) -> Markup {
html! {
fn prepare_component(&self, cx: &mut Context) -> Result<Markup, ComponentError> {
Ok(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))
}
}
})
}
}

View file

@ -36,9 +36,9 @@ impl Component for Input {
);
}
fn prepare_component(&self, cx: &mut Context) -> Markup {
fn prepare_component(&self, cx: &mut Context) -> Result<Markup, ComponentError> {
let id = self.name().get().map(|name| util::join!("edit-", name));
html! {
Ok(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) }
}
}
}
})
}
}

View file

@ -35,8 +35,8 @@ impl Component for Icon {
}
}
fn prepare_component(&self, cx: &mut Context) -> Markup {
match self.icon_kind() {
fn prepare_component(&self, cx: &mut Context) -> Result<Markup, ComponentError> {
Ok(match self.icon_kind() {
IconKind::None => html! {},
IconKind::Font(_) => {
let aria_label = self.aria_label().lookup(cx);
@ -69,7 +69,7 @@ impl Component for Icon {
}
}
}
}
})
}
}

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) -> Markup {
fn prepare_component(&self, cx: &mut Context) -> Result<Markup, ComponentError> {
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 html! {
return Ok(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),
};
html! {
Ok(html! {
img
src=[source]
alt=(alt_text)
id=[self.id()]
class=[self.classes().get()]
style=[dimensions] {}
}
})
}
}

View file

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

View file

@ -99,8 +99,8 @@ impl Component for Item {
self.alter_classes(ClassesOp::Prepend, self.item_kind().to_class());
}
fn prepare_component(&self, cx: &mut Context) -> Markup {
match self.item_kind() {
fn prepare_component(&self, cx: &mut Context) -> Result<Markup, ComponentError> {
Ok(match self.item_kind() {
ItemKind::Void => html! {},
ItemKind::Label(label) => html! {
@ -162,7 +162,7 @@ impl Component for Item {
if let Some(dd) = menu.borrow() {
let items = dd.items().render(cx);
if items.is_empty() {
return html! {};
return Ok(html! {});
}
let title = dd.title().lookup(cx).unwrap_or_else(|| {
L10n::t("dropdown", &LOCALES_BOOTSIER)
@ -189,7 +189,7 @@ impl Component for Item {
html! {}
}
}
}
})
}
}

View file

@ -36,20 +36,20 @@ impl Component for Brand {
self.id.get()
}
fn prepare_component(&self, cx: &mut Context) -> Markup {
fn prepare_component(&self, cx: &mut Context) -> Result<Markup, ComponentError> {
let image = self.image().render(cx);
let title = self.title().using(cx);
if title.is_empty() && image.is_empty() {
return html! {};
return Ok(html! {});
}
let slogan = self.slogan().using(cx);
html! {
Ok(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) }
}
}
})
}
}

View file

@ -48,7 +48,7 @@ impl Component for Navbar {
});
}
fn prepare_component(&self, cx: &mut Context) -> Markup {
fn prepare_component(&self, cx: &mut Context) -> Result<Markup, ComponentError> {
// 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 html! {};
return Ok(html! {});
}
// Asegura que la barra tiene un `id` para poder asociarlo al colapso/offcanvas.
let id = cx.required_id::<Self>(self.id());
html! {
Ok(html! {
nav id=(id) class=[self.classes().get()] {
div class="container-fluid" {
@match self.layout() {
@ -162,7 +162,7 @@ impl Component for Navbar {
}
}
}
}
})
}
}

View file

@ -46,15 +46,15 @@ impl Component for Item {
}
}
fn prepare_component(&self, cx: &mut Context) -> Markup {
match self {
fn prepare_component(&self, cx: &mut Context) -> Result<Markup, ComponentError> {
Ok(match self {
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 html! {};
return Ok(html! {});
}
html! {
ul id=[nav.id()] class=[nav.classes().get()] {
@ -70,7 +70,7 @@ impl Component for Item {
(text.using(cx))
}
},
}
})
}
}

View file

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