ToHtml has been removed in favor of IntoPropValue<Html>

Infinoid · Infinoid · commit f5e6ad4a65d1 · 2026-01-13T04:57:48.000-05:00
see yewstack/yew#3453
diff --git a/src/components/alert.rs b/src/components/alert.rs
@@ -191,7 +191,7 @@ pub fn view(props: &GroupProperties) -> Html {
     html! (
         <ul class={classes} role="list">
             { for props.children.iter().map(|child|
-                wrapper_elt_with_attributes(child.to_html(), "li", &[("class", "pf-v5-c-alert-group__item", ApplyAttributeAs::Attribute)])
+                wrapper_elt_with_attributes(child.into(), "li", &[("class", "pf-v5-c-alert-group__item", ApplyAttributeAs::Attribute)])
             )}
         </ul>
     )
diff --git a/src/components/chip_group.rs b/src/components/chip_group.rs
@@ -44,7 +44,7 @@ pub fn chip_group(props: &ChipGroupProperties) -> Html {
                         aria-hidden="true"
                         id={format!("{id}-label")}
                     >
-                        { &label }
+                        { label }
                     </span>
                 }
                 <ul
@@ -54,7 +54,7 @@ pub fn chip_group(props: &ChipGroupProperties) -> Html {
                     aria-labelledby={aria_labelled_by}
                 >
                     { for props.children.iter().map(|chip| {
-                        wrapper_elt_with_attributes(chip.to_html(), "li", &[("class", "pf-v5-c-chip-group__list-item", ApplyAttributeAs::Attribute)])
+                        wrapper_elt_with_attributes(chip.into(), "li", &[("class", "pf-v5-c-chip-group__list-item", ApplyAttributeAs::Attribute)])
                     })}
                 </ul>
             </div>
diff --git a/src/components/dual_list_selector/item_renderer.rs b/src/components/dual_list_selector/item_renderer.rs
@@ -2,8 +2,15 @@
 
 use core::fmt::Debug;
 
+use yew::html::IntoPropValue;
 use yew::prelude::*;
 
-pub trait DualListSelectorItemRenderer: Debug + Clone + PartialEq + ToHtml + 'static {}
+pub trait DualListSelectorItemRenderer:
+    Debug + Clone + PartialEq + IntoPropValue<Html> + 'static
+{
+}
 
-impl<T: ToHtml + Debug + Clone + PartialEq + 'static> DualListSelectorItemRenderer for T {}
+impl<T: IntoPropValue<Html> + Debug + Clone + PartialEq + 'static> DualListSelectorItemRenderer
+    for T
+{
+}
diff --git a/src/components/dual_list_selector/list/list_inner.rs b/src/components/dual_list_selector/list/list_inner.rs
@@ -39,7 +39,7 @@ pub fn list<T: ItemRenderer>(props: &DualListSelectorListProps) -> Html {
                     let is_selected = context.selected_options.contains(&key);
                     html_nested! {
                         <DualListSelectorListItem key={key} {onoptionselect} {is_selected} disabled={context.disabled}>
-                            { option.to_html() }
+                            { option.clone() }
                         </DualListSelectorListItem>
                     }
                 })}
diff --git a/src/components/search_input/mod.rs b/src/components/search_input/mod.rs
@@ -6,6 +6,7 @@ use crate::components::input_group::*;
 use crate::components::text_input_group::*;
 use crate::icon::Icon;
 use crate::utils::HtmlElementSupport;
+use yew::html::IntoPropValue;
 use yew::prelude::*;
 use yew_hooks::use_event_with_window;
 
@@ -18,8 +19,8 @@ pub enum ResultsCount {
     Fraction(usize, usize),
 }
 
-impl ToHtml for ResultsCount {
-    fn to_html(&self) -> Html {
+impl IntoPropValue<Html> for ResultsCount {
+    fn into_prop_value(self) -> Html {
         match self {
             Self::Absolute(i) => html!(i),
             Self::Fraction(i, j) => html!(format!("{i}/{j}")),
@@ -301,7 +302,7 @@ fn inner_text_input_group(props: &InnerTextInputGroupProps) -> Html {
             || (props.props.onnextclick.is_some() && props.props.onpreviousclick.is_some())
             || (props.props.onclear.is_some() && props.props.expandable.is_none()));
     let badge = if let Some(results_count) = &props.props.results_count {
-        html! { <Badge read=true>{results_count}</Badge> }
+        html! { <Badge read=true>{results_count.clone()}</Badge> }
     } else {
         html! {}
     };
diff --git a/src/components/table/column.rs b/src/components/table/column.rs
@@ -162,17 +162,15 @@ where
                         }
                     >
                         <div class="pf-v5-c-table__button-content">
-                            <span class="pf-v5-c-table__text">{ &label }</span>
+                            <span class="pf-v5-c-table__text">{ label }</span>
                             <span class="pf-v5-c-table__sort-indicator">
                                 {sort_by_next_status.0}
                             </span>
                         </div>
                     </button>
                 )
             } else {
-                html_nested!(
-                    <>{ &label }</>
-                )
+                html_nested!({ label.into() })
             };
 
             html!(
diff --git a/src/components/tabs/router.rs b/src/components/tabs/router.rs
@@ -138,7 +138,7 @@ where
             data-ouia-safe={props.ouia_safe}
         >
             <Link<T> element="button" class={link_classes} to={props.to.clone()}>
-                <span class="pf-v5-c-tabs__item-text"> { &props.title } </span>
+                <span class="pf-v5-c-tabs__item-text"> { props.title.clone() } </span>
             </Link<T>>
         </li>
     )
diff --git a/src/components/tabs/simple.rs b/src/components/tabs/simple.rs
@@ -173,7 +173,7 @@ where
                                 index={c.props.index.clone()}
                                 {onselect}
                             >
-                                { c.props.title.to_html() }
+                                { c.props.title.clone() }
                             </TabHeaderItem<T>>
                         )
                     }) }
