github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-19 10:30:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

🐛 fix https://github.com/siyuan-note/siyuan/issues/6126

Browse Source
This commit is contained in:
Vanessa 2022-10-10 10:25:44 +08:00
parent 8c32785367
commit 7df95e03b2
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/protyle/wysiwyg/keydown.ts
View File

@ -680,6 +680,12 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
const selectText = range.toString(); const selectText = range.toString();
// 删除，不可使用 !isCtrl(event)，否则软删除回导致 https://github.com/siyuan-note/siyuan/issues/5607 // 删除，不可使用 !isCtrl(event)，否则软删除回导致 https://github.com/siyuan-note/siyuan/issues/5607
if (!event.altKey && !event.shiftKey && (event.key === "Backspace" || event.key === "Delete")) { if (!event.altKey && !event.shiftKey && (event.key === "Backspace" || event.key === "Delete")) {
if (protyle.wysiwyg.element.querySelector(".protyle-wysiwyg--select")) {
removeBlock(protyle, nodeElement, range);
event.stopPropagation();
event.preventDefault();
return;
}
// https://github.com/siyuan-note/siyuan/issues/5547 // https://github.com/siyuan-note/siyuan/issues/5547
const previousSibling = hasPreviousSibling(range.startContainer) as HTMLElement; const previousSibling = hasPreviousSibling(range.startContainer) as HTMLElement;
if (range.startOffset === 1 && range.startContainer.textContent === Constants.ZWSP && if (range.startOffset === 1 && range.startContainer.textContent === Constants.ZWSP &&
@ -712,7 +718,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
} }
// 光标位于转义符前 F5 后，rang 和点击后的不同，也需进行判断 // 光标位于转义符前 F5 后，rang 和点击后的不同，也需进行判断
if (range.startOffset === 1 && range.startContainer.nodeType !== 3 && if (range.startOffset === 1 && range.startContainer.nodeType !== 3 &&
range.startContainer.parentElement.getAttribute("data-type").indexOf("backslash") > -1 && range.startContainer.parentElement.getAttribute("data-type")?.indexOf("backslash") > -1 &&
!hasPreviousSibling(range.startContainer.parentElement)) { !hasPreviousSibling(range.startContainer.parentElement)) {
range.setStartBefore(range.startContainer.parentElement); range.setStartBefore(range.startContainer.parentElement);
removeBlock(protyle, nodeElement, range); removeBlock(protyle, nodeElement, range);
@ -721,12 +727,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
return; return;
} }
const imgSelectElement = protyle.wysiwyg.element.querySelector(".img--select"); const imgSelectElement = protyle.wysiwyg.element.querySelector(".img--select");
if (protyle.wysiwyg.element.querySelector(".protyle-wysiwyg--select")) { if (imgSelectElement) {
removeBlock(protyle, nodeElement, range);
event.stopPropagation();
event.preventDefault();
return;
} else if (imgSelectElement) {
imgSelectElement.insertAdjacentHTML("afterend", "<wbr>"); imgSelectElement.insertAdjacentHTML("afterend", "<wbr>");
imgSelectElement.classList.remove("img--select"); imgSelectElement.classList.remove("img--select");
const oldHTML = nodeElement.outerHTML; const oldHTML = nodeElement.outerHTML;