Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-15 11:38:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2022-08-15 10:24:37 +08:00
parent 455bb1c050
commit b6cf45b003
3 changed files with 33 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/src/protyle/toolbar/index.ts
View file

@ -39,6 +39,7 @@ import {escapeHtml} from "../../util/escape";
import {hideElements} from "../ui/hideElements";
import {linkMenu} from "../../menus/protyle";
import {renderAssetsPreview} from "../../asset/renderAssets";
import {electronUndo} from "../undo";
export class Toolbar {
public element: HTMLElement;
@ -866,18 +867,7 @@ export class Toolbar {
if (event.isComposing) {
return;
}
/// #if !BROWSER
if (matchHotKey(window.siyuan.config.keymap.editor.general.undo.custom, event)) {
getCurrentWindow().webContents.undo();
event.preventDefault();
return;
}
if (matchHotKey(window.siyuan.config.keymap.editor.general.redo.custom, event)) {
getCurrentWindow().webContents.redo();
event.preventDefault();
return;
}
/// #endif
electronUndo(event);
if (event.key === "Escape" || matchHotKey("⌘↩", event)) {
this.subElement.classList.add("fn__none");
this.subElement.querySelector('[data-type="pin"]').classList.remove("block__icon--active");

21
app/src/protyle/undo/index.ts
View file

@ -3,13 +3,17 @@ import {preventScroll} from "../scroll/preventScroll";
import {Constants} from "../../constants";
import {hideElements} from "../ui/hideElements";
import {scrollCenter} from "../../util/highlightById";
/// #if !BROWSER
import {getCurrentWindow} from "@electron/remote";
/// #endif
import {matchHotKey} from "../util/hotKey";
interface IOperations {
doOperations: IOperation[],
undoOperations: IOperation[]
}
class Undo {
export class Undo {
private hasUndo = false;
private redoStack: IOperations[];
private undoStack: IOperations[];
@ -86,4 +90,17 @@ class Undo {
}
}
export {Undo};
export const electronUndo = (event: KeyboardEvent) => {
/// #if !BROWSER
if (matchHotKey(window.siyuan.config.keymap.editor.general.undo.custom, event)) {
getCurrentWindow().webContents.undo();
event.preventDefault();
return;
}
if (matchHotKey(window.siyuan.config.keymap.editor.general.redo.custom, event)) {
getCurrentWindow().webContents.redo();
event.preventDefault();
return;
}
/// #endif
}