@@ -312,23 +312,13 @@ impl IntoPropValue<TabTitle> for Html {
     }
 }
 
-impl ToHtml for TabTitle {
-    fn to_html(&self) -> Html {
+impl IntoPropValue<Html> for TabTitle {
+    fn into_prop_value(self) -> Html {
         match self {
             TabTitle::String(s) => s.into(),
             TabTitle::Html(html) => html.clone(),
         }
     }
-
-    fn into_html(self) -> Html
-    where
-        Self: Sized,
-    {
-        match self {
-            TabTitle::String(s) => s.into(),
-            TabTitle::Html(html) => html,
-        }
-    }
 }
 
 /// Properties for [`Tab`]
diff --git a/src/components/truncate.rs b/src/components/truncate.rs
@@ -146,11 +146,11 @@ pub fn truncate(props: &TruncateProperties) -> Html {
             {
                 match &props.content {
                     TruncateContent::Default(value) => html!(
-                        <span class={start_class}>{ &value }</span>
+                        <span class={start_class}>{ value }</span>
                     ),
                     TruncateContent::Middle(start, end) => html!(<>
-                        <span class={start_class}>{ &start }</span>
-                        <span class={end_class}>{ &end }</span>
+                        <span class={start_class}>{ start }</span>
+                        <span class={end_class}>{ end }</span>
                     </>),
                     TruncateContent::Start(value) => html!(<>
                         <span class={end_class}>{ &value }{ "\u{200E}" }</span>
diff --git a/src/core/content.rs b/src/core/content.rs
@@ -20,16 +20,9 @@ impl DerefMut for OptionalHtml {
     }
 }
 
-impl ToHtml for OptionalHtml {
-    fn to_html(&self) -> Html {
-        self.0.to_html()
-    }
-
-    fn into_html(self) -> Html
-    where
-        Self: Sized,
-    {
-        self.0.into_html()
+impl IntoPropValue<Option<Html>> for OptionalHtml {
+    fn into_prop_value(self) -> Option<Html> {
+        self.0
     }
 }
 
diff --git a/src/icon/mod.rs b/src/icon/mod.rs
@@ -79,8 +79,8 @@ impl IntoPropValue<Option<Html>> for Icon {
     }
 }
 
-impl ToHtml for Icon {
-    fn to_html(&self) -> Html {
+impl IntoPropValue<Html> for Icon {
+    fn into_prop_value(self) -> Html {
         self.as_html()
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ pub fn view(props: &GroupProperties) -> Html {`
`191`	`191`	`html! (`
`192`	`192`	`<ul class={classes} role="list">`
`193`	`193`	`{ for props.children.iter().map(\|child\|`
`194`		`- wrapper_elt_with_attributes(child.to_html(), "li", &[("class", "pf-v5-c-alert-group__item", ApplyAttributeAs::Attribute)])`
	`194`	`+ wrapper_elt_with_attributes(child.into(), "li", &[("class", "pf-v5-c-alert-group__item", ApplyAttributeAs::Attribute)])`
`195`	`195`	`)}`
`196`	`196`	`</ul>`
`197`	`197`	`)`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ pub fn chip_group(props: &ChipGroupProperties) -> Html {`
`44`	`44`	`aria-hidden="true"`
`45`	`45`	`id={format!("{id}-label")}`
`46`	`46`	`>`
`47`		`- { &label }`
	`47`	`+ { label }`
`48`	`48`	`</span>`
`49`	`49`	`}`
`50`	`50`	`<ul`
`@@ -54,7 +54,7 @@ pub fn chip_group(props: &ChipGroupProperties) -> Html {`
`54`	`54`	`aria-labelledby={aria_labelled_by}`
`55`	`55`	`>`
`56`	`56`	`{ for props.children.iter().map(\|chip\| {`
`57`		`- wrapper_elt_with_attributes(chip.to_html(), "li", &[("class", "pf-v5-c-chip-group__list-item", ApplyAttributeAs::Attribute)])`
	`57`	`+ wrapper_elt_with_attributes(chip.into(), "li", &[("class", "pf-v5-c-chip-group__list-item", ApplyAttributeAs::Attribute)])`
`58`	`58`	`})}`
`59`	`59`	`</ul>`
`60`	`60`	`</div>`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ pub fn list<T: ItemRenderer>(props: &DualListSelectorListProps) -> Html {`
`39`	`39`	`let is_selected = context.selected_options.contains(&key);`
`40`	`40`	`html_nested! {`
`41`	`41`	`<DualListSelectorListItem key={key} {onoptionselect} {is_selected} disabled={context.disabled}>`
`42`		`- { option.to_html() }`
	`42`	`+ { option.clone() }`
`43`	`43`	`</DualListSelectorListItem>`
`44`	`44`	`}`
`45`	`45`	`})}`
Original file line number	Diff line number	Diff line change
`@@ -162,17 +162,15 @@ where`
`162`	`162`	`}`
`163`	`163`	`>`
`164`	`164`	`<div class="pf-v5-c-table__button-content">`
`165`		`- <span class="pf-v5-c-table__text">{ &label }</span>`
	`165`	`+ <span class="pf-v5-c-table__text">{ label }</span>`
`166`	`166`	`<span class="pf-v5-c-table__sort-indicator">`
`167`	`167`	`{sort_by_next_status.0}`
`168`	`168`	`</span>`
`169`	`169`	`</div>`
`170`	`170`	`</button>`
`171`	`171`	`)`
`172`	`172`	`} else {`
`173`		`- html_nested!(`
`174`		`- <>{ &label }</>`
`175`		`- )`
	`173`	`+ html_nested!({ label.into() })`
`176`	`174`	`};`
`177`	`175`
`178`	`176`	`html!(`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ where`
`138`	`138`	`data-ouia-safe={props.ouia_safe}`
`139`	`139`	`>`
`140`	`140`	`<Link<T> element="button" class={link_classes} to={props.to.clone()}>`
`141`		`- <span class="pf-v5-c-tabs__item-text"> { &props.title } </span>`
	`141`	`+ <span class="pf-v5-c-tabs__item-text"> { props.title.clone() } </span>`
`142`	`142`	`</Link<T>>`
`143`	`143`	`</li>`
`144`	`144`	`)`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ where`
`173`	`173`	`index={c.props.index.clone()}`
`174`	`174`	`{onselect}`
`175`	`175`	`>`
`176`		`- { c.props.title.to_html() }`
	`176`	`+ { c.props.title.clone() }`
`177`	`177`	`</TabHeaderItem<T>>`
`178`	`178`	`)`
`179`	`179`	`}) }`
`@@ -312,23 +312,13 @@ impl IntoPropValue<TabTitle> for Html {`
`312`	`312`	`}`
`313`	`313`	`}`
`314`	`314`
`315`		`-impl ToHtml for TabTitle {`
`316`		`- fn to_html(&self) -> Html {`
	`315`	`+impl IntoPropValue<Html> for TabTitle {`
	`316`	`+ fn into_prop_value(self) -> Html {`
`317`	`317`	`match self {`
`318`	`318`	`TabTitle::String(s) => s.into(),`
`319`	`319`	`TabTitle::Html(html) => html.clone(),`
`320`	`320`	`}`
`321`	`321`	`}`
`322`		`-`
`323`		`- fn into_html(self) -> Html`
`324`		`- where`
`325`		`- Self: Sized,`
`326`		`- {`
`327`		`- match self {`
`328`		`- TabTitle::String(s) => s.into(),`
`329`		`- TabTitle::Html(html) => html,`
`330`		`- }`
`331`		`- }`
`332`	`322`	`}`
`333`	`323`
`334`	`324`	/// Properties for [`Tab`]
Original file line number	Diff line number	Diff line change
`@@ -20,16 +20,9 @@ impl DerefMut for OptionalHtml {`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`
`23`		`-impl ToHtml for OptionalHtml {`
`24`		`- fn to_html(&self) -> Html {`
`25`		`- self.0.to_html()`
`26`		`- }`
`27`		`-`
`28`		`- fn into_html(self) -> Html`
`29`		`- where`
`30`		`- Self: Sized,`
`31`		`- {`
`32`		`- self.0.into_html()`
	`23`	`+impl IntoPropValue<Option<Html>> for OptionalHtml {`
	`24`	`+ fn into_prop_value(self) -> Option<Html> {`
	`25`	`+ self.0`
`33`	`26`	`}`
`34`	`27`	`}`
`35`	`28`