🎨 undo redo ir

stevapple · Apr 8, 2020 · 980e41a · 980e41a
1 parent fceaf47
commit 980e41a
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 17 deletions.
diff --git a/src/ts/ir/processKeydown.ts b/src/ts/ir/processKeydown.ts
@@ -11,6 +11,11 @@ export const processKeydown = (vditor: IVditor, event: KeyboardEvent) => {
         return false;
     }
 
+    // 添加第一次记录 undo 的光标
+    if (event.key.indexOf("Arrow") === -1) {
+        vditor.irUndo.recordFirstWbr(vditor, event);
+    }
+
     // 仅处理以下快捷键操作
     if (event.key !== "Enter" && event.key !== "Tab" && event.key !== "Backspace" &&
         !isCtrl(event) && event.key !== "Escape") {

diff --git a/src/ts/undo/IRUndo.ts b/src/ts/undo/IRUndo.ts
@@ -1,7 +1,5 @@
 import DiffMatchPatch, {diff_match_patch, patch_obj} from "diff-match-patch";
 import {processAfterRender} from "../ir/process";
-import {disableToolbar} from "../toolbar/setToolbar";
-import {enableToolbar} from "../toolbar/setToolbar";
 import {isFirefox, isSafari} from "../util/compatibility";
 import {scrollCenter} from "../util/editorCommenEvent";
 import {setSelectionFocus} from "../util/selection";
@@ -102,11 +100,6 @@ class IRUndo {
         if (this.hasUndo) {
             this.redoStack = [];
             this.hasUndo = false;
-            disableToolbar(vditor.toolbar.elements, ["redo"]);
-        }
-
-        if (this.undoStack.length > 1) {
-            enableToolbar(vditor.toolbar.elements, ["undo"]);
         }
     }
 

diff --git a/src/ts/util/editorCommenEvent.ts b/src/ts/util/editorCommenEvent.ts
@@ -101,29 +101,37 @@ export const hotkeyEvent = (vditor: IVditor, editorElement: HTMLElement) => {
         }
 
         // undo
-        if (!vditor.toolbar.elements.undo && matchHotKey("⌘-Z", event)) {
-            if (vditor.currentMode === "sv") {
+        if (matchHotKey("⌘-Z", event)) {
+            if (vditor.currentMode === "sv" && !vditor.toolbar.elements.undo) {
                 vditor.undo.undo(vditor);
-            } else if (vditor.currentMode === "wysiwyg") {
+                event.preventDefault();
+                return;
+            } else if (vditor.currentMode === "wysiwyg" && !vditor.toolbar.elements.undo) {
                 vditor.wysiwygUndo.undo(vditor);
+                event.preventDefault();
+                return;
             } else if (vditor.currentMode === "ir") {
                 vditor.irUndo.undo(vditor);
+                event.preventDefault();
+                return;
             }
-            event.preventDefault();
-            return;
         }
 
         // redo
-        if (!vditor.toolbar.elements.redo && matchHotKey("⌘-Y", event)) {
-            if (vditor.currentMode === "sv") {
+        if (matchHotKey("⌘-Y", event)) {
+            if (vditor.currentMode === "sv" && !vditor.toolbar.elements.redo) {
                 vditor.undo.redo(vditor);
-            } else if (vditor.currentMode === "wysiwyg") {
+                event.preventDefault();
+                return;
+            } else if (vditor.currentMode === "wysiwyg" && !vditor.toolbar.elements.redo) {
                 vditor.wysiwygUndo.redo(vditor);
+                event.preventDefault();
+                return;
             } else if (vditor.currentMode === "ir") {
                 vditor.irUndo.redo(vditor);
+                event.preventDefault();
+                return;
             }
-            event.preventDefault();
-            return;
         }
 
         // esc