@mdxeditor/editor 3.53.0 → 3.54.0

package/dist/index.d.ts

@@ -540,6 +540,8 @@ export declare interface CodeBlockLanguage {
     alias?: readonly string[];
     /** File extensions associated with this language (e.g. `["js", "mjs"]`). */
     extensions?: readonly string[];
+    /** Pre-loaded language support. When provided, this is used directly instead of auto-loading. */
+    support?: CodeBlockLanguageSupport;
 }
 
 /**
@@ -548,6 +550,14 @@ export declare interface CodeBlockLanguage {
  */
 export declare const codeBlockLanguages$: NodeRef<NormalizedCodeBlockLanguages>;
 
+/**
+ * Compatible with CodeMirror `LanguageSupport` objects without exposing that package in the public API.
+ * @group CodeMirror
+ */
+export declare interface CodeBlockLanguageSupport {
+    extension: Extension_2;
+}
+
 /**
  * A lexical node that represents a fenced code block. Use {@link "$createCodeBlockNode"} to construct one.
  * @group Code Block
@@ -1204,6 +1214,8 @@ export declare const editorWrapperElementRef$: NodeRef<default_2.RefObject<HTMLD
 
 /* Excluded from this release type: editorWrappers$ */
 
+/* Excluded from this release type: EMPTY_VALUE */
+
 export declare const EmptyTextNodeIndex: TextNodeIndex;
 
 /* Excluded from this release type: ExportLexicalTreeOptions */
@@ -2533,6 +2545,8 @@ export declare interface NormalizedCodeBlockLanguages {
     }[];
     /** Maps any known key (canonical, alias, extension) to the canonical key. */
     keyMap: Record<string, string>;
