@mdxeditor/editor 1.11.1 → 1.11.3

package/dist/exportMarkdownFromLexical.d.ts

@@ -91,11 +91,12 @@ export interface ExportLexicalTreeOptions {
     visitors: LexicalVisitor[];
     jsxComponentDescriptors: JsxComponentDescriptor[];
     jsxIsAvailable: boolean;
+    addImportStatements?: boolean;
 }
 /**
  * @internal
  */
-export declare function exportLexicalTreeToMdast({ root, visitors, jsxComponentDescriptors, jsxIsAvailable }: ExportLexicalTreeOptions): Mdast.Root;
+export declare function exportLexicalTreeToMdast({ root, visitors, jsxComponentDescriptors, jsxIsAvailable, addImportStatements }: ExportLexicalTreeOptions): Mdast.Root;
 /**
  * @internal
  */

package/dist/exportMarkdownFromLexical.js

@@ -9,7 +9,8 @@ function exportLexicalTreeToMdast({
   root,
   visitors,
   jsxComponentDescriptors,
-  jsxIsAvailable
+  jsxIsAvailable,
+  addImportStatements = true
 }) {
   let unistRoot = null;
   const referredComponents = /* @__PURE__ */ new Set();
@@ -120,10 +121,12 @@ function exportLexicalTreeToMdast({
   );
   const typedRoot = unistRoot;
   const frontmatter = typedRoot.children.find((child) => child.type === "yaml");
-  if (frontmatter) {
-    typedRoot.children.splice(typedRoot.children.indexOf(frontmatter) + 1, 0, ...imports);
-  } else {
-    typedRoot.children.unshift(...imports);
+  if (addImportStatements) {
+    if (frontmatter) {
+      typedRoot.children.splice(typedRoot.children.indexOf(frontmatter) + 1, 0, ...imports);
+    } else {
+      typedRoot.children.unshift(...imports);
+    }
   }
   fixWrappingWhitespace(typedRoot, []);
   collapseNestedHtmlTags(typedRoot);
@@ -133,7 +136,7 @@ function exportLexicalTreeToMdast({
   return typedRoot;
 }
 function collapseNestedHtmlTags(node) {
-  if ("children" in node) {
+  if ("children" in node && node.children) {
     if (isMdastHTMLNode(node) && node.children.length === 1) {
       const onlyChild = node.children[0];
       if (onlyChild.type === "mdxJsxTextElement" && onlyChild.name === "span") {
@@ -212,7 +215,7 @@ function fixWrappingWhitespace(node, parentChain) {
       }
     }
   }
-  if (Object.hasOwn(node, "children")) {
+  if ("children" in node && node.children) {
     const nodeAsParent = node;
     nodeAsParent.children.forEach((child) => fixWrappingWhitespace(child, [...parentChain, nodeAsParent]));
   }

package/dist/index.d.ts

@@ -51,4 +51,12 @@ export * from './plugins/toolbar/primitives/TooltipWrap';
 export * from './plugins/toolbar/primitives/select';
 export * from './plugins/core/NestedLexicalEditor';
 export * from './plugins/core/PropertyPopover';
+export * from './utils/detectMac';
+export * from './utils/fp';
+export * from './utils/isPartOftheEditorUI';
+export * from './utils/lexicalHelpers';
+export * from './utils/makeHslTransparent';
+export * from './utils/uuid4';
+export * from './utils/voidEmitter';
+export * from './utils/whitespaceConversion';
 export * from './gurx';

package/dist/index.js

@@ -48,6 +48,14 @@ import { TooltipWrap } from "./plugins/toolbar/primitives/TooltipWrap.js";
 import { Select, SelectButtonTrigger, SelectContent, SelectItem, SelectTrigger } from "./plugins/toolbar/primitives/select.js";
 import { NestedEditorsContext, NestedLexicalEditor, useLexicalNodeRemove, useMdastNodeUpdater, useNestedEditorContext } from "./plugins/core/NestedLexicalEditor.js";
 import { PropertyPopover } from "./plugins/core/PropertyPopover.js";
+import { CAN_USE_DOM, IS_APPLE, controlOrMeta } from "./utils/detectMac.js";
+import { always, call, compose, curry1to0, curry2to1, joinProc, noop, prop, tap, thrush } from "./utils/fp.js";
+import { isPartOftheEditorUI } from "./utils/isPartOftheEditorUI.js";
+import { fromWithinEditorRead, getSelectedNode, getSelectionRectangle, getStateAsMarkdown } from "./utils/lexicalHelpers.js";
+import { makeHslTransparent } from "./utils/makeHslTransparent.js";
+import { uuidv4 } from "./utils/uuid4.js";
+import { voidEmitter } from "./utils/voidEmitter.js";
+import { WHITESPACE_MARKER, replaceWhitespace } from "./utils/whitespaceConversion.js";
 import { $createGenericHTMLNode, $isGenericHTMLNode, GenericHTMLNode } from "./plugins/core/GenericHTMLNode.js";
 import { $createImageNode, $isImageNode, ImageNode } from "./plugins/image/ImageNode.js";
 import { useCodeBlockEditorContext } from "./plugins/codeblock/CodeBlockNode.js";
@@ -66,6 +74,7 @@ export {
   Button,
   ButtonOrDropdownButton,
   ButtonWithTooltip,
+  CAN_USE_DOM,
   ChangeAdmonitionType,
   ChangeCodeMirrorLanguage,
   CodeMirrorEditor,
@@ -78,6 +87,7 @@ export {
   GenericHTMLNode,
   GenericJsxEditor,
   INSERT_IMAGE_COMMAND,
+  IS_APPLE,
   ImageNode,
   InsertAdmonition,
   InsertCodeBlock,
@@ -111,15 +121,22 @@ export {
   ToolbarToggleItem,
   TooltipWrap,
   UndoRedo,
+  WHITESPACE_MARKER,
+  always,
+  call,
   codeBlockPlugin,
   codeBlockPluginHooks,
   codeBlockSystem,
   codeMirrorHooks,
   codeMirrorPlugin,
   codeMirrorSystem,
+  compose,
+  controlOrMeta,
   corePlugin,
   corePluginHooks,
   coreSystem,
+  curry1to0,
+  curry2to1,
   defaultComparator,
   diffSourcePlugin,
   diffSourcePluginHooks,
@@ -129,10 +146,14 @@ export {
   directivesSystem,
   exportLexicalTreeToMdast,
   exportMarkdownFromLexical,
+  fromWithinEditorRead,
   frontmatterPlugin,
   frontmatterPluginHooks,
   frontmatterSystem,
   getRealmFactory,
+  getSelectedNode,
+  getSelectionRectangle,
+  getStateAsMarkdown,
   headingsPlugin,
   headingsPluginHooks,
   headingsSystem,
@@ -141,6 +162,8 @@ export {
   imageSystem,
   importMarkdownToLexical,
   importMdastTreeToLexical,
+  isPartOftheEditorUI,
+  joinProc,
   jsxPlugin,
   jsxPluginHooks,
   jsxSystem,
@@ -150,13 +173,17 @@ export {
   listsPlugin,
   listsPluginHooks,
   listsSystem,
+  makeHslTransparent,
   markdownShortcutPlugin,
+  noop,
+  prop,
   quotePlugin,
   quotePluginHooks,
   realm,
   realmFactory,
   realmFactoryToComponent,
   realmPlugin,
+  replaceWhitespace,
   sandpackPlugin,
   sandpackPluginHooks,
   sandpackSystem,
@@ -165,9 +192,11 @@ export {
   tablePlugin,
   tablePluginHooks,
   tableSystem,
+  tap,
   thematicBreakPlugin,
   thematicBreakPluginHooks,
   thematicBreakSystem,
+  thrush,
   toolbarPlugin,
   toolbarPluginHooks,
   toolbarSystem,
@@ -175,5 +204,7 @@ export {
   useHasPlugin,
   useLexicalNodeRemove,
   useMdastNodeUpdater,
-  useNestedEditorContext
+  useNestedEditorContext,
+  uuidv4,
+  voidEmitter
 };

package/dist/plugins/core/LexicalTextVisitor.js

@@ -3,12 +3,13 @@ import { IS_CODE, IS_ITALIC, IS_BOLD, IS_UNDERLINE } from "../../FormatConstants
 function isMdastText(mdastNode) {
   return mdastNode.type === "text";
 }
+const JOINABLE_TAGS = ["u", "span"];
 const LexicalTextVisitor = {
   shouldJoin: (prevNode, currentNode) => {
     if (["text", "emphasis", "strong"].includes(prevNode.type)) {
       return prevNode.type === currentNode.type;
     }
-    if (prevNode.type === "mdxJsxTextElement" && currentNode.type === "mdxJsxTextElement") {
+    if (prevNode.type === "mdxJsxTextElement" && currentNode.type === "mdxJsxTextElement" && JOINABLE_TAGS.includes(currentNode.name)) {
       const currentMdxNode = currentNode;
       return prevNode.name === currentMdxNode.name && JSON.stringify(prevNode.attributes) === JSON.stringify(currentMdxNode.attributes);
     }

package/dist/plugins/core/NestedLexicalEditor.js

@@ -1,6 +1,6 @@
 import { $addUpdateTag, $getNodeByKey, createEditor, $getRoot, BLUR_COMMAND, COMMAND_PRIORITY_EDITOR, SELECTION_CHANGE_COMMAND, COMMAND_PRIORITY_HIGH, KEY_BACKSPACE_COMMAND, COMMAND_PRIORITY_CRITICAL } from "lexical";
 import React__default from "react";
-import { corePluginHooks, NESTED_EDITOR_UPDATED_COMMAND } from "./index.js";
+import { NESTED_EDITOR_UPDATED_COMMAND, corePluginHooks } from "./index.js";
 import { ContentEditable } from "@lexical/react/LexicalContentEditable.js";
 import LexicalErrorBoundary from "@lexical/react/LexicalErrorBoundary.js";
 import { LexicalNestedComposer } from "@lexical/react/LexicalNestedComposer.js";
@@ -23,13 +23,17 @@ function useNestedEditorContext() {
 function useMdastNodeUpdater() {
   const { parentEditor, mdastNode, lexicalNode } = useNestedEditorContext();
   return function updateMdastNode(node) {
-    parentEditor.update(() => {
-      $addUpdateTag("history-push");
-      const currentNode = $getNodeByKey(lexicalNode.getKey());
-      if (currentNode) {
-        currentNode.setMdastNode({ ...mdastNode, ...node });
-      }
-    });
+    parentEditor.update(
+      () => {
+        $addUpdateTag("history-push");
+        const currentNode = $getNodeByKey(lexicalNode.getKey());
+        if (currentNode) {
+          currentNode.setMdastNode({ ...mdastNode, ...node });
+        }
+      },
+      { discrete: true }
+    );
+    parentEditor.dispatchCommand(NESTED_EDITOR_UPDATED_COMMAND, void 0);
   };
 }
 function useLexicalNodeRemove() {
@@ -98,7 +102,8 @@ const NestedLexicalEditor = function(props) {
           root: $getRoot(),
           visitors: exportVisitors,
           jsxComponentDescriptors,
-          jsxIsAvailable
+          jsxIsAvailable,
+          addImportStatements: false
         });
         const content2 = block ? mdast.children : mdast.children[0].children;
         updateMdastNode(getUpdatedMdastNode(structuredClone(mdastNode), content2));

package/dist/plugins/core/index.js

@@ -330,6 +330,9 @@ const coreSystem = system((r) => {
                   setTimeout(() => node.select());
                 }
               });
+              setTimeout(() => {
+                theEditor.dispatchCommand(NESTED_EDITOR_UPDATED_COMMAND, void 0);
+              });
             }
           }
         });

package/dist/utils/fp.js

@@ -1,14 +1,44 @@
+function compose(a, b) {
+  return (arg) => a(b(arg));
+}
+function thrush(arg, proc) {
+  return proc(arg);
+}
+function curry2to1(proc, arg1) {
+  return (arg2) => proc(arg1, arg2);
+}
+function curry1to0(proc, arg) {
+  return () => proc(arg);
+}
+function prop(property) {
+  return (object) => object[property];
+}
 function tap(arg, proc) {
   proc(arg);
   return arg;
 }
+function call(proc) {
+  proc();
+}
 function always(value) {
   return () => value;
 }
+function joinProc(...procs) {
+  return () => {
+    procs.map(call);
+  };
+}
 function noop() {
 }
 export {
   always,
+  call,
+  compose,
+  curry1to0,
+  curry2to1,
+  joinProc,
   noop,
-  tap
+  prop,
+  tap,
+  thrush
 };

package/dist/utils/lexicalHelpers.js

@@ -1,5 +1,14 @@
-import { $getSelection } from "lexical";
+import { $getSelection, $getRoot } from "lexical";
 import { $isAtNodeEnd } from "@lexical/selection";
+import { tap } from "./fp.js";
+import { exportMarkdownFromLexical } from "../exportMarkdownFromLexical.js";
+function fromWithinEditorRead(editor, fn) {
+  let result = null;
+  editor.getEditorState().read(() => {
+    result = fn();
+  });
+  return result;
+}
 function getSelectedNode(selection) {
   try {
     const anchor = selection.anchor;
@@ -56,7 +65,16 @@ function getSelectionRectangle(editor) {
   }
   return null;
 }
+function getStateAsMarkdown(editor, exportParams) {
+  return tap({ markdown: "" }, (result) => {
+    editor.getEditorState().read(() => {
+      result.markdown = exportMarkdownFromLexical({ root: $getRoot(), ...exportParams });
+    });
+  }).markdown;
+}
 export {
+  fromWithinEditorRead,
   getSelectedNode,
-  getSelectionRectangle
+  getSelectionRectangle,
+  getStateAsMarkdown
 };

package/dist/utils/makeHslTransparent.d.ts

@@ -0,0 +1 @@
+export declare function makeHslTransparent(hsl: string, alpha: number): string;

package/dist/utils/makeHslTransparent.js

@@ -0,0 +1,6 @@
+function makeHslTransparent(hsl, alpha) {
+  return hsl.replace("hsl", "hsla").replace(")", `, ${alpha})`);
+}
+export {
+  makeHslTransparent
+};

package/dist/utils/whitespaceConversion.d.ts

@@ -0,0 +1,2 @@
+export declare const WHITESPACE_MARKER = "\u00A0";
+export declare function replaceWhitespace(str: string): string;

package/dist/utils/whitespaceConversion.js

@@ -0,0 +1,9 @@
+const WHITESPACE_MARKER = " ";
+const WHITESPACE_REGEX = /^\s+|\s+$/g;
+function replaceWhitespace(str) {
+  return str.replace(WHITESPACE_REGEX, (spaces) => WHITESPACE_MARKER.repeat(spaces.length));
+}
+export {
+  WHITESPACE_MARKER,
+  replaceWhitespace
+};

package/package.json

@@ -9,7 +9,7 @@
   "private": false,
   "sideEffects": false,
   "type": "module",
-  "version": "1.11.1",
+  "version": "1.11.3",
   "description": "React component for rich text markdown editing",
   "scripts": {
     "build": "vite build",
@@ -232,6 +232,11 @@
       "import": "./dist/plugins/core/NestedLexicalEditor.js",
       "default": "./dist/plugins/core/NestedLexicalEditor.js"
     },
+    "./utils": {
+      "types": "./dist/utils.d.ts",
+      "import": "./dist/utils.js",
+      "default": "./dist/utils.js"
+    },
     "./plugins/codeblock": {
       "types": "./dist/plugins/codeblock/index.d.ts",
       "import": "./dist/plugins/codeblock/index.js",