Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-20 08:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2023-06-03 21:45:24 +08:00
parent f99d9e19bc
commit f43770d8d2
7 changed files with 43 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/constants.ts
View file

@ -82,6 +82,7 @@ export abstract class Constants {
public static readonly LOCAL_PDFTHEME = "local-pdftheme";
public static readonly LOCAL_LAYOUTS = "local-layouts";
public static readonly LOCAL_AI = "local-ai";
public static readonly LOCAL_PLUGINTOPUNPIN = "local-plugintopunpin";
// timeout
public static readonly TIMEOUT_DBLCLICK = 190;

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

@ -102,7 +102,7 @@ export const initBar = (app: App) => {
}
};
if (!useElement) {
const svgElement = hideElement.querySelector("svg");
const svgElement = hideElement.querySelector("svg").cloneNode(true) as HTMLElement;
svgElement.classList.add("b3-menu__icon");
menuOptions.iconHTML = svgElement.outerHTML;
}
@ -275,6 +275,31 @@ const openPlugin = (app: App, target: Element) => {
// @ts-ignore
const hasSetting = plugin.setting || plugin.__proto__.hasOwnProperty("openSetting");
plugin.topBarIcons.forEach(item => {
const hasUnpin = window.siyuan.storage[Constants.LOCAL_PLUGINTOPUNPIN].includes(item.id);
const submenu = [{
icon: "iconPin",
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"),
@ -282,25 +307,12 @@ const openPlugin = (app: App, target: Element) => {
item.dispatchEvent(new CustomEvent("click"))
},
type: "submenu",
submenu: [{
icon: "iconPin",
label: window.siyuan.languages.pin,
click() {
}
}, {
icon: "iconSettings",
label: window.siyuan.languages.config,
disabled: !hasSetting,
click() {
plugin.openSetting();
},
}]
submenu
}
if (item.querySelector("use")) {
menuOption.icon = item.querySelector("use").getAttribute("xlink:href").replace("#", "");
} else {
const svgElement = item.querySelector("svg");
const svgElement = item.querySelector("svg").cloneNode(true) as HTMLElement;
svgElement.classList.add("b3-menu__icon")
menuOption.iconHTML = svgElement.outerHTML;
}

3
app/src/layout/util.ts
View file

@ -631,6 +631,9 @@ export const resizeTopbar = () => {
} else if (left < right && right - left < width / 3) {
dragElement.style.paddingLeft = (right - left) + "px";
}
window.siyuan.storage[Constants.LOCAL_PLUGINTOPUNPIN].forEach((id: string) => {
toolbarElement.querySelector("#" + id)?.classList.add("fn__none");
});
};
let resizeTimeout: number;

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

@ -77,7 +77,7 @@ export class Plugin {
const iconElement = document.createElement("div");
iconElement.setAttribute("data-menu", "true");
iconElement.addEventListener("click", options.callback);
iconElement.id = "plugin" + genUUID();
iconElement.id = `plugin_${this.name}_${this.topBarIcons.length}`;
if (isMobile()) {
iconElement.className = "b3-menu__item";
iconElement.innerHTML = (options.icon.startsWith("icon") ? `<svg class="b3-menu__icon"><use xlink:href="#${options.icon}"></use></svg>` : options.icon) +

7
app/src/plugin/loader.ts
View file

@ -2,10 +2,11 @@ import {fetchSyncPost} from "../util/fetch";
import {App} from "../index";
import {Plugin} from "./index";
/// #if !MOBILE
import {exportLayout} from "../layout/util";
import {exportLayout, resizeTopbar} from "../layout/util";
/// #endif
import {API} from "./API";
import {getFrontend, isMobile, isWindow} from "../util/functions";
import {Constants} from "../constants";
const getObject = (key: string) => {
const api = {
@ -141,9 +142,13 @@ export const afterLoadPlugin = (plugin: Plugin) => {
if (isMobile()) {
document.querySelector("#menuAbout").after(element);
} else if (!isWindow()) {
if (window.siyuan.storage[Constants.LOCAL_PLUGINTOPUNPIN].includes(element.id)) {
element.classList.add("fn__none");
}
document.querySelector("#" + (element.getAttribute("data-position") === "right" ? "barPlugins" : "drag")).before(element);
}
});
resizeTopbar();
}
/// #if !MOBILE
mergePluginHotkey(plugin);

3
app/src/plugin/uninstall.ts
View file

@ -1,7 +1,7 @@
import {App} from "../index";
import {Plugin} from "../plugin";
import {getAllModels} from "../layout/getAll";
import {exportLayout} from "../layout/util";
import {exportLayout, resizeTopbar} from "../layout/util";
import {Constants} from "../constants";
export const uninstall = (app: App, name: string) => {
@ -24,6 +24,7 @@ export const uninstall = (app: App, name: string) => {
plugin.topBarIcons.forEach(item => {
item.remove();
});
resizeTopbar();
// rm statusBar
/// #if !MOBILE
plugin.statusBarIcons.forEach(item => {

3
app/src/protyle/util/compatibility.ts
View file

@ -161,6 +161,7 @@ export const getLocalStorage = (cb: () => void) => {
};
defaultStorage[Constants.LOCAL_LAYOUTS] = []; // {name: "", layout:{}}
defaultStorage[Constants.LOCAL_AI] = []; // {name: "", memo: ""}
defaultStorage[Constants.LOCAL_PLUGINTOPUNPIN] = [];
defaultStorage[Constants.LOCAL_BAZAAR] = {
theme: "0",
template: "0",
@ -214,7 +215,7 @@ export const getLocalStorage = (cb: () => void) => {
[Constants.LOCAL_EXPORTIMG, Constants.LOCAL_SEARCHKEYS, Constants.LOCAL_PDFTHEME, Constants.LOCAL_BAZAAR, Constants.LOCAL_EXPORTWORD,
Constants.LOCAL_EXPORTPDF, Constants.LOCAL_DOCINFO, Constants.LOCAL_FONTSTYLES, Constants.LOCAL_SEARCHDATA,
Constants.LOCAL_ZOOM, Constants.LOCAL_LAYOUTS, Constants.LOCAL_AI].forEach((key) => {
Constants.LOCAL_ZOOM, Constants.LOCAL_LAYOUTS, Constants.LOCAL_AI, Constants.LOCAL_PLUGINTOPUNPIN].forEach((key) => {
if (typeof response.data[key] === "string") {
try {
window.siyuan.storage[key] = Object.assign(defaultStorage[key], JSON.parse(response.data[key]));