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

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

Browse source
This commit is contained in:
Vanessa 2024-08-10 18:46:05 +08:00
parent 09fb905764
commit 7bbbc8ae32
5 changed files with 125 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

89
app/src/layout/topBar.ts
View file

@ -1,5 +1,5 @@
import {getWorkspaceName} from "../util/noRelyPCFunction";
import {isHuawei, isInAndroid, isInIOS, setStorageVal, updateHotkeyTip} from "../protyle/util/compatibility";
import {isInAndroid, isInIOS, setStorageVal, updateHotkeyTip} from "../protyle/util/compatibility";
import {exitSiYuan, processSync} from "../dialog/processSystem";
import {goBack, goForward} from "../util/backForward";
import {syncGuide} from "../sync/syncGuide";
@ -14,12 +14,12 @@ import {webFrame} from "electron";
/// #endif
import {Constants} from "../constants";
import {isBrowser, isWindow} from "../util/functions";
import {Menu} from "../plugin/Menu";
import {fetchPost} from "../util/fetch";
import {needSubscribe} from "../util/needSubscribe";
import * as dayjs from "dayjs";
import {exportLayout} from "./util";
import {commandPanel} from "../boot/globalEvent/command/panel";
import {openTopBarMenu} from "../plugin/openTopBarMenu";
export const initBar = (app: App) => {
const toolbarElement = document.getElementById("toolbar");
@ -179,7 +179,7 @@ export const initBar = (app: App) => {
event.stopPropagation();
break;
} else if (targetId === "barPlugins") {
openPlugin(app, target);
openTopBarMenu(app, target);
event.stopPropagation();
break;
} else if (targetId === "barCommand") {
@ -298,86 +298,3 @@ export const setZoom = (type: "zoomIn" | "zoomOut" | "restore") => {
}
/// #endif
};
const openPlugin = (app: App, target: Element) => {
const menu = new Menu("topBarPlugin");
menu.addItem({
icon: "iconSettings",
label: window.siyuan.languages.manage,
ignore: isHuawei() || window.siyuan.config.readonly,
click() {
openSetting(app).element.querySelector('.b3-tab-bar [data-name="bazaar"]').dispatchEvent(new CustomEvent("click"));
}
});
menu.addSeparator(undefined, isHuawei() || window.siyuan.config.readonly);
let hasPlugin = false;
app.plugins.forEach((plugin) => {
// @ts-ignore
const hasSetting = plugin.setting || plugin.__proto__.hasOwnProperty("openSetting");
let hasTopBar = false;
plugin.topBarIcons.forEach(item => {
const hasUnpin = window.siyuan.storage[Constants.LOCAL_PLUGINTOPUNPIN].includes(item.id);
const submenu = [{
icon: hasUnpin ? "iconPin" : "iconUnpin",
label: hasUnpin ? window.siyuan.languages.pin : window.siyuan.languages.unpin,
click() {
if (hasUnpin) {
window.siyuan.storage[Constants.LOCAL_PLUGINTOPUNPIN].splice(window.siyuan.storage[Constants.LOCAL_PLUGINTOPUNPIN].indexOf(item.id), 1);
item.classList.remove("fn__none");
} else {
window.siyuan.storage[Constants.LOCAL_PLUGINTOPUNPIN].push(item.id);
window.siyuan.storage[Constants.LOCAL_PLUGINTOPUNPIN] = Array.from(new Set(window.siyuan.storage[Constants.LOCAL_PLUGINTOPUNPIN]));
item.classList.add("fn__none");
}
setStorageVal(Constants.LOCAL_PLUGINTOPUNPIN, window.siyuan.storage[Constants.LOCAL_PLUGINTOPUNPIN]);
}
}];
if (hasSetting) {
submenu.push({
icon: "iconSettings",
label: window.siyuan.languages.config,
click() {
plugin.openSetting();
},
});
}
const menuOption: IMenu = {
icon: "iconInfo",
label: item.getAttribute("aria-label"),
click() {
item.dispatchEvent(new CustomEvent("click"));
},
type: "submenu",
submenu
};
if (item.querySelector("use")) {
menuOption.icon = item.querySelector("use").getAttribute("xlink:href").replace("#", "");
} else {
const svgElement = item.querySelector("svg").cloneNode(true) as HTMLElement;
svgElement.classList.add("b3-menu__icon");
menuOption.iconHTML = svgElement.outerHTML;
}
menu.addItem(menuOption);
hasPlugin = true;
hasTopBar = true;
});
if (!hasTopBar && hasSetting) {
hasPlugin = true;
menu.addItem({
icon: "iconSettings",
label: plugin.displayName,
click() {
plugin.openSetting();
}
});
}
});
if (!hasPlugin) {
window.siyuan.menus.menu.element.querySelector(".b3-menu__separator")?.remove();
}
let rect = target.getBoundingClientRect();
if (rect.width === 0) {
rect = document.querySelector("#barMore").getBoundingClientRect();
}
menu.open({x: rect.right, y: rect.bottom, isLeft: true});
};