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

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

Browse source
This commit is contained in:
Vanessa 2023-09-14 09:56:13 +08:00
parent 6ffa2425d2
commit 1ec2e03846
6 changed files with 25 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/boot/globalEvent/keydown.ts
View file

@ -55,6 +55,7 @@ import {App} from "../../index";
import {commandPanel} from "../../plugin/commandPanel";
import {toggleDockBar} from "../../layout/dock/util";
import {workspaceMenu} from "../../menus/workspace";
import {resize} from "../../protyle/util/resize";
const switchDialogEvent = (app: App, event: MouseEvent) => {
event.preventDefault();
@ -244,6 +245,7 @@ const editKeydown = (app: App, event: KeyboardEvent) => {
}
if (matchHotKey(window.siyuan.config.keymap.editor.general.fullscreen.custom, event)) {
fullscreen(protyle.element);
resize(protyle);
event.preventDefault();
return true;
}

4
app/src/card/openCard.ts
View file

@ -15,6 +15,7 @@ import {openFile} from "../editor/util";
/// #endif
import {getDisplayName, movePathTo} from "../util/pathName";
import {App} from "../index";
import {resize} from "../protyle/util/resize";
export const genCardHTML = (options: {
id: string,
@ -198,6 +199,7 @@ export const bindCardEvent = (options: {
if (fullscreenElement) {
fullscreen(options.element.querySelector(".card__main"),
options.element.querySelector('[data-type="fullscreen"]'));
resize(editor.protyle);
event.stopPropagation();
event.preventDefault();
return;
@ -321,7 +323,7 @@ export const bindCardEvent = (options: {
editor.protyle.element.classList.remove("card__block--hidemark", "card__block--hideli", "card__block--hidesb");
actionElements[0].classList.add("fn__none");
actionElements[1].querySelectorAll(".b3-button").forEach((element, btnIndex) => {
element.previousElementSibling.textContent = options.blocks[index].nextDues[btnIndex];
element.previousElementSibling.textContent = options.blocks[index].nextDues[btnIndex];
});
actionElements[1].classList.remove("fn__none");
return;

11
app/src/dialog/index.ts
View file

@ -15,11 +15,12 @@ export class Dialog {
title?: string,
transparent?: boolean,
content: string,
width?: string
width?: string,
height?: string,
destroyCallback?: (options?: IObject) => void
disableClose?: boolean
disableAnimation?: boolean
destroyCallback?: (options?: IObject) => void,
disableClose?: boolean,
disableAnimation?: boolean,
resizeCallback?: (type: string) => void
}) {
this.disableClose = options.disableClose;
this.id = genUUID();
@ -61,7 +62,7 @@ export class Dialog {
});
}
/// #if !MOBILE
moveResize(this.element.querySelector(".b3-dialog__container"));
moveResize(this.element.querySelector(".b3-dialog__container"), options.resizeCallback);
/// #endif
}

12
app/src/protyle/breadcrumb/action.ts
View file

@ -71,14 +71,16 @@ export const fullscreen = (element: Element, btnElement?: Element) => {
window.siyuan.editorIsFullscreen = !isFullscreen;
}
getAllModels().editor.forEach(item => {
if (window.siyuan.editorIsFullscreen) {
if (!element.isSameNode(item.element) && item.element.classList.contains("fullscreen")) {
if (!element.isSameNode(item.element)) {
if (window.siyuan.editorIsFullscreen) {
if (item.element.classList.contains("fullscreen")) {
item.element.classList.remove("fullscreen");
resize(item.editor.protyle);
}
} else if (item.element.classList.contains("fullscreen")) {
item.element.classList.remove("fullscreen");
resize(item.editor.protyle);
}
} else if (item.element.classList.contains("fullscreen")) {
item.element.classList.remove("fullscreen");
resize(item.editor.protyle);
}
});
/// #endif

2
app/src/protyle/breadcrumb/index.ts
View file

@ -30,6 +30,7 @@ import {getNoContainerElement} from "../wysiwyg/getBlock";
import {openTitleMenu} from "../header/openTitleMenu";
import {emitOpenMenu} from "../../plugin/EventBus";
import {isInAndroid} from "../util/compatibility";
import {resize} from "../util/resize";
export class Breadcrumb {
public element: HTMLElement;
@ -404,6 +405,7 @@ export class Breadcrumb {
label: window.siyuan.languages.fullscreen,
click: () => {
fullscreen(protyle.element);
resize(protyle);
}
}).element);
/// #endif

5
app/src/search/spread.ts
View file

@ -90,6 +90,11 @@ export const openSearch = async (options: {
if (edit) {
edit.destroy();
}
},
resizeCallback(type: string) {
if (type !== "d" && type !== "t" && edit) {
edit.resize();
}
}
});
dialog.element.setAttribute("data-key", options.hotkey);