Skip to content

Commit

Permalink
🎨 Protyle HTML 块改进 siyuan-note/siyuan#4742
Browse files Browse the repository at this point in the history
  • Loading branch information
@88250
88250 committed May 2, 2022
1 parent af3aefd commit ff77727
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion javascript/lute.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion javascript/lute.min.js.map
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion protyle.go
View file
Expand Up @@ -819,7 +819,7 @@ func (lute *Lute) genASTByBlockDOM(n *html.Node, tree *parse.Tree) {
defer tree.Context.ParentTip()
case ast.NodeHTMLBlock:
node.Type = ast.NodeHTMLBlock
content := lute.domAttrValue(n.FirstChild.FirstChild, "data-content")
content := lute.domAttrValue(n.FirstChild.NextSibling.FirstChild, "data-content")
content = html.UnescapeHTMLStr(content)
node.Tokens = util.StrToBytes(content)
tree.Context.Tip.AppendChild(node)
Expand Down
2 changes: 1 addition & 1 deletion test/spin_block_test.go
View file
Expand Up @@ -25,7 +25,7 @@ var spinBlockDOMTests = []*parseTest{
{"121", "<div data-node-id=\"20220409234837-m3ujc92\" data-node-index=\"0\" data-type=\"NodeParagraph\" class=\"p\" updated=\"20220409235956\"><div contenteditable=\"true\" spellcheck=\"false\">1<code>​<wbr></code></div><div class=\"protyle-attr\" contenteditable=\"false\">​</div></div>", "<div data-node-id=\"20220409234837-m3ujc92\" data-node-index=\"1\" data-type=\"NodeParagraph\" class=\"p\" updated=\"20220409235956\"><div contenteditable=\"true\" spellcheck=\"false\">1<wbr></div><div class=\"protyle-attr\" contenteditable=\"false\">\u200b</div></div>"},
{"120", "<div data-node-id=\"20220326104224-xo18oem\" data-node-index=\"1\" data-type=\"NodeParagraph\" class=\"p\" updated=\"20220326104333\"><div contenteditable=\"true\" spellcheck=\"false\"><span data-type=\"block-ref\" data-subtype=\"s\" data-id=\"20211226121831-ppl9gr8\">\n<wbr>foo</span></div><div class=\"protyle-attr\" contenteditable=\"false\">\u200b</div></div>", "<div data-node-id=\"20220326104224-xo18oem\" data-node-index=\"1\" data-type=\"NodeParagraph\" class=\"p\" updated=\"20220326104333\"><div contenteditable=\"true\" spellcheck=\"false\"><span data-type=\"block-ref\" data-subtype=\"s\" data-id=\"20211226121831-ppl9gr8\"><wbr>foo</span></div><div class=\"protyle-attr\" contenteditable=\"false\">\u200b</div></div>"},
{"119", "<div data-node-id=\"20220323092551-0pizg1y\" data-node-index=\"3\" data-type=\"NodeTable\" class=\"table\" colgroup=\"\" updated=\"20220323093033\"><div contenteditable=\"false\"><table contenteditable=\"true\" spellcheck=\"false\"></table><div class=\"protyle-action__table\"><div class=\"table__resize\" data-col-index=\"0\" style=\"height:36px;left: 48px;display:block\"></div><div class=\"table__select\"></div></div></div><div class=\"protyle-attr\" contenteditable=\"false\">\u200b</div></div>", "<div data-node-id=\"20220323092551-0pizg1y\" data-node-index=\"1\" data-type=\"NodeParagraph\" class=\"p\" updated=\"20220323093033\"><div contenteditable=\"true\" spellcheck=\"false\"></div><div class=\"protyle-attr\" contenteditable=\"false\">\u200b</div></div>"},
{"118", "<div data-node-id=\"20220312000656-2kshb2z\" data-node-index=\"1\" data-type=\"NodeHTMLBlock\" class=\"render-node\" updated=\"20220312000749\" data-subtype=\"block\"><div><protyle-html data-content=\"<div>\"></protyle-html><span style=\"position: absolute\">​</span></div><div class=\"protyle-attr\" contenteditable=\"false\">\u200b</div></div>", "<div data-node-id=\"20220312000656-2kshb2z\" data-node-index=\"1\" data-type=\"NodeHTMLBlock\" class=\"render-node\" updated=\"20220312000749\" data-subtype=\"block\"><div class=\"protyle-icons\"><span class=\"protyle-icon protyle-icon--first protyle-action__edit\"><svg><use xlink:href=\"#iconEdit\"></use></svg></span><span class=\"protyle-icon protyle-action__menu protyle-icon--last\"><svg><use xlink:href=\"#iconMore\"></use></svg></span></div><div><protyle-html data-content=\"&lt;div&gt;\"></protyle-html><span style=\"position: absolute\">\u200b</span></div><div class=\"protyle-attr\" contenteditable=\"false\">\u200b</div></div>"},
{"118", "<div data-node-id=\"20220312000656-2kshb2z\" data-node-index=\"1\" data-type=\"NodeHTMLBlock\" class=\"render-node\" updated=\"20220312000749\" data-subtype=\"block\"><div class=\"protyle-icons\"><span class=\"protyle-icon protyle-icon--first protyle-action__edit\"><svg><use xlink:href=\"#iconEdit\"></use></svg></span><span class=\"protyle-icon protyle-action__menu protyle-icon--last\"><svg><use xlink:href=\"#iconMore\"></use></svg></span></div><div><protyle-html data-content=\"&lt;div&gt;\"></protyle-html><span style=\"position: absolute\">\u200b</span></div><div class=\"protyle-attr\" contenteditable=\"false\">\u200b</div></div>", "<div data-node-id=\"20220312000656-2kshb2z\" data-node-index=\"1\" data-type=\"NodeHTMLBlock\" class=\"render-node\" updated=\"20220312000749\" data-subtype=\"block\"><div class=\"protyle-icons\"><span class=\"protyle-icon protyle-icon--first protyle-action__edit\"><svg><use xlink:href=\"#iconEdit\"></use></svg></span><span class=\"protyle-icon protyle-action__menu protyle-icon--last\"><svg><use xlink:href=\"#iconMore\"></use></svg></span></div><div><protyle-html data-content=\"&lt;div&gt;\"></protyle-html><span style=\"position: absolute\">\u200b</span></div><div class=\"protyle-attr\" contenteditable=\"false\">\u200b</div></div>"},
{"117", "<div data-node-id=\"20220306183943-dyqi68d\" data-node-index=\"10\" data-type=\"NodeParagraph\" class=\"p\" updated=\"20220306184057\"><div contenteditable=\"true\" spellcheck=\"false\"><kbd><wbr></kbd></div><div class=\"protyle-attr\" contenteditable=\"false\">\u200b</div></div>", "<div data-node-id=\"20220306183943-dyqi68d\" data-node-index=\"1\" data-type=\"NodeParagraph\" class=\"p\" updated=\"20220306184057\"><div contenteditable=\"true\" spellcheck=\"false\"><wbr></div><div class=\"protyle-attr\" contenteditable=\"false\">\u200b</div></div>"},
{"116", "<div data-node-id=\"20220219105313-86cs7qs\" data-node-index=\"1\" data-type=\"NodeTable\" class=\"table\" updated=\"20220219235656\" colgroup=\"\"><div contenteditable=\"true\" spellcheck=\"false\"><table><colgroup><col></colgroup><thead><tr><th>foo</th></tr></thead><tbody><tr><td>bar{: colspan=\"2\" rowspan=\"1\"}baz<wbr></td></tr></tbody></table><div class=\"protyle-action__table\"><div class=\"table__resize\" data-col-index=\"0\" style=\"height:71px;left: 42px;display:block\"></div><div class=\"table__select\"></div></div></div><div class=\"protyle-attr\" contenteditable=\"false\">\u200b</div></div>", "<div data-node-id=\"20220219105313-86cs7qs\" data-node-index=\"1\" data-type=\"NodeTable\" class=\"table\" updated=\"20220219235656\" colgroup=\"\"><div contenteditable=\"false\"><table contenteditable=\"true\" spellcheck=\"false\"><colgroup><col /></colgroup><thead><tr><th>foo</th></tr></thead><tbody><tr><td>bar{: colspan=&quot;2&quot; rowspan=&quot;1&quot;}baz<wbr></td></tr></tbody></table><div class=\"protyle-action__table\"><div class=\"table__resize\"></div><div class=\"table__select\"></div></div></div><div class=\"protyle-attr\" contenteditable=\"false\">\u200b</div></div>"},
{"115", "<div data-node-id=\"20220217221445-se4e4kf\" data-node-index=\"1\" data-type=\"NodeTable\" class=\"table\" updated=\"20220217221504\" colgroup=\"||\"><div contenteditable=\"true\" spellcheck=\"false\"><table><colgroup><col><col><col></colgroup><thead><tr><th colspan=\"1\" rowspan=\"3\">col1<br></th><th>col2</th><th>col3</th></tr><tr><th class=\"fn__none\"></th><th>f<wbr></th><th></th></tr><tr><th class=\"fn__none\"></th><th></th><th></th></tr></thead></table><div class=\"protyle-action__table\"><div class=\"table__resize\" data-col-index=\"1\" style=\"height:106px;left: 98px;display:block\"></div><div class=\"table__select\"></div></div></div><div class=\"protyle-attr\" contenteditable=\"false\">\u200b</div></div>", "<div data-node-id=\"20220217221445-se4e4kf\" data-node-index=\"1\" data-type=\"NodeTable\" class=\"table\" updated=\"20220217221504\" colgroup=\"||\"><div contenteditable=\"false\"><table contenteditable=\"true\" spellcheck=\"false\"><colgroup><col /><col /><col /></colgroup><thead><tr><th colspan=\"1\" rowspan=\"3\">col1<br /></th><th>col2</th><th>col3</th></tr><tr><th class=\"fn__none\"></th><th>f<wbr></th><th></th></tr><tr><th class=\"fn__none\"></th><th></th><th></th></tr></thead><tbody></tbody></table><div class=\"protyle-action__table\"><div class=\"table__resize\"></div><div class=\"table__select\"></div></div></div><div class=\"protyle-attr\" contenteditable=\"false\">\u200b</div></div>"},
Expand Down

0 comments on commit ff77727

Please sign in to comment.