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

Fixed markdown white space issue.

This commit is contained in:
Samuel Guerra 2023-10-29 00:07:58 -03:00
parent b5897a2298
commit 9990a37352
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
TODO/Widgets.md
View File

@ -15,14 +15,13 @@ Widget that need to be implemented.
* Slider.
* ToolTip.
* Resize parent.
* Basic markdown view.
* Charts.
* Media (audio & video).
* Image effects.
* Markdown.
* Massive images (deep zoom).
* SVG images.
* Html (CSS, no Js).
* HTML (CSS, no Js).
* Full Markdown (HTML+CSS).
* Diagram editor.
* Rich text editor.
* Browser hosting.

1
TODO/_current.md
View File

@ -48,7 +48,6 @@
# Markdown/Scroll
* Markdown "can `inline`" does not render separated with space.
* Markdown scrolls on init if only focusable is not in view.
# Publish

19
zero-ui/src/widgets/markdown.rs
View File

@ -430,7 +430,7 @@ fn markdown_view_fn(md: &str) -> impl UiNode {
match WhiteSpace::MergeAll.transform(&txt) {
std::borrow::Cow::Borrowed(_) => {
if starts_with_space && last_txt_end != '\0' || !txt.is_empty() && last_txt_end.is_whitespace() {
txt.to_mut().insert(0, '\u{20}');
txt.to_mut().insert(0, ' ');
}
txt.end_mut();
last_txt_end = txt_end;
@ -439,7 +439,7 @@ fn markdown_view_fn(md: &str) -> impl UiNode {
txt = t;
if !txt.is_empty() {
if starts_with_space && last_txt_end != '\0' || !txt.is_empty() && last_txt_end.is_whitespace() {
txt.to_mut().insert(0, '\u{20}');
txt.to_mut().insert(0, ' ');
txt.end_mut();
}
last_txt_end = txt_end;
@ -468,6 +468,21 @@ fn markdown_view_fn(md: &str) -> impl UiNode {
}
Event::Code(txt) => {
let txt = html_escape::decode_html_entities(txt.as_ref());
if last_txt_end.is_whitespace() {
inlines.push(
text_view(TextFnArgs {
txt: ' '.into(),
style: MarkdownStyle {
strong: strong > 0,
emphasis: emphasis > 0,
strikethrough: strikethrough > 0,
},
})
.boxed(),
);
}
inlines.push(
code_inline_view(CodeInlineFnArgs {
txt: txt.to_text(),