0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 fix https://github.com/siyuan-note/siyuan/issues/10389

Browse source
This commit is contained in:
Vanessa 2024-02-26 11:34:19 +08:00
parent 892d166acf
commit 66931a7cda
7 changed files with 57 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/mobile/index.ts
View file

@ -122,7 +122,7 @@ class App {
const nodeElement = hasClosestBlock(range.startContainer); const nodeElement = hasClosestBlock(range.startContainer);
if (nodeElement && isNotEditBlock(nodeElement)) { if (nodeElement && isNotEditBlock(nodeElement)) {
nodeElement.classList.add("protyle-wysiwyg--select"); nodeElement.classList.add("protyle-wysiwyg--select");
removeBlock(editor.protyle, nodeElement, range); removeBlock(editor.protyle, nodeElement, range, event.key);
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();
return; return;

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

@ -771,7 +771,7 @@ export class Gutter {
}); });
writeText(protyle.lute.BlockDOM2StdMd(html).trimEnd()); writeText(protyle.lute.BlockDOM2StdMd(html).trimEnd());
protyle.breadcrumb?.hide(); protyle.breadcrumb?.hide();
removeBlock(protyle, selectsElement[0], getEditorRange(selectsElement[0])); removeBlock(protyle, selectsElement[0], getEditorRange(selectsElement[0]), "remove");
} else { } else {
focusByRange(getEditorRange(selectsElement[0])); focusByRange(getEditorRange(selectsElement[0]));
document.execCommand("cut"); document.execCommand("cut");
@ -817,7 +817,7 @@ export class Gutter {
accelerator: "⌫", accelerator: "⌫",
click: () => { click: () => {
protyle.breadcrumb?.hide(); protyle.breadcrumb?.hide();
removeBlock(protyle, selectsElement[0], getEditorRange(selectsElement[0])); removeBlock(protyle, selectsElement[0], getEditorRange(selectsElement[0]), "Backspace");
} }
}).element); }).element);
@ -1222,7 +1222,7 @@ export class Gutter {
click: () => { click: () => {
if (isNotEditBlock(nodeElement)) { if (isNotEditBlock(nodeElement)) {
writeText(protyle.lute.BlockDOM2StdMd(removeEmbed(nodeElement)).trimEnd()); writeText(protyle.lute.BlockDOM2StdMd(removeEmbed(nodeElement)).trimEnd());
removeBlock(protyle, nodeElement, getEditorRange(nodeElement)); removeBlock(protyle, nodeElement, getEditorRange(nodeElement), "remove");
protyle.breadcrumb?.hide(); protyle.breadcrumb?.hide();
} else { } else {
focusByRange(getEditorRange(nodeElement)); focusByRange(getEditorRange(nodeElement));
@ -1266,7 +1266,7 @@ export class Gutter {
accelerator: "⌫", accelerator: "⌫",
click: () => { click: () => {
protyle.breadcrumb?.hide(); protyle.breadcrumb?.hide();
removeBlock(protyle, nodeElement, getEditorRange(nodeElement)); removeBlock(protyle, nodeElement, getEditorRange(nodeElement), "Backspace");
} }
}).element); }).element);
} }

2
app/src/protyle/render/av/openMenuPanel.ts
View file

