🎨 Protyle improve merging the same elements siyuan-note/siyuan#13619

88250 · Dec 26, 2024 · 62695d4 · 62695d4
1 parent 996f9fa
commit 62695d4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/javascript/lute.min.js b/javascript/lute.min.js
diff --git a/javascript/lute.min.js.map b/javascript/lute.min.js.map
diff --git a/protyle.go b/protyle.go
@@ -352,9 +352,10 @@ func (lute *Lute) MergeSameTextMark(n *ast.Node) {
 
 		mergeWithIAL = true
 	} else {
+		previewText := n.Previous.TokensStr()
 		if ast.NodeText == n.Previous.Type &&
-			!strings.Contains(n.Previous.TokensStr(), " ") && !strings.Contains(n.Previous.TokensStr(), "\n") &&
-			"" == strings.TrimSpace(strings.ReplaceAll(strings.ReplaceAll(n.Previous.TokensStr(), editor.Zwsp, ""), editor.Caret, "")) &&
+			!strings.Contains(previewText, "　") && !strings.Contains(previewText, " ") && !strings.Contains(previewText, "\n") && !strings.Contains(previewText, "\t") &&
+			"" == strings.TrimSpace(strings.ReplaceAll(strings.ReplaceAll(previewText, editor.Zwsp, ""), editor.Caret, "")) &&
 			nil != n.Previous.Previous && n.IsSameTextMarkType(n.Previous.Previous) {
 			mergeWithZwsp = true
 		} else {

diff --git a/test/spin_block_test.go b/test/spin_block_test.go
@@ -19,6 +19,7 @@ import (
 
 var spinBlockDOMTests = []*parseTest{
 
+	{"241", "<div data-node-id=\"20241226205012-1a6gsxg\" data-type=\"NodeParagraph\" class=\"p\" updated=\"20241226205141\"><div contenteditable=\"true\" spellcheck=\"false\">1 <span data-type=\"strong\">2</span>　<span data-type=\"strong\">3</span>　4 <wbr></div><div class=\"protyle-attr\" contenteditable=\"false\"></div></div>", "<div data-node-id=\"20241226205012-1a6gsxg\" data-node-index=\"1\" data-type=\"NodeParagraph\" class=\"p\" updated=\"20241226205141\"><div contenteditable=\"true\" spellcheck=\"false\">1 <span data-type=\"strong\">2</span>\u3000<span data-type=\"strong\">3</span>\u30004 <wbr></div><div class=\"protyle-attr\" contenteditable=\"false\">\u200b</div></div>"},
 	{"240", "<div data-node-id=\"20241217101900-0lfsuso\" data-node-index=\"1\" data-type=\"NodeCodeBlock\" class=\"code-block\" updated=\"20241217102406\"><div class=\"protyle-action\"><span class=\"protyle-action--first protyle-action__language\" contenteditable=\"false\"></span><span class=\"fn__flex-1\"></span><span class=\"b3-tooltips__nw b3-tooltips protyle-icon protyle-icon--first protyle-action__copy\" aria-label=\"复制\"><svg><use xlink:href=\"#iconCopy\"></use></svg></span><span class=\"b3-tooltips__nw b3-tooltips protyle-icon protyle-icon--last protyle-action__menu\" aria-label=\"更多\"><svg><use xlink:href=\"#iconMore\"></use></svg></span></div><div class=\"hljs\" style=\"display: block;\"><div class=\"fn__none\"></div><div contenteditable=\"true\" style=\"flex: 1 1 0%; white-space: pre; word-break: initial; font-variant-ligatures: none;\" spellcheck=\"false\">👩‍❤️‍💋‍👨<wbr>\n</div></div><div class=\"protyle-attr\" contenteditable=\"false\"></div></div>", "<div data-node-id=\"20241217101900-0lfsuso\" data-node-index=\"1\" data-type=\"NodeCodeBlock\" class=\"code-block\" updated=\"20241217102406\"><div class=\"protyle-action\"><span class=\"protyle-action--first protyle-action__language\" contenteditable=\"false\"></span><span class=\"fn__flex-1\"></span><span class=\"b3-tooltips__nw b3-tooltips protyle-icon protyle-icon--first protyle-action__copy\"><svg><use xlink:href=\"#iconCopy\"></use></svg></span><span class=\"b3-tooltips__nw b3-tooltips protyle-icon protyle-icon--last protyle-action__menu\"><svg><use xlink:href=\"#iconMore\"></use></svg></span></div><div class=\"hljs\"><div></div><div contenteditable=\"true\" style=\"flex: 1\" spellcheck=\"false\">👩\u200d❤️\u200d💋\u200d👨<wbr>\n</div></div><div class=\"protyle-attr\" contenteditable=\"false\">\u200b</div></div>"},
 	{"239", "<div data-node-id=\"20241216215356-8csb7bj\" data-node-index=\"1\" data-type=\"NodeParagraph\" class=\"p\" updated=\"20241216215405\"><div contenteditable=\"true\" spellcheck=\"false\"><span contenteditable=\"false\" data-type=\"img\" class=\"img\"><span> </span><span><span class=\"protyle-action protyle-icons\"><span class=\"protyle-icon protyle-icon--only\"><svg class=\"svg\"><use xlink:href=\"#iconMore\"></use></svg></span></span><img src=\" assets/image-20241216215356-kcrpglk.png\" data-src=\" assets/image-20241216215356-kcrpglk.png\" loading=\"lazy\" alt=\"image\"><span class=\"protyle-action__drag\"></span><span class=\"img__net\"><svg><use xlink:href=\"#iconLanguage\"></use></svg></span><span class=\"protyle-action__title\"><span></span></span></span><span> </span></span></div><div class=\"protyle-attr\" contenteditable=\"false\"></div></div>", "<div data-node-id=\"20241216215356-8csb7bj\" data-node-index=\"1\" data-type=\"NodeParagraph\" class=\"p\" updated=\"20241216215405\"><div contenteditable=\"true\" spellcheck=\"false\">\u200b<span contenteditable=\"false\" data-type=\"img\" class=\"img\"><span> </span><span><span class=\"protyle-action protyle-icons\"><span class=\"protyle-icon protyle-icon--only\"><svg class=\"svg\"><use xlink:href=\"#iconMore\"></use></svg></span></span><img src=\"assets/image-20241216215356-kcrpglk.png\" data-src=\"assets/image-20241216215356-kcrpglk.png\" loading=\"lazy\" alt=\"image\" /><span class=\"protyle-action__drag\"></span><span class=\"protyle-action__title\"><span></span></span></span><span> </span></span>\u200b</div><div class=\"protyle-attr\" contenteditable=\"false\">\u200b</div></div>"},
 	{"238", "<div data-node-id=\"20241211073144-72jsrs1\" data-node-index=\"1\" data-type=\"NodeParagraph\" class=\"p\" updated=\"20241211073144\"><div contenteditable=\"true\" spellcheck=\"true\">&lt;span data-type=&quot;text&quot; style=&quot;text-emphasis-style: dot; text-emphasis-position: under;&quot;&gt;着重符号&lt;span&gt; <span data-type=\"block-ref\" data-subtype=\"s\" data-id=\"20241210194444-oqwwntf\">*</span></div><div class=\"protyle-attr\" contenteditable=\"false\"></div></div>", "<div data-node-id=\"20241211073144-72jsrs1\" data-node-index=\"1\" data-type=\"NodeParagraph\" class=\"p\" updated=\"20241211073144\"><div contenteditable=\"true\" spellcheck=\"false\">&lt;span data-type=&quot;text&quot; style=&quot;text-emphasis-style: dot; text-emphasis-position: under;&quot;&gt; 着重符号 &lt;span&gt; <span data-type=\"block-ref\" data-subtype=\"s\" data-id=\"20241210194444-oqwwntf\">*</span></div><div class=\"protyle-attr\" contenteditable=\"false\">\u200b</div></div>"},