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

🎨 https://github.com/siyuan-note/siyuan/issues/11529

Browse source
This commit is contained in:
Vanessa 2024-05-25 17:29:21 +08:00
parent 1be46ef5fd
commit 709af9adbf
1 changed files with 30 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
app/src/layout/dock/Outline.ts
View file

@ -244,7 +244,8 @@ export class Outline extends Model {
}
});
documentSelf.onmousemove = (moveEvent: MouseEvent) => {
if (!editor || editor.disabled || moveEvent.clientY === event.clientY && moveEvent.clientX === event.clientX) {
if (!editor || editor.disabled || Math.abs(moveEvent.clientY - event.clientY) < 3 &&
Math.abs(moveEvent.clientX - event.clientX) < 3) {
return;
}
moveEvent.preventDefault();
@ -287,6 +288,7 @@ export class Outline extends Model {
if (!selectItem) {
selectItem = this.element.querySelector(".dragover__top, .dragover__bottom, .dragover");
}
let hasChange = true;
if (selectItem && selectItem.className.indexOf("dragover") > -1 && editor) {
let previousID;
let parentID;
@ -308,30 +310,37 @@ export class Outline extends Model {
previousID = selectItem.previousElementSibling?.getAttribute("data-node-id");
}
if (previousID === item.dataset.nodeId || parentID === item.dataset.nodeId) {
return true;
hasChange = false;
} else {
selectItem.before(item);
}
selectItem.before(item);
} else if (selectItem.classList.contains("dragover__bottom")) {
previousID = selectItem.getAttribute("data-node-id");
selectItem.after(item);
if (previousID === item.previousElementSibling?.getAttribute("data-node-id")) {
hasChange = false;
} else {
selectItem.after(item);
}
}
if (hasChange) {
this.element.setAttribute("data-loading", "true");
transaction(editor, [{
action: "moveOutlineHeading",
id: item.dataset.nodeId,
previousID,
parentID,
}], [{
action: "moveOutlineHeading",
id: item.dataset.nodeId,
previousID: undoPreviousID,
parentID: undoParentID,
}]);
// https://github.com/siyuan-note/siyuan/issues/10828#issuecomment-2044099675
editor.wysiwyg.element.querySelectorAll('[data-type="NodeHeading"] [contenteditable="true"][spellcheck]').forEach(item => {
item.setAttribute("contenteditable", "false");
});
return true;
}
this.element.setAttribute("data-loading", "true");
transaction(editor, [{
action: "moveOutlineHeading",
id: item.dataset.nodeId,
previousID,
parentID,
}], [{
action: "moveOutlineHeading",
id: item.dataset.nodeId,
previousID: undoPreviousID,
parentID: undoParentID,
}]);
// https://github.com/siyuan-note/siyuan/issues/10828#issuecomment-2044099675
editor.wysiwyg.element.querySelectorAll('[data-type="NodeHeading"] [contenteditable="true"][spellcheck]').forEach(item => {
item.setAttribute("contenteditable", "false");
});
return true;
}
this.element.querySelectorAll(".dragover__top, .dragover__bottom, .dragover").forEach(item => {
item.classList.remove("dragover__top", "dragover__bottom", "dragover");