From f5ce6872866080346e084e7d575401217319a509 Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Fri, 16 Sep 2022 16:45:09 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20https://github.com/siyuan-note/siy?=
 =?UTF-8?q?uan/issues/2911=20=E7=B2=98=E8=B4=B4=E5=B8=A6=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E7=9A=84=E8=A1=8C=E5=86=85=E5=85=83=E7=B4=A0=E5=88=B0=E5=8F=A6?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E8=A1=8C=E5=86=85=E5=85=83=E7=B4=A0=E4=B8=AD?=
 =?UTF-8?q?=E9=9C=80=E8=BF=9B=E8=A1=8C=E5=88=87=E5=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/protyle/util/insertHTML.ts | 14 ++++++++++++++
 app/src/protyle/wysiwyg/index.ts   | 15 ---------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/app/src/protyle/util/insertHTML.ts b/app/src/protyle/util/insertHTML.ts
index e519633f9de..d832657a8ff 100644
--- a/app/src/protyle/util/insertHTML.ts
+++ b/app/src/protyle/util/insertHTML.ts
@@ -87,6 +87,20 @@ export const insertHTML = (html: string, protyle: IProtyle, isBlock = false) =>
             if (tempElement.content.firstChild.nodeType !== 3 && tempElement.content.firstElementChild.classList.contains("p")) {
                 tempElement.innerHTML = tempElement.content.firstElementChild.firstElementChild.innerHTML.trim();
             }
+            // 粘贴带样式的行内元素到另一个行内元素中需进行切割
+            const spanElement = range.startContainer.nodeType === 3 ? range.startContainer.parentElement: range.startContainer as HTMLElement;
+            if (spanElement.tagName === "SPAN" && spanElement.isSameNode( range.endContainer.nodeType === 3 ? range.endContainer.parentElement: range.endContainer)) {
+                const afterElement = document.createElement("span");
+                const attributes = spanElement.attributes;
+                for (let i = 0; i < attributes.length; i++) {
+                    afterElement.setAttribute(attributes[i].name, attributes[i].value);
+                }
+                range.setEnd(spanElement.lastChild, spanElement.lastChild.textContent.length);
+                afterElement.append(range.extractContents());
+                spanElement.after(afterElement);
+                range.setStartBefore(afterElement);
+                range.collapse(true);
+            }
             range.insertNode(tempElement.content.cloneNode(true));
             range.collapse(false);
             blockElement.setAttribute("updated", dayjs().format("YYYYMMDDHHmmss"));
diff --git a/app/src/protyle/wysiwyg/index.ts b/app/src/protyle/wysiwyg/index.ts
index 5bf14f793c2..7c394ff9cf7 100644
--- a/app/src/protyle/wysiwyg/index.ts
+++ b/app/src/protyle/wysiwyg/index.ts
@@ -1211,21 +1211,6 @@ export class WYSIWYG {
                 event.stopPropagation();
                 return;
             }
-            const range = getEditorRange(this.element);
-            // https://github.com/siyuan-note/siyuan/issues/3257
-            if (range.toString() === "" && range.startContainer.nodeType === 3 && !protyle.toolbar.isNewEmptyInline &&
-                // https://github.com/siyuan-note/siyuan/issues/4118
-                range.startOffset >= range.startContainer.textContent.length &&
-                protyle.toolbar.getCurrentType(range).length > 0) {
-                // 粗体等行内元素粘贴
-                if (!hasNextSibling(range.startContainer)) {
-                    range.setEndAfter(range.startContainer.parentElement);
-                    range.collapse(false);
-                } else if (!hasPreviousSibling(range.startContainer)) {
-                    range.setStartBefore(range.startContainer.parentElement);
-                    range.collapse(true);
-                }
-            }
             paste(protyle, event);
         });