Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-14 20:58:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 Fix code block copy issue with ZWJ https://github.com/siyuan-note/siyuan/issues/14800 (#16770)

Browse source
This commit is contained in:
Jeffrey Chen 2026-01-04 21:06:00 +08:00 • committed by GitHub
parent 27810da357
commit 12456ce23a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/boot/globalEvent/click.ts
View file

@ -43,6 +43,8 @@ export const globalClick = (event: MouseEvent & { target: HTMLElement }) => {
if (copyElement) {
let text = copyElement.parentElement.nextElementSibling.textContent.replace(/\n$/, "");
text = text.replace(/\u00A0/g, " "); // Replace non-breaking spaces with normal spaces when copying https://github.com/siyuan-note/siyuan/issues/9382
// https://github.com/siyuan-note/siyuan/issues/14800
text = text.replace(/\u200D```/g, "```");
writeText(text);
showMessage(window.siyuan.languages.copied, 2000);
event.preventDefault();

4
app/src/protyle/export/index.ts
View file

@ -51,7 +51,7 @@ export const saveExport = (option: IExportOptions) => {
}, zipResponse => {
hideMessage(msgId);
if (zipResponse.code === -1) {
showMessage(window.siyuan.languages._kernel[14] + ": " + zipResponse.msg, 0, "error");
showMessage(window.siyuan.languages._kernel[14].replace("%s", zipResponse.msg), 0, "error");
return;
}
window.open(zipResponse.data.zip);
@ -532,6 +532,7 @@ ${getIconScript(servePath)}
} else if (target.classList.contains("protyle-action__copy")) {
let text = target.parentElement.nextElementSibling.textContent.trimEnd();
text = text.replace(/\u00A0/g, " "); // Replace non-breaking spaces with normal spaces when copying https://github.com/siyuan-note/siyuan/issues/9382
text = text.replace(/\u200D\`\`\`/g, "\`\`\`");
navigator.clipboard.writeText(text);
event.preventDefault();
event.stopPropagation();
@ -825,6 +826,7 @@ ${getIconScript(servePath)}
item.addEventListener("click", (event) => {
let text = item.parentElement.nextElementSibling.textContent.trimEnd();
text = text.replace(/\u00A0/g, " "); // Replace non-breaking spaces with normal spaces when copying
text = text.replace(/\u200D\`\`\`/g, "\`\`\`");
navigator.clipboard.writeText(text);
event.preventDefault();
event.stopPropagation();

12
app/src/protyle/gutter/index.ts
View file

@ -773,7 +773,10 @@ export class Gutter {
selectsElement.forEach((item: HTMLElement) => {
html += getPlainText(item) + "\n";
});
copyPlainText(html.trimEnd());
let plainText = html.trimEnd();
// https://github.com/siyuan-note/siyuan/issues/14800
plainText = plainText.replace(/\u200D```/g, "```");
copyPlainText(plainText);
focusBlock(selectsElement[0]);
}
}, {
@ -1344,7 +1347,12 @@ export class Gutter {
label: window.siyuan.languages.copyPlainText,
accelerator: window.siyuan.config.keymap.editor.general.copyPlainText.custom,
click() {
copyPlainText(getPlainText(nodeElement as HTMLElement).trimEnd());
let plainText = getPlainText(nodeElement as HTMLElement).trimEnd();
if (type === "NodeCodeBlock") {
// https://github.com/siyuan-note/siyuan/issues/14800
plainText = plainText.replace(/\u200D```/g, "```");
}
copyPlainText(plainText);
focusBlock(nodeElement);
}
}, {

12
app/src/protyle/util/paste.ts
View file

@ -159,7 +159,7 @@ export const pasteAsPlainText = async (protyle: IProtyle) => {
if (getSelection().rangeCount > 0) {
const range = getSelection().getRangeAt(0);
if (hasClosestByAttribute(range.startContainer, "data-type", "code") || hasClosestByClassName(range.startContainer, "hljs")) {
insertHTML(textPlain.replace(/\u200D```/g, "```").replace(/```/g, "\u200D```"), protyle);
insertHTML(textPlain.replace(/```/g, "\u200D```"), protyle);
return;
}
}
@ -361,7 +361,7 @@ export const paste = async (protyle: IProtyle, event: (ClipboardEvent | DragEven
if (nodeElement.getAttribute("data-type") === "NodeCodeBlock" ||
protyle.toolbar.getCurrentType(range).includes("code")) {
// https://github.com/siyuan-note/siyuan/issues/13552
insertHTML(textPlain.replace(/\u200D```/g, "```").replace(/```/g, "\u200D```"), protyle);
insertHTML(textPlain.replace(/```/g, "\u200D```"), protyle);
return;
} else if (siyuanHTML) {
// 编辑器内部粘贴
@ -439,10 +439,6 @@ export const paste = async (protyle: IProtyle, event: (ClipboardEvent | DragEven
// 复制 HTML 块粘贴出来的不是 HTML 块 https://github.com/siyuan-note/siyuan/issues/12994
tempInnerHTML = Lute.UnEscapeHTMLStr(tempInnerHTML);
}
// https://github.com/siyuan-note/siyuan/issues/13552
tempInnerHTML = tempInnerHTML.replace(/\u200D```/g, "```");
insertHTML(tempInnerHTML, protyle, isBlock, false, true);
}
blockRender(protyle, protyle.wysiwyg.element);
@ -588,10 +584,6 @@ export const paste = async (protyle: IProtyle, event: (ClipboardEvent | DragEven
}
}
}
// https://github.com/siyuan-note/siyuan/issues/13552
textPlain = textPlain.replace(/\u200D```/g, "```");
const textPlainDom = protyle.lute.Md2BlockDOM(textPlain);
insertHTML(textPlainDom, protyle, false, false, true);
}

4
app/src/protyle/wysiwyg/index.ts
View file

@ -469,6 +469,8 @@ export class WYSIWYG {
if (isEndOfBlock(range)) {
textPlain = textPlain.replace(/\n$/, "");
}
// https://github.com/siyuan-note/siyuan/issues/14800
textPlain = textPlain.replace(/\u200D```/g, "```");
isInCodeBlock = true;
} else if (hasClosestByTag(range.startContainer, "TD") || hasClosestByTag(range.startContainer, "TH")) {
tempElement.innerHTML = tempElement.innerHTML.replace(/<br>/g, "\n").replace(/<br\/>/g, "\n");
@ -2041,6 +2043,8 @@ export class WYSIWYG {
if (hasClosestByAttribute(range.startContainer, "data-type", "NodeCodeBlock") ||
hasClosestByTag(range.startContainer, "CODE")) {
textPlain = tempElement.textContent.replace(Constants.ZWSP, "");
// https://github.com/siyuan-note/siyuan/issues/14800
textPlain = textPlain.replace(/\u200D```/g, "```");
isInCodeBlock = true;
}
// https://github.com/siyuan-note/siyuan/issues/4321