rme 0.0.58 → 0.0.60

package/dist/index.d.ts

@@ -9,6 +9,7 @@ export { useCommands, useHelpers, useKeymap, useRemirrorContext } from '@remirro
 import * as _drl990114_codemirror_themes from '@drl990114/codemirror-themes';
 import { CreateThemeOptions } from '@drl990114/codemirror-themes';
 export { CreateThemeOptions, createTheme } from '@drl990114/codemirror-themes';
+import { EditorViewConfig } from '@codemirror/view';
 import { LanguageDescription, LanguageSupport } from '@codemirror/language';
 import * as styled_components from 'styled-components';
 import * as styled_components_dist_types from 'styled-components/dist/types';
@@ -214,6 +215,13 @@ declare const wysiwygTransformer: {
 declare const _default: react.NamedExoticComponent<EditorProps>;
 
 declare const changeTheme: (theme: CreateThemeOptions) => void;
+type CreateCodemirrorOptions = {
+    /**
+     * when it is true, undo and redo will use prosemirror view.
+     */
+    useProsemirrorHistoryKey?: boolean;
+    codemirrorEditorViewConfig?: EditorViewConfig;
+};
 declare const getLanguageMap: () => Record<string, LanguageDescription>;
 declare const loadLanguage: (languageName: string) => Promise<LanguageSupport> | LanguageSupport | undefined;
 declare function computeChange(oldVal: string, newVal: string): {
@@ -433,4 +441,4 @@ declare const lightTheme: {
     };
 };
 
-export { type CreateWysiwygDelegateOptions, type DocToString, Editor, type EditorChangeEventParams, type EditorChangeHandler, type EditorContext, type EditorDelegate, extensions as EditorExtensions, type EditorProps, type EditorRef, type EditorState, type EditorViewType, type Note, Preview, SourceCodeThemeWrapper, _default$1 as SourceEditor, type StringToDoc, ThemeProvider, _default as WysiwygEditor, WysiwygThemeWrapper, buildMarkdownParser, buildMarkdownSerializer, changeTheme, common, computeChange, createSourceCodeDelegate, createSourceCodeManager, createWysiwygDelegate, darkTheme, getLanguageMap, lightTheme, loadLanguage, tableSelectorSize, wysiwygTransformer };
+export { type CreateCodemirrorOptions, type CreateWysiwygDelegateOptions, type DocToString, Editor, type EditorChangeEventParams, type EditorChangeHandler, type EditorContext, type EditorDelegate, extensions as EditorExtensions, type EditorProps, type EditorRef, type EditorState, type EditorViewType, type Note, Preview, SourceCodeThemeWrapper, _default$1 as SourceEditor, type StringToDoc, ThemeProvider, _default as WysiwygEditor, WysiwygThemeWrapper, buildMarkdownParser, buildMarkdownSerializer, changeTheme, common, computeChange, createSourceCodeDelegate, createSourceCodeManager, createWysiwygDelegate, darkTheme, getLanguageMap, lightTheme, loadLanguage, tableSelectorSize, wysiwygTransformer };

package/dist/index.mjs

@@ -5801,7 +5801,7 @@ var fromMarkdownOptions = {
 };
 function parseInlineMarkdown(text) {
   try {
-    const root = fromMarkdown(text, fromMarkdownOptions);
+    const root = fromMarkdown(text, "utf-8", fromMarkdownOptions);
     if (root.children.length === 0) {
       return [];
     }
@@ -5955,6 +5955,7 @@ function hasHtmlToken(mdastToken) {
 }
 function fromInlineMarkdown(text) {
   const phrasingContents = parseInlineMarkdown(text);
+  console.log("phrasingContents", phrasingContents);
   if (hasHtmlToken(phrasingContents)) {
     const nodes = flatHTMLInlineToken(phrasingContents);
     return nodes;
@@ -8301,6 +8302,7 @@ import { nanoid as nanoid2 } from "nanoid";
 import { createTheme } from "@drl990114/codemirror-themes";
 
 // src/editor/codemirror/codemirror.ts
+import { redo, undo } from "@remirror/pm/history";
 var cmInstanceMap = /* @__PURE__ */ new Map();
 var themeRef = { current: createTheme(lightTheme.codemirrorTheme) };
 var changeTheme = (theme) => {
@@ -8318,7 +8320,7 @@ var MfCodemirrorView = class {
     node,
     extensions: extensions2 = [],
     languageName,
-    createParams = {}
+    options = {}
   }) {
     this.toggleName = "paragraph";
     this.id = nanoid2();
@@ -8332,6 +8334,7 @@ var MfCodemirrorView = class {
     this.schema = node.type.schema;
     this.languageName = languageName;
     this.loadLanguage = loadLanguage;
+    this.options = options;
     this.content = this.node.textContent;
     const changeFilter = CodeMirrorEditorState.changeFilter.of((tr) => {
       if (!tr.docChanged) {
@@ -8352,7 +8355,7 @@ var MfCodemirrorView = class {
     this.cm = new CodeMirrorEditorView({
       state: startState,
       dispatch: this.valueChanged.bind(this),
-      ...createParams
+      ...this.options.codemirrorEditorViewConfig || {}
     });
     cmInstanceMap.set(this.id, this);
     this.updateLanguage();
@@ -8442,7 +8445,7 @@ var MfCodemirrorView = class {
     return TextSelection3.between(doc.resolve(anchor + start), doc.resolve(head + start));
   }
   codeMirrorKeymap() {
-    return [
+    const keymaps = [
       {
         key: "ArrowUp",
         run: this.maybeEscape("line", -1)
@@ -8498,6 +8501,38 @@ var MfCodemirrorView = class {
         }
       }
     ];
+    if (this.options?.useProsemirrorHistoryKey) {
+      keymaps.push(
+        {
+          key: "Mod-z",
+          run: () => {
+            undo(this.view.state, this.view.dispatch);
+            this.view.focus();
+            return false;
+          }
+        },
+        {
+          key: "Mod-y",
+          mac: "Mod-Shift-z",
+          run: () => {
+            redo(this.view.state, this.view.dispatch);
+            this.view.focus();
+            return false;
+          },
+          preventDefault: true
+        },
+        {
+          linux: "Ctrl-Shift-z",
+          run: () => {
+            redo(this.view.state, this.view.dispatch);
+            this.view.focus();
+            return false;
+          },
+          preventDefault: true
+        }
+      );
+    }
+    return keymaps;
   }
   maybeEscape(unit, dir) {
     return (view) => {
@@ -8626,8 +8661,6 @@ var minimalSetup = (() => [
   dropCursor(),
   lineNumbers(),
   highlightSpecialChars(),
-  history(),
-  indentOnInput(),
   syntaxHighlighting(defaultHighlightStyle, { fallback: true }),
   bracketMatching(),
   closeBrackets(),
@@ -8635,13 +8668,7 @@ var minimalSetup = (() => [
   crosshairCursor(),
   highlightSelectionMatches(),
   keymap2.of([
-    ...closeBracketsKeymap,
-    ...defaultKeymap,
-    ...searchKeymap,
-    ...historyKeymap,
-    ...foldKeymap,
-    ...completionKeymap,
-    ...lintKeymap
+    ...defaultKeymap
   ])
 ])();
 
@@ -15042,6 +15069,7 @@ function removeNewlines(str) {
 var HtmlNodeView = class {
   constructor(node, view, getPos) {
     this._htmlSrcElt = null;
+    this.destroying = false;
     this.ignoreMutation = () => true;
     this.handleMouseEnter = () => {
       this.dom.classList.add("node-enter");
@@ -15147,13 +15175,13 @@ var HtmlNodeView = class {
       node: this._node,
       getPos: this._getPos,
       languageName: "html",
-      createParams: {
-        parent: this._htmlSrcElt
-      },
-      extensions: [
-        minimalSetup,
-        htmlLang
-      ]
+      extensions: [minimalSetup, htmlLang],
+      options: {
+        useProsemirrorHistoryKey: true,
+        codemirrorEditorViewConfig: {
+          parent: this._htmlSrcElt
+        }
+      }
     });
     this._htmlSrcElt.classList.remove("node-hide");
     this._innerView = this.mfCodemirrorView.cm;
@@ -15162,11 +15190,14 @@ var HtmlNodeView = class {
     this.setSelection(prevCursorPos, prevCursorPos);
     this._innerView.focus();
     this._innerView.contentDOM.addEventListener("blur", () => {
+      if (this.destroying)
+        return;
       this.closeEditor(true);
     });
     this.mfCodemirrorView.forwardSelection();
   }
   destroy() {
+    this.destroying = true;
     this.closeEditor(false);
     if (this._htmlRenderElt) {
       this._htmlRenderElt.remove();
@@ -17614,7 +17645,8 @@ function extensions({ handleViewImgSrcUrl }) {
     new LineHeadingExtension({}),
     new LineListExtension(),
     new LineCodeMirrorExtension({
-      extensions: [minimalSetup]
+      extensions: [minimalSetup],
+      useProsemirrorHistoryKey: true
     }),
     new LineTableExtension({ resizable: false }),
     new LineTableRowExtension(),
@@ -18633,7 +18665,8 @@ var CodeMirror6NodeView = class {
     node,
     view,
     getPos,
-    extensions: extensions2
+    extensions: extensions2,
+    options
   }) {
     this.node = node;
     this.view = view;
@@ -18644,7 +18677,8 @@ var CodeMirror6NodeView = class {
       getPos: this.getPos,
       node: this.node,
       extensions: extensions2,
-      languageName: this.languageName
+      languageName: this.languageName,
+      options
     });
     this.cm = this.mfCodemirrorView.cm;
     this.dom = this.cm.dom;
@@ -18714,7 +18748,10 @@ var LineCodeMirrorExtension = class extends NodeExtension4 {
         view,
         getPos,
         extensions: this.options.extensions,
-        toggleName: this.options.toggleName
+        toggleName: this.options.toggleName,
+        options: {
+          useProsemirrorHistoryKey: this.options.useProsemirrorHistoryKey
+        }
       });
       return this.nodeview;
     };
@@ -18870,8 +18907,12 @@ LineCodeMirrorExtension = __decorateClass([
     defaultOptions: {
       hideDecoration: false,
       extensions: null,
-      toggleName: "paragraph"
-    }
+      toggleName: "paragraph",
+      useProsemirrorHistoryKey: false
+    },
+    staticKeys: [],
+    handlerKeys: [],
+    customHandlerKeys: []
   })
 ], LineCodeMirrorExtension);