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

♻️ (bootsier, htmx): Adapta ciclo de render async

Browse source 
Añade `#[async_trait]` a todos los `impl Extension`, `Theme` y
`Component`. Convierte `prepare()` en `async fn` y añade `.await` a las
llamadas `render()` y `render_offcanvas()`.
This commit is contained in:
Manuel Cillero 2026-07-06 07:55:30 +02:00
parent 9354894b3a
commit 1139df6210
17 changed files with 68 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,13 +25,14 @@ pub struct Brand {
route: Option<FnPathByContext>,
}
#[async_trait]
impl Component for Brand {
fn new() -> Self {
Self::default()
}
fn prepare(&self, cx: &mut Context) -> Result<Markup, ComponentError> {
let image = self.image().render(cx);
async fn prepare(&self, cx: &mut Context) -> Result<Markup, ComponentError> {
let image = self.image().render(cx).await;
let title = self.title().using(cx);
if title.is_empty() && image.is_empty() {
return Ok(html! {});

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

@ -149,6 +149,7 @@ pub struct Navbar {
items: Children,
}
#[async_trait]
impl Component for Navbar {
fn new() -> Self {
Self::default()
@ -171,7 +172,7 @@ impl Component for Navbar {
}));
}
fn prepare(&self, cx: &mut Context) -> Result<Markup, ComponentError> {
async fn prepare(&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);
@ -196,7 +197,7 @@ impl Component for Navbar {
}
// Si no hay contenidos, no tiene sentido mostrar una barra vacía.
let items = self.items().render(cx);
let items = self.items().render(cx).await;
if items.is_empty() {
return Ok(html! {});
}
@ -225,7 +226,7 @@ impl Component for Navbar {
// Barra con marca a la izquierda, siempre visible.
bs::navbar::Layout::SimpleBrandLeft(brand) => {
(brand.render(cx))
(brand.render(cx).await)
(items)
},
@ -233,7 +234,7 @@ impl Component for Navbar {
bs::navbar::Layout::BrandLeft(brand) => {
@let id_content = util::join!(id, "-content");
(brand.render(cx))
(brand.render(cx).await)
(button(cx, TOGGLE_COLLAPSE, &id_content))
div id=(&id_content) class="collapse navbar-collapse" {
(items)
@ -245,7 +246,7 @@ impl Component for Navbar {
@let id_content = util::join!(id, "-content");
(button(cx, TOGGLE_COLLAPSE, &id_content))
(brand.render(cx))
(brand.render(cx).await)
div id=(&id_content) class="collapse navbar-collapse" {
(items)
}
@ -257,7 +258,7 @@ impl Component for Navbar {
(button(cx, TOGGLE_OFFCANVAS, &id_content))
@if let Some(oc) = offcanvas.get() {
(oc.render_offcanvas(cx, Some(self.items())))
(oc.render_offcanvas(cx, Some(self.items())).await)
}
},
@ -265,10 +266,10 @@ impl Component for Navbar {
bs::navbar::Layout::OffcanvasBrandLeft(brand, offcanvas) => {
@let id_content = offcanvas.id().unwrap_or_default();
(brand.render(cx))
(brand.render(cx).await)
(button(cx, TOGGLE_OFFCANVAS, &id_content))
@if let Some(oc) = offcanvas.get() {
(oc.render_offcanvas(cx, Some(self.items())))
(oc.render_offcanvas(cx, Some(self.items())).await)
}
},
@ -277,9 +278,9 @@ impl Component for Navbar {
@let id_content = offcanvas.id().unwrap_or_default();
(button(cx, TOGGLE_OFFCANVAS, &id_content))
(brand.render(cx))
(brand.render(cx).await)
@if let Some(oc) = offcanvas.get() {
(oc.render_offcanvas(cx, Some(self.items())))
(oc.render_offcanvas(cx, Some(self.items())).await)
}
},
}

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

@ -26,6 +26,7 @@ pub enum Item {
Text(L10n),
}
#[async_trait]
impl Component for Item {
fn new() -> Self {
Self::default()
@ -42,19 +43,19 @@ impl Component for Item {
fn setup(&mut self, _cx: &Context) {
if let Self::Nav(nav) = self {
if let Some(mut nav) = nav.get() {
if let Some(nav) = nav.get_mut() {
nav.alter_prop(PropsOp::prepend_classes("navbar-nav"));
}
}
}
fn prepare(&self, cx: &mut Context) -> Result<Markup, ComponentError> {
async fn prepare(&self, cx: &mut Context) -> Result<Markup, ComponentError> {
Ok(match self {
Self::Void => html! {},
Self::Brand(brand) => html! { (brand.render(cx)) },
Self::Brand(brand) => html! { (brand.render(cx).await) },
Self::Nav(nav) => {
if let Some(nav) = nav.get() {
let items = nav.items().render(cx);
let items = nav.items().render(cx).await;
if items.is_empty() {
return Ok(html! {});
}