@lobehub/editor 3.3.1 → 3.3.2

package/es/plugins/codemirror-block/command/index.js

@@ -1,6 +1,7 @@
-import { mergeRegister } from '@lexical/utils';
-import { $getNodeByKey, $insertNodes, $setSelection, COMMAND_PRIORITY_EDITOR, createCommand } from 'lexical';
-import { $createCodeMirrorNode } from "../node/CodeMirrorNode";
+import { $findMatchingParent, mergeRegister } from '@lexical/utils';
+import { $getNodeByKey, $getSelection, $insertNodes, $isRangeSelection, $setSelection, COMMAND_PRIORITY_EDITOR, createCommand } from 'lexical';
+import { UPDATE_CODEBLOCK_LANG } from "../../codeblock";
+import { $createCodeMirrorNode, $isCodeMirrorNode } from "../node/CodeMirrorNode";
 export var INSERT_CODEMIRROR_COMMAND = createCommand('INSERT_CODEMIRROR_COMMAND');
 export var SELECT_BEFORE_CODEMIRROR_COMMAND = createCommand('SELECT_BEFORE_CODEMIRROR_COMMAND');
 export var SELECT_AFTER_CODEMIRROR_COMMAND = createCommand('SELECT_AFTER_CODEMIRROR_COMMAND');
@@ -12,7 +13,37 @@ export function registerCodeMirrorCommand(editor) {
     });
     return true;
   }, COMMAND_PRIORITY_EDITOR // Priority
