Update spin_sdk to spin v3 (#2525)

* Update spin_sdk to spin v3

* Add id to Body
This commit is contained in:
Ben Wishovich 2024-04-14 14:34:38 -07:00 committed by GitHub
parent e29d31e686
commit 1ff0a7176d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 26 additions and 2 deletions

View file

@ -27,7 +27,7 @@ bytecheck = { version = "0.7", features = [
rustc-hash = "1"
serde-wasm-bindgen = "0.6"
serde_json = "1"
spin-sdk = { version = "2", optional = true }
spin-sdk = { version = "3", optional = true }
base64 = "0.22"
thiserror = "1"
tokio = { version = "1", features = [

View file

@ -11,6 +11,8 @@ pub struct BodyContext {
#[cfg(feature = "ssr")]
class: Rc<RefCell<Option<TextProp>>>,
#[cfg(feature = "ssr")]
id: Rc<RefCell<Option<TextProp>>>,
#[cfg(feature = "ssr")]
attributes: Rc<RefCell<HashMap<&'static str, Attribute>>>,
}
@ -24,6 +26,13 @@ impl BodyContext {
leptos::leptos_dom::ssr::escape_attr(&val.get())
)
});
let id = self.id.borrow().as_ref().map(|val| {
format!(
"id=\"{}\"",
leptos::leptos_dom::ssr::escape_attr(&val.get())
)
});
let attributes = self.attributes.borrow();
let attributes = (!attributes.is_empty()).then(|| {
attributes
@ -41,7 +50,7 @@ impl BodyContext {
.join(" ")
});
let mut val = [class, attributes]
let mut val = [id, class, attributes]
.into_iter()
.flatten()
.collect::<Vec<_>>()
@ -92,6 +101,9 @@ pub fn Body(
/// The `class` attribute on the `<body>`.
#[prop(optional, into)]
class: Option<TextProp>,
/// The `id` attribute on the `<body>`.
#[prop(optional, into)]
id: Option<TextProp>,
/// Arbitrary attributes to add to the `<body>`
#[prop(attrs)]
attributes: Vec<(&'static str, Attribute)>,
@ -112,15 +124,27 @@ pub fn Body(
});
}
if let Some(id) = id {
create_render_effect({
let el = el.clone();
move |_| {
let value = id.get();
_ = el.set_attribute("id", &value);
}
});
}
for (name, value) in attributes {
leptos::leptos_dom::attribute_helper(el.unchecked_ref(), name.into(), value);
}
} else if #[cfg(feature = "ssr")] {
let meta = crate::use_head();
*meta.body.class.borrow_mut() = class;
*meta.body.id.borrow_mut() = id;
meta.body.attributes.borrow_mut().extend(attributes);
} else {
_ = class;
_ = id;
_ = attributes;
#[cfg(debug_assertions)]