From ab1d4f0efb179b1f2ea9b472cd7ca3df613dd425 Mon Sep 17 00:00:00 2001
From: Manuel Cillero <manuel@cillero.es>
Date: Sat, 5 Sep 2026 00:19:39 +0200
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20(pagetop):=20Incorpora=20C?=
 =?UTF-8?q?ontext=20al=20render=20de=20Props?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pagetop-bootsier/src/theme/bs/dialog.rs   |  2 +-
 .../pagetop-bootsier/src/theme/bs/dropdown.rs |  4 +-
 .../src/theme/bs/form/input.rs                |  2 +-
 .../src/theme/bs/form/select.rs               |  2 +-
 .../src/theme/bs/form/textarea.rs             |  2 +-
 .../pagetop-bootsier/src/theme/bs/icon.rs     |  4 +-
 .../pagetop-bootsier/src/theme/bs/nav.rs      |  8 +-
 .../src/theme/bs/navbar/component.rs          |  2 +-
 .../src/theme/bs/offcanvas/component.rs       |  2 +-
 extensions/pagetop-htmx/README.md             |  4 +-
 extensions/pagetop-htmx/src/hx.rs             |  8 +-
 extensions/pagetop-htmx/src/lib.rs            |  4 +-
 .../src/component/admin/role_table.rs         |  2 +-
 .../src/component/admin/user_table.rs         |  2 +-
 src/base/component/badge.rs                   |  2 +-
 src/base/component/block.rs                   |  2 +-
 src/base/component/brand.rs                   |  4 +-
 src/base/component/breadcrumb/component.rs    |  2 +-
 src/base/component/breadcrumb/crumb.rs        |  4 +-
 src/base/component/button/component.rs        |  4 +-
 src/base/component/container.rs               | 12 +--
 src/base/component/dialog.rs                  |  2 +-
 src/base/component/dropdown/component.rs      |  2 +-
 src/base/component/dropdown/item.rs           | 10 +--
 src/base/component/form/check.rs              |  2 +-
 src/base/component/form/checkbox.rs           |  2 +-
 src/base/component/form/component.rs          |  2 +-
 src/base/component/form/fieldset.rs           |  2 +-
 src/base/component/form/input.rs              |  2 +-
 src/base/component/form/number.rs             |  2 +-
 src/base/component/form/radio.rs              |  2 +-
 src/base/component/form/range.rs              |  2 +-
 src/base/component/form/select.rs             |  2 +-
 src/base/component/form/textarea.rs           |  2 +-
 src/base/component/image/component.rs         |  8 +-
 src/base/component/messages.rs                |  2 +-
 src/base/component/nav/component.rs           |  2 +-
 src/base/component/nav/item.rs                |  8 +-
 src/base/component/navbar/component.rs        | 12 +--
 src/base/component/pager.rs                   |  2 +-
 src/base/component/table/column.rs            |  6 +-
 src/base/component/table/component.rs         |  6 +-
 src/html/logo.rs                              | 20 +++--
 src/html/props.rs                             | 72 ++++++++++++++----
 src/response/page.rs                          |  2 +-
 tests/html_props.rs                           | 75 ++++++++++++-------
 tests/html_props_classes.rs                   |  6 +-
 tests/html_props_extras.rs                    |  3 +-
 tests/html_props_styles.rs                    |  9 ++-
 49 files changed, 212 insertions(+), 133 deletions(-)

