dnrops
/
leptos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: correctly escape text nodes, except in script/style tags

This commit is contained in:
Greg Johnston 2024-06-15 21:08:58 -04:00
parent 3f83ad7dda
commit 0d867ba016
37 changed files with 528 additions and 352 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/server_fns_axum/src/app.rs
View File

@ -232,8 +232,8 @@ pub fn WithActionForm() -> impl IntoView {
/>
<button>Submit</button>
</ActionForm>
//<p>You submitted: {move || format!("{:?}", action.input().get())}</p>
//<p>The result was: {move || format!("{:?}", action.value().get())}</p>
<p>You submitted: {move || format!("{:?}", action.input().get())}</p>
<p>The result was: {move || format!("{:?}", action.value().get())}</p>
<Transition>archive underaligned: need alignment 4 but have alignment 1
<p>Total rows: {row_count}</p>
</Transition>

23
leptos/src/error_boundary.rs
View File

@ -275,18 +275,24 @@ where
}
}
fn to_html_with_buf(self, buf: &mut String, position: &mut Position) {
fn to_html_with_buf(
self,
buf: &mut String,
position: &mut Position,
escape: bool,
) {
// first, attempt to serialize the children to HTML, then check for errors
let mut new_buf = String::with_capacity(Chil::MIN_LENGTH);
let mut new_pos = *position;
self.children.to_html_with_buf(&mut new_buf, &mut new_pos);
self.children
.to_html_with_buf(&mut new_buf, &mut new_pos, escape);
// any thrown errors would've been caught here
if self.errors.with_untracked(|map| map.is_empty()) {
buf.push_str(&new_buf);
} else {
// otherwise, serialize the fallback instead
self.fallback.to_html_with_buf(buf, position);
self.fallback.to_html_with_buf(buf, position, escape);
}
}
@ -294,14 +300,18 @@ where
self,
buf: &mut StreamBuilder,
position: &mut Position,
escape: bool,
) where
Self: Sized,
{
// first, attempt to serialize the children to HTML, then check for errors
let mut new_buf = StreamBuilder::new(buf.clone_id());
let mut new_pos = *position;
self.children
.to_html_async_with_buf::<OUT_OF_ORDER>(&mut new_buf, &mut new_pos);
self.children.to_html_async_with_buf::<OUT_OF_ORDER>(
&mut new_buf,
&mut new_pos,
escape,
);
if let Some(sc) = Owner::current_shared_context() {
sc.seal_errors(&self.boundary_id);
@ -313,7 +323,8 @@ where
} else {
// otherwise, serialize the fallback instead
let mut fallback = String::with_capacity(Fal::MIN_LENGTH);
self.fallback.to_html_with_buf(&mut fallback, position);
self.fallback
.to_html_with_buf(&mut fallback, position, escape);
buf.push_sync(&fallback);
}
}

15
leptos/src/into_view.rs
View File

@ -57,18 +57,21 @@ impl<T: IntoView> RenderHtml<Dom> for View<T> {
self.0.dry_resolve();
}
fn to_html_with_buf(self, buf: &mut String, position: &mut Position) {
self.0.to_html_with_buf(buf, position);
fn to_html_with_buf(
self,
buf: &mut String,
position: &mut Position,
escape: bool,
) {
self.0.to_html_with_buf(buf, position, escape);
}
fn to_html_async_with_buf<const OUT_OF_ORDER: bool>(
self,
buf: &mut StreamBuilder,
position: &mut Position,
) where
buf: &mut StreamBuilder, position: &mut Position, escape: bool) where
Self: Sized,
{
self.0.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position)
self.0.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position, escape)
}
fn hydrate<const FROM_SERVER: bool>(

15
leptos/src/suspense_component.rs
View File

@ -162,14 +162,20 @@ where
self
}
fn to_html_with_buf(self, buf: &mut String, position: &mut Position) {
self.fallback.to_html_with_buf(buf, position);
fn to_html_with_buf(
self,
buf: &mut String,
position: &mut Position,
escape: bool,
) {
self.fallback.to_html_with_buf(buf, position, escape);
}
fn to_html_async_with_buf<const OUT_OF_ORDER: bool>(
mut self,
buf: &mut StreamBuilder,
position: &mut Position,
escape: bool,
) where
Self: Sized,
{
@ -222,7 +228,9 @@ where
match fut.as_mut().now_or_never() {
Some(resolved) => {
Either::<Fal, _>::Right(resolved)
.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position);
.to_html_async_with_buf::<OUT_OF_ORDER>(
buf, position, escape,
);
}
None => {
let id = buf.clone_id();
@ -247,6 +255,7 @@ where
.to_html_async_with_buf::<OUT_OF_ORDER>(
&mut builder,
&mut position,
escape,
);
builder.finish().take_chunks()
}

15
leptos_server/src/lib.rs
View File

@ -211,20 +211,23 @@ mod view_implementations {
(move || Suspend(async move { self.await })).resolve()
}
fn to_html_with_buf(self, buf: &mut String, position: &mut Position) {
fn to_html_with_buf(
self,
buf: &mut String,
position: &mut Position,
escape: bool,
) {
(move || Suspend(async move { self.await }))
.to_html_with_buf(buf, position);
.to_html_with_buf(buf, position, escape);
}
fn to_html_async_with_buf<const OUT_OF_ORDER: bool>(
self,
buf: &mut StreamBuilder,
position: &mut Position,
) where
buf: &mut StreamBuilder, position: &mut Position, escape: bool) where
Self: Sized,
{
(move || Suspend(async move { self.await }))
.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position);
.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position, escape);
}
fn hydrate<const FROM_SERVER: bool>(

2
meta/src/body.rs
View File

@ -132,7 +132,7 @@ impl RenderHtml<Dom> for BodyView {
self
}
fn to_html_with_buf(self, _buf: &mut String, _position: &mut Position) {}
fn to_html_with_buf(self, _buf: &mut String, _position: &mut Position, _escape: bool) {}
fn hydrate<const FROM_SERVER: bool>(
self,

2
meta/src/html.rs
View File

@ -145,7 +145,7 @@ impl RenderHtml<Dom> for HtmlView {
self
}
fn to_html_with_buf(self, _buf: &mut String, _position: &mut Position) {
fn to_html_with_buf(self, _buf: &mut String, _position: &mut Position, _escape: bool) {
// meta tags are rendered into the buffer stored into the context
// the value has already been taken out, when we're on the server
}

22
meta/src/lib.rs
View File

@ -294,9 +294,11 @@ where
#[cfg(feature = "ssr")]
if let Some(cx) = use_context::<ServerMetaContext>() {
let mut inner = cx.inner.write().or_poisoned();
el.take()
.unwrap()
.to_html_with_buf(&mut inner.head_html, &mut Position::NextChild);
el.take().unwrap().to_html_with_buf(
&mut inner.head_html,
&mut Position::NextChild,
false,
);
} else {
tracing::warn!(
"tried to use a leptos_meta component without `ServerMetaContext` \
@ -391,7 +393,12 @@ where
self // TODO?
}
fn to_html_with_buf(self, _buf: &mut String, _position: &mut Position) {
fn to_html_with_buf(
self,
_buf: &mut String,
_position: &mut Position,
_escape: bool,
) {
// meta tags are rendered into the buffer stored into the context
// the value has already been taken out, when we're on the server
}
@ -490,7 +497,12 @@ impl RenderHtml<Dom> for MetaTagsView {
self
}
fn to_html_with_buf(self, buf: &mut String, _position: &mut Position) {
fn to_html_with_buf(
self,
buf: &mut String,
_position: &mut Position,
_escape: bool,
) {
buf.push_str("<!--HEAD-->");
}

7
meta/src/title.rs
View File

@ -245,7 +245,12 @@ impl RenderHtml<Dom> for TitleView {
self
}
fn to_html_with_buf(self, _buf: &mut String, _position: &mut Position) {
fn to_html_with_buf(
self,
_buf: &mut String,
_position: &mut Position,
_escape: bool,
) {
// meta tags are rendered into the buffer stored into the context
// the value has already been taken out, when we're on the server
}

16
router/src/flat_router.rs
View File

@ -162,9 +162,7 @@ where
self.view.mount(parent, marker);
}
fn insert_before_this(&self,
child: &mut dyn Mountable<R>,
) -> bool {
fn insert_before_this(&self, child: &mut dyn Mountable<R>) -> bool {
self.view.insert_before_this(child)
}
}
@ -480,7 +478,12 @@ where
self
}
fn to_html_with_buf(self, buf: &mut String, position: &mut Position) {
fn to_html_with_buf(
self,
buf: &mut String,
position: &mut Position,
escape: bool,
) {
// if this is being run on the server for the first time, generating all possible routes
if RouteList::is_generating() {
// add routes
@ -528,7 +531,7 @@ where
RouteList::register(RouteList::from(routes));
} else {
let view = self.choose_ssr();
view.to_html_with_buf(buf, position);
view.to_html_with_buf(buf, position, escape);
}
}
@ -536,11 +539,12 @@ where
self,
buf: &mut StreamBuilder,
position: &mut Position,
escape: bool,
) where
Self: Sized,
{
let view = self.choose_ssr();
view.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position)
view.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position, escape)
}
fn hydrate<const FROM_SERVER: bool>(

12
router/src/nested_router.rs
View File

@ -236,7 +236,12 @@ where
self
}
fn to_html_with_buf(self, buf: &mut String, position: &mut Position) {
fn to_html_with_buf(
self,
buf: &mut String,
position: &mut Position,
escape: bool,
) {
// if this is being run on the server for the first time, generating all possible routes
if RouteList::is_generating() {
// add routes
@ -321,7 +326,7 @@ where
})
}
};
view.to_html_with_buf(buf, position);
view.to_html_with_buf(buf, position, escape);
}
}
@ -329,6 +334,7 @@ where
self,
buf: &mut StreamBuilder,
position: &mut Position,
escape: bool,
) where
Self: Sized,
{
@ -370,7 +376,7 @@ where
})
}
};
view.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position);
view.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position, escape);
}
fn hydrate<const FROM_SERVER: bool>(

34
router/src/reactive.rs
View File

@ -127,7 +127,12 @@ where
{
const MIN_LENGTH: usize = <<Router<Rndr, Loc, Defs, FallbackFn> as FallbackOrView>::Output as RenderHtml<Rndr>>::MIN_LENGTH;
fn to_html_with_buf(self, buf: &mut String, position: &mut Position) {
fn to_html_with_buf(
self,
buf: &mut String,
position: &mut Position,
escape: bool,
) {
// if this is being run on the server for the first time, generating all possible routes
if RouteList::is_generating() {
let mut routes = RouteList::new();
@ -143,7 +148,7 @@ where
RouteList::register(routes);
} else {
let (id, view) = self.inner.fallback_or_view();
view.to_html_with_buf(buf, position)
view.to_html_with_buf(buf, position, escape)
}
}
@ -151,13 +156,14 @@ where
self,
buf: &mut StreamBuilder,
position: &mut Position,
escape: bool,
) where
Self: Sized,
{
self.inner
.fallback_or_view()
.1
.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position)
.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position, escape)
}
fn hydrate<const FROM_SERVER: bool>(
@ -209,9 +215,7 @@ where
self.inner.mount(parent, marker);
}
fn insert_before_this(&self,
child: &mut dyn Mountable<Rndr>,
) -> bool {
fn insert_before_this(&self, child: &mut dyn Mountable<Rndr>) -> bool {
self.inner.insert_before_this(child)
}
}
@ -316,7 +320,12 @@ where
{
const MIN_LENGTH: usize = 0;
fn to_html_with_buf(self, buf: &mut String, position: &mut Position) {
fn to_html_with_buf(
self,
buf: &mut String,
position: &mut Position,
escape: bool,
) {
let MatchedRoute {
search_params,
params,
@ -327,13 +336,16 @@ where
params: ArcRwSignal::new(params),
matched: ArcRwSignal::new(matched),
};
untrack(|| (self.view_fn)(&matched).to_html_with_buf(buf, position));
untrack(|| {
(self.view_fn)(&matched).to_html_with_buf(buf, position, escape)
});
}
fn to_html_async_with_buf<const OUT_OF_ORDER: bool>(
self,
buf: &mut StreamBuilder,
position: &mut Position,
escape: bool,
) where
Self: Sized,
{
@ -349,7 +361,7 @@ where
};
untrack(|| {
(self.view_fn)(&matched)
.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position)
.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position, escape)
});
}
@ -406,9 +418,7 @@ where
self.view_state.mount(parent, marker);
}
fn insert_before_this(&self,
child: &mut dyn Mountable<R>,
) -> bool {
fn insert_before_this(&self, child: &mut dyn Mountable<R>) -> bool {
self.view_state.insert_before_this(child)
}
}

