✨ siyuan-note#2911 粘贴带样式的行内元素到另一个行内元素中需进行切割

leolee9086 · Oct 4, 2022 · f5ce687 · f5ce687
1 parent b9855c1
commit f5ce687
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git 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
@@ -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);
         });