@ -650,7 +650,7 @@ export const openMenuPanel = (options: {
break; break;
} else if (type === "delete-view") { } else if (type === "delete-view") {
if (data.views.length === 1) { if (data.views.length === 1) {
removeBlock(options.protyle, options.blockElement, getEditorRange(options.blockElement)); removeBlock(options.protyle, options.blockElement, getEditorRange(options.blockElement), "remove");
} else { } else {
transaction(options.protyle, [{ transaction(options.protyle, [{
action: "removeAttrViewView", action: "removeAttrViewView",

2
app/src/protyle/render/av/view.ts
View file

@ -62,7 +62,7 @@ export const openViewMenu = (options: { protyle: IProtyle, blockElement: HTMLEle
click() { click() {
document.querySelector(".av__panel")?.remove(); document.querySelector(".av__panel")?.remove();
if (options.blockElement.querySelectorAll(".layout-tab-bar .item").length === 1) { if (options.blockElement.querySelectorAll(".layout-tab-bar .item").length === 1) {
removeBlock(options.protyle, options.blockElement, getEditorRange(options.blockElement)); removeBlock(options.protyle, options.blockElement, getEditorRange(options.blockElement), "remove");
} else { } else {
transaction(options.protyle, [{ transaction(options.protyle, [{
action: "removeAttrViewView", action: "removeAttrViewView",

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

@ -1295,7 +1295,7 @@ export class WYSIWYG {
} }
} }
const nextElement = getNextBlock(selectElements[selectElements.length - 1]); const nextElement = getNextBlock(selectElements[selectElements.length - 1]);
removeBlock(protyle, nodeElement, range); removeBlock(protyle, nodeElement, range, "remove");
if (nextElement) { if (nextElement) {
// Ctrl+X 剪切后光标应跳到下一行行首 https://github.com/siyuan-note/siyuan/issues/5485 // Ctrl+X 剪切后光标应跳到下一行行首 https://github.com/siyuan-note/siyuan/issues/5485
focusBlock(nextElement); focusBlock(nextElement);

12
app/src/protyle/wysiwyg/keydown.ts
View file

@ -726,7 +726,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
if ((!event.altKey && (event.key === "Backspace" || event.key === "Delete")) || if ((!event.altKey && (event.key === "Backspace" || event.key === "Delete")) ||
matchHotKey("⌃D", event)) { matchHotKey("⌃D", event)) {
if (protyle.wysiwyg.element.querySelector(".protyle-wysiwyg--select")) { if (protyle.wysiwyg.element.querySelector(".protyle-wysiwyg--select")) {
removeBlock(protyle, nodeElement, range); removeBlock(protyle, nodeElement, range, event.key === "Backspace" ? "Backspace" : "Delete");
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();
return; return;
@ -779,7 +779,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
const editElement = getContenteditableElement(nodeElement); const editElement = getContenteditableElement(nodeElement);
if (!editElement) { if (!editElement) {
nodeElement.classList.add("protyle-wysiwyg--select"); nodeElement.classList.add("protyle-wysiwyg--select");
removeBlock(protyle, nodeElement, range); removeBlock(protyle, nodeElement, range, event.key === "Backspace" ? "Backspace" : "Delete");
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();
return; return;
@ -794,7 +794,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
if (nextRange) { if (nextRange) {
const nextBlockElement = hasClosestBlock(nextRange.startContainer); const nextBlockElement = hasClosestBlock(nextRange.startContainer);
if (nextBlockElement) { if (nextBlockElement) {
removeBlock(protyle, nextBlockElement, nextRange, true); removeBlock(protyle, nextBlockElement, nextRange, "Delete");
} }
} }
event.stopPropagation(); event.stopPropagation();
@ -812,7 +812,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
range.startOffset === 0 || range.startOffset === 0 ||
(currentNode && currentNode.nodeType === 3 && !hasPreviousSibling(currentNode) && currentNode.textContent === "") // https://ld246.com/article/1649251218696 (currentNode && currentNode.nodeType === 3 && !hasPreviousSibling(currentNode) && currentNode.textContent === "") // https://ld246.com/article/1649251218696
)) { )) {
removeBlock(protyle, nodeElement, range); removeBlock(protyle, nodeElement, range, "Backspace");
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();
return; return;
@ -821,7 +821,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
nodeElement.getAttribute("data-type") === "NodeTable" && nodeElement.getAttribute("data-type") === "NodeTable" &&
(range.startContainer as HTMLElement).children[range.startOffset - 1]?.tagName === "TABLE") { (range.startContainer as HTMLElement).children[range.startOffset - 1]?.tagName === "TABLE") {
nodeElement.classList.add("protyle-wysiwyg--select"); nodeElement.classList.add("protyle-wysiwyg--select");
removeBlock(protyle, nodeElement, range); removeBlock(protyle, nodeElement, range, "Backspace");
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();
return; return;
@ -856,7 +856,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
} }
if (position.start === 1 && !inlineElement && editElement.textContent.startsWith(Constants.ZWSP)) { if (position.start === 1 && !inlineElement && editElement.textContent.startsWith(Constants.ZWSP)) {
setFirstNodeRange(editElement, range); setFirstNodeRange(editElement, range);
removeBlock(protyle, nodeElement, range); removeBlock(protyle, nodeElement, range, "Backspace");
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();
return; return;

47
app/src/protyle/wysiwyg/remove.ts
View file

@ -186,14 +186,29 @@ const removeLi = (protyle: IProtyle, blockElement: Element, range: Range, isDele
focusByWbr(previousLastElement.parentElement, range); focusByWbr(previousLastElement.parentElement, range);
}; };
export const removeBlock = (protyle: IProtyle, blockElement: Element, range: Range, isDelete = false) => { export const removeBlock = (protyle: IProtyle, blockElement: Element, range: Range, type: "Delete" | "Backspace" | "remove") => {
// 删除后，防止滚动条滚动后调用 get 请求，因为返回的请求已查找不到内容块了 // 删除后，防止滚动条滚动后调用 get 请求，因为返回的请求已查找不到内容块了
preventScroll(protyle); preventScroll(protyle);
const selectElements = Array.from(protyle.wysiwyg.element.querySelectorAll(".protyle-wysiwyg--select")); const selectElements = Array.from(protyle.wysiwyg.element.querySelectorAll(".protyle-wysiwyg--select"));
if (selectElements?.length > 0) { if (selectElements?.length > 0) {
const deletes: IOperation[] = []; const deletes: IOperation[] = [];
const inserts: IOperation[] = []; const inserts: IOperation[] = [];
let sideElement = selectElements[0].previousElementSibling || selectElements[selectElements.length - 1].nextElementSibling; let sideElement;
let sideIsNext = false;
if (type === "Backspace") {
sideElement = selectElements[0].previousElementSibling;
if (!sideElement) {
sideIsNext = true;
sideElement = selectElements[selectElements.length - 1].nextElementSibling
}
} else {
sideElement = selectElements[selectElements.length - 1].nextElementSibling;
sideIsNext = true;
if (!sideElement) {
sideIsNext = false;
sideElement = selectElements[0].previousElementSibling;
}
}
let listElement: Element; let listElement: Element;
let topParentElement: Element; let topParentElement: Element;
hideElements(["select"], protyle); hideElements(["select"], protyle);
@ -205,7 +220,24 @@ export const removeBlock = (protyle: IProtyle, blockElement: Element, range: Ran
action: "delete", action: "delete",
id, id,
}); });
sideElement = getNextBlock(topElement) || getPreviousBlock(topElement) || topElement.parentElement || protyle.wysiwyg.element.firstElementChild; if (type === "Backspace") {
sideElement = getPreviousBlock(topElement);
if (!sideElement) {
sideIsNext = true;
sideElement = getNextBlock(topElement);
}
} else {
sideElement = getNextBlock(topElement)
sideIsNext = true;
if (!sideElement) {
sideIsNext = false;
sideElement = getPreviousBlock(topElement);
}
}
if (!sideElement) {
sideElement = topElement.parentElement || protyle.wysiwyg.element.firstElementChild;
sideIsNext = false;
}
if (topElement.getAttribute("data-type") === "NodeHeading" && topElement.getAttribute("fold") === "1") { if (topElement.getAttribute("data-type") === "NodeHeading" && topElement.getAttribute("fold") === "1") {
// https://github.com/siyuan-note/siyuan/issues/2188 // https://github.com/siyuan-note/siyuan/issues/2188
setFold(protyle, topElement, undefined, true); setFold(protyle, topElement, undefined, true);
@ -271,7 +303,12 @@ export const removeBlock = (protyle: IProtyle, blockElement: Element, range: Ran
focusByWbr(emptyElement, range); focusByWbr(emptyElement, range);
} }
// https://github.com/siyuan-note/siyuan/issues/5485 // https://github.com/siyuan-note/siyuan/issues/5485
// https://github.com/siyuan-note/siyuan/issues/10389
if (type === "remove" && sideIsNext) {
focusBlock(sideElement); focusBlock(sideElement);
} else {
focusBlock(sideElement, undefined, false);
}
scrollCenter(protyle, sideElement); scrollCenter(protyle, sideElement);
if (listElement) { if (listElement) {
inserts.push({ inserts.push({
@ -303,7 +340,7 @@ export const removeBlock = (protyle: IProtyle, blockElement: Element, range: Ran
// 空代码块直接删除 // 空代码块直接删除
if (blockElement.getAttribute("data-type") === "NodeCodeBlock" && getContenteditableElement(blockElement).textContent.trim() === "") { if (blockElement.getAttribute("data-type") === "NodeCodeBlock" && getContenteditableElement(blockElement).textContent.trim() === "") {
blockElement.classList.add("protyle-wysiwyg--select"); blockElement.classList.add("protyle-wysiwyg--select");
removeBlock(protyle, blockElement, range); removeBlock(protyle, blockElement, range, type);
return; return;
} }
// 设置 bq 和代码块光标 // 设置 bq 和代码块光标
@ -364,7 +401,7 @@ export const removeBlock = (protyle: IProtyle, blockElement: Element, range: Ran
} }
if (blockElement.parentElement.classList.contains("li") && blockElement.previousElementSibling.classList.contains("protyle-action")) { if (blockElement.parentElement.classList.contains("li") && blockElement.previousElementSibling.classList.contains("protyle-action")) {
removeLi(protyle, blockElement, range, isDelete); removeLi(protyle, blockElement, range, type === "Delete");
return; return;
} }