Skip to content

feat: allow &str and String conversion for Option<Html> #4020

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Casheeew wants to merge 1 commit into
base: master
Choose a base branch
from
+78 −0
Open

feat: allow &str and String conversion for Option<Html> #4020

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 78 additions & 0 deletions packages/yew/src/html/conversion/into_prop_value.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,24 @@ macro_rules! impl_into_prop_value_via_display {
self.clone().into_prop_value()
}
}
impl IntoPropValue<Option<VNode>> for $from_ty {
#[inline(always)]
fn into_prop_value(self) -> Option<VNode> {
Some(IntoPropValue::<VNode>::into_prop_value(self))
}
}
impl IntoPropValue<Option<VNode>> for &$from_ty {
#[inline(always)]
fn into_prop_value(self) -> Option<VNode> {
Some(IntoPropValue::<VNode>::into_prop_value(self))
}
}
impl IntoPropValue<Option<VNode>> for Option<$from_ty> {
#[inline(always)]
fn into_prop_value(self) -> Option<VNode> {
self.map(IntoPropValue::<VNode>::into_prop_value)
}
}
};
}

Expand All @@ -310,6 +328,18 @@ macro_rules! impl_into_prop_value_via_attr_value {
VText::new(self).into()
}
}
impl IntoPropValue<Option<VNode>> for $from_ty {
#[inline(always)]
fn into_prop_value(self) -> Option<VNode> {
Some(VText::new(self).into())
}
}
impl IntoPropValue<Option<VNode>> for Option<$from_ty> {
#[inline(always)]
fn into_prop_value(self) -> Option<VNode> {
self.map(|v| VText::new(v).into())
}
}
};
}

Expand Down Expand Up @@ -368,6 +398,28 @@ mod test {
let _: VNode = Some(true).into_prop_value();
}

#[test]
fn test_into_option_vnode() {
// T -> Option<VNode>
let _: Option<VNode> = "hello".into_prop_value();
let _: Option<VNode> = String::from("hello").into_prop_value();
let _: Option<VNode> = AttrValue::Static("hello").into_prop_value();
let _: Option<VNode> = 42u32.into_prop_value();
let _: Option<VNode> = true.into_prop_value();
// &T -> Option<VNode>
let _: Option<VNode> = (&42u32).into_prop_value();
let _: Option<VNode> = (&true).into_prop_value();
let s = String::from("hello");
let _: Option<VNode> = (&s).into_prop_value();
// Option<T> -> Option<VNode>
let _: Option<VNode> = Some("hello").into_prop_value();
let _: Option<VNode> = Option::<&str>::None.into_prop_value();
let _: Option<VNode> = Some(String::from("hello")).into_prop_value();
let _: Option<VNode> = Option::<String>::None.into_prop_value();
let _: Option<VNode> = Some(42u32).into_prop_value();
let _: Option<VNode> = Some(true).into_prop_value();
}

#[test]
fn test_ref_to_vnode() {
let _: VNode = (&42i32).into_prop_value();
Expand Down Expand Up @@ -570,4 +622,30 @@ mod test {
let _ = html! { <Child>{&attr_value}</Child> };
}
}

#[test]
fn test_option_html_prop_compiles() {
use crate::prelude::*;

#[derive(PartialEq, Properties)]
pub struct Props {
pub title: Option<Html>,
}

#[component]
fn Foo(props: &Props) -> Html {
match &props.title {
Some(title) => html! { <h1>{ title.clone() }</h1> },
None => html! {},
}
}

let _ = html! { <Foo title="Title" /> };

let _ = html! { <Foo title={String::from("Title")} /> };

let _ = html! { <Foo title={Some("Title")} /> };

let _ = html! { <Foo title={Option::<Html>::None} /> };
}
}
Loading