fix: allow Option<String> and Option<AttrValue> as VNode children in html!

Generalize `IntoPropValue<VNode> for Option<VNode>` into a blanket
`IntoPropValue<VNode> for Option<T>` where `T: IntoPropValue<VNode>`.

The single-expression child path in the html! macro calls
`IntoPropValue::<VNode>::into_prop_value()` directly, which only had
an impl for `Option<VNode>`. This is a regression from the removal of
the `ToHtml` trait, which had a blanket `Option<T: ToHtml>` impl.

Author: Madoshakalaka

Cargo.lock

@@ -491,8 +491,8 @@ error[E0277]: the trait bound `Option<NotToString>: IntoPropValue<Option<implici
              `Option<F>` implements `IntoPropValue<Option<yew::Callback<I, O>>>`
              `Option<Rc<str>>` implements `IntoPropValue<Option<implicit_clone::unsync::string::IString>>`
              `Option<String>` implements `IntoPropValue<Option<implicit_clone::unsync::string::IString>>`
+             `Option<T>` implements `IntoPropValue<VNode>`
              `Option<VChild<T>>` implements `IntoPropValue<Option<ChildrenRenderer<C>>>`
-             `Option<VNode>` implements `IntoPropValue<VNode>`
 
 error[E0277]: the trait bound `Option<{integer}>: IntoPropValue<Option<implicit_clone::unsync::string::IString>>` is not satisfied
   --> tests/html_macro/element-fail.rs:48:22
@@ -510,8 +510,8 @@ error[E0277]: the trait bound `Option<{integer}>: IntoPropValue<Option<implicit_
              `Option<F>` implements `IntoPropValue<Option<yew::Callback<I, O>>>`
              `Option<Rc<str>>` implements `IntoPropValue<Option<implicit_clone::unsync::string::IString>>`
              `Option<String>` implements `IntoPropValue<Option<implicit_clone::unsync::string::IString>>`
+             `Option<T>` implements `IntoPropValue<VNode>`
              `Option<VChild<T>>` implements `IntoPropValue<Option<ChildrenRenderer<C>>>`
-             `Option<VNode>` implements `IntoPropValue<VNode>`
 
 error[E0277]: the trait bound `{integer}: IntoEventCallback<MouseEvent>` is not satisfied
   --> tests/html_macro/element-fail.rs:51:28
@@ -627,8 +627,8 @@ error[E0277]: the trait bound `Option<yew::NodeRef>: IntoPropValue<yew::NodeRef>
              `Option<F>` implements `IntoPropValue<Option<yew::Callback<I, O>>>`
              `Option<Rc<str>>` implements `IntoPropValue<Option<implicit_clone::unsync::string::IString>>`
              `Option<String>` implements `IntoPropValue<Option<implicit_clone::unsync::string::IString>>`
+             `Option<T>` implements `IntoPropValue<VNode>`
              `Option<VChild<T>>` implements `IntoPropValue<Option<ChildrenRenderer<C>>>`
-             `Option<VNode>` implements `IntoPropValue<VNode>`
 
 error[E0277]: the trait bound `yew::Callback<String>: IntoEventCallback<MouseEvent>` is not satisfied
   --> tests/html_macro/element-fail.rs:58:29

packages/yew-macro/tests/html_macro/element-fail.stderr

@@ -123,6 +123,17 @@ fn compile_pass() {
 
     let option_vnode = ::std::option::Option::Some(::yew::html! {});
     _ = ::yew::html! { <div>{option_vnode}</div> };
+
+    let opt_string: ::std::option::Option<::std::string::String> =
+        ::std::option::Option::Some(::std::convert::From::from("hello"));
+    _ = ::yew::html! { <div>{opt_string}</div> };
+
+    let opt_attr: ::std::option::Option<::yew::AttrValue> =
+        ::std::option::Option::Some(::yew::AttrValue::Static("hello"));
+    _ = ::yew::html! { <div>{opt_attr}</div> };
+
+    let opt_none: ::std::option::Option<::std::string::String> = ::std::option::Option::None;
+    _ = ::yew::html! { <div>{opt_none}</div> };
 }
 
 fn main() {}

packages/yew-macro/tests/html_macro/html-element-pass.rs

@@ -214,10 +214,10 @@ impl IntoPropValue<VNode> for Vec<VNode> {
     }
 }
 
-impl IntoPropValue<VNode> for Option<VNode> {
+impl<T: IntoPropValue<VNode>> IntoPropValue<VNode> for Option<T> {
     #[inline]
     fn into_prop_value(self) -> VNode {
-        self.unwrap_or_default()
+        self.map(IntoPropValue::into_prop_value).unwrap_or_default()
     }
 }
 
@@ -350,6 +350,18 @@ mod test {
         let _: Option<AttrValue> = Cow::Borrowed("foo").into_prop_value();
     }
 
+    #[test]
+    fn test_option_to_vnode() {
+        let _: VNode = Some(String::from("hello")).into_prop_value();
+        let _: VNode = Some(AttrValue::Static("hello")).into_prop_value();
+        let _: VNode = Option::<String>::None.into_prop_value();
+        let _: VNode = Option::<AttrValue>::None.into_prop_value();
+        let _: VNode = Some(VNode::default()).into_prop_value();
+        let _: VNode = Option::<VNode>::None.into_prop_value();
+        let _: VNode = Some(42u32).into_prop_value();
+        let _: VNode = Some(true).into_prop_value();
+    }
+
     #[test]
     fn test_callback() {
         let _: Callback<String> = (|_: String| ()).into_prop_value();