Skip to content

fix: include nested callout content in html export #8738

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
mturac wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: include nested callout content in html export #8738

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions frontend/rust-lib/flowy-document/src/parser/parser_entities.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ impl NestedBlock {
// <aside>😁Hello</aside>
CALLOUT => {
html.push_str(&format!(
"<{}>{}{}</{}>",
"<{}>{}{}",
ASIDE_TAG_NAME,
self
.data
Expand All @@ -327,8 +327,11 @@ impl NestedBlock {
.to_string()
.trim_matches('\"'),
text_html,
ASIDE_TAG_NAME
));
html.push_str(&convert_nested_block_children_to_html(Arc::new(
self.to_owned(),
)));
html.push_str(&format!("</{}>", ASIDE_TAG_NAME));
},
// <img src="https://www.google.com/images/branding/googlelogo/2x/googlelogo_color_272x92dp.png" alt="Google Logo" />
IMAGE => {
Expand Down
1 change: 1 addition & 0 deletions frontend/rust-lib/flowy-document/tests/assets/html/callout_nested.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<meta charset="UTF-8"><aside>📌<p>CALLOUT 1</p></aside>
24 changes: 24 additions & 0 deletions frontend/rust-lib/flowy-document/tests/assets/json/callout_nested.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"type": "page",
"data": {},
"children": [
{
"type": "callout",
"data": {
"icon": "📌"
},
"children": [
{
"type": "paragraph",
"data": {
"delta": [
{
"insert": "CALLOUT 1"
}
]
}
}
]
}
]
}
2 changes: 2 additions & 0 deletions frontend/rust-lib/flowy-document/tests/assets/text/callout_nested.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
📌
CALLOUT 1
1 change: 1 addition & 0 deletions frontend/rust-lib/flowy-document/tests/parser/parse_to_html_text/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ async fn block_tests() {
let test_cases = generate_test_cases!(
heading,
callout,
callout_nested,
paragraph,
divider,
image,
Expand Down
Loading