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

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

Browse source
This commit is contained in:
Vanessa 2024-02-24 21:38:25 +08:00
parent eb92b9acf4
commit 3ec2ff243f
5 changed files with 49 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,7 @@ import {
hasClosestByAttribute,
hasClosestByClassName,
hasClosestByMatchTag,
hasClosestByTag
hasClosestByTag, hasTopClosestByClassName
} from "../util/hasClosest";
import {getIconByType} from "../../editor/getIcon";
import {enterBack, iframeMenu, setFold, tableMenu, videoMenu, zoomOut} from "../../menus/protyle";
@ -312,7 +312,8 @@ export class Gutter {
window.siyuan.menus.menu.fullscreen();
} else {
window.siyuan.menus.menu.popup({x: gutterRect.left, y: gutterRect.bottom, isLeft: true});
window.siyuan.menus.menu.element.setAttribute("data-from", hasClosestByClassName(protyle.element, "block__edit") ? "popover" : "app");
const popoverElement = hasTopClosestByClassName(protyle.element, "block__popover", true);
window.siyuan.menus.menu.element.setAttribute("data-from", popoverElement ? popoverElement.dataset.level + "popover" : "app");
focusByRange(protyle.toolbar.range);
}
}
@ -343,7 +344,8 @@ export class Gutter {
} else if (buttonElement.dataset.type !== "NodeAttributeViewRow") {
this.renderMenu(protyle, buttonElement);
window.siyuan.menus.menu.popup({x: gutterRect.left, y: gutterRect.bottom, isLeft: true});
window.siyuan.menus.menu.element.setAttribute("data-from", hasClosestByClassName(protyle.element, "block__edit") ? "popover" : "app");
const popoverElement = hasTopClosestByClassName(protyle.element, "block__popover", true);
window.siyuan.menus.menu.element.setAttribute("data-from", popoverElement ? popoverElement.dataset.level + "popover" : "app");
}
}
event.preventDefault();
@ -790,7 +792,7 @@ export class Gutter {
label: window.siyuan.languages.addToDatabase,
icon: "iconDatabase",
click: () => {
openSearchAV("", this.element, (listItemElement) => {
openSearchAV("", selectsElement[0] as HTMLElement, (listItemElement) => {
const sourceIds: string[] = [];
selectsElement.forEach(item => {
sourceIds.push(item.getAttribute("data-node-id"));
@ -1242,7 +1244,7 @@ export class Gutter {
label: window.siyuan.languages.addToDatabase,
icon: "iconDatabase",
click: () => {
openSearchAV("", this.element, (listItemElement) => {
openSearchAV("", nodeElement as HTMLElement, (listItemElement) => {
const sourceIds: string[] = [nodeElement.getAttribute("data-node-id")];
const avID = listItemElement.dataset.avId;
transaction(protyle, [{