-  ), editor.registerCommand(SELECT_BEFORE_CODEMIRROR_COMMAND, function (payload) {
+  ), editor.registerCommand(UPDATE_CODEBLOCK_LANG, function (payload) {
+    var codeMirrorNode = editor.getEditorState().read(function () {
+      var selection = $getSelection();
+      if ($isRangeSelection(selection)) {
+        if (selection.isCollapsed()) {
+          var node = $findMatchingParent(selection.anchor.getNode(), $isCodeMirrorNode);
+          return node;
+        } else {
+          var anchor = $findMatchingParent(selection.anchor.getNode(), $isCodeMirrorNode);
+          var focus = $findMatchingParent(selection.focus.getNode(), $isCodeMirrorNode);
+          if (anchor && focus && anchor === focus) {
+            return anchor;
+          }
+          return null;
+        }
+      }
+      return false;
+    });
+    if (!codeMirrorNode) {
+      return false;
+    }
+    // Need to defer execution due to possible transform execution order confusion from selection changes
+    queueMicrotask(function () {
+      editor.update(function () {
+        if ($isCodeMirrorNode(codeMirrorNode)) {
+          codeMirrorNode.setLang(payload.lang);
+        }
+      });
+    });
+    return true;
+  }, COMMAND_PRIORITY_EDITOR), editor.registerCommand(SELECT_BEFORE_CODEMIRROR_COMMAND, function (payload) {
     editor.update(function () {
       var node = $getNodeByKey(payload.key);
       if (!node) {

package/es/plugins/codemirror-block/index.d.ts

@@ -1,2 +1,3 @@
+export { INSERT_CODEMIRROR_COMMAND, SELECT_AFTER_CODEMIRROR_COMMAND, SELECT_BEFORE_CODEMIRROR_COMMAND, } from './command';
 export * from './plugin';
 export * from './react';

package/es/plugins/codemirror-block/index.js

@@ -1,2 +1,7 @@
+// Export commands explicitly to avoid conflicts with codeblock plugin
+export { INSERT_CODEMIRROR_COMMAND, SELECT_AFTER_CODEMIRROR_COMMAND, SELECT_BEFORE_CODEMIRROR_COMMAND
+// UPDATE_CODEBLOCK_LANG is already exported by codeblock plugin
+// Both plugins can use the same command for consistency
+} from "./command";
 export * from "./plugin";
 export * from "./react";

package/es/plugins/codemirror-block/react/CodemirrorNode.js

@@ -165,9 +165,17 @@ var ReactCodemirrorNode = function ReactCodemirrorNode(_ref) {
     }
   }, [isSelected, isNodeSelected, editor]);
   useEffect(function () {
+    // 防止重复初始化：如果已经有实例，直接返回
+    if (instanceRef.current) {
+      return;
+    }
     if (ref.current) {
       var dom = ref.current;
       loadCodeMirror().then(function (CodeMirror) {
+        // 双重检查：在异步操作后再次确认没有重复初始化
+        if (instanceRef.current) {
+          return;
+        }
         var instance = CodeMirror.fromTextArea(dom, {
           // keep options alphabetically ordered
           indentWithTabs: useTabs,

package/es/plugins/codemirror-block/react/style.js

@@ -4,5 +4,5 @@ import { createStaticStyles } from 'antd-style';
 export var styles = createStaticStyles(function (_ref) {
   var css = _ref.css,
     cssVar = _ref.cssVar;
-  return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    cursor: pointer;\n\n    position: relative;\n\n    overflow: hidden;\n    display: flex;\n    flex-direction: column;\n    align-items: center;\n\n    width: 100%;\n\n    background: ", ";\n\n    .cm-hidden-actions {\n      opacity: 0;\n      transition: opacity 0.2s ease-in-out;\n    }\n\n    .cm-language-select {\n      opacity: 0.5;\n      filter: grayscale(100%);\n      transition:\n        opacity,\n        grayscale 0.2s ease-in-out;\n    }\n\n    &.selected {\n      user-select: none;\n    }\n\n    &.selected::after {\n      pointer-events: none;\n      content: '';\n\n      position: absolute;\n      z-index: 10;\n      inset: 0;\n\n      width: 100%;\n      height: 100%;\n\n      opacity: 0.2;\n      background: ", ";\n\n      transition: all 0.3s;\n    }\n\n    .cm-container {\n      position: relative;\n      width: 100%;\n      border-block-start: 1px solid ", ";\n    }\n\n    .cm-container-collapsed {\n      overflow: hidden;\n      height: 0;\n      border-block-start: none;\n    }\n\n    .cm-textarea {\n      height: 44px;\n      opacity: 0;\n    }\n\n    &:hover {\n      .cm-hidden-actions {\n        opacity: 1;\n      }\n\n      .cm-language-select {\n        opacity: 1;\n        filter: grayscale(0);\n      }\n    }\n  "])), cssVar.colorFillQuaternary, cssVar.yellow, cssVar.colorFillQuaternary);
+  return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    cursor: pointer;\n\n    position: relative;\n\n    overflow: hidden;\n    display: flex;\n    flex-direction: column;\n    align-items: center;\n\n    width: 100%;\n    margin-block: calc(var(--lobe-markdown-margin-multiple) * 0.5em);\n    border-radius: var(--lobe-markdown-border-radius);\n\n    background: ", ";\n\n    .cm-hidden-actions {\n      opacity: 0;\n      transition: opacity 0.2s ease-in-out;\n    }\n\n    .cm-language-select {\n      opacity: 0.5;\n      filter: grayscale(100%);\n      transition:\n        opacity,\n        grayscale 0.2s ease-in-out;\n    }\n\n    &.selected {\n      user-select: none;\n    }\n\n    &.selected::after {\n      pointer-events: none;\n      content: '';\n\n      position: absolute;\n      z-index: 10;\n      inset: 0;\n\n      width: 100%;\n      height: 100%;\n\n      opacity: 0.2;\n      background: ", ";\n\n      transition: all 0.3s;\n    }\n\n    .cm-container {\n      position: relative;\n      width: 100%;\n      border-block-start: 1px solid ", ";\n    }\n\n    .cm-container-collapsed {\n      overflow: hidden;\n      height: 0;\n      border-block-start: none;\n    }\n\n    .cm-textarea {\n      height: 44px;\n      opacity: 0;\n    }\n\n    &:hover {\n      .cm-hidden-actions {\n        opacity: 1;\n      }\n\n      .cm-language-select {\n        opacity: 1;\n        filter: grayscale(0);\n      }\n    }\n  "])), cssVar.colorFillQuaternary, cssVar.yellow, cssVar.colorFillQuaternary);
 });

package/es/react/hooks/useEditorState/index.js

@@ -16,6 +16,7 @@ import { noop } from "../../../editor-kernel";
 import { INSERT_CODEINLINE_COMMAND } from "../../../plugins/code";
 import { $isSelectionInCodeInline } from "../../../plugins/code/node/code";
 import { UPDATE_CODEBLOCK_LANG } from "../../../plugins/codeblock";
+import { $createCodeMirrorNode, $isCodeMirrorNode } from "../../../plugins/codemirror-block/node/CodeMirrorNode";
 import { $isRootTextContentEmpty } from "../../../plugins/common/utils";
 import { INSERT_LINK_HIGHLIGHT_COMMAND } from "../../../plugins/link-highlight/command";
 import { $isLinkHighlightNode } from "../../../plugins/link-highlight/node/link-highlight";
@@ -137,9 +138,18 @@ export function useEditorState(editor) {
       var parent = node.getParent();
       // Check for both Link and LinkHighlight nodes
       setIsLink($isLinkNode(parent) || $isLinkNode(node) || $isLinkHighlightNode(parent) || $isLinkHighlightNode(node));
-      var isCodeBlock = $isCodeNode(element) && $isCodeNode(focusElement) && elementKey === focusElement.getKey();
+      // Support both CodeNode (from codeblock plugin) and CodeMirrorNode (from codemirror-block plugin)
+      var isLexicalCodeBlock = $isCodeNode(element) && $isCodeNode(focusElement) && elementKey === focusElement.getKey();
+      var isCodeMirrorBlock = $isCodeMirrorNode(element) && $isCodeMirrorNode(focusElement) && elementKey === focusElement.getKey();
+      var isCodeBlock = isLexicalCodeBlock || isCodeMirrorBlock;
       setIsInCodeblok(isCodeBlock);
-      setCodeblockLang(isCodeBlock ? element.getLanguage() : '');
+      if (isLexicalCodeBlock) {
+        setCodeblockLang(element.getLanguage());
+      } else if (isCodeMirrorBlock) {
+        setCodeblockLang(element.lang);
+      } else {
+        setCodeblockLang('');
+      }
       var _isBlockquote = $isQuoteNode(element) && $isQuoteNode(focusElement) && elementKey === focusElement.getKey();
       setIsInBlockquote(_isBlockquote);
       if (elementDOM !== null) {
@@ -222,21 +232,46 @@ export function useEditorState(editor) {
     if (blockType !== 'code') {
       var _editor$getLexicalEdi2;
       editor === null || editor === void 0 || (_editor$getLexicalEdi2 = editor.getLexicalEditor()) === null || _editor$getLexicalEdi2 === void 0 || _editor$getLexicalEdi2.update(function () {
+        var _lexicalEditor$_nodes;
         var selection = $getSelection();
         if (!selection) {
           return;
         }
-        if (!$isRangeSelection(selection) || selection.isCollapsed()) {
-          $setBlocksType(selection, function () {
-            return $createCodeNode();
-          });
+
+        // Try to use CodeMirrorNode if available, otherwise fall back to CodeNode
+        var lexicalEditor = editor === null || editor === void 0 ? void 0 : editor.getLexicalEditor();
+        var hasCodeMirrorNode = lexicalEditor ? lexicalEditor._nodes.has('code') && ((_lexicalEditor$_nodes = lexicalEditor._nodes.get('code')) === null || _lexicalEditor$_nodes === void 0 ? void 0 : _lexicalEditor$_nodes.klass.name) === 'CodeMirrorNode' : false;
+        if (hasCodeMirrorNode) {
+          // Use CodeMirrorNode
+          if (!$isRangeSelection(selection) || selection.isCollapsed()) {
+            var textContent = selection.getTextContent();
+            var codeMirrorNode = $createCodeMirrorNode('plain', textContent);
+            var nodeSelection = $createNodeSelection();
+            nodeSelection.add(codeMirrorNode.getKey());
+            selection.insertNodes([codeMirrorNode]);
+            $setSelection(nodeSelection);
+          } else {
+            var _textContent = selection.getTextContent();
+            var _codeMirrorNode = $createCodeMirrorNode('plain', _textContent);
+            selection.insertNodes([_codeMirrorNode]);
+            var _nodeSelection = $createNodeSelection();
+            _nodeSelection.add(_codeMirrorNode.getKey());
+            $setSelection(_nodeSelection);
+          }
         } else {
-          var textContent = selection.getTextContent();
-          var codeNode = $createCodeNode();
-          selection.insertNodes([codeNode]);
-          selection = $getSelection();
-          if ($isRangeSelection(selection)) {
-            selection.insertRawText(textContent);
+          // Use original CodeNode
+          if (!$isRangeSelection(selection) || selection.isCollapsed()) {
+            $setBlocksType(selection, function () {
+              return $createCodeNode();
+            });
+          } else {
+            var _textContent2 = selection.getTextContent();
+            var codeNode = $createCodeNode();
+            selection.insertNodes([codeNode]);
+            selection = $getSelection();
+            if ($isRangeSelection(selection)) {
+              selection.insertRawText(_textContent2);
+            }
           }
         }
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/editor",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "A powerful and extensible rich text editor built on Meta's Lexical framework, providing a modern editing experience with React integration.",
   "keywords": [
     "lobehub",