36
router/src/router.rs
View File

@ -205,7 +205,7 @@ where
self
}
fn to_html_with_buf(self, buf: &mut String, position: &mut Position) {
fn to_html_with_buf(self, buf: &mut String, position: &mut Position, escape: bool) {
// if this is being run on the server for the first time, generating all possible routes
if RouteList::is_generating() {
// add routes
@ -272,9 +272,7 @@ where
fn to_html_async_with_buf<const OUT_OF_ORDER: bool>(
self,
buf: &mut StreamBuilder,
position: &mut Position,
) where
buf: &mut StreamBuilder, position: &mut Position, escape: bool) where
Self: Sized,
{
let outer_owner =
@ -291,7 +289,7 @@ where
}
_ => Either::Right((self.fallback)()),
}
.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position)*/
.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position, escape)*/
}
fn hydrate<const FROM_SERVER: bool>(
@ -703,16 +701,14 @@ where
//(self.inner.read().or_poisoned().html_len)()
}
fn to_html_with_buf(self, buf: &mut String, position: &mut Position) {
fn to_html_with_buf(self, buf: &mut String, position: &mut Position, escape: bool) {
/*let view = self.inner.read().or_poisoned().view.take().unwrap();
view.to_html_with_buf(buf, position);*/
}
fn to_html_async_with_buf<const OUT_OF_ORDER: bool>(
self,
buf: &mut StreamBuilder,
position: &mut Position,
) where
buf: &mut StreamBuilder, position: &mut Position, escape: bool) where
Self: Sized,
{
/*let view = self
@ -724,7 +720,7 @@ where
.or_poisoned()
.take()
.unwrap();
view.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position);*/
view.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position, escape);*/
}
fn hydrate<const FROM_SERVER: bool>(
@ -975,21 +971,19 @@ where
self.view.html_len()
}
fn to_html_with_buf(self, buf: &mut String, position: &mut Position) {
fn to_html_with_buf(self, buf: &mut String, position: &mut Position, escape: bool) {
buf.reserve(self.html_len());
self.view.to_html_with_buf(buf, position);
self.view.to_html_with_buf(buf, position, escape);
}
fn to_html_async_with_buf<const OUT_OF_ORDER: bool>(
self,
buf: &mut StreamBuilder,
position: &mut Position,
) where
buf: &mut StreamBuilder, position: &mut Position, escape: bool) where
Self: Sized,
{
buf.reserve(self.html_len());
self.view
.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position)
.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position, escape)
}
fn hydrate<const FROM_SERVER: bool>(
@ -1234,7 +1228,7 @@ where
self
}
fn to_html_with_buf(self, buf: &mut String, position: &mut Position) {
fn to_html_with_buf(self, buf: &mut String, position: &mut Position, escape: bool) {
// if this is being run on the server for the first time, generating all possible routes
if RouteList::is_generating() {
// add routes
@ -1315,15 +1309,13 @@ where
}
None => Either::Right((self.fallback)()),
}
.to_html_with_buf(buf, position)
.to_html_with_buf(buf, position, escape)
}
}
fn to_html_async_with_buf<const OUT_OF_ORDER: bool>(
self,
buf: &mut StreamBuilder,
position: &mut Position,
) where
buf: &mut StreamBuilder, position: &mut Position, escape: bool) where
Self: Sized,
{
let outer_owner =
@ -1360,7 +1352,7 @@ where
}
None => Either::Right((self.fallback)()),
}
.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position)
.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position, escape)
}
fn hydrate<const FROM_SERVER: bool>(

1
tachys/src/html/element/custom.rs
View File

@ -35,6 +35,7 @@ where
const TAG: &'static str = E::KEY;
const SELF_CLOSING: bool = false;
const ESCAPE_CHILDREN: bool = true;
fn tag(&self) -> &str {
self.0.as_ref()

230
tachys/src/html/element/elements.rs
View File

@ -18,6 +18,7 @@ macro_rules! html_elements {
($(
#[$meta:meta]
$tag:ident $ty:ident [$($attr:ty),*]
$escape:literal
),*
$(,)?
) => {
@ -83,6 +84,7 @@ macro_rules! html_elements {
const TAG: &'static str = stringify!($tag);
const SELF_CLOSING: bool = false;
const ESCAPE_CHILDREN: bool = $escape;
#[inline(always)]
fn tag(&self) -> &str {
@ -121,7 +123,7 @@ macro_rules! html_elements {
macro_rules! html_self_closing_elements {
($(
#[$meta:meta]
$tag:ident $ty:ident [$($attr:ty),*]
$tag:ident $ty:ident [$($attr:ty),*] $escape:literal
),*
$(,)?
) => {
@ -187,6 +189,7 @@ macro_rules! html_self_closing_elements {
const TAG: &'static str = stringify!($tag);
const SELF_CLOSING: bool = true;
const ESCAPE_CHILDREN: bool = $escape;
#[inline(always)]
fn tag(&self) -> &str {
@ -213,232 +216,232 @@ macro_rules! html_self_closing_elements {
html_self_closing_elements! {
/// The `<area>` HTML element defines an area inside an image map that has predefined clickable areas. An image map allows geometric areas on an image to be associated with Hyperlink.
area HtmlAreaElement [alt, coords, download, href, hreflang, ping, rel, shape, target],
area HtmlAreaElement [alt, coords, download, href, hreflang, ping, rel, shape, target] true,
/// The `<base>` HTML element specifies the base URL to use for all relative URLs in a document. There can be only one `<base>` element in a document.
base HtmlBaseElement [href, target],
base HtmlBaseElement [href, target] true,
/// The `<br>` HTML element produces a line break in text (carriage-return). It is useful for writing a poem or an address, where the division of lines is significant.
br HtmlBrElement [],
br HtmlBrElement [] true,
/// The `<col>` HTML element defines a column within a table and is used for defining common semantics on all common cells. It is generally found within a colgroup element.
col HtmlTableColElement [span],
col HtmlTableColElement [span] true,
/// The `<embed>` HTML element embeds external content at the specified point in the document. This content is provided by an external application or other source of interactive content such as a browser plug-in.
embed HtmlEmbedElement [height, src, r#type, width],
embed HtmlEmbedElement [height, src, r#type, width] true,
/// The `<hr>` HTML element represents a thematic break between paragraph-level elements: for example, a change of scene in a story, or a shift of topic within a section.
hr HtmlHrElement [],
hr HtmlHrElement [] true,
/// The `<img>` HTML element embeds an image into the document.
img HtmlImageElement [alt, crossorigin, decoding, height, ismap, sizes, src, srcset, usemap, width],
img HtmlImageElement [alt, crossorigin, decoding, height, ismap, sizes, src, srcset, usemap, width] true,
/// The `<input>` HTML element is used to create interactive controls for web-based forms in order to accept data from the user; a wide variety of types of input data and control widgets are available, depending on the device and user agent. The `<input>` element is one of the most powerful and complex in all of HTML due to the sheer number of combinations of input types and attributes.
input HtmlInputElement [accept, alt, autocomplete, capture, checked, disabled, form, formaction, formenctype, formmethod, formnovalidate, formtarget, height, list, max, maxlength, min, minlength, multiple, name, pattern, placeholder, popovertarget, popovertargetaction, readonly, required, size, src, step, r#type, value, width],
input HtmlInputElement [accept, alt, autocomplete, capture, checked, disabled, form, formaction, formenctype, formmethod, formnovalidate, formtarget, height, list, max, maxlength, min, minlength, multiple, name, pattern, placeholder, popovertarget, popovertargetaction, readonly, required, size, src, step, r#type, value, width] true,
/// The `<link>` HTML element specifies relationships between the current document and an external resource. This element is most commonly used to link to CSS, but is also used to establish site icons (both "favicon" style icons and icons for the home screen and apps on mobile devices) among other things.
link HtmlLinkElement [r#as, blocking, crossorigin, fetchpriority, href, hreflang, imagesizes, imagesrcset, integrity, media, rel, referrerpolicy, sizes, r#type],
link HtmlLinkElement [r#as, blocking, crossorigin, fetchpriority, href, hreflang, imagesizes, imagesrcset, integrity, media, rel, referrerpolicy, sizes, r#type] true,
/// The `<meta>` HTML element represents Metadata that cannot be represented by other HTML meta-related elements, like base, link, script, style or title.
meta HtmlMetaElement [charset, content, http_equiv, name],
meta HtmlMetaElement [charset, content, http_equiv, name] true,
/// The `<source>` HTML element specifies multiple media resources for the picture, the audio element, or the video element. It is an empty element, meaning that it has no content and does not have a closing tag. It is commonly used to offer the same media content in multiple file formats in order to provide compatibility with a broad range of browsers given their differing support for image file formats and media file formats.
source HtmlSourceElement [src, r#type],
source HtmlSourceElement [src, r#type] true,
/// The `<track>` HTML element is used as a child of the media elements, audio and video. It lets you specify timed text tracks (or time-based data), for example to automatically handle subtitles. The tracks are formatted in WebVTT format (.vtt files) — Web Video Text Tracks.
track HtmlTrackElement [default, kind, label, src, srclang],
track HtmlTrackElement [default, kind, label, src, srclang] true,
/// The `<wbr>` HTML element represents a word break opportunity—a position within text where the browser may optionally break a line, though its line-breaking rules would not otherwise create a break at that location.
wbr HtmlElement []
wbr HtmlElement [] true,
}
html_elements! {
/// The `<a>` HTML element (or anchor element), with its href attribute, creates a hyperlink to web pages, files, email addresses, locations in the same page, or anything else a URL can address.
a HtmlAnchorElement [download, href, hreflang, ping, rel, target, r#type ],
a HtmlAnchorElement [download, href, hreflang, ping, rel, target, r#type ] true,
/// The `<abbr>` HTML element represents an abbreviation or acronym; the optional title attribute can provide an expansion or description for the abbreviation. If present, title must contain this full description and nothing else.
abbr HtmlElement [],
abbr HtmlElement [] true,
/// The `<address>` HTML element indicates that the enclosed HTML provides contact information for a person or people, or for an organization.
address HtmlElement [],
address HtmlElement [] true,
/// The `<article>` HTML element represents a self-contained composition in a document, page, application, or site, which is intended to be independently distributable or reusable (e.g., in syndication). Examples include: a forum post, a magazine or newspaper article, or a blog entry, a product card, a user-submitted comment, an interactive widget or gadget, or any other independent item of content.
article HtmlElement [],
article HtmlElement [] true,
/// The `<aside>` HTML element represents a portion of a document whose content is only indirectly related to the document's main content. Asides are frequently presented as sidebars or call-out boxes.
aside HtmlElement [],
aside HtmlElement [] true,
/// The `<audio>` HTML element is used to embed sound content in documents. It may contain one or more audio sources, represented using the src attribute or the source element: the browser will choose the most suitable one. It can also be the destination for streamed media, using a MediaStream.
audio HtmlAudioElement [autoplay, controls, crossorigin, r#loop, muted, preload, src],
audio HtmlAudioElement [autoplay, controls, crossorigin, r#loop, muted, preload, src] true,
/// The `<b>` HTML element is used to draw the reader's attention to the element's contents, which are not otherwise granted special importance. This was formerly known as the Boldface element, and most browsers still draw the text in boldface. However, you should not use `<b>` for styling text; instead, you should use the CSS font-weight property to create boldface text, or the strong element to indicate that text is of special importance.
b HtmlElement [],
b HtmlElement [] true,
/// The `<bdi>` HTML element tells the browser's bidirectional algorithm to treat the text it contains in isolation from its surrounding text. It's particularly useful when a website dynamically inserts some text and doesn't know the directionality of the text being inserted.
bdi HtmlElement [],
bdi HtmlElement [] true,
/// The `<bdo>` HTML element overrides the current directionality of text, so that the text within is rendered in a different direction.
bdo HtmlElement [],
bdo HtmlElement [] true,
/// The `<blockquote>` HTML element indicates that the enclosed text is an extended quotation. Usually, this is rendered visually by indentation (see Notes for how to change it). A URL for the source of the quotation may be given using the cite attribute, while a text representation of the source can be given using the cite element.
blockquote HtmlQuoteElement [cite],
blockquote HtmlQuoteElement [cite] true,
/// The `<body>` HTML element represents the content of an HTML document. There can be only one `<body>` element in a document.
body HtmlBodyElement [],
body HtmlBodyElement [] true,
/// The `<button>` HTML element represents a clickable button, used to submit forms or anywhere in a document for accessible, standard button functionality.
button HtmlButtonElement [disabled, form, formaction, formenctype, formmethod, formnovalidate, formtarget, name, r#type, value],
button HtmlButtonElement [disabled, form, formaction, formenctype, formmethod, formnovalidate, formtarget, name, r#type, value] true,
/// Use the HTML `<canvas>` element with either the canvas scripting API or the WebGL API to draw graphics and animations.
canvas HtmlCanvasElement [height, width],
canvas HtmlCanvasElement [height, width] true,
/// The `<caption>` HTML element specifies the caption (or title) of a table.
caption HtmlTableCaptionElement [],
caption HtmlTableCaptionElement [] true,
/// The `<cite>` HTML element is used to describe a reference to a cited creative work, and must include the title of that work. The reference may be in an abbreviated form according to context-appropriate conventions related to citation metadata.
cite HtmlElement [],
cite HtmlElement [] true,
/// The `<code>` HTML element displays its contents styled in a fashion intended to indicate that the text is a short fragment of computer code. By default, the content text is displayed using the user agent default monospace font.
code HtmlElement [],
code HtmlElement [] true,
/// The `<colgroup>` HTML element defines a group of columns within a table.
colgroup HtmlTableColElement [span],
colgroup HtmlTableColElement [span] true,
/// The `<data>` HTML element links a given piece of content with a machine-readable translation. If the content is time- or date-related, the time element must be used.
data HtmlDataElement [value],
data HtmlDataElement [value] true,
/// The `<datalist>` HTML element contains a set of option elements that represent the permissible or recommended options available to choose from within other controls.
datalist HtmlDataListElement [],
datalist HtmlDataListElement [] true,
/// The `<dd>` HTML element provides the description, definition, or value for the preceding term (dt) in a description list (dl).
dd HtmlElement [],
dd HtmlElement [] true,
/// The `<del>` HTML element represents a range of text that has been deleted from a document. This can be used when rendering "track changes" or source code diff information, for example. The ins element can be used for the opposite purpose: to indicate text that has been added to the document.
del HtmlModElement [cite, datetime],
del HtmlModElement [cite, datetime] true,
/// The `<details>` HTML element creates a disclosure widget in which information is visible only when the widget is toggled into an "open" state. A summary or label must be provided using the summary element.
details HtmlDetailsElement [open],
details HtmlDetailsElement [open] true,
/// The `<dfn>` HTML element is used to indicate the term being defined within the context of a definition phrase or sentence. The p element, the dt/dd pairing, or the section element which is the nearest ancestor of the `<dfn>` is considered to be the definition of the term.
dfn HtmlElement [],
dfn HtmlElement [] true,
/// The `<dialog>` HTML element represents a dialog box or other interactive component, such as a dismissible alert, inspector, or subwindow.
dialog HtmlDialogElement [open],
dialog HtmlDialogElement [open] true,
/// The `<div>` HTML element is the generic container for flow content. It has no effect on the content or layout until styled in some way using CSS (e.g. styling is directly applied to it, or some kind of layout model like Flexbox is applied to its parent element).
div HtmlDivElement [],
div HtmlDivElement [] true,
/// The `<dl>` HTML element represents a description list. The element encloses a list of groups of terms (specified using the dt element) and descriptions (provided by dd elements). Common uses for this element are to implement a glossary or to display metadata (a list of key-value pairs).
dl HtmlDListElement [],
dl HtmlDListElement [] true,
/// The `<dt>` HTML element specifies a term in a description or definition list, and as such must be used inside a dl element. It is usually followed by a dd element; however, multiple `<dt>` elements in a row indicate several terms that are all defined by the immediate next dd element.
dt HtmlElement [],
dt HtmlElement [] true,
/// The `<em>` HTML element marks text that has stress emphasis. The `<em>` element can be nested, with each level of nesting indicating a greater degree of emphasis.
em HtmlElement [],
em HtmlElement [] true,
/// The `<fieldset>` HTML element is used to group several controls as well as labels (label) within a web form.
fieldset HtmlFieldSetElement [],
fieldset HtmlFieldSetElement [] true,
/// The `<figcaption>` HTML element represents a caption or legend describing the rest of the contents of its parent figure element.
figcaption HtmlElement [],
figcaption HtmlElement [] true,
/// The `<figure>` HTML element represents self-contained content, potentially with an optional caption, which is specified using the figcaption element. The figure, its caption, and its contents are referenced as a single unit.
figure HtmlElement [],
figure HtmlElement [] true,
/// The `<footer>` HTML element represents a footer for its nearest sectioning content or sectioning root element. A `<footer>` typically contains information about the author of the section, copyright data or links to related documents.
footer HtmlElement [],
footer HtmlElement [] true,
/// The `<form>` HTML element represents a document section containing interactive controls for submitting information.
form HtmlFormElement [accept_charset, action, autocomplete, enctype, method, name, novalidate, target],
form HtmlFormElement [accept_charset, action, autocomplete, enctype, method, name, novalidate, target] true,
/// The `<h1>` to `<h6>` HTML elements represent six levels of section headings. `<h1>` is the highest section level and `<h6>` is the lowest.
h1 HtmlHeadingElement [],
h1 HtmlHeadingElement [] true,
/// The `<h1>` to `<h6>` HTML elements represent six levels of section headings. `<h1>` is the highest section level and `<h6>` is the lowest.
h2 HtmlHeadingElement [],
h2 HtmlHeadingElement [] true,
/// The `<h1>` to `<h6>` HTML elements represent six levels of section headings. `<h1>` is the highest section level and `<h6>` is the lowest.
h3 HtmlHeadingElement [],
h3 HtmlHeadingElement [] true,
/// The `<h1>` to `<h6>` HTML elements represent six levels of section headings. `<h1>` is the highest section level and `<h6>` is the lowest.
h4 HtmlHeadingElement [],
h4 HtmlHeadingElement [] true,
/// The `<h1>` to `<h6>` HTML elements represent six levels of section headings. `<h1>` is the highest section level and `<h6>` is the lowest.
h5 HtmlHeadingElement [],
h5 HtmlHeadingElement [] true,
/// The `<h1>` to `<h6>` HTML elements represent six levels of section headings. `<h1>` is the highest section level and `<h6>` is the lowest.
h6 HtmlHeadingElement [],
h6 HtmlHeadingElement [] true,
/// The `<head>` HTML element contains machine-readable information (metadata) about the document, like its title, scripts, and style sheets.
head HtmlHeadElement [],
head HtmlHeadElement [] true,
/// The `<header>` HTML element represents introductory content, typically a group of introductory or navigational aids. It may contain some heading elements but also a logo, a search form, an author name, and other elements.
header HtmlElement [],
header HtmlElement [] true,
/// The `<hgroup>` HTML element represents a heading and related content. It groups a single `<h1>–<h6>` element with one or more `<p>`.
hgroup HtmlElement [],
hgroup HtmlElement [] true,
/// The `<html>` HTML element represents the root (top-level element) of an HTML document, so it is also referred to as the root element. All other elements must be descendants of this element.
html HtmlHtmlElement [],
html HtmlHtmlElement [] true,
/// The `<i>` HTML element represents a range of text that is set off from the normal text for some reason, such as idiomatic text, technical terms, taxonomical designations, among others. Historically, these have been presented using italicized type, which is the original source of the `<i>` naming of this element.
i HtmlElement [],
i HtmlElement [] true,
/// The `<iframe>` HTML element represents a nested browsing context, embedding another HTML page into the current one.
iframe HtmlIFrameElement [allow, allowfullscreen, allowpaymentrequest, height, name, referrerpolicy, sandbox, src, srcdoc, width],
iframe HtmlIFrameElement [allow, allowfullscreen, allowpaymentrequest, height, name, referrerpolicy, sandbox, src, srcdoc, width] true,
/// The `<ins>` HTML element represents a range of text that has been added to a document. You can use the del element to similarly represent a range of text that has been deleted from the document.
ins HtmlElement [cite, datetime],
ins HtmlElement [cite, datetime] true,
/// The `<kbd>` HTML element represents a span of inline text denoting textual user input from a keyboard, voice input, or any other text entry device. By convention, the user agent defaults to rendering the contents of a `<kbd>` element using its default monospace font, although this is not mandated by the HTML standard.
kbd HtmlElement [],
kbd HtmlElement [] true,
/// The `<label>` HTML element represents a caption for an item in a user interface.
label HtmlLabelElement [r#for, form],
label HtmlLabelElement [r#for, form] true,
/// The `<legend>` HTML element represents a caption for the content of its parent fieldset.
legend HtmlLegendElement [],
legend HtmlLegendElement [] true,
/// The `<li>` HTML element is used to represent an item in a list. It must be contained in a parent element: an ordered list (ol), an unordered list (ul), or a menu (menu). In menus and unordered lists, list items are usually displayed using bullet points. In ordered lists, they are usually displayed with an ascending counter on the left, such as a number or letter.
li HtmlLiElement [value],
li HtmlLiElement [value] true,
/// The `<main>` HTML element represents the dominant content of the body of a document. The main content area consists of content that is directly related to or expands upon the central topic of a document, or the central functionality of an application.
main HtmlElement [],
main HtmlElement [] true,
/// The `<map>` HTML element is used with area elements to define an image map (a clickable link area).
map HtmlMapElement [name],
map HtmlMapElement [name] true,
/// The `<mark>` HTML element represents text which is marked or highlighted for reference or notation purposes, due to the marked passage's relevance or importance in the enclosing context.
mark HtmlElement [],
mark HtmlElement [] true,
/// The `<menu>` HTML element is a semantic alternative to ul. It represents an unordered list of items (represented by li elements), each of these represent a link or other command that the user can activate.
menu HtmlMenuElement [],
menu HtmlMenuElement [] true,
/// The `<meter>` HTML element represents either a scalar value within a known range or a fractional value.
meter HtmlMeterElement [value, min, max, low, high, optimum, form],
meter HtmlMeterElement [value, min, max, low, high, optimum, form] true,
/// The `<nav>` HTML element represents a section of a page whose purpose is to provide navigation links, either within the current document or to other documents. Common examples of navigation sections are menus, tables of contents, and indexes.
nav HtmlElement [],
nav HtmlElement [] true,
/// The `<noscript>` HTML element defines a section of HTML to be inserted if a script type on the page is unsupported or if scripting is currently turned off in the browser.
noscript HtmlElement [],
noscript HtmlElement [] true,
/// The `<object>` HTML element represents an external resource, which can be treated as an image, a nested browsing context, or a resource to be handled by a plugin.
object HtmlObjectElement [data, form, height, name, r#type, usemap, width],
object HtmlObjectElement [data, form, height, name, r#type, usemap, width] true,
/// The `<ol>` HTML element represents an ordered list of items — typically rendered as a numbered list.
ol HtmlOListElement [reversed, start, r#type],
ol HtmlOListElement [reversed, start, r#type] true,
/// The `<optgroup>` HTML element creates a grouping of options within a select element.
optgroup HtmlOptGroupElement [disabled, label],
optgroup HtmlOptGroupElement [disabled, label] true,
/// The `<output>` HTML element is a container element into which a site or app can inject the results of a calculation or the outcome of a user action.
output HtmlOutputElement [r#for, form, name],
output HtmlOutputElement [r#for, form, name] true,
/// The `<p>` HTML element represents a paragraph. Paragraphs are usually represented in visual media as blocks of text separated from adjacent blocks by blank lines and/or first-line indentation, but HTML paragraphs can be any structural grouping of related content, such as images or form fields.
p HtmlParagraphElement [],
p HtmlParagraphElement [] true,
/// The `<picture>` HTML element contains zero or more source elements and one img element to offer alternative versions of an image for different display/device scenarios.
picture HtmlPictureElement [],
picture HtmlPictureElement [] true,
/// The `<portal>` HTML element enables the embedding of another HTML page into the current one for the purposes of allowing smoother navigation into new pages.
portal HtmlElement [referrerpolicy, src],
portal HtmlElement [referrerpolicy, src] true,
/// The `<pre>` HTML element represents preformatted text which is to be presented exactly as written in the HTML file. The text is typically rendered using a non-proportional, or "monospaced, font. Whitespace inside this element is displayed as written.
pre HtmlPreElement [],
pre HtmlPreElement [] true,
/// The `<progress>` HTML element displays an indicator showing the completion progress of a task, typically displayed as a progress bar.
progress HtmlProgressElement [min, max, value],
progress HtmlProgressElement [min, max, value] true,
/// The `<q>` HTML element indicates that the enclosed text is a short inline quotation. Most modern browsers implement this by surrounding the text in quotation marks. This element is intended for short quotations that don't require paragraph breaks; for long quotations use the blockquote element.
q HtmlQuoteElement [cite],
q HtmlQuoteElement [cite] true,
/// The `<rp>` HTML element is used to provide fall-back parentheses for browsers that do not support display of ruby annotations using the ruby element. One `<rp>` element should enclose each of the opening and closing parentheses that wrap the rt element that contains the annotation's text.
rp HtmlElement [],
rp HtmlElement [] true,
/// The `<rt>` HTML element specifies the ruby text component of a ruby annotation, which is used to provide pronunciation, translation, or transliteration information for East Asian typography. The `<rt>` element must always be contained within a ruby element.
rt HtmlElement [],
rt HtmlElement [] true,
/// The `<ruby>` HTML element represents small annotations that are rendered above, below, or next to base text, usually used for showing the pronunciation of East Asian characters. It can also be used for annotating other kinds of text, but this usage is less common.
ruby HtmlElement [],
ruby HtmlElement [] true,
/// The `<s>` HTML element renders text with a strikethrough, or a line through it. Use the `<s>` element to represent things that are no longer relevant or no longer accurate. However, `<s>` is not appropriate when indicating document edits; for that, use the del and ins elements, as appropriate.
s HtmlElement [],
s HtmlElement [] true,
/// The `<samp>` HTML element is used to enclose inline text which represents sample (or quoted) output from a computer program. Its contents are typically rendered using the browser's default monospaced font (such as Courier or Lucida Console).
samp HtmlElement [],
samp HtmlElement [] true,
/// The `<script>` HTML element is used to embed executable code or data; this is typically used to embed or refer to JavaScript code. The `<script>` element can also be used with other languages, such as WebGL's GLSL shader programming language and JSON.
script HtmlScriptElement [r#async, crossorigin, defer, fetchpriority, integrity, nomodule, referrerpolicy, src, r#type, blocking],
script HtmlScriptElement [r#async, crossorigin, defer, fetchpriority, integrity, nomodule, referrerpolicy, src, r#type, blocking] false,
/// The `<search>` HTML element is a container representing the parts of the document or application with form controls or other content related to performing a search or filtering operation.
search HtmlElement [],
search HtmlElement [] true,
/// The `<section>` HTML element represents a generic standalone section of a document, which doesn't have a more specific semantic element to represent it. Sections should always have a heading, with very few exceptions.
section HtmlElement [],
section HtmlElement [] true,
/// The `<select>` HTML element represents a control that provides a menu of options:
select HtmlSelectElement [autocomplete, disabled, form, multiple, name, required, size],
select HtmlSelectElement [autocomplete, disabled, form, multiple, name, required, size] true,
/// The `<slot>` HTML element—part of the Web Components technology suite—is a placeholder inside a web component that you can fill with your own markup, which lets you create separate DOM trees and present them together.
slot HtmlSlotElement [name],
slot HtmlSlotElement [name] true,
/// The `<small>` HTML element represents side-comments and small print, like copyright and legal text, independent of its styled presentation. By default, it renders text within it one font-size smaller, such as from small to x-small.
small HtmlElement [],
small HtmlElement [] true,
/// The `<span>` HTML element is a generic inline container for phrasing content, which does not inherently represent anything. It can be used to group elements for styling purposes (using the class or id attributes), or because they share attribute values, such as lang. It should be used only when no other semantic element is appropriate. `<span>` is very much like a div element, but div is a block-level element whereas a `<span>` is an inline element.
span HtmlSpanElement [],
span HtmlSpanElement [] true,
/// The `<strong>` HTML element indicates that its contents have strong importance, seriousness, or urgency. Browsers typically render the contents in bold type.
strong HtmlElement [],
strong HtmlElement [] true,
/// The `<style>` HTML element contains style information for a document, or part of a document. It contains CSS, which is applied to the contents of the document containing the `<style>` element.
style HtmlStyleElement [media, blocking],
style HtmlStyleElement [media, blocking] false,
/// The `<sub>` HTML element specifies inline text which should be displayed as subscript for solely typographical reasons. Subscripts are typically rendered with a lowered baseline using smaller text.
sub HtmlElement [],
sub HtmlElement [] true,
/// The `<summary>` HTML element specifies a summary, caption, or legend for a details element's disclosure box. Clicking the `<summary>` element toggles the state of the parent `<details>` element open and closed.
summary HtmlElement [],
summary HtmlElement [] true,
/// The `<sup>` HTML element specifies inline text which is to be displayed as superscript for solely typographical reasons. Superscripts are usually rendered with a raised baseline using smaller text.
sup HtmlElement [],
sup HtmlElement [] true,
/// The `<table>` HTML element represents tabular data — that is, information presented in a two-dimensional table comprised of rows and columns of cells containing data.
table HtmlTableElement [],
table HtmlTableElement [] true,
/// The `<tbody>` HTML element encapsulates a set of table rows (tr elements), indicating that they comprise the body of the table (table).
tbody HtmlTableSectionElement [],
tbody HtmlTableSectionElement [] true,
/// The `<td>` HTML element defines a cell of a table that contains data. It participates in the table model.
td HtmlTableCellElement [colspan, headers, rowspan],
td HtmlTableCellElement [colspan, headers, rowspan] true,
/// The `<template>` HTML element is a mechanism for holding HTML that is not to be rendered immediately when a page is loaded but may be instantiated subsequently during runtime using JavaScript.
template HtmlTemplateElement [],
template HtmlTemplateElement [] true,
/// The `<textarea>` HTML element represents a multi-line plain-text editing control, useful when you want to allow users to enter a sizeable amount of free-form text, for example a comment on a review or feedback form.
textarea HtmlTextAreaElement [autocomplete, cols, dirname, disabled, form, maxlength, minlength, name, placeholder, readonly, required, rows, wrap],
textarea HtmlTextAreaElement [autocomplete, cols, dirname, disabled, form, maxlength, minlength, name, placeholder, readonly, required, rows, wrap] true,
/// The `<tfoot>` HTML element defines a set of rows summarizing the columns of the table.
tfoot HtmlTableSectionElement [],
tfoot HtmlTableSectionElement [] true,
/// The `<th>` HTML element defines a cell as header of a group of table cells. The exact nature of this group is defined by the scope and headers attributes.
th HtmlTableCellElement [abbr, colspan, headers, rowspan, scope],
th HtmlTableCellElement [abbr, colspan, headers, rowspan, scope] true,
/// The `<thead>` HTML element defines a set of rows defining the head of the columns of the table.
thead HtmlTableSectionElement [],
thead HtmlTableSectionElement [] true,
/// The `<time>` HTML element represents a specific period in time. It may include the datetime attribute to translate dates into machine-readable format, allowing for better search engine results or custom features such as reminders.
time HtmlTimeElement [datetime],
time HtmlTimeElement [datetime] true,
/// The `<title>` HTML element defines the document's title that is shown in a Browser's title bar or a page's tab. It only contains text; tags within the element are ignored.
title HtmlTitleElement [],
title HtmlTitleElement [] true,
/// The `<tr>` HTML element defines a row of cells in a table. The row's cells can then be established using a mix of td (data cell) and th (header cell) elements.
tr HtmlTableRowElement [],
tr HtmlTableRowElement [] true,
/// The `<u>` HTML element represents a span of inline text which should be rendered in a way that indicates that it has a non-textual annotation. This is rendered by default as a simple solid underline, but may be altered using CSS.
u HtmlElement [],
u HtmlElement [] true,
/// The `<ul>` HTML element represents an unordered list of items, typically rendered as a bulleted list.
ul HtmlUListElement [],
ul HtmlUListElement [] true,
/// The `<var>` HTML element represents the name of a variable in a mathematical expression or a programming context. It's typically presented using an italicized version of the current typeface, although that behavior is browser-dependent.
var HtmlElement [],
var HtmlElement [] true,
/// The `<video>` HTML element embeds a media player which supports video playback into the document. You can use `<video>` for audio content as well, but the audio element may provide a more appropriate user experience.
video HtmlVideoElement [controls, controlslist, crossorigin, disablepictureinpicture, disableremoteplayback, height, r#loop, muted, playsinline, poster, preload, src, width],
video HtmlVideoElement [controls, controlslist, crossorigin, disablepictureinpicture, disableremoteplayback, height, r#loop, muted, playsinline, poster, preload, src, width] true,
}
pub fn option<Rndr>() -> HtmlElement<Option_, (), (), Rndr>
@ -463,6 +466,7 @@ impl ElementType for Option_ {
const TAG: &'static str = "option";
const SELF_CLOSING: bool = false;
const ESCAPE_CHILDREN: bool = true;
#[inline(always)]
fn tag(&self) -> &str {

22
tachys/src/html/element/mod.rs
View File

@ -149,6 +149,7 @@ pub trait ElementType: Send {
const TAG: &'static str;
const SELF_CLOSING: bool;
const ESCAPE_CHILDREN: bool;
fn tag(&self) -> &str;
}
@ -254,7 +255,12 @@ where
}
}
fn to_html_with_buf(self, buf: &mut String, position: &mut Position) {
fn to_html_with_buf(
self,
buf: &mut String,
position: &mut Position,
_escape: bool,
) {
// opening tag
buf.push('<');
buf.push_str(E::TAG);
@ -299,7 +305,11 @@ where
} else {
// children
*position = Position::FirstChild;
self.children.to_html_with_buf(buf, position);
self.children.to_html_with_buf(
buf,
position,
E::ESCAPE_CHILDREN,
);
}
// closing tag
@ -314,6 +324,7 @@ where
self,
buffer: &mut StreamBuilder,
position: &mut Position,
_escape: bool,
) where
Self: Sized,
{
@ -367,8 +378,11 @@ where
if !inner_html.is_empty() {
buffer.push_sync(&inner_html);
} else {
self.children
.to_html_async_with_buf::<OUT_OF_ORDER>(buffer, position);
self.children.to_html_async_with_buf::<OUT_OF_ORDER>(
buffer,
position,
E::ESCAPE_CHILDREN,
);
}
// closing tag

30
tachys/src/html/islands.rs
View File

@ -108,17 +108,20 @@ where
self.view.resolve().await
}
fn to_html_with_buf(self, buf: &mut String, position: &mut Position) {
fn to_html_with_buf(
self,
buf: &mut String,
position: &mut Position,
escape: bool,
) {
Self::open_tag(self.component, buf);
self.view.to_html_with_buf(buf, position);
self.view.to_html_with_buf(buf, position, escape);
Self::close_tag(buf);
}
fn to_html_async_with_buf<const OUT_OF_ORDER: bool>(
self,
buf: &mut StreamBuilder,
position: &mut Position,
) where
buf: &mut StreamBuilder, position: &mut Position, escape: bool) where
Self: Sized,
{
// insert the opening tag synchronously
@ -128,7 +131,7 @@ where
// streaming render for the view
self.view
.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position);
.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position, escape);
// and insert the closing tag synchronously
tag.clear();
@ -228,17 +231,20 @@ where
self.view.resolve().await
}
fn to_html_with_buf(self, buf: &mut String, position: &mut Position) {
fn to_html_with_buf(
self,
buf: &mut String,
position: &mut Position,
escape: bool,
) {
Self::open_tag(buf);
self.view.to_html_with_buf(buf, position);
self.view.to_html_with_buf(buf, position, escape);
Self::close_tag(buf);
}
fn to_html_async_with_buf<const OUT_OF_ORDER: bool>(
self,
buf: &mut StreamBuilder,
position: &mut Position,
) where
buf: &mut StreamBuilder, position: &mut Position, escape: bool) where
Self: Sized,
{
// insert the opening tag synchronously
@ -248,7 +254,7 @@ where
// streaming render for the view
self.view
.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position);
.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position, escape);
// and insert the closing tag synchronously
tag.clear();

7
tachys/src/html/mod.rs
View File

@ -50,7 +50,12 @@ where
self
}
fn to_html_with_buf(self, buf: &mut String, _position: &mut Position) {
fn to_html_with_buf(
self,
buf: &mut String,
_position: &mut Position,
_escape: bool,
) {
buf.push_str("<!DOCTYPE ");
buf.push_str(self.value);
buf.push('>');

1
tachys/src/mathml/mod.rs
View File

@ -112,6 +112,7 @@ macro_rules! mathml_elements {
const TAG: &'static str = stringify!($tag);
const SELF_CLOSING: bool = false;
const ESCAPE_CHILDREN: bool = true;
#[inline(always)]
fn tag(&self) -> &str {

9
tachys/src/oco.rs
View File

@ -46,8 +46,13 @@ where
self
}
fn to_html_with_buf(self, buf: &mut String, position: &mut Position) {
<&str as RenderHtml<R>>::to_html_with_buf(&self, buf, position)
fn to_html_with_buf(
self,
buf: &mut String,
position: &mut Position,
escape: bool,
) {
<&str as RenderHtml<R>>::to_html_with_buf(&self, buf, position, escape)
}
fn hydrate<const FROM_SERVER: bool>(

4
tachys/src/reactive_graph/guards.rs
View File

@ -103,7 +103,7 @@ macro_rules! render_primitive {
const MIN_LENGTH: usize = 0;
fn to_html_with_buf(self, buf: &mut String, position: &mut Position) {
fn to_html_with_buf(self, buf: &mut String, position: &mut Position, escape: bool) {
// add a comment node to separate from previous sibling, if any
if matches!(position, Position::NextChildAfterText) {
buf.push_str("<!>")
@ -264,7 +264,7 @@ where
const MIN_LENGTH: usize = 0;
fn to_html_with_buf(self, buf: &mut String, position: &mut Position) {
fn to_html_with_buf(self, buf: &mut String, position: &mut Position, escape: bool) {
<&str as RenderHtml<R>>::to_html_with_buf(&self, buf, position)
}

28
tachys/src/reactive_graph/mod.rs
View File

@ -164,20 +164,26 @@ where
V::MIN_LENGTH
}
fn to_html_with_buf(mut self, buf: &mut String, position: &mut Position) {
fn to_html_with_buf(
mut self,
buf: &mut String,
position: &mut Position,
escape: bool,
) {
let value = self.invoke();
value.to_html_with_buf(buf, position)
value.to_html_with_buf(buf, position, escape)
}
fn to_html_async_with_buf<const OUT_OF_ORDER: bool>(
mut self,
buf: &mut StreamBuilder,
position: &mut Position,
escape: bool,
) where
Self: Sized,
{
let value = self.invoke();
value.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position);
value.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position, escape);
}
fn hydrate<const FROM_SERVER: bool>(
@ -481,20 +487,24 @@ mod stable {
self,
buf: &mut String,
position: &mut Position,
escape: bool,
) {
let value = self.get();
value.to_html_with_buf(buf, position)
value.to_html_with_buf(buf, position, escape)
}
fn to_html_async_with_buf<const OUT_OF_ORDER: bool>(
self,
buf: &mut StreamBuilder,
position: &mut Position,
escape: bool,
) where
Self: Sized,
{
let value = self.get();
value.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position);
value.to_html_async_with_buf::<OUT_OF_ORDER>(
buf, position, escape,
);
}
fn hydrate<const FROM_SERVER: bool>(
@ -628,20 +638,24 @@ mod stable {
self,
buf: &mut String,
position: &mut Position,
escape: bool,
) {
let value = self.get();
value.to_html_with_buf(buf, position)
value.to_html_with_buf(buf, position, escape)
}
fn to_html_async_with_buf<const OUT_OF_ORDER: bool>(
self,
buf: &mut StreamBuilder,
position: &mut Position,
escape: bool,
) where
Self: Sized,
{
let value = self.get();
value.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position);
value.to_html_async_with_buf::<OUT_OF_ORDER>(
buf, position, escape,
);
}
fn hydrate<const FROM_SERVER: bool>(

12
tachys/src/reactive_graph/owned.rs
View File

@ -119,22 +119,24 @@ where
fn to_html_with_buf(
self,
buf: &mut String,
position: &mut crate::view::Position,
position: &mut Position,
escape: bool,
) {
self.owner
.with(|| self.view.to_html_with_buf(buf, position));
.with(|| self.view.to_html_with_buf(buf, position, escape));
}
fn to_html_async_with_buf<const OUT_OF_ORDER: bool>(
self,
buf: &mut StreamBuilder,
position: &mut Position,
escape: bool,
) where
Self: Sized,
{
self.owner.with(|| {
self.view
.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position)
.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position, escape)
});
}
@ -179,9 +181,7 @@ where
self.state.mount(parent, marker);
}
fn insert_before_this(&self,
child: &mut dyn Mountable<R>,
) -> bool {
fn insert_before_this(&self, child: &mut dyn Mountable<R>) -> bool {
self.state.insert_before_this(child)
}
}

12
tachys/src/reactive_graph/suspense.rs
View File

@ -64,9 +64,7 @@ where
self.inner.borrow_mut().mount(parent, marker);
}
fn insert_before_this(&self,
child: &mut dyn Mountable<Rndr>,
) -> bool {
fn insert_before_this(&self, child: &mut dyn Mountable<Rndr>) -> bool {
self.inner.borrow_mut().insert_before_this(child)
}
}
@ -169,7 +167,12 @@ where
const MIN_LENGTH: usize = Fut::Output::MIN_LENGTH;
fn to_html_with_buf(self, _buf: &mut String, _position: &mut Position) {
fn to_html_with_buf(
self,
_buf: &mut String,
_position: &mut Position,
_escape: bool,
) {
todo!()
}
@ -177,6 +180,7 @@ where
self,
_buf: &mut StreamBuilder,
_position: &mut Position,
_escape: bool,
) where
Self: Sized,
{

3
tachys/src/ssr/mod.rs
View File

@ -100,7 +100,7 @@ impl StreamBuilder {
Rndr: Renderer,
{
self.write_chunk_marker(true);
fallback.to_html_with_buf(&mut self.sync_buf, position);
fallback.to_html_with_buf(&mut self.sync_buf, position, true);
self.write_chunk_marker(false);
*position = Position::NextChild;
}
@ -177,6 +177,7 @@ impl StreamBuilder {
view.to_html_async_with_buf::<true>(
&mut subbuilder,
&mut position,
true,
);
subbuilder.sync_buf.push_str("<!></template>");

1
tachys/src/svg/mod.rs
View File

@ -72,6 +72,7 @@ macro_rules! svg_elements {
const TAG: &'static str = stringify!($tag);
const SELF_CLOSING: bool = false;
const ESCAPE_CHILDREN: bool = true;
#[inline(always)]
fn tag(&self) -> &str {

75
tachys/src/view/any_view.rs
View File

@ -28,11 +28,12 @@ where
#[cfg(feature = "ssr")]
html_len: usize,
#[cfg(feature = "ssr")]
to_html: fn(Box<dyn Any>, &mut String, &mut Position),
to_html: fn(Box<dyn Any>, &mut String, &mut Position, bool),
#[cfg(feature = "ssr")]
to_html_async: fn(Box<dyn Any>, &mut StreamBuilder, &mut Position),
to_html_async: fn(Box<dyn Any>, &mut StreamBuilder, &mut Position, bool),
#[cfg(feature = "ssr")]
to_html_async_ooo: fn(Box<dyn Any>, &mut StreamBuilder, &mut Position),
to_html_async_ooo:
fn(Box<dyn Any>, &mut StreamBuilder, &mut Position, bool),
build: fn(Box<dyn Any>) -> AnyViewState<R>,
rebuild: fn(TypeId, Box<dyn Any>, &mut AnyViewState<R>),
#[cfg(feature = "ssr")]
@ -158,33 +159,35 @@ where
as Pin<Box<dyn Future<Output = AnyView<R>> + Send>>
};
#[cfg(feature = "ssr")]
let to_html =
|value: Box<dyn Any>, buf: &mut String, position: &mut Position| {
let value = value
.downcast::<T>()
.expect("AnyView::to_html could not be downcast");
value.to_html_with_buf(buf, position);
};
let to_html = |value: Box<dyn Any>,
buf: &mut String,
position: &mut Position,
escape: bool| {
let value = value
.downcast::<T>()
.expect("AnyView::to_html could not be downcast");
value.to_html_with_buf(buf, position, escape);
};
#[cfg(feature = "ssr")]
let to_html_async =
|value: Box<dyn Any>,
buf: &mut StreamBuilder,
position: &mut Position| {
let value = value
.downcast::<T>()
.expect("AnyView::to_html could not be downcast");
value.to_html_async_with_buf::<false>(buf, position);
};
let to_html_async = |value: Box<dyn Any>,
buf: &mut StreamBuilder,
position: &mut Position,
escape: bool| {
let value = value
.downcast::<T>()
.expect("AnyView::to_html could not be downcast");
value.to_html_async_with_buf::<false>(buf, position, escape);
};
#[cfg(feature = "ssr")]
let to_html_async_ooo =
|value: Box<dyn Any>,
buf: &mut StreamBuilder,
position: &mut Position| {
let value = value
.downcast::<T>()
.expect("AnyView::to_html could not be downcast");
value.to_html_async_with_buf::<true>(buf, position);
};
let to_html_async_ooo = |value: Box<dyn Any>,
buf: &mut StreamBuilder,
position: &mut Position,
escape: bool| {
let value = value
.downcast::<T>()
.expect("AnyView::to_html could not be downcast");
value.to_html_async_with_buf::<true>(buf, position, escape);
};
let build = |value: Box<dyn Any>| {
let value = value
.downcast::<T>()
@ -328,13 +331,19 @@ where
const MIN_LENGTH: usize = 0;
fn to_html_with_buf(self, buf: &mut String, position: &mut Position) {
fn to_html_with_buf(
self,
buf: &mut String,
position: &mut Position,
escape: bool,
) {
#[cfg(feature = "ssr")]
(self.to_html)(self.value, buf, position);
(self.to_html)(self.value, buf, position, escape);
#[cfg(not(feature = "ssr"))]
{
_ = buf;
_ = position;
_ = escape;
panic!(
"You are rendering AnyView to HTML without the `ssr` feature \
enabled."
@ -346,19 +355,21 @@ where
self,
buf: &mut StreamBuilder,
position: &mut Position,
escape: bool,
) where
Self: Sized,
{
#[cfg(feature = "ssr")]
if OUT_OF_ORDER {
(self.to_html_async_ooo)(self.value, buf, position);
(self.to_html_async_ooo)(self.value, buf, position, escape);
} else {
(self.to_html_async)(self.value, buf, position);
(self.to_html_async)(self.value, buf, position, escape);
}
#[cfg(not(feature = "ssr"))]
{
_ = buf;
_ = position;
_ = escape;
panic!(
"You are rendering AnyView to HTML without the `ssr` feature \
enabled."

51
tachys/src/view/either.rs
View File

@ -91,9 +91,7 @@ where
}
}
fn insert_before_this(&self,
child: &mut dyn Mountable<Rndr>,
) -> bool {
fn insert_before_this(&self, child: &mut dyn Mountable<Rndr>) -> bool {
match &self.state {
Either::Left(left) => left.insert_before_this(child),
Either::Right(right) => right.insert_before_this(child),
@ -171,10 +169,17 @@ where
}
}
fn to_html_with_buf(self, buf: &mut String, position: &mut Position) {
fn to_html_with_buf(
self,
buf: &mut String,
position: &mut Position,
escape: bool,
) {
match self {
Either::Left(left) => left.to_html_with_buf(buf, position),
Either::Right(right) => right.to_html_with_buf(buf, position),
Either::Left(left) => left.to_html_with_buf(buf, position, escape),
Either::Right(right) => {
right.to_html_with_buf(buf, position, escape)
}
}
buf.push_str("<!>");
*position = Position::NextChild;
@ -184,16 +189,15 @@ where
self,
buf: &mut StreamBuilder,
position: &mut Position,
escape: bool,
) where
Self: Sized,
{
match self {
Either::Left(left) => {
left.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position)
}
Either::Right(right) => {
right.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position)
}
Either::Left(left) => left
.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position, escape),
Either::Right(right) => right
.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position, escape),
}
buf.push_sync("<!>");
*position = Position::NextChild;
@ -343,7 +347,12 @@ where
todo!()
}
fn to_html_with_buf(self, _buf: &mut String, _position: &mut Position) {
fn to_html_with_buf(
self,
_buf: &mut String,
_position: &mut Position,
_escape: bool,
) {
todo!()
}
@ -413,9 +422,7 @@ where
self.marker.mount(parent, marker);
}
fn insert_before_this(&self,
child: &mut dyn Mountable<Rndr>,
) -> bool {
fn insert_before_this(&self, child: &mut dyn Mountable<Rndr>) -> bool {
if self.showing_b {
self.b
.as_ref()
@ -465,7 +472,7 @@ macro_rules! tuples {
};
}
fn insert_before_this(&self,
fn insert_before_this(&self,
child: &mut dyn Mountable<Rndr>,
) -> bool {
match &self.state {
@ -566,9 +573,9 @@ macro_rules! tuples {
}
}
fn to_html_with_buf(self, buf: &mut String, position: &mut Position) {
fn to_html_with_buf(self, buf: &mut String, position: &mut Position, escape: bool) {
match self {
$([<EitherOf $num>]::$ty(this) => this.to_html_with_buf(buf, position),)*
$([<EitherOf $num>]::$ty(this) => this.to_html_with_buf(buf, position, escape),)*
}
buf.push_str("<!>");
*position = Position::NextChild;
@ -576,13 +583,11 @@ macro_rules! tuples {
fn to_html_async_with_buf<const OUT_OF_ORDER: bool>(
self,
buf: &mut StreamBuilder,
position: &mut Position,
) where
buf: &mut StreamBuilder, position: &mut Position, escape: bool) where
Self: Sized,
{
match self {
$([<EitherOf $num>]::$ty(this) => this.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position),)*
$([<EitherOf $num>]::$ty(this) => this.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position, escape),)*
}
buf.push_sync("<!>");
*position = Position::NextChild;

13
tachys/src/view/error_boundary.rs
View File

@ -95,9 +95,7 @@ where
}
}
fn insert_before_this(&self,
child: &mut dyn Mountable<R>,
) -> bool {
fn insert_before_this(&self, child: &mut dyn Mountable<R>) -> bool {
if self.state.as_ref().map(|n| n.insert_before_this(child)) == Ok(true)
{
true
@ -161,9 +159,10 @@ where
self,
buf: &mut String,
position: &mut super::Position,
escape: bool,
) {
match self {
Ok(inner) => inner.to_html_with_buf(buf, position),
Ok(inner) => inner.to_html_with_buf(buf, position, escape),
Err(e) => {
throw_error::throw(e);
}
@ -173,14 +172,12 @@ where
fn to_html_async_with_buf<const OUT_OF_ORDER: bool>(
self,
buf: &mut StreamBuilder,
position: &mut Position,
) where
buf: &mut StreamBuilder, position: &mut Position, escape: bool) where
Self: Sized,
{
match self {
Ok(inner) => {
inner.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position)
inner.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position, escape)
}
Err(e) => {
throw_error::throw(e);

42
tachys/src/view/iterators.rs
View File

@ -93,9 +93,14 @@ where
}
}
fn to_html_with_buf(self, buf: &mut String, position: &mut Position) {
fn to_html_with_buf(
self,
buf: &mut String,
position: &mut Position,
escape: bool,
) {
if let Some(value) = self {
value.to_html_with_buf(buf, position);
value.to_html_with_buf(buf, position, escape);
}
// placeholder
buf.push_str("<!>");
@ -104,13 +109,11 @@ where
fn to_html_async_with_buf<const OUT_OF_ORDER: bool>(
self,
buf: &mut StreamBuilder,
position: &mut Position,
) where
buf: &mut StreamBuilder, position: &mut Position, escape: bool) where
Self: Sized,
{
if let Some(value) = self {
value.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position);
value.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position, escape);
}
// placeholder
buf.push_sync("<!>");
@ -163,9 +166,7 @@ where
self.placeholder.mount(parent, marker);
}
fn insert_before_this(&self,
child: &mut dyn Mountable<R>,
) -> bool {
fn insert_before_this(&self, child: &mut dyn Mountable<R>) -> bool {
if self.state.as_ref().map(|n| n.insert_before_this(child))
== Some(true)
{
@ -264,9 +265,7 @@ where
self.marker.mount(parent, marker);
}
fn insert_before_this(&self,
child: &mut dyn Mountable<R>,
) -> bool {
fn insert_before_this(&self, child: &mut dyn Mountable<R>) -> bool {
if let Some(first) = self.states.first() {
first.insert_before_this(child)
} else {
@ -323,30 +322,33 @@ where
self.iter().map(|n| n.html_len()).sum::<usize>() + 3
}
fn to_html_with_buf(self, buf: &mut String, position: &mut Position) {
fn to_html_with_buf(
self,
buf: &mut String,
position: &mut Position,
escape: bool,
) {
let mut children = self.into_iter();
if let Some(first) = children.next() {
first.to_html_with_buf(buf, position);
first.to_html_with_buf(buf, position, escape);
}
for child in children {
child.to_html_with_buf(buf, position);
child.to_html_with_buf(buf, position, escape);
}
buf.push_str("<!>");
}
fn to_html_async_with_buf<const OUT_OF_ORDER: bool>(
self,
buf: &mut StreamBuilder,
position: &mut Position,
) where
buf: &mut StreamBuilder, position: &mut Position, escape: bool) where
Self: Sized,
{
let mut children = self.into_iter();
if let Some(first) = children.next() {
first.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position);
first.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position, escape);
}
for child in children {
child.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position);
child.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position, escape);
}
buf.push_sync("<!>");
}

15
tachys/src/view/keyed.rs
View File

@ -213,22 +213,25 @@ where
.collect::<Vec<_>>()
}
fn to_html_with_buf(self, buf: &mut String, position: &mut Position) {
fn to_html_with_buf(
self,
buf: &mut String,
position: &mut Position,
escape: bool,
) {
for item in self.items.into_iter() {
let item = (self.view_fn)(item);
item.to_html_with_buf(buf, position);
item.to_html_with_buf(buf, position, escape);
*position = Position::NextChild;
}
}
fn to_html_async_with_buf<const OUT_OF_ORDER: bool>(
self,
buf: &mut StreamBuilder,
position: &mut Position,
) {
buf: &mut StreamBuilder, position: &mut Position, escape: bool) {
for item in self.items.into_iter() {
let item = (self.view_fn)(item);
item.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position);
item.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position, escape);
*position = Position::NextChild;
}
}

22
tachys/src/view/mod.rs
View File

@ -87,7 +87,7 @@ where
Self: Sized,
{
let mut buf = String::with_capacity(self.html_len());
self.to_html_with_buf(&mut buf, &mut Position::FirstChild);
self.to_html_with_buf(&mut buf, &mut Position::FirstChild, true);
buf
}
@ -100,6 +100,7 @@ where
self.to_html_async_with_buf::<false>(
&mut builder,
&mut Position::FirstChild,
true,
);
builder.finish()
}
@ -116,6 +117,7 @@ where
self.to_html_async_with_buf::<true>(
&mut builder,
&mut Position::FirstChild,
true,
);
builder.finish()
/*let mut b = builder.finish();
@ -138,17 +140,23 @@ where
}
/// Renders a view to HTML, writing it into the given buffer.
fn to_html_with_buf(self, buf: &mut String, position: &mut Position);
fn to_html_with_buf(
self,
buf: &mut String,
position: &mut Position,
escape: bool,
);
/// Renders a view into a buffer of (synchronous or asynchronous) HTML chunks.
fn to_html_async_with_buf<const OUT_OF_ORDER: bool>(
self,
buf: &mut StreamBuilder,
position: &mut Position,
escape: bool,
) where
Self: Sized,
{
buf.with_buf(|buf| self.to_html_with_buf(buf, position));
buf.with_buf(|buf| self.to_html_with_buf(buf, position, escape));
}
/// Makes a set of DOM nodes rendered from HTML interactive.
@ -244,9 +252,7 @@ where
}
}
fn insert_before_this(&self,
child: &mut dyn Mountable<R>,
) -> bool {
fn insert_before_this(&self, child: &mut dyn Mountable<R>) -> bool {
self.as_ref()
.map(|inner| inner.insert_before_this(child))
.unwrap_or(false)
@ -266,9 +272,7 @@ where
self.borrow_mut().mount(parent, marker);
}
fn insert_before_this(&self,
child: &mut dyn Mountable<R>,
) -> bool {
fn insert_before_this(&self, child: &mut dyn Mountable<R>) -> bool {
self.borrow().insert_before_this(child)
}
}

2
tachys/src/view/primitives.rs
View File

@ -76,7 +76,7 @@ macro_rules! render_primitive {
self
}
fn to_html_with_buf(self, buf: &mut String, position: &mut Position) {
fn to_html_with_buf(self, buf: &mut String, position: &mut Position, _escape: bool) {
// add a comment node to separate from previous sibling, if any
if matches!(position, Position::NextChildAfterText) {
buf.push_str("<!>")

13
tachys/src/view/static_types.rs
View File

@ -176,12 +176,21 @@ where
std::future::ready(self)
}
fn to_html_with_buf(self, buf: &mut String, position: &mut Position) {
fn to_html_with_buf(
self,
buf: &mut String,
position: &mut Position,
escape: bool,
) {
// add a comment node to separate from previous sibling, if any
if matches!(position, Position::NextChildAfterText) {
buf.push_str("<!>")
}
buf.push_str(V);
if escape {
buf.push_str(&html_escape::encode_text(V));
} else {
buf.push_str(V);
}
*position = Position::NextChildAfterText;
}

44
tachys/src/view/strings.rs
View File

@ -53,13 +53,21 @@ where
self.len()
}
fn to_html_with_buf(self, buf: &mut String, position: &mut Position) {
fn to_html_with_buf(
self,
buf: &mut String,
position: &mut Position,
escape: bool,
) {
// add a comment node to separate from previous sibling, if any
if matches!(position, Position::NextChildAfterText) {
buf.push_str("<!>")
}
if self.is_empty() {
buf.push(' ');
} else if escape {
let escaped = html_escape::encode_text(self);
buf.push_str(&escaped);
} else {
buf.push_str(self);
}
@ -173,8 +181,18 @@ where
self.len()
}
fn to_html_with_buf(self, buf: &mut String, position: &mut Position) {
<&str as RenderHtml<R>>::to_html_with_buf(self.as_str(), buf, position)
fn to_html_with_buf(
self,
buf: &mut String,
position: &mut Position,
escape: bool,
) {
<&str as RenderHtml<R>>::to_html_with_buf(
self.as_str(),
buf,
position,
escape,
)
}
fn hydrate<const FROM_SERVER: bool>(
@ -263,7 +281,7 @@ where
self.len()
}
fn to_html_with_buf(self, buf: &mut String, position: &mut Position) {
fn to_html_with_buf(self, buf: &mut String, position: &mut Position, escape: bool) {
<&str as RenderHtml<R>>::to_html_with_buf(&self, buf, position)
}
@ -353,8 +371,13 @@ where
self.len()
}
fn to_html_with_buf(self, buf: &mut String, position: &mut Position) {
<&str as RenderHtml<R>>::to_html_with_buf(&self, buf, position)
fn to_html_with_buf(
self,
buf: &mut String,
position: &mut Position,
escape: bool,
) {
<&str as RenderHtml<R>>::to_html_with_buf(&self, buf, position, escape)
}
fn hydrate<const FROM_SERVER: bool>(
@ -443,8 +466,13 @@ where
self.len()
}
fn to_html_with_buf(self, buf: &mut String, position: &mut Position) {
<&str as RenderHtml<R>>::to_html_with_buf(&self, buf, position)
fn to_html_with_buf(
self,
buf: &mut String,
position: &mut Position,
escape: bool,
) {
<&str as RenderHtml<R>>::to_html_with_buf(&self, buf, position, escape)
}
fn hydrate<const FROM_SERVER: bool>(

9
tachys/src/view/template.rs
View File

@ -80,8 +80,13 @@ where
const MIN_LENGTH: usize = V::MIN_LENGTH;
fn to_html_with_buf(self, buf: &mut String, position: &mut Position) {
self.view.to_html_with_buf(buf, position)
fn to_html_with_buf(
self,
buf: &mut String,
position: &mut Position,
escape: bool,
) {
self.view.to_html_with_buf(buf, position, escape)
}
fn hydrate<const FROM_SERVER: bool>(

31
tachys/src/view/tuples.rs
View File

@ -27,7 +27,7 @@ where
const MIN_LENGTH: usize = 0;
fn to_html_with_buf(self, _buf: &mut String, _position: &mut Position) {}
fn to_html_with_buf(self, _buf: &mut String, _position: &mut Position, _escape: bool) {}
fn hydrate<const FROM_SERVER: bool>(
self,
@ -106,18 +106,21 @@ where
self.0.html_len()
}
fn to_html_with_buf(self, buf: &mut String, position: &mut Position) {
self.0.to_html_with_buf(buf, position);
fn to_html_with_buf(
self,
buf: &mut String,
position: &mut Position,
escape: bool,
) {
self.0.to_html_with_buf(buf, position, escape);
}
fn to_html_async_with_buf<const OUT_OF_ORDER: bool>(
self,
buf: &mut StreamBuilder,
position: &mut Position,
) where
buf: &mut StreamBuilder, position: &mut Position, escape: bool) where
Self: Sized,
{
self.0.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position);
self.0.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position, escape);
}
fn hydrate<const FROM_SERVER: bool>(
@ -218,24 +221,22 @@ macro_rules! impl_view_for_tuples {
$($ty.html_len() +)* $first.html_len()
}
fn to_html_with_buf(self, buf: &mut String, position: &mut Position) {
fn to_html_with_buf(self, buf: &mut String, position: &mut Position, escape: bool) {
#[allow(non_snake_case)]
let ($first, $($ty,)* ) = self;
$first.to_html_with_buf(buf, position);
$($ty.to_html_with_buf(buf, position));*
$first.to_html_with_buf(buf, position, escape);
$($ty.to_html_with_buf(buf, position, escape));*
}
fn to_html_async_with_buf<const OUT_OF_ORDER: bool>(
self,
buf: &mut StreamBuilder,
position: &mut Position,
) where
buf: &mut StreamBuilder, position: &mut Position, escape: bool) where
Self: Sized,
{
#[allow(non_snake_case)]
let ($first, $($ty,)* ) = self;
$first.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position);
$($ty.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position));*
$first.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position, escape);
$($ty.to_html_async_with_buf::<OUT_OF_ORDER>(buf, position, escape));*
}
fn hydrate<const FROM_SERVER: bool>(self, cursor: &Cursor<Rndr>, position: &PositionState) -> Self::State {