+    /** Maps canonical keys to pre-loaded language support, when provided. */
+    supportMap: Partial<Record<string, CodeBlockLanguageSupport>>;
 }
 
 /**

package/dist/index.js

@@ -18,7 +18,7 @@ import { insertJsx$, isMdastJsxNode, jsxPlugin } from "./plugins/jsx/index.js";
 import { GenericJsxEditor } from "./jsx-editors/GenericJsxEditor.js";
 import { insertSandpack$, sandpackConfig$, sandpackPlugin } from "./plugins/sandpack/index.js";
 import { SandpackEditor } from "./plugins/sandpack/SandpackEditor.js";
-import { codeBlockLanguages$, codeMirrorAutoLoadLanguageSupport$, codeMirrorExtensions$, codeMirrorPlugin, insertCodeMirror$, normalizeCodeBlockLanguages } from "./plugins/codemirror/index.js";
+import { EMPTY_VALUE, codeBlockLanguages$, codeMirrorAutoLoadLanguageSupport$, codeMirrorExtensions$, codeMirrorPlugin, insertCodeMirror$, normalizeCodeBlockLanguages } from "./plugins/codemirror/index.js";
 import { COMMON_STATE_CONFIG_EXTENSIONS, CodeMirrorEditor } from "./plugins/codemirror/CodeMirrorEditor.js";
 import { appendCodeBlockEditorDescriptor$, codeBlockPlugin, defaultCodeBlockLanguage$, insertCodeBlock$ } from "./plugins/codeblock/index.js";
 import { directivesPlugin, insertDirective$ } from "./plugins/directives/index.js";
@@ -110,6 +110,7 @@ export {
   DialogButton,
   DiffSourceToggleWrapper,
   DirectiveNode,
+  EMPTY_VALUE,
   EmptyTextNodeIndex,
   FrontmatterNode,
   GenericDirectiveEditor,

package/dist/plugins/codemirror/CodeMirrorEditor.js

@@ -10,11 +10,10 @@ import { indentWithTab } from "@codemirror/commands";
 import { basicLight } from "cm6-theme-basic-light";
 import { basicSetup } from "codemirror";
 import { $setSelection } from "lexical";
-import { codeMirrorExtensions$, codeMirrorAutoLoadLanguageSupport$, codeBlockLanguages$ } from "./index.js";
+import { codeMirrorExtensions$, codeMirrorAutoLoadLanguageSupport$, codeBlockLanguages$, EMPTY_VALUE } from "./index.js";
 import { useCodeMirrorRef } from "../sandpack/useCodeMirrorRef.js";
 import { Select } from "../toolbar/primitives/select.js";
 const COMMON_STATE_CONFIG_EXTENSIONS = [];
-const EMPTY_VALUE = "__EMPTY_VALUE__";
 const CodeMirrorEditor = ({ language, nodeKey, code, focusEmitter }) => {
   const t = useTranslation();
   const { parentEditor, lexicalNode } = useCodeBlockEditorContext();
@@ -58,16 +57,22 @@ const CodeMirrorEditor = ({ language, nodeKey, code, focusEmitter }) => {
       if (readOnly) {
         extensions.push(EditorState.readOnly.of(true));
       }
-      if (language !== "" && autoLoadLanguageSupport) {
-        const languageData = languages.find((l) => {
-          return l.name === language || l.alias.includes(language) || l.extensions.includes(language);
-        });
-        if (languageData) {
-          try {
-            const languageSupport = await languageData.load();
-            extensions.push(languageSupport.extension);
-          } catch (_e) {
-            console.warn("failed to load language support for", language);
+      if (language !== "") {
+        const canonical = codeBlockLanguages.keyMap[language] ?? language;
+        const providedSupport = codeBlockLanguages.supportMap[canonical];
+        if (providedSupport) {
+          extensions.push(providedSupport.extension);
+        } else if (autoLoadLanguageSupport) {
+          const languageData = languages.find((l) => {
+            return l.name === language || l.alias.includes(language) || l.extensions.includes(language);
+          });
+          if (languageData) {
+            try {
+              const languageSupport = await languageData.load();
+              extensions.push(languageSupport.extension);
+            } catch (_e) {
+              console.warn("failed to load language support for", language);
+            }
           }
         }
       }

package/dist/plugins/codemirror/index.js

@@ -2,10 +2,12 @@ import { realmPlugin } from "../../RealmWithPlugins.js";
 import { Cell, Signal, map } from "@mdxeditor/gurx";
 import { insertCodeBlock$, appendCodeBlockEditorDescriptor$ } from "../codeblock/index.js";
 import { CodeMirrorEditor } from "./CodeMirrorEditor.js";
+const EMPTY_VALUE = "__EMPTY_VALUE__";
 function normalizeCodeBlockLanguages(input) {
   var _a;
   const items = [];
   const keyMap = {};
+  const supportMap = {};
   if (Array.isArray(input)) {
     for (const lang of input) {
       const canonical = ((_a = lang.alias) == null ? void 0 : _a[0]) ?? lang.name.toLowerCase();
@@ -22,18 +24,21 @@ function normalizeCodeBlockLanguages(input) {
         }
       }
       keyMap[lang.name.toLowerCase()] = canonical;
+      if (lang.support) {
+        supportMap[canonical] = lang.support;
+      }
     }
   } else {
     const firstKeyByLabel = {};
     for (const [key, label] of Object.entries(input)) {
       if (!(label in firstKeyByLabel)) {
         firstKeyByLabel[label] = key;
-        items.push({ value: key || "__EMPTY_VALUE__", label });
+        items.push({ value: key || EMPTY_VALUE, label });
       }
-      keyMap[key] = firstKeyByLabel[label] || "__EMPTY_VALUE__";
+      keyMap[key] = firstKeyByLabel[label] || EMPTY_VALUE;
     }
   }
-  return { items, keyMap };
+  return { items, keyMap, supportMap };
 }
 const codeBlockLanguages$ = Cell(
   normalizeCodeBlockLanguages({
@@ -82,13 +87,14 @@ const codeMirrorPlugin = realmPlugin({
 function buildCodeBlockDescriptor(normalized) {
   return {
     match(language, meta) {
-      return (language ?? "") in normalized.keyMap && !meta;
+      return Object.hasOwn(normalized.keyMap, language ?? "") && !meta;
     },
     priority: 1,
     Editor: CodeMirrorEditor
   };
 }
 export {
+  EMPTY_VALUE,
   codeBlockLanguages$,
   codeMirrorAutoLoadLanguageSupport$,
   codeMirrorExtensions$,

package/dist/plugins/core/MdastParagraphVisitor.js

@@ -1,5 +1,5 @@
 import { $createParagraphNode } from "lexical";
-const lexicalTypesThatShouldSkipParagraphs = ["listitem", "quote", "admonition"];
+const lexicalTypesThatShouldSkipParagraphs = ["listitem", "admonition"];
 const MdastParagraphVisitor = {
   testNode: "paragraph",
   visitNode: function({ mdastNode, lexicalParent, actions }) {

package/dist/plugins/quote/LexicalQuoteVisitor.js

@@ -1,10 +1,8 @@
 import { $isQuoteNode } from "@lexical/rich-text";
 const LexicalQuoteVisitor = {
   testLexicalNode: $isQuoteNode,
-  visitLexicalNode: ({ lexicalNode, mdastParent, actions }) => {
-    const paragraph = { type: "paragraph", children: [] };
-    actions.appendToParent(mdastParent, { type: "blockquote", children: [paragraph] });
-    actions.visitChildren(lexicalNode, paragraph);
+  visitLexicalNode: ({ actions }) => {
+    actions.addAndStepInto("blockquote");
   }
 };
 export {

package/dist/plugins/toolbar/components/ChangeCodeMirrorLanguage.js

@@ -2,10 +2,9 @@ import { useCellValues } from "@mdxeditor/gurx";
 import React__default from "react";
 import styles from "../../../styles/ui.module.css.js";
 import { $isCodeBlockNode } from "../../codeblock/CodeBlockNode.js";
-import { codeBlockLanguages$ } from "../../codemirror/index.js";
+import { codeBlockLanguages$, EMPTY_VALUE } from "../../codemirror/index.js";
 import { editorInFocus$, activeEditor$, useTranslation } from "../../core/index.js";
 import { Select } from "../primitives/select.js";
-const EMPTY_VALUE = "__EMPTY_VALUE__";
 const ChangeCodeMirrorLanguage = () => {
   const [editorInFocus, theEditor, codeBlockLanguages] = useCellValues(editorInFocus$, activeEditor$, codeBlockLanguages$);
   const codeBlockNode = $isCodeBlockNode(editorInFocus.rootNode) ? editorInFocus.rootNode : null;

package/dist/plugins/toolbar/primitives/select.js

@@ -38,7 +38,7 @@ const SelectContent = ({
       },
       position: "popper"
     },
-    /* @__PURE__ */ React__default.createElement(RadixSelect.Viewport, { "data-editor-dropdown": true }, children)
+    /* @__PURE__ */ React__default.createElement(RadixSelect.Viewport, { "data-editor-dropdown": true, style: { maxHeight: "var(--radix-select-content-available-height)" } }, children)
   ));
 };
 const SelectButtonTrigger = ({

package/package.json

@@ -11,7 +11,7 @@
     "*.css"
   ],
   "type": "module",
-  "version": "3.53.0",
+  "version": "3.54.0",
   "description": "React component for rich text markdown editing",
   "scripts": {
     "build": "vite build",