From 8cfe987d8258c041b89405c5b314d4c2d097ba82 Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Thu, 5 Jun 2025 18:07:04 +0800
Subject: [PATCH] :art: https://github.com/siyuan-note/siyuan/issues/14965

---
 app/src/protyle/util/insertHTML.ts | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/src/protyle/util/insertHTML.ts b/app/src/protyle/util/insertHTML.ts
index 287f42733..a7c394dbf 100644
--- a/app/src/protyle/util/insertHTML.ts
+++ b/app/src/protyle/util/insertHTML.ts
@@ -290,7 +290,8 @@ export const insertHTML = (html: string, protyle: IProtyle, isBlock = false,
     let id = blockElement.getAttribute("data-node-id");
     range.insertNode(document.createElement("wbr"));
     let oldHTML = blockElement.outerHTML;
-    const isNodeCodeBlock = blockElement.getAttribute("data-type") === "NodeCodeBlock";
+    const type = blockElement.getAttribute("data-type");
+    const isNodeCodeBlock = type === "NodeCodeBlock";
     const editableElement = getContenteditableElement(blockElement);
     if (!isBlock &&
         (isNodeCodeBlock || protyle.toolbar.getCurrentType(range).includes("code"))) {
@@ -348,8 +349,9 @@ export const insertHTML = (html: string, protyle: IProtyle, isBlock = false,
     }
     const tempElement = document.createElement("template");
 
-    // https://github.com/siyuan-note/siyuan/issues/14162
-    if (html.startsWith("&gt;") && editableElement.textContent.replace(Constants.ZWSP, "") !== "") {
+    // https://github.com/siyuan-note/siyuan/issues/14162 & https://github.com/siyuan-note/siyuan/issues/14162
+    if (/^\s*&gt;|\*|-|\+|\d*.|\[ \]|[x]/.test(html) &&
+        editableElement.textContent.replace(Constants.ZWSP, "") !== "") {
         unSpinHTML = html;
     }
 
@@ -360,19 +362,22 @@ export const insertHTML = (html: string, protyle: IProtyle, isBlock = false,
     innerHTML = innerHTML.replace(/;;;lt;;;/g, "&lt;").replace(/;;;gt;;;/g, "&gt;");
     tempElement.innerHTML = innerHTML;
 
-    // https://github.com/siyuan-note/siyuan/issues/14114
-    let heading2text = false;
-    if ((editableElement.textContent.replace(Constants.ZWSP, "") !== "" || blockElement.getAttribute("data-type") === "NodeHeading") &&
+    let block2text = false;
+    if ((
+            editableElement.textContent.replace(Constants.ZWSP, "") !== "" ||
+            type === "NodeHeading"
+        ) &&
         tempElement.content.childElementCount === 1 &&
         tempElement.content.firstChild.nodeType !== 3 &&
         tempElement.content.firstElementChild.getAttribute("data-type") === "NodeHeading") {
+        // https://github.com/siyuan-note/siyuan/issues/14114
         isBlock = false;
-        heading2text = true;
+        block2text = true;
     }
 
     // 使用 lute 方法会添加 p 元素，只有一个 p 元素或者只有一个字符串或者为 <u>b</u> 时的时候只拷贝内部
     if (!isBlock) {
-        if (tempElement.content.firstChild.nodeType === 3 || heading2text ||
+        if (tempElement.content.firstChild.nodeType === 3 || block2text ||
             (tempElement.content.firstChild.nodeType !== 3 &&
                 ((tempElement.content.firstElementChild.classList.contains("p") && tempElement.content.childElementCount === 1) ||
                     tempElement.content.firstElementChild.tagName !== "DIV"))) {