dan/gpui-component
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

text_view: Fix HTML render to support blockquote. (#703)

Browse source 
<img width="850" alt="image"
src="https://github.com/user-attachments/assets/4d8f662f-aebe-4c40-bc56-828627f16064"
/>
This commit is contained in:
Jason Lee 2025-03-10 22:53:53 +08:00 committed by GitHub
parent 81e6da503b
commit 6a00cfcc4a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crates/story/examples/html.html
View file

@ -10,6 +10,12 @@
>, <strong>bold</strong>, <em>italic</em>, and
<code>code</code> text.
</p>
<p>This is a text before blockquote.</p>
<blockquote>
This is before paragraph in blockquote.
<p>This is a second blockquote paragraph.</p>
<p>This is after paragraph in blockquote.</p>
</blockquote>
<p>
<img
src="https://is1-ssl.mzstatic.com/image/thumb/avICmr1PbBRB-PAeplGreA/1378x774.jpg"

11
crates/ui/src/text/element.rs
View file

@ -602,14 +602,11 @@ impl Node {
match self {
Node::Root { children } => div()
.children({
let children_len = children.len();
children.into_iter().enumerate().map(move |(ix, c)| {
let is_last_child = ix == children_len - 1;
c.render(None, is_last_child, text_view_style, window, cx)
.children(
children.into_iter().map(move |c| {
c.render(None, false, text_view_style, window, cx)
})
})
)
.into_any_element(),
Node::Paragraph(paragraph) => div().mb(mb).child(paragraph).into_any_element(),
Node::Heading { level, children } => {

19
crates/ui/src/text/html.rs
View file

@ -499,6 +499,7 @@ fn parse_paragraph(
title: title.map(Into::into),
});
}
_ => {
// All unknown tags to as text
let mut child_paragraph = Paragraph::default();
@ -697,6 +698,24 @@ fn parse_node(node: &Rc<Node>, paragraph: &mut Paragraph) -> element::Node {
table
}
}
local_name!("blockquote") => {
let mut children = vec![];
if !paragraph.is_empty() {
children.push(element::Node::Paragraph(paragraph.clone()));
paragraph.clear();
}
let mut blockquote = Paragraph::default();
for (i, child) in node.children.borrow().iter().enumerate() {
if i > 0 {
blockquote.push_str("\n");
}
parse_paragraph(&mut blockquote, child);
}
children.push(element::Node::Blockquote(blockquote));
element::Node::Root { children: children }
}
_ => {
if BLOCK_ELEMENTS.contains(&name.local.trim()) {
let mut children: Vec<element::Node> = vec![];