diff --git a/extensions/pagetop-bootsier/src/theme/bs/dialog.rs b/extensions/pagetop-bootsier/src/theme/bs/dialog.rs
index 74c6c652..c56e226d 100644
--- a/extensions/pagetop-bootsier/src/theme/bs/dialog.rs
+++ b/extensions/pagetop-bootsier/src/theme/bs/dialog.rs
@@ -27,7 +27,7 @@ pub(crate) async fn render(dialog: &Dialog, cx: &mut Context) -> Result<Markup,
 
     Ok(html! {
         div
-            (dialog.props())
+            (dialog.props().unpack(cx))
             tabindex="-1"
             aria-hidden="true"
             aria-labelledby=[id_label.as_deref()]
diff --git a/extensions/pagetop-bootsier/src/theme/bs/dropdown.rs b/extensions/pagetop-bootsier/src/theme/bs/dropdown.rs
index 338a45fd..c071f3fb 100644
--- a/extensions/pagetop-bootsier/src/theme/bs/dropdown.rs
+++ b/extensions/pagetop-bootsier/src/theme/bs/dropdown.rs
@@ -121,7 +121,7 @@ pub(crate) async fn render(
     if title.is_empty() {
         // Sin título: menú contextual estático, sin botón ni comportamiento de apertura/cierre.
         return Ok(html! {
-            div (dropdown.props()) {
+            div (dropdown.props().unpack(cx)) {
                 ul class="dropdown-menu" { (items) }
             }
         });
@@ -173,7 +173,7 @@ pub(crate) async fn render(
     };
 
     Ok(html! {
-        div (dropdown.props()) {
+        div (dropdown.props().unpack(cx)) {
             // Renderizado en modo split (dos botones) o simple (un botón).
             @if *dropdown.button_split() {
                 // Botón principal (acción/etiqueta).
diff --git a/extensions/pagetop-bootsier/src/theme/bs/form/input.rs b/extensions/pagetop-bootsier/src/theme/bs/form/input.rs
index 524b2fa4..be6ac934 100644
--- a/extensions/pagetop-bootsier/src/theme/bs/form/input.rs
+++ b/extensions/pagetop-bootsier/src/theme/bs/form/input.rs
@@ -94,7 +94,7 @@ pub(crate) fn render(field: &Field, cx: &mut Context) -> Result<Markup, Componen
     };
 
     Ok(html! {
-        div (field.props()) {
+        div (field.props().unpack(cx)) {
             @if !floating { (label) }
             input
                 type=(field.kind())
diff --git a/extensions/pagetop-bootsier/src/theme/bs/form/select.rs b/extensions/pagetop-bootsier/src/theme/bs/form/select.rs
index 7132ca26..804a2bfc 100644
--- a/extensions/pagetop-bootsier/src/theme/bs/form/select.rs
+++ b/extensions/pagetop-bootsier/src/theme/bs/form/select.rs
@@ -80,7 +80,7 @@ pub(crate) fn render(field: &Field, cx: &mut Context) -> Result<Markup, Componen
         None => html! {},
     };
     Ok(html! {
-        div (field.props()) {
+        div (field.props().unpack(cx)) {
             @if !floating { (label) }
             select
                 id=[select_id.as_deref()]
diff --git a/extensions/pagetop-bootsier/src/theme/bs/form/textarea.rs b/extensions/pagetop-bootsier/src/theme/bs/form/textarea.rs
index 8d5573a8..fd097e55 100644
--- a/extensions/pagetop-bootsier/src/theme/bs/form/textarea.rs
+++ b/extensions/pagetop-bootsier/src/theme/bs/form/textarea.rs
@@ -86,7 +86,7 @@ pub(crate) fn render(field: &Textarea, cx: &mut Context) -> Result<Markup, Compo
         None => html! {},
     };
     Ok(html! {
-        div (field.props()) {
+        div (field.props().unpack(cx)) {
             @if !floating { (label) }
             textarea
                 id=[textarea_id.as_deref()]
diff --git a/extensions/pagetop-bootsier/src/theme/bs/icon.rs b/extensions/pagetop-bootsier/src/theme/bs/icon.rs
index ea4bb430..d3c628a7 100644
--- a/extensions/pagetop-bootsier/src/theme/bs/icon.rs
+++ b/extensions/pagetop-bootsier/src/theme/bs/icon.rs
@@ -48,7 +48,7 @@ impl Component for Icon {
                 let has_label = aria_label.is_some();
                 html! {
                     i
-                        (self.props())
+                        (self.props().unpack(cx))
                         role=[has_label.then_some("img")]
                         aria-label=[aria_label]
                         aria-hidden=[(!has_label).then_some("true")]
@@ -65,7 +65,7 @@ impl Component for Icon {
                         viewBox=(viewbox)
                         fill="currentColor"
                         focusable="false"
-                        (self.props())
+                        (self.props().unpack(cx))
                         role=[has_label.then_some("img")]
                         aria-label=[aria_label]
                         aria-hidden=[(!has_label).then_some("true")]
diff --git a/extensions/pagetop-bootsier/src/theme/bs/nav.rs b/extensions/pagetop-bootsier/src/theme/bs/nav.rs
index ba2079ef..5567bef9 100644
--- a/extensions/pagetop-bootsier/src/theme/bs/nav.rs
+++ b/extensions/pagetop-bootsier/src/theme/bs/nav.rs
@@ -101,7 +101,7 @@ pub(crate) async fn item_render(item: &Item, cx: &mut Context) -> Result<Markup,
         ItemKind::Void => html! {},
 
         ItemKind::Label(label) => html! {
-            li (item.props()) {
+            li (item.props().unpack(cx)) {
                 span class="nav-link disabled" aria-disabled="true" {
                     (label.using(cx))
                 }
@@ -137,7 +137,7 @@ pub(crate) async fn item_render(item: &Item, cx: &mut Context) -> Result<Markup,
             let aria_disabled = (*disabled).then_some("true");
 
             html! {
-                li (item.props()) {
+                li (item.props().unpack(cx)) {
                     a
                         class=(classes)
                         href=[href]
@@ -153,7 +153,7 @@ pub(crate) async fn item_render(item: &Item, cx: &mut Context) -> Result<Markup,
         }
 
         ItemKind::Html(html) => html! {
-            li (item.props()) {
+            li (item.props().unpack(cx)) {
                 (html.render(cx).await)
             }
         },
@@ -170,7 +170,7 @@ pub(crate) async fn item_render(item: &Item, cx: &mut Context) -> Result<Markup,
                         .unwrap_or_else(|| "Dropdown".to_string())
                 });
                 html! {
-                    li (item.props()) {
+                    li (item.props().unpack(cx)) {
                         a
                             class="nav-link dropdown-toggle"
                             data-bs-toggle="dropdown"
diff --git a/extensions/pagetop-bootsier/src/theme/bs/navbar/component.rs b/extensions/pagetop-bootsier/src/theme/bs/navbar/component.rs
index 82a0bff6..ab1d8a33 100644
--- a/extensions/pagetop-bootsier/src/theme/bs/navbar/component.rs
+++ b/extensions/pagetop-bootsier/src/theme/bs/navbar/component.rs
@@ -261,7 +261,7 @@ pub(crate) async fn render(navbar: &Navbar, cx: &mut Context) -> Result<Markup,
         .unwrap_or_else(|_| translate_layout(navbar.layout()));
 
     Ok(html! {
-        nav (navbar.props()) {
+        nav (navbar.props().unpack(cx)) {
             div class="container-fluid" {
                 @match layout {
                     // Barra más sencilla: sólo contenido.
diff --git a/extensions/pagetop-bootsier/src/theme/bs/offcanvas/component.rs b/extensions/pagetop-bootsier/src/theme/bs/offcanvas/component.rs
index 1dcabe91..2e902a1e 100644
--- a/extensions/pagetop-bootsier/src/theme/bs/offcanvas/component.rs
+++ b/extensions/pagetop-bootsier/src/theme/bs/offcanvas/component.rs
@@ -187,7 +187,7 @@ impl Offcanvas {
 
         html! {
             div
-                (self.props())
+                (self.props().unpack(cx))
                 tabindex="-1"
                 data-bs-scroll=[body_scroll]
                 data-bs-backdrop=[backdrop]
diff --git a/extensions/pagetop-htmx/README.md b/extensions/pagetop-htmx/README.md
index d7578a4d..47382b51 100644
--- a/extensions/pagetop-htmx/README.md
+++ b/extensions/pagetop-htmx/README.md
@@ -77,8 +77,8 @@ async fn homepage(request: HttpRequest) -> Result<Markup, ErrorPage> {
         .with_prop(PropsOp::set(hx::TARGET, "#result"));
 
     Page::new(request)
-        .with_child(Html::with(move |_| html! {
-            button (props) { "Say hello" }
+        .with_child(Html::with(move |cx| html! {
+            button (props.unpack(cx)) { "Say hello" }
             div #result {}
         }))
         .render().await
diff --git a/extensions/pagetop-htmx/src/hx.rs b/extensions/pagetop-htmx/src/hx.rs
index 2b5c08dc..0d489427 100644
--- a/extensions/pagetop-htmx/src/hx.rs
+++ b/extensions/pagetop-htmx/src/hx.rs
@@ -23,15 +23,15 @@
 //! puedes usar [`Props`](pagetop::html::Props) combinado con las constantes de este módulo:
 //!
 //! ```rust,no_run
-//! use pagetop::prelude::*;
-//! use pagetop_htmx::prelude::*;
-//!
+//! # use pagetop::prelude::*;
+//! # use pagetop_htmx::prelude::*;
+//! # let cx = Context::default();
 //! let props = Props::new(hx::GET, "/api/items")
 //!     .with_prop(PropsOp::set(hx::TARGET, "#list"))
 //!     .with_prop(PropsOp::set(hx::SWAP, hx::swap::OUTER_HTML));
 //!
 //! let markup = html! {
-//!     button (props) { "Load" }
+//!     button (props.unpack(&cx)) { "Load" }
 //! };
 //! ```
 //!
diff --git a/extensions/pagetop-htmx/src/lib.rs b/extensions/pagetop-htmx/src/lib.rs
index 1e3c830b..cdcfc83b 100644
--- a/extensions/pagetop-htmx/src/lib.rs
+++ b/extensions/pagetop-htmx/src/lib.rs
@@ -78,8 +78,8 @@ async fn homepage(request: HttpRequest) -> Result<Markup, ErrorPage> {
         .with_prop(PropsOp::set(hx::TARGET, "#result"));
 
     Page::new(request)
-        .with_child(Html::with(move |_| html! {
-            button (props) { "Say hello" }
+        .with_child(Html::with(move |cx| html! {
+            button (props.unpack(cx)) { "Say hello" }
             div #result {}
         }))
         .render().await
diff --git a/extensions/pagetop-user/src/component/admin/role_table.rs b/extensions/pagetop-user/src/component/admin/role_table.rs
index 8bd97db0..10123264 100644
--- a/extensions/pagetop-user/src/component/admin/role_table.rs
+++ b/extensions/pagetop-user/src/component/admin/role_table.rs
@@ -111,7 +111,7 @@ impl Component for RoleTable {
         let new_href = waypoint.append_to(cx.route(format!("{ADMIN_ROLES_PATH}/new")));
 
         Ok(html! {
-            div (self.props()) {
+            div (self.props().unpack(cx)) {
                 div.user-admin-actions {
                     a href=(new_href) {
                         (Lc::t("btn-create-role", &LOCALES_USER).using(cx))
diff --git a/extensions/pagetop-user/src/component/admin/user_table.rs b/extensions/pagetop-user/src/component/admin/user_table.rs
index b32315eb..851574e1 100644
--- a/extensions/pagetop-user/src/component/admin/user_table.rs
+++ b/extensions/pagetop-user/src/component/admin/user_table.rs
@@ -87,7 +87,7 @@ impl Component for UserTable {
         let new_href = waypoint.append_to(cx.route(format!("{ADMIN_USERS_PATH}/new")));
 
         Ok(html! {
-            div (self.props()) {
+            div (self.props().unpack(cx)) {
                 div.user-admin-actions {
                     a href=(new_href) {
                         (Lc::t("btn-create-user", &LOCALES_USER).using(cx))
diff --git a/src/base/component/badge.rs b/src/base/component/badge.rs
index 3aee8b06..b27b0ca8 100644
--- a/src/base/component/badge.rs
+++ b/src/base/component/badge.rs
@@ -42,7 +42,7 @@ impl Component for Badge {
 
     async fn prepare(&self, cx: &mut Context) -> Result<Markup, ComponentError> {
         Ok(html! {
-            span (self.props()) {
+            span (self.props().unpack(cx)) {
                 (self.label().using(cx))
             }
         })
diff --git a/src/base/component/block.rs b/src/base/component/block.rs
index fef014ce..39d6534a 100644
--- a/src/base/component/block.rs
+++ b/src/base/component/block.rs
@@ -40,7 +40,7 @@ impl Component for Block {
         }
 
         Ok(html! {
-            div (self.props()) {
+            div (self.props().unpack(cx)) {
                 @if let Some(title) = self.title().lookup(cx) {
                     h2 class="block-title" { span { (title) } }
                 }
diff --git a/src/base/component/brand.rs b/src/base/component/brand.rs
index 913a24e1..773ff6a8 100644
--- a/src/base/component/brand.rs
+++ b/src/base/component/brand.rs
@@ -69,9 +69,9 @@ impl Component for Brand {
         }
         Ok(html! {
             @if let Some(route) = self.route() {
-                a (self.props()) href=(route.resolve(cx)) { (inner_brand) }
+                a (self.props().unpack(cx)) href=(route.resolve(cx)) { (inner_brand) }
             } @else {
-                span (self.props()) { (inner_brand) }
+                span (self.props().unpack(cx)) { (inner_brand) }
             }
         })
     }
diff --git a/src/base/component/breadcrumb/component.rs b/src/base/component/breadcrumb/component.rs
index 186091af..2543a5b5 100644
--- a/src/base/component/breadcrumb/component.rs
+++ b/src/base/component/breadcrumb/component.rs
@@ -56,7 +56,7 @@ impl Component for Breadcrumb {
         }
 
         Ok(html! {
-            nav (self.props()) aria-label=[Lc::l("breadcrumb_label").lookup(cx)] {
+            nav (self.props().unpack(cx)) aria-label=[Lc::l("breadcrumb_label").lookup(cx)] {
                 ol.breadcrumb {
                     @for crumb in self.crumbs() {
                         (crumb.render_crumb(cx))
diff --git a/src/base/component/breadcrumb/crumb.rs b/src/base/component/breadcrumb/crumb.rs
index 0352a76f..bbfc3501 100644
--- a/src/base/component/breadcrumb/crumb.rs
+++ b/src/base/component/breadcrumb/crumb.rs
@@ -92,12 +92,12 @@ impl Crumb {
         let label = self.label().using(cx);
         match self.route() {
             Some(route) => html! {
-                li (self.props()) {
+                li (self.props().unpack(cx)) {
                     a href=(route.resolve(cx).to_string()) { (label) }
                 }
             },
             None => html! {
-                li (self.props()) { (label) }
+                li (self.props().unpack(cx)) { (label) }
             },
         }
     }
diff --git a/src/base/component/button/component.rs b/src/base/component/button/component.rs
index 805881d5..224c98ef 100644
--- a/src/base/component/button/component.rs
+++ b/src/base/component/button/component.rs
@@ -103,7 +103,7 @@ impl Component for Button {
 
             return Ok(html! {
                 a
-                    (self.props())
+                    (self.props().unpack(cx))
                     href=[href]
                     title=[self.title().lookup(cx)]
                     autofocus[*self.autofocus()]
@@ -118,7 +118,7 @@ impl Component for Button {
         Ok(html! {
             button
                 type=(self.kind())
-                (self.props())
+                (self.props().unpack(cx))
                 name=[self.name().as_deref()]
                 value=[self.value().as_deref()]
                 title=[self.title().lookup(cx)]
diff --git a/src/base/component/container.rs b/src/base/component/container.rs
index fff52183..19ad829a 100644
--- a/src/base/component/container.rs
+++ b/src/base/component/container.rs
@@ -77,12 +77,12 @@ impl Component for Container {
             return Ok(html! {});
         }
         Ok(match self.kind() {
-            Kind::Default => html! { div     (self.props()) { (output) } },
-            Kind::Main    => html! { main    (self.props()) { (output) } },
-            Kind::Header  => html! { header  (self.props()) { (output) } },
-            Kind::Footer  => html! { footer  (self.props()) { (output) } },
-            Kind::Section => html! { section (self.props()) { (output) } },
-            Kind::Article => html! { article (self.props()) { (output) } },
+            Kind::Default => html! { div     (self.props().unpack(cx)) { (output) } },
+            Kind::Main    => html! { main    (self.props().unpack(cx)) { (output) } },
+            Kind::Header  => html! { header  (self.props().unpack(cx)) { (output) } },
+            Kind::Footer  => html! { footer  (self.props().unpack(cx)) { (output) } },
+            Kind::Section => html! { section (self.props().unpack(cx)) { (output) } },
+            Kind::Article => html! { article (self.props().unpack(cx)) { (output) } },
         })
     }
 }
diff --git a/src/base/component/dialog.rs b/src/base/component/dialog.rs
index 231a89fb..cdde8399 100644
--- a/src/base/component/dialog.rs
+++ b/src/base/component/dialog.rs
@@ -82,7 +82,7 @@ impl Component for Dialog {
         let id_label = (!title.is_empty()).then(|| util::join!(self.id().unwrap(), "-label"));
 
         Ok(html! {
-            dialog (self.props()) aria-labelledby=[id_label.as_deref()] {
+            dialog (self.props().unpack(cx)) aria-labelledby=[id_label.as_deref()] {
                 div class="dialog-header" {
                     @if let Some(id_label) = &id_label {
                         h2 id=(id_label) class="dialog-title" { (title) }
diff --git a/src/base/component/dropdown/component.rs b/src/base/component/dropdown/component.rs
index afc216fd..3e9170cd 100644
--- a/src/base/component/dropdown/component.rs
+++ b/src/base/component/dropdown/component.rs
@@ -103,7 +103,7 @@ impl Component for Dropdown {
         let toggle_label = Lc::l("dropdown_toggle").using(cx);
 
         Ok(html! {
-            div (self.props()) {
+            div (self.props().unpack(cx)) {
                 @if *self.button_split() {
                     button type="button" class=(&button_classes) { (&title) }
                     button
diff --git a/src/base/component/dropdown/item.rs b/src/base/component/dropdown/item.rs
index ce82a347..f5ccccf1 100644
--- a/src/base/component/dropdown/item.rs
+++ b/src/base/component/dropdown/item.rs
@@ -63,7 +63,7 @@ impl Component for Item {
             ItemKind::Void => html! {},
 
             ItemKind::Label(label) => html! {
-                li (self.props()) {
+                li (self.props().unpack(cx)) {
                     span class="dropdown-item-text" {
                         (label.using(cx))
                     }
@@ -97,7 +97,7 @@ impl Component for Item {
                 let tabindex = disabled.then_some("-1");
 
                 html! {
-                    li (self.props()) {
+                    li (self.props().unpack(cx)) {
                         a
                             class=(classes)
                             href=[href]
@@ -123,7 +123,7 @@ impl Component for Item {
                 let disabled_attr = disabled.then_some("disabled");
 
                 html! {
-                    li (self.props()) {
+                    li (self.props().unpack(cx)) {
                         button
                             class=(classes)
                             type="button"
@@ -137,7 +137,7 @@ impl Component for Item {
             }
 
             ItemKind::Header(label) => html! {
-                li (self.props()) {
+                li (self.props().unpack(cx)) {
                     h6 class="dropdown-header" {
                         (label.using(cx))
                     }
@@ -145,7 +145,7 @@ impl Component for Item {
             },
 
             ItemKind::Divider => html! {
-                li (self.props()) { hr class="dropdown-divider" {} }
+                li (self.props().unpack(cx)) { hr class="dropdown-divider" {} }
             },
         })
     }
diff --git a/src/base/component/form/check.rs b/src/base/component/form/check.rs
index f09095aa..8697700b 100644
--- a/src/base/component/form/check.rs
+++ b/src/base/component/form/check.rs
@@ -144,7 +144,7 @@ impl Component for Field {
         let container_id = self.id().unwrap();
 
         Ok(html! {
-            div (self.props()) {
+            div (self.props().unpack(cx)) {
                 @if let Some(label) = self.label().lookup(cx) {
                     label class="form-label" { (label) }
                 }
diff --git a/src/base/component/form/checkbox.rs b/src/base/component/form/checkbox.rs
index b6ed74a6..25ee5500 100644
--- a/src/base/component/form/checkbox.rs
+++ b/src/base/component/form/checkbox.rs
@@ -105,7 +105,7 @@ impl Component for Checkbox {
         let is_switch = *self.checkbox_kind() == form::CheckboxKind::Switch;
 
         Ok(html! {
-            div (self.props()) {
+            div (self.props().unpack(cx)) {
                 input
                     type="checkbox"
                     role=[is_switch.then_some("switch")]
diff --git a/src/base/component/form/component.rs b/src/base/component/form/component.rs
index 3634c3b7..d38ac554 100644
--- a/src/base/component/form/component.rs
+++ b/src/base/component/form/component.rs
@@ -78,7 +78,7 @@ impl Component for Form {
         };
         Ok(html! {
             form
-                (self.props())
+                (self.props().unpack(cx))
                 action=[self.action().try_resolve(cx)]
                 method=[method]
                 accept-charset=[self.charset().as_deref()]
diff --git a/src/base/component/form/fieldset.rs b/src/base/component/form/fieldset.rs
index 0a416668..6e16c278 100644
--- a/src/base/component/form/fieldset.rs
+++ b/src/base/component/form/fieldset.rs
@@ -54,7 +54,7 @@ impl Component for Fieldset {
         }
 
         Ok(html! {
-            fieldset (self.props()) disabled[*self.disabled()] {
+            fieldset (self.props().unpack(cx)) disabled[*self.disabled()] {
                 @if let Some(legend) = self.legend().lookup(cx) {
                     legend { (legend) }
                 }
diff --git a/src/base/component/form/input.rs b/src/base/component/form/input.rs
index 13d2fd94..3a36755b 100644
--- a/src/base/component/form/input.rs
+++ b/src/base/component/form/input.rs
@@ -234,7 +234,7 @@ impl Component for Field {
         };
 
         Ok(html! {
-            div (self.props()) {
+            div (self.props().unpack(cx)) {
                 @if let Some(label) = self.label().lookup(cx) {
                     label for=[input_id.as_deref()] class="form-label" {
                         (label)
diff --git a/src/base/component/form/number.rs b/src/base/component/form/number.rs
index 38accda9..78dfe219 100644
--- a/src/base/component/form/number.rs
+++ b/src/base/component/form/number.rs
@@ -86,7 +86,7 @@ impl Component for Number {
         let container_id = self.id();
         let input_id = container_id.as_deref().map(|id| util::join!(id, "-input"));
         Ok(html! {
-            div (self.props()) {
+            div (self.props().unpack(cx)) {
                 @if let Some(label) = self.label().lookup(cx) {
                     label for=[input_id.as_deref()] class="form-label" {
                         (label)
diff --git a/src/base/component/form/radio.rs b/src/base/component/form/radio.rs
index f5b4e8ca..821472ac 100644
--- a/src/base/component/form/radio.rs
+++ b/src/base/component/form/radio.rs
@@ -144,7 +144,7 @@ impl Component for Field {
         let container_id = self.id().unwrap();
 
         Ok(html! {
-            div (self.props()) {
+            div (self.props().unpack(cx)) {
                 @if let Some(label) = self.label().lookup(cx) {
                     label class="form-label" {
                         (label)
diff --git a/src/base/component/form/range.rs b/src/base/component/form/range.rs
index 8cf82858..75b5f242 100644
--- a/src/base/component/form/range.rs
+++ b/src/base/component/form/range.rs
@@ -83,7 +83,7 @@ impl Component for Range {
         let container_id = self.id();
         let range_id = container_id.as_deref().map(|id| util::join!(id, "-range"));
         Ok(html! {
-            div (self.props()) {
+            div (self.props().unpack(cx)) {
                 @if let Some(label) = self.label().lookup(cx) {
                     label for=[range_id.as_deref()] class="form-label" { (label) }
                 }
diff --git a/src/base/component/form/select.rs b/src/base/component/form/select.rs
index 6ab4b2f8..54ec2773 100644
--- a/src/base/component/form/select.rs
+++ b/src/base/component/form/select.rs
@@ -242,7 +242,7 @@ impl Component for Field {
         let select_id = container_id.as_deref().map(|id| util::join!(id, "-select"));
 
         Ok(html! {
-            div (self.props()) {
+            div (self.props().unpack(cx)) {
                 @if let Some(label) = self.label().lookup(cx) {
                     label for=[select_id.as_deref()] class="form-label" {
                         (label)
diff --git a/src/base/component/form/textarea.rs b/src/base/component/form/textarea.rs
index 868755a8..f5c58b4b 100644
--- a/src/base/component/form/textarea.rs
+++ b/src/base/component/form/textarea.rs
@@ -95,7 +95,7 @@ impl Component for Textarea {
             .map(|id| util::join!(id, "-textarea"));
 
         Ok(html! {
-            div (self.props()) {
+            div (self.props().unpack(cx)) {
                 @if let Some(label) = self.label().lookup(cx) {
                     label for=[textarea_id.as_deref()] class="form-label" {
                         (label)
diff --git a/src/base/component/image/component.rs b/src/base/component/image/component.rs
index 5c81bdcc..649a783d 100644
--- a/src/base/component/image/component.rs
+++ b/src/base/component/image/component.rs
@@ -77,11 +77,9 @@ impl Component for Image {
     }
 
     async fn prepare(&self, cx: &mut Context) -> Result<Markup, ComponentError> {
-        let alt_text = self.alternative().lookup(cx).unwrap_or_default();
         let source = match self.source() {
             image::Source::Logo(svg) => {
-                let label = (!alt_text.is_empty()).then_some(alt_text.as_str());
-                return Ok(svg.markup_with(self.props(), label));
+                return Ok(svg.markup_with(cx, self.props(), self.alternative().clone()));
             }
             image::Source::Responsive(source) => Some(source),
             image::Source::Thumbnail(source) => Some(source),
@@ -90,8 +88,8 @@ impl Component for Image {
         Ok(html! {
             img
                 src=[source]
-                alt=(alt_text)
-                (self.props()) {}
+                alt=(self.alternative().lookup(cx).unwrap_or_default())
+                (self.props().unpack(cx)) {}
         })
     }
 }
diff --git a/src/base/component/messages.rs b/src/base/component/messages.rs
index 0024d2c1..827d5760 100644
--- a/src/base/component/messages.rs
+++ b/src/base/component/messages.rs
@@ -54,7 +54,7 @@ impl Component for Messages {
             return Ok(html! {});
         }
         Ok(html! {
-            div (self.props()) role="alert" {
+            div (self.props().unpack(cx)) role="alert" {
                 @for message in cx.messages() {
                     div class=(match message.level() {
                         MessageLevel::Info => "message message-info",
diff --git a/src/base/component/nav/component.rs b/src/base/component/nav/component.rs
index 69be8193..eb0b779a 100644
--- a/src/base/component/nav/component.rs
+++ b/src/base/component/nav/component.rs
@@ -62,7 +62,7 @@ impl Component for Nav {
         }
 
         Ok(html! {
-            ul (self.props()) {
+            ul (self.props().unpack(cx)) {
                 (items)
             }
         })
diff --git a/src/base/component/nav/item.rs b/src/base/component/nav/item.rs
index 9c942444..c3744a5f 100644
--- a/src/base/component/nav/item.rs
+++ b/src/base/component/nav/item.rs
@@ -86,7 +86,7 @@ impl Component for Item {
             ItemKind::Void => html! {},
 
             ItemKind::Label(label) => html! {
-                li (self.props()) {
+                li (self.props().unpack(cx)) {
                     span class="nav-link disabled" aria-disabled="true" {
                         (label.using(cx))
                     }
@@ -119,7 +119,7 @@ impl Component for Item {
                 let aria_disabled = (*disabled).then_some("true");
 
                 html! {
-                    li (self.props()) {
+                    li (self.props().unpack(cx)) {
                         a
                             class=(classes)
                             href=[route_link]
@@ -135,7 +135,7 @@ impl Component for Item {
             }
 
             ItemKind::Html(html) => html! {
-                li (self.props()) {
+                li (self.props().unpack(cx)) {
                     (html.render(cx).await)
                 }
             },
@@ -153,7 +153,7 @@ impl Component for Item {
                         title
                     };
                     html! {
-                        li (self.props()) {
+                        li (self.props().unpack(cx)) {
                             a
                                 class="nav-link dropdown-toggle"
                                 href="#"
diff --git a/src/base/component/navbar/component.rs b/src/base/component/navbar/component.rs
index 8417b634..7a8663d5 100644
--- a/src/base/component/navbar/component.rs
+++ b/src/base/component/navbar/component.rs
@@ -139,36 +139,36 @@ impl Component for Navbar {
         content_props.alter_prop(PropsOp::prepend_classes("navbar-content"));
 
         Ok(html! {
-            nav (self.props()) {
+            nav (self.props().unpack(cx)) {
                 @match self.layout() {
                     // Barra más sencilla: sólo contenido, siempre visible.
                     navbar::Layout::Simple => {
-                        div (content_props) { (items) }
+                        div (content_props.unpack(cx)) { (items) }
                     },
 
                     // Barra sencilla que se puede contraer/expandir.
                     navbar::Layout::SimpleToggle => {
                         (button(cx, &id_content))
-                        div id=(&id_content) (content_props) { (items) }
+                        div id=(&id_content) (content_props.unpack(cx)) { (items) }
                     },
 
                     // Barra con marca, siempre visible, sin botón.
                     navbar::Layout::SimpleBrandLeft(brand) => {
                         (brand.render(cx).await)
-                        div (content_props) { (items) }
+                        div (content_props.unpack(cx)) { (items) }
                     },
 
                     // Barra con marca y botón, en ese orden.
                     navbar::Layout::BrandLeft(brand) => {
                         (brand.render(cx).await)
                         (button(cx, &id_content))
-                        div id=(&id_content) (content_props) { (items) }
+                        div id=(&id_content) (content_props.unpack(cx)) { (items) }
                     },
 
                     // Barra con botón y marca, en ese orden.
                     navbar::Layout::BrandRight(brand) => {
                         (button(cx, &id_content))
-                        div id=(&id_content) (content_props) { (items) }
+                        div id=(&id_content) (content_props.unpack(cx)) { (items) }
                         (brand.render(cx).await)
                     },
                 }
diff --git a/src/base/component/pager.rs b/src/base/component/pager.rs
index ec9cc697..f4e143f3 100644
--- a/src/base/component/pager.rs
+++ b/src/base/component/pager.rs
@@ -235,7 +235,7 @@ impl Component for Pager {
         };
 
         Ok(html! {
-            nav (self.props()) aria-label=[self.aria_label().lookup(cx)] {
+            nav (self.props().unpack(cx)) aria-label=[self.aria_label().lookup(cx)] {
                 @if show_summary {
                     @let items_per_page = self.items_per_page().max(1);
                     @let first = (page - 1) * items_per_page + 1;
diff --git a/src/base/component/table/column.rs b/src/base/component/table/column.rs
index ed10411e..9b9fbc5c 100644
--- a/src/base/component/table/column.rs
+++ b/src/base/component/table/column.rs
@@ -89,13 +89,13 @@ impl Column {
         let label = self.label().using(cx);
 
         let Some(sort) = self.sort() else {
-            return html! { th (self.props()) scope="col" { (label) } };
+            return html! { th (self.props().unpack(cx)) scope="col" { (label) } };
         };
         let (aria_sort, link_props) = sort.header_attrs();
 
         html! {
-            th (self.props()) scope="col" aria-sort=(aria_sort) {
-                a href=[sort.href().as_deref()] (link_props) { (label) }
+            th (self.props().unpack(cx)) scope="col" aria-sort=(aria_sort) {
+                a href=[sort.href().as_deref()] (link_props.unpack(cx)) { (label) }
             }
         }
     }
diff --git a/src/base/component/table/component.rs b/src/base/component/table/component.rs
index 7c52d77b..a857f09e 100644
--- a/src/base/component/table/component.rs
+++ b/src/base/component/table/component.rs
@@ -81,7 +81,7 @@ impl Component for Table {
 
         Ok(html! {
             div.table-responsive {
-                table (self.props()) {
+                table (self.props().unpack(cx)) {
                     @if !self.columns().is_empty() {
                         thead {
                             tr {
@@ -94,9 +94,9 @@ impl Component for Table {
                     @if !self.rows().is_empty() {
                         tbody {
                             @for row in self.rows() {
-                                tr (row.props()) {
+                                tr (row.props().unpack(cx)) {
                                     @for cell in row.cells() {
-                                        td (cell.props()) { (cell.children().render(cx).await) }
+                                        td (cell.props().unpack(cx)) { (cell.children().render(cx).await) }
                                     }
                                 }
                             }
diff --git a/src/html/logo.rs b/src/html/logo.rs
index 2953849c..bdf49dd0 100644
--- a/src/html/logo.rs
+++ b/src/html/logo.rs
@@ -1,5 +1,7 @@
 use crate::AutoDefault;
+use crate::core::component::Context;
 use crate::html::{Markup, Props, html};
+use crate::locale::Lc;
 
 /// Representación SVG del **logotipo de PageTop** para incrustar en HTML.
 ///
@@ -55,28 +57,32 @@ impl PageTopSvg {
         }
     }
 
-    /// Igual que [`markup()`], pero fusiona [`Props`] (identificador, clases, estilo, atributos)
-    /// directamente en el `<svg>` y deja la etiqueta libre para quien llama. Con `Some(texto)` se
-    /// muestra como imagen informativa (`role="img"` + `aria-label`), y con `None` como imagen
-    /// puramente decorativa (`aria-hidden="true"`, sin `role` ni `aria-label`).
+    /// Igual que [`markup()`], pero incluye [`Props`] (identificador, clases, estilo, atributos)
+    /// directamente en el `<svg>`, con etiqueta de accesibilidad (`aria-label`) según `label`; `cx`
+    /// es el `Context` activo, necesario para combinarlo con `props` (ver [`Props::unpack()`]) y
+    /// para resolver `label`. Si `label` resuelve a texto se muestra como imagen informativa
+    /// (`role="img"` + `aria-label`); con [`Lc::none()`] o una traducción sin resultado, como
+    /// imagen puramente decorativa (`aria-hidden="true"`, sin `role` ni `aria-label`).
     ///
     /// Pensado para poner el logotipo con clases, estilo y accesibilidad propios, sin envolverlo en
     /// un elemento aparte; como hace el componente [`Image`] con [`image::Source::Logo`].
     ///
     /// [`markup()`]: Self::markup
+    /// [`Lc::none()`]: crate::locale::Lc::none
     /// [`Image`]: crate::base::component::Image
     /// [`image::Source::Logo`]: crate::base::component::image::Source::Logo
-    pub fn markup_with(&self, props: &Props, label: Option<&str>) -> Markup {
+    pub fn markup_with(&self, cx: &Context, props: &Props, label: Lc) -> Markup {
+        let label = label.lookup(cx);
         html! {
             svg
                 viewBox="0 0 1614 1614"
                 xmlns="http://www.w3.org/2000/svg"
                 role=[label.is_some().then_some("img")]
-                aria-label=[label]
+                aria-label=[label.as_deref()]
                 aria-hidden=[label.is_none().then_some("true")]
                 preserveAspectRatio="xMidYMid slice"
                 focusable="false"
-                (props)
+                (props.unpack(cx))
             {
                 (self.path_fills())
             }
diff --git a/src/html/props.rs b/src/html/props.rs
index 90eb49fc..55a24d35 100644
--- a/src/html/props.rs
+++ b/src/html/props.rs
@@ -1,4 +1,5 @@
 use crate::core::TypeInfo;
+use crate::core::component::Context;
 use crate::html::flex::FlexItem;
 use crate::html::maud::{Escaper, RenderAttrs};
 use crate::{AutoDefault, CowStr, builder_impl, trace, util};
@@ -333,14 +334,18 @@ impl PropsOp {
 ///
 /// # Ejemplo
 ///
+/// En los ejemplos se omite la construcción explícita de `Context` (`let cx = Context::default();`)
+/// para no distraer del resto del ejemplo.
+///
 /// ```rust
 /// # use pagetop::prelude::*;
+/// # let cx = Context::default();
 /// let props = Props::new("hx-get", "/api/items")
 ///     .with_prop(PropsOp::set("hx-target", "#lista"))
 ///     .with_prop(PropsOp::set("hx-swap", "outerHTML"));
 ///
 /// let markup = html! {
-///     button (props) { "Cargar" }
+///     button (props.unpack(&cx)) { "Cargar" }
 /// };
 ///
 /// assert_eq!(
@@ -357,8 +362,9 @@ impl PropsOp {
 ///
 /// ```rust
 /// # use pagetop::prelude::*;
+/// # let cx = Context::default();
 /// let props = Props::default().with_id("My Button");
-/// let markup = html! { button (props) { "OK" } };
+/// let markup = html! { button (props.unpack(&cx)) { "OK" } };
 /// assert_eq!(markup.into_string(), r#"<button id="my_button">OK</button>"#);
 /// ```
 ///
@@ -382,12 +388,13 @@ impl PropsOp {
 ///
 /// ```rust
 /// # use pagetop::prelude::*;
+/// # let cx = Context::default();
 /// let props = Props::default()
 ///     .with_prop(PropsOp::add_classes("btn btn-primary"))
 ///     .with_prop(PropsOp::add_classes("active"))
 ///     .with_prop(PropsOp::replace_classes("btn-primary", "btn-secondary"));
 ///
-/// let markup = html! { button (props) { "OK" } };
+/// let markup = html! { button (props.unpack(&cx)) { "OK" } };
 /// assert_eq!(markup.into_string(), r#"<button class="btn btn-secondary active">OK</button>"#);
 /// ```
 ///
@@ -398,19 +405,20 @@ impl PropsOp {
 ///
 /// ```rust
 /// # use pagetop::prelude::*;
+/// # let cx = Context::default();
 /// let props = Props::default()
 ///     .with_prop(PropsOp::add_style("color", "red"))
 ///     .with_prop(PropsOp::add_style("font-weight", "bold"))
 ///     .with_prop(PropsOp::add_style("color", "blue"))
 ///     .with_prop(PropsOp::remove_style("font-weight"));
 ///
-/// let markup = html! { button (props) { "OK" } };
+/// let markup = html! { button (props.unpack(&cx)) { "OK" } };
 /// assert_eq!(markup.into_string(), r#"<button style="color: blue">OK</button>"#);
 /// ```
 ///
 /// # Atributos duplicados junto a `Props`
 ///
-/// Cuando el componente combina `(self.props())` con un atributo literal del mismo nombre en el
+/// Cuando el componente combina `(self.props().unpack(cx))` con un atributo del mismo nombre en el
 /// mismo elemento (una clase, un `#id`, o `nombre=valor`), la macro [`html!`](crate::html::html)
 /// evita automáticamente la duplicación. Recopila en tiempo de compilación los nombres de los
 /// atributos del elemento y al renderizar se omiten los duplicados en tiempo de ejecución. No
@@ -418,9 +426,10 @@ impl PropsOp {
 ///
 /// ```rust
 /// # use pagetop::prelude::*;
+/// # let cx = Context::default();
 /// let props = Props::default().with_prop(PropsOp::set("title", "de Props"));
 ///
-/// let markup = html! { span title="literal" (props) { "OK" } };
+/// let markup = html! { span title="literal" (props.unpack(&cx)) { "OK" } };
 ///
 /// // El atributo literal prevalece; `Props` omite su propio "title" en vez de duplicarlo.
 /// assert_eq!(markup.into_string(), r#"<span title="literal">OK</span>"#);
@@ -471,7 +480,7 @@ impl PropsOp {
 ///
 ///     async fn prepare(&self, cx: &mut Context) -> Result<Markup, ComponentError> {
 ///         Ok(html! {
-///             button (self.props()) {
+///             button (self.props().unpack(cx)) {
 ///                 (self.label().using(cx))
 ///             }
 ///         })
@@ -869,6 +878,25 @@ impl Props {
         self.extra::<T>(key).ok().cloned().unwrap_or_else(f)
     }
 
+    // **< Props RENDER >***************************************************************************
+
+    /// Extrae `Props` en la posición de atributos de [`html!`](crate::html::html) usando el
+    /// `Context` activo: `button (self.props().unpack(cx)) { ... }`.
+    ///
+    /// `Props` no implementa [`RenderAttrs`] directamente. Obliga a pasar siempre el `Context`
+    /// vigente en el punto donde se renderiza, aunque no lo necesite ningún atributo.
+    ///
+    /// ```rust
+    /// # use pagetop::prelude::*;
+    /// # let cx = Context::default();
+    /// let props = Props::default().with_id("example");
+    /// let markup = html! { button (props.unpack(&cx)) { "OK" } };
+    /// assert_eq!(markup.into_string(), r#"<button id="example">OK</button>"#);
+    /// ```
+    pub fn unpack<'a>(&'a self, cx: &'a Context) -> impl RenderAttrs + 'a {
+        PropsUnpack { props: self, cx }
+    }
+
     // **< Props PRIVATE >**************************************************************************
 
     fn apply_id(&mut self, id: &str) {
@@ -966,14 +994,14 @@ impl Props {
     }
 }
 
-#[doc(hidden)]
-impl RenderAttrs for Props {
-    // Omite cualquier atributo que esté en `exclude` (recopilados por `html!` a partir de los
-    // atributos literales del elemento). Registra un `trace::debug!` por cada atributo duplicado,
-    // con la posición exacta del `html!` que lo produjo (propagado gracias a `#[track_caller]`)
-    // para facilitar la localización del problema.
+impl Props {
+    // Escribe los atributos, omitiendo cualquiera que esté en `exclude` (recopilados por `html!` a
+    // partir de los atributos literales del elemento). Registra un `trace::debug!` por cada
+    // atributo duplicado, con la posición exacta del `html!` que lo produjo (propagado gracias a
+    // `#[track_caller]`, heredado desde `PropsUnpack::render_attrs_to()`) para facilitar la
+    // localización del problema.
     #[track_caller]
-    fn render_attrs_to(&self, w: &mut String, exclude: &[&str]) {
+    fn write_attrs(&self, _cx: &Context, w: &mut String, exclude: &[&str]) {
         if let Some(id) = self.id.as_deref() {
             if exclude.contains(&"id") {
                 trace::debug!(
@@ -1051,3 +1079,19 @@ impl RenderAttrs for Props {
         }
     }
 }
+
+// **< PropsUnpack >********************************************************************************
+
+// Devuelto por `Props::unpack()`.
+struct PropsUnpack<'a> {
+    props: &'a Props,
+    cx: &'a Context,
+}
+
+#[doc(hidden)]
+impl RenderAttrs for PropsUnpack<'_> {
+    #[track_caller]
+    fn render_attrs_to(&self, w: &mut String, exclude: &[&str]) {
+        self.props.write_attrs(self.cx, w, exclude);
+    }
+}
diff --git a/src/response/page.rs b/src/response/page.rs
index 83d69877..d64c462a 100644
--- a/src/response/page.rs
+++ b/src/response/page.rs
@@ -245,7 +245,7 @@ impl Page {
                 head {
                     (head)
                 }
-                body (self.body_props()) {
+                body (self.body_props().unpack(&self.context)) {
                     (body)
                 }
             }
diff --git a/tests/html_props.rs b/tests/html_props.rs
index afcfe929..5b70472c 100644
--- a/tests/html_props.rs
+++ b/tests/html_props.rs
@@ -4,8 +4,9 @@ use pagetop::prelude::*;
 
 #[pagetop::test]
 async fn props_default_renders_nothing() {
+    let cx = Context::default();
     assert_eq!(
-        html! { span (Props::default()) {} }.into_string(),
+        html! { span (Props::default().unpack(&cx)) {} }.into_string(),
         "<span></span>"
     );
 }
@@ -44,8 +45,9 @@ async fn props_set_replaces_existing_value() {
 async fn props_set_does_not_create_duplicate_key() {
     // Reassigning the same key must replace the value, not add a duplicate entry.
     let p = Props::new("key", "v1").with_prop(PropsOp::set("key", "v2"));
+    let cx = Context::default();
     assert_eq!(
-        html! { span (p) {} }.into_string(),
+        html! { span (p.unpack(&cx)) {} }.into_string(),
         r#"<span key="v2"></span>"#
     );
 }
@@ -55,8 +57,9 @@ async fn props_set_preserves_insertion_order() {
     let p = Props::new("a", "1")
         .with_prop(PropsOp::set("b", "2"))
         .with_prop(PropsOp::set("c", "3"));
+    let cx = Context::default();
     assert_eq!(
-        html! { span (p) {} }.into_string(),
+        html! { span (p.unpack(&cx)) {} }.into_string(),
         r#"<span a="1" b="2" c="3"></span>"#
     );
 }
@@ -82,7 +85,11 @@ async fn props_remove_nonexistent_key_is_noop() {
 #[pagetop::test]
 async fn props_renders_nothing_after_removing_last_attr() {
     let p = Props::new("only", "one").with_prop(PropsOp::remove("only"));
-    assert_eq!(html! { span (p) {} }.into_string(), "<span></span>");
+    let cx = Context::default();
+    assert_eq!(
+        html! { span (p.unpack(&cx)) {} }.into_string(),
+        "<span></span>"
+    );
 }
 
 // **< HTML Escaped >*******************************************************************************
@@ -90,8 +97,9 @@ async fn props_renders_nothing_after_removing_last_attr() {
 #[pagetop::test]
 async fn props_escapes_ampersand_and_angle_brackets_in_value() {
     let p = Props::new("data-info", "a&b<c>d");
+    let cx = Context::default();
     assert_eq!(
-        html! { span (p) {} }.into_string(),
+        html! { span (p.unpack(&cx)) {} }.into_string(),
         r#"<span data-info="a&amp;b&lt;c&gt;d"></span>"#
     );
 }
@@ -99,8 +107,9 @@ async fn props_escapes_ampersand_and_angle_brackets_in_value() {
 #[pagetop::test]
 async fn props_escapes_double_quotes_in_value() {
     let p = Props::new("data-label", r#"say "hello""#);
+    let cx = Context::default();
     assert_eq!(
-        html! { span (p) {} }.into_string(),
+        html! { span (p.unpack(&cx)) {} }.into_string(),
         r#"<span data-label="say &quot;hello&quot;"></span>"#
     );
 }
@@ -111,8 +120,9 @@ async fn props_escapes_double_quotes_in_value() {
 async fn props_empty_in_html_macro_produces_no_attributes() {
     // An empty Props must not emit even an extra blank space.
     let p = Props::default();
+    let cx = Context::default();
     assert_eq!(
-        html! { button (p) { "x" } }.into_string(),
+        html! { button (p.unpack(&cx)) { "x" } }.into_string(),
         "<button>x</button>"
     );
 }
@@ -120,8 +130,9 @@ async fn props_empty_in_html_macro_produces_no_attributes() {
 #[pagetop::test]
 async fn props_single_attr_in_html_macro() {
     let p = Props::new("hx-get", "/api");
+    let cx = Context::default();
     assert_eq!(
-        html! { button (p) { "Load" } }.into_string(),
+        html! { button (p.unpack(&cx)) { "Load" } }.into_string(),
         r#"<button hx-get="/api">Load</button>"#
     );
 }
@@ -131,18 +142,20 @@ async fn props_multiple_attrs_preserve_order_in_html_macro() {
     let p = Props::new("hx-get", "/api")
         .with_prop(PropsOp::set("hx-target", "#result"))
         .with_prop(PropsOp::set("hx-swap", "outerHTML"));
+    let cx = Context::default();
     assert_eq!(
-        html! { button (p) {} }.into_string(),
+        html! { button (p.unpack(&cx)) {} }.into_string(),
         r##"<button hx-get="/api" hx-target="#result" hx-swap="outerHTML"></button>"##
     );
 }
 
 #[pagetop::test]
 async fn props_alongside_class_and_id_in_html_macro() {
-    // The splice is always emitted after class and id, regardless of the order they are written in.
+    // The unpack is always emitted after class and id, regardless of the order they are written in.
     let p = Props::new("hx-get", "/api");
+    let cx = Context::default();
     assert_eq!(
-        html! { button #mybtn .btn (p) { "Go" } }.into_string(),
+        html! { button #mybtn .btn (p.unpack(&cx)) { "Go" } }.into_string(),
         r#"<button class="btn" id="mybtn" hx-get="/api">Go</button>"#
     );
 }
@@ -150,40 +163,44 @@ async fn props_alongside_class_and_id_in_html_macro() {
 #[pagetop::test]
 async fn props_alongside_named_attr_renders_after_it() {
     let p = Props::new("hx-get", "/api");
+    let cx = Context::default();
     assert_eq!(
-        html! { button type="button" (p) {} }.into_string(),
+        html! { button type="button" (p.unpack(&cx)) {} }.into_string(),
         r#"<button type="button" hx-get="/api"></button>"#
     );
 }
 
 #[pagetop::test]
 async fn props_combined_via_chaining_instead_of_multiple_splices() {
-    // An element accepts only a single attribute splice (a second `(props)` on the same element
+    // An element accepts only a single attribute unpack (a second `(props)` on the same element
     // is a compile error); values from separate sources are combined by chaining `with_prop()`
     // on one `Props`, not by splicing two of them.
     let p = Props::new("hx-get", "/api").with_prop(PropsOp::set("hx-swap", "outerHTML"));
+    let cx = Context::default();
     assert_eq!(
-        html! { button (p) {} }.into_string(),
+        html! { button (p.unpack(&cx)) {} }.into_string(),
         r#"<button hx-get="/api" hx-swap="outerHTML"></button>"#
     );
 }
 
 #[pagetop::test]
 async fn props_inline_construction_in_html_macro() {
+    let cx = Context::default();
     assert_eq!(
-        html! { button (Props::new("hx-get", "/api")) { "Go" } }.into_string(),
+        html! { button (Props::new("hx-get", "/api").unpack(&cx)) { "Go" } }.into_string(),
         r#"<button hx-get="/api">Go</button>"#
     );
 }
 
 #[pagetop::test]
 async fn props_conditional_expression_in_html_macro() {
+    let cx = Context::default();
     for (active, expected) in [
         (true, r#"<button hx-get="/api">x</button>"#),
         (false, "<button>x</button>"),
     ] {
         let markup = html! {
-            button (if active { Props::new("hx-get", "/api") } else { Props::default() }) { "x" }
+            button (if active { Props::new("hx-get", "/api") } else { Props::default() }.unpack(&cx)) { "x" }
         };
         assert_eq!(markup.into_string(), expected);
     }
@@ -191,7 +208,7 @@ async fn props_conditional_expression_in_html_macro() {
 
 #[pagetop::test]
 async fn props_splice_empty_string_emits_nothing() {
-    // An empty splice emits no attribute nor extra space.
+    // An empty unpack emits no attribute nor extra space.
     assert_eq!(html! { span ("") { "x" } }.into_string(), "<span>x</span>");
 }
 
@@ -202,8 +219,9 @@ async fn props_id_collision_with_literal_omits_props_id() {
     // A literal `#id` on the element takes precedence; `Props`'s own id is silently omitted instead
     // of producing a duplicate `id` attribute.
     let p = Props::default().with_id("from-props");
+    let cx = Context::default();
     assert_eq!(
-        html! { div #fixed (p) {} }.into_string(),
+        html! { div #fixed (p.unpack(&cx)) {} }.into_string(),
         r#"<div id="fixed"></div>"#
     );
 }
@@ -211,8 +229,9 @@ async fn props_id_collision_with_literal_omits_props_id() {
 #[pagetop::test]
 async fn props_class_collision_with_literal_omits_props_classes() {
     let p = Props::classes("from-props-a from-props-b");
+    let cx = Context::default();
     assert_eq!(
-        html! { div.fixed (p) {} }.into_string(),
+        html! { div.fixed (p.unpack(&cx)) {} }.into_string(),
         r#"<div class="fixed"></div>"#
     );
 }
@@ -222,8 +241,9 @@ async fn props_style_collision_with_literal_omits_props_styles() {
     let p = Props::default()
         .with_prop(PropsOp::add_style("color", "red"))
         .with_prop(PropsOp::add_style("font-weight", "bold"));
+    let cx = Context::default();
     assert_eq!(
-        html! { div style="color: blue" (p) {} }.into_string(),
+        html! { div style="color: blue" (p.unpack(&cx)) {} }.into_string(),
         r#"<div style="color: blue"></div>"#
     );
 }
@@ -231,8 +251,9 @@ async fn props_style_collision_with_literal_omits_props_styles() {
 #[pagetop::test]
 async fn props_named_attr_collision_with_literal_omits_props_value() {
     let p = Props::default().with_prop(PropsOp::set("title", "from-props"));
+    let cx = Context::default();
     assert_eq!(
-        html! { span title="literal" (p) {} }.into_string(),
+        html! { span title="literal" (p.unpack(&cx)) {} }.into_string(),
         r#"<span title="literal"></span>"#
     );
 }
@@ -300,8 +321,9 @@ async fn get_prop_id_matches_get_id() {
 async fn props_hx_target_value_with_hash_renders_correctly() {
     // Regression: r#"..."# used to close prematurely when it found `"#list"`.
     let p = Props::new("hx-target", "#list");
+    let cx = Context::default();
     assert_eq!(
-        html! { button (p) {} }.into_string(),
+        html! { button (p.unpack(&cx)) {} }.into_string(),
         r##"<button hx-target="#list"></button>"##
     );
 }
@@ -309,8 +331,9 @@ async fn props_hx_target_value_with_hash_renders_correctly() {
 #[pagetop::test]
 async fn props_with_empty_value_renders_attr_with_empty_value() {
     let p = Props::new("data-expanded", "");
+    let cx = Context::default();
     assert_eq!(
-        html! { span (p) {} }.into_string(),
+        html! { span (p.unpack(&cx)) {} }.into_string(),
         r#"<span data-expanded=""></span>"#
     );
 }
@@ -325,8 +348,9 @@ async fn props_chained_set_and_remove_yields_expected_state() {
     assert_eq!(p.get_prop("a"), Some("updated".to_string()));
     assert_eq!(p.get_prop("b"), None);
     assert_eq!(p.get_prop("c"), Some("3".to_string()));
+    let cx = Context::default();
     assert_eq!(
-        html! { span (p) {} }.into_string(),
+        html! { span (p.unpack(&cx)) {} }.into_string(),
         r#"<span a="updated" c="3"></span>"#
     );
 }
@@ -335,8 +359,9 @@ async fn props_chained_set_and_remove_yields_expected_state() {
 async fn props_with_empty_attr_name_renders_without_validation() {
     // Documented behavior: names are not validated; the resulting HTML is not standard.
     let p = Props::new("", "val");
+    let cx = Context::default();
     assert_eq!(
-        html! { span (p) {} }.into_string(),
+        html! { span (p.unpack(&cx)) {} }.into_string(),
         r#"<span ="val"></span>"#
     );
 }
diff --git a/tests/html_props_classes.rs b/tests/html_props_classes.rs
index cf06484a..dc512652 100644
--- a/tests/html_props_classes.rs
+++ b/tests/html_props_classes.rs
@@ -299,8 +299,9 @@ async fn get_prop_class_matches_get_classes() {
 #[pagetop::test]
 async fn props_classes_renders_class_attribute() {
     let p = Props::classes("btn btn-primary");
+    let cx = Context::default();
     assert_eq!(
-        html! { button (p) { "OK" } }.into_string(),
+        html! { button (p.unpack(&cx)) { "OK" } }.into_string(),
         r#"<button class="btn btn-primary">OK</button>"#
     );
 }
@@ -308,8 +309,9 @@ async fn props_classes_renders_class_attribute() {
 #[pagetop::test]
 async fn props_classes_can_be_extended_with_add_classes() {
     let p = Props::classes("btn").with_prop(PropsOp::add_classes("active"));
+    let cx = Context::default();
     assert_eq!(
-        html! { button (p) { "OK" } }.into_string(),
+        html! { button (p.unpack(&cx)) { "OK" } }.into_string(),
         r#"<button class="btn active">OK</button>"#
     );
 }
diff --git a/tests/html_props_extras.rs b/tests/html_props_extras.rs
index 784e849a..0ae47005 100644
--- a/tests/html_props_extras.rs
+++ b/tests/html_props_extras.rs
@@ -113,8 +113,9 @@ async fn extras_not_emitted_in_html() {
     let props = Props::default()
         .with_prop(PropsOp::set_extra("ext.flag", true))
         .with_prop(PropsOp::add_classes("btn"));
+    let cx = Context::default();
     assert_eq!(
-        html! { button (props) { "OK" } }.into_string(),
+        html! { button (props.unpack(&cx)) { "OK" } }.into_string(),
         r#"<button class="btn">OK</button>"#
     );
 }
diff --git a/tests/html_props_styles.rs b/tests/html_props_styles.rs
index c01ae00d..153ae85b 100644
--- a/tests/html_props_styles.rs
+++ b/tests/html_props_styles.rs
@@ -275,8 +275,9 @@ async fn props_styles_renders_style_attribute() {
     let p = Props::default()
         .with_prop(PropsOp::add_style("color", "red"))
         .with_prop(PropsOp::add_style("font-weight", "bold"));
+    let cx = Context::default();
     assert_eq!(
-        html! { button (p) { "OK" } }.into_string(),
+        html! { button (p.unpack(&cx)) { "OK" } }.into_string(),
         r#"<button style="color: red; font-weight: bold">OK</button>"#
     );
 }
@@ -288,8 +289,9 @@ async fn props_styles_render_after_class_and_before_other_attrs() {
         .with_prop(PropsOp::add_classes("btn"))
         .with_prop(PropsOp::add_style("color", "red"))
         .with_prop(PropsOp::set("data-x", "1"));
+    let cx = Context::default();
     assert_eq!(
-        html! { button (p) { "OK" } }.into_string(),
+        html! { button (p.unpack(&cx)) { "OK" } }.into_string(),
         r#"<button id="main" class="btn" style="color: red" data-x="1">OK</button>"#
     );
 }
@@ -297,8 +299,9 @@ async fn props_styles_render_after_class_and_before_other_attrs() {
 #[pagetop::test]
 async fn props_styles_escapes_double_quotes_in_value() {
     let p = Props::default().with_prop(PropsOp::add_style("content", r#""hi""#));
+    let cx = Context::default();
     assert_eq!(
-        html! { span (p) {} }.into_string(),
+        html! { span (p.unpack(&cx)) {} }.into_string(),
         r#"<span style="content: &quot;hi&quot;"></span>"#
     );
 }