fix(editor): fix undo (#1110)

ocavue · Jul 29, 2022 · 65884f4 · 65884f4
1 parent 7948267
commit 65884f4
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 9 deletions.
diff --git a/.changeset/popular-zebras-wait.md b/.changeset/popular-zebras-wait.md
@@ -0,0 +1,6 @@
+---
+"@rino.app/editor": patch
+"@rino.app/electron": patch
+---
+
+Fix an issue that causes undo keyboard shortcut not to work.
diff --git a/packages/editor/package.json b/packages/editor/package.json
@@ -41,7 +41,7 @@
         "@remirror/extension-codemirror6": "^1.0.0-beta.12",
         "@remirror/extension-doc": "^2.0.0-beta.12",
         "@remirror/extension-drop-cursor": "^2.0.0-beta.12",
-        "@remirror/extension-events": "2.0.0-beta.12",
+        "@remirror/extension-events": "^2.0.0-beta.12",
         "@remirror/extension-hard-break": "^2.0.0-beta.12",
         "@remirror/extension-heading": "^2.0.0-beta.12",
         "@remirror/extension-horizontal-rule": "^2.0.0-beta.12",

diff --git a/packages/editor/src/extensions/inline/inline-deco-extension.ts b/packages/editor/src/extensions/inline/inline-deco-extension.ts
@@ -3,9 +3,9 @@ import { Node as ProsemirrorNode } from "@remirror/pm/model"
 import { EditorState } from "@remirror/pm/state"
 import { Decoration, DecorationSet } from "@remirror/pm/view"
 
-import { isAutoHideMark, RinnMarkAttrs } from "./inline-mark-extensions"
+import { isAutoHideMark, RinoMarkAttrs } from "./inline-mark-extensions"
 
-type TextAttrs = Partial<RinnMarkAttrs & { isAutoHideMark?: boolean }>
+type TextAttrs = Partial<RinoMarkAttrs & { isAutoHideMark?: boolean }>
 
 /**
  * Read a text node and return information from its mark

diff --git a/packages/editor/src/extensions/inline/inline-mark-extensions.ts b/packages/editor/src/extensions/inline/inline-mark-extensions.ts
@@ -92,7 +92,7 @@ class CodeText extends MarkExtension {
     }
 }
 
-class CodeSapce extends MarkExtension {
+class CodeSpace extends MarkExtension {
     static disableExtraAttributes = true
     get name() {
         return "mdCodeSpace" as const
@@ -226,7 +226,7 @@ export const rinoMarkExtensions = [
     new Emphasis(),
     new Strong(),
     new CodeText(),
-    new CodeSapce(),
+    new CodeSpace(),
     new Delete(),
     new LinkText(),
     new LinkUri(),
@@ -235,7 +235,7 @@ export const rinoMarkExtensions = [
 ]
 export type RinoMarkExtension = typeof rinoMarkExtensions[number]
 export type RinoMarkName = RinoMarkExtension["name"]
-export type RinnMarkAttrs = {
+export type RinoMarkAttrs = {
     depth: number
 
     /**

diff --git a/packages/editor/src/extensions/inline/inline-mark-helpers.ts b/packages/editor/src/extensions/inline/inline-mark-helpers.ts
@@ -83,6 +83,7 @@ export function applySelectionMarks(view: EditorView): void {
     if (view.isDestroyed) return
 
     const tr = view.state.tr
+    tr.setMeta("addToHistory", false)
     if (updateRangeMarks(tr)) {
         view.dispatch(tr)
     }

diff --git a/packages/editor/src/extensions/inline/inline-types.ts b/packages/editor/src/extensions/inline/inline-types.ts
@@ -1,4 +1,4 @@
-import type { RinnMarkAttrs, RinoMarkName } from "./inline-mark-extensions"
+import type { RinoMarkAttrs, RinoMarkName } from "./inline-mark-extensions"
 
 export enum InlineDecorateType {
     Ignore = "IGNORE",
@@ -15,5 +15,5 @@ export interface InlineToken {
     // end position
     end: number
 
-    attrs: RinnMarkAttrs
+    attrs: RinoMarkAttrs
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml