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

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

Browse source
This commit is contained in:
Vanessa 2022-10-08 16:12:21 +08:00
parent 3c8c66fbdd
commit b5ae48703d
1 changed files with 20 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -78,10 +78,8 @@ export class Gutter {
buttonElement.setAttribute("disabled", "disabled");
let foldElement: Element;
Array.from(protyle.wysiwyg.element.querySelectorAll(`[data-node-id="${(buttonElement.previousElementSibling || buttonElement.nextElementSibling).getAttribute("data-node-id")}"]`)).find(item => {
const itemRect = item.getBoundingClientRect();
const gutterTop = this.element.getBoundingClientRect().top + 8;
if (!hasClosestByAttribute(item.parentElement, "data-type", "NodeBlockQueryEmbed") &&
itemRect.top <= gutterTop && itemRect.bottom >= gutterTop) {
this.isMatchNode(item)) {
foldElement = item;
return true;
}
@ -160,10 +158,8 @@ export class Gutter {
} else if (window.siyuan.altIsPressed) {
let foldElement: Element;
Array.from(protyle.wysiwyg.element.querySelectorAll(`[data-node-id="${id}"]`)).find(item => {
const itemRect = item.getBoundingClientRect();
const gutterTop = this.element.getBoundingClientRect().top + 8;
if (!hasClosestByAttribute(item.parentElement, "data-type", "NodeBlockQueryEmbed") &&
itemRect.top <= gutterTop && itemRect.bottom >= gutterTop) {
this.isMatchNode(item)) {
foldElement = item;
return true;
}
@ -233,18 +229,14 @@ export class Gutter {
return;
}
Array.from(protyle.wysiwyg.element.querySelectorAll(`[data-node-id="${buttonElement.getAttribute("data-node-id")}"]`)).find(item => {
if (!hasClosestByAttribute(item.parentElement, "data-type", "NodeBlockQueryEmbed")) {
const itemRect = item.getBoundingClientRect();
const gutterTop = this.element.getBoundingClientRect().top + 8;
if (itemRect.top <= gutterTop && itemRect.bottom >= gutterTop) {
Array.from(protyle.wysiwyg.element.querySelectorAll(".protyle-wysiwyg--hl")).forEach(hlItem => {
if (!item.isSameNode(hlItem)) {
hlItem.classList.remove("protyle-wysiwyg--hl");
}
});
item.classList.add("protyle-wysiwyg--hl");
return true;
}
if (!hasClosestByAttribute(item.parentElement, "data-type", "NodeBlockQueryEmbed") && this.isMatchNode(item)) {
Array.from(protyle.wysiwyg.element.querySelectorAll(".protyle-wysiwyg--hl")).forEach(hlItem => {
if (!item.isSameNode(hlItem)) {
hlItem.classList.remove("protyle-wysiwyg--hl");
}
});
item.classList.add("protyle-wysiwyg--hl");
return true;
}
});
event.preventDefault();
@ -258,6 +250,15 @@ export class Gutter {
});
}
private isMatchNode(item: Element) {
const itemRect = item.getBoundingClientRect();
let gutterTop = this.element.getBoundingClientRect().top + 4;
if (itemRect.height < Math.floor(window.siyuan.config.editor.fontSize * 1.625) + 8) {
gutterTop = gutterTop - (itemRect.height - this.element.clientHeight) / 2
}
return itemRect.top <= gutterTop && itemRect.bottom >= gutterTop
}
private turnsOneInto(options: {
icon: string,
label: string,
@ -669,10 +670,8 @@ export class Gutter {
let nodeElement: Element;
if (buttonElement.tagName === "BUTTON") {
Array.from(protyle.wysiwyg.element.querySelectorAll(`[data-node-id="${id}"]`)).find(item => {
const itemRect = item.getBoundingClientRect();
const gutterTop = this.element.getBoundingClientRect().top + 8; // 缩放后小数点会有偏差
if (!hasClosestByAttribute(item.parentElement, "data-type", "NodeBlockQueryEmbed") &&
itemRect.top <= gutterTop && itemRect.bottom >= gutterTop) {
this.isMatchNode(item)) {
nodeElement = item;
return true;
}