@lobehub/editor 3.3.0 → 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/lib/index.d.ts

@@ -18,6 +18,7 @@ export interface ICodeMirrorInstance {
     clearHistory(): void;
     destroy(): void;
     focus(): void;
+    foldGutter?: boolean;
     foldLines(): number[];
     foldLines(lines: number[]): void;
     formatAll(): void;
@@ -55,4 +56,8 @@ export interface ICodeMirror {
     fromTextArea: (textarea: HTMLTextAreaElement, options?: Options) => ICodeMirrorInstance;
     new (dom: HTMLElement, options?: Options): ICodeMirrorInstance;
 }
-export declare function loadCodeMirror(): Promise<ICodeMirror>;
+/**
+ * 从 CDN 加载 CodeMirror
+ * @param cdnUrl - 可选的自定义 CDN URL
+ */
+export declare function loadCodeMirror(cdnUrl?: string): Promise<ICodeMirror>;

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

@@ -2,39 +2,145 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-var CodeMirrorLoading = false;
+import { createDebugLogger } from "../../../utils/debug";
+var logger = createDebugLogger('plugin', 'codemirror-loader');
+
+// CDN URL 配置
+var DEFAULT_CDN_URL = 'https://registry.npmmirror.com/@lobehub/codemirror/1.0.0/files/es/index.js';
+var LOAD_TIMEOUT = 10000; // 10 秒超时
+var POLL_INTERVAL = 50; // 50ms 轮询间隔
+
 export var AllLang = [];
+// 使用 Promise 缓存避免并发重复加载
+var codeMirrorPromise = null;
+
+/**
+ * 加载 script 标签
+ */
+function loadScript(src) {
+  return new Promise(function (resolve, reject) {
+    // 检查是否已经加载过相同的脚本
+    var existingScript = document.querySelector("script[src=\"".concat(src, "\"]"));
+    if (existingScript) {
+      logger.debug('Script already loaded:', src);
+      resolve();
+      return;
+    }
+    logger.debug('Loading script:', src);
+    var script = document.createElement('script');
+    script.src = src;
+    script.type = 'module';
+    script.async = true;
+    script.addEventListener('load', function () {
+      logger.debug('Script loaded successfully:', src);
+      resolve();
+    });
+    script.addEventListener('error', function (error) {
+      logger.error('Failed to load script:', src, error);
+      reject(new Error("Failed to load script: ".concat(src)));
+    });
+    document.head.append(script);
+  });
+}
+
+/**
+ * 等待 window.CodeMirror 可用
+ */
+function waitForCodeMirror() {
+  var timeout = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : LOAD_TIMEOUT;
+  return new Promise(function (resolve, reject) {
+    var startTime = Date.now();
+    var checkCodeMirror = function checkCodeMirror() {
+      // @ts-expect-error not error
+      if (window.CodeMirror) {
+        logger.debug('CodeMirror is ready');
+        resolve();
+        return;
+      }
+      if (Date.now() - startTime > timeout) {
+        logger.error('Timeout waiting for CodeMirror');
+        reject(new Error('Timeout: CodeMirror failed to load from CDN'));
+        return;
+      }
+      setTimeout(checkCodeMirror, POLL_INTERVAL);
+    };
+    checkCodeMirror();
+  });
+}
+
+/**
+ * 从 CDN 加载 CodeMirror
+ * @param cdnUrl - 可选的自定义 CDN URL
+ */
 export function loadCodeMirror() {
   return _loadCodeMirror.apply(this, arguments);
 }
 function _loadCodeMirror() {
-  _loadCodeMirror = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
+  _loadCodeMirror = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _window$CodeMirror;
+    var cdnUrl,
+      _args2 = arguments;
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          if (!(!window.CodeMirror && !CodeMirrorLoading)) {
-            _context.next = 11;
+          cdnUrl = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : DEFAULT_CDN_URL;
+          if (!((_window$CodeMirror = window.CodeMirror) !== null && _window$CodeMirror !== void 0 && _window$CodeMirror.default)) {
+            _context2.next = 4;
+            break;
+          }
+          logger.debug('CodeMirror already available');
+          // @ts-expect-error not error
+          return _context2.abrupt("return", window.CodeMirror.default);
+        case 4:
+          if (!codeMirrorPromise) {
+            _context2.next = 7;
             break;
           }
-          CodeMirrorLoading = true;
-          _context.prev = 2;
-          _context.next = 5;
-          return import('@lobehub/codemirror');
-        case 5:
-          _context.next = 11;
-          break;
+          logger.debug('CodeMirror loading in progress, reusing promise');
+          return _context2.abrupt("return", codeMirrorPromise);
         case 7:
-          _context.prev = 7;
-          _context.t0 = _context["catch"](2);
-          CodeMirrorLoading = false;
-          throw _context.t0;
-        case 11:
-          return _context.abrupt("return", window.CodeMirror.default);
-        case 12:
+          // 创建新的加载 Promise
+          codeMirrorPromise = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+            var _window$CodeMirror2;
+            return _regeneratorRuntime().wrap(function _callee$(_context) {
+              while (1) switch (_context.prev = _context.next) {
+                case 0:
+                  _context.prev = 0;
+                  logger.debug('Starting CodeMirror load from:', cdnUrl);
+                  _context.next = 4;
+                  return loadScript(cdnUrl);
+                case 4:
+                  _context.next = 6;
+                  return waitForCodeMirror();
+                case 6:
+                  if ((_window$CodeMirror2 = window.CodeMirror) !== null && _window$CodeMirror2 !== void 0 && _window$CodeMirror2.default) {
+                    _context.next = 8;
+                    break;
+                  }
+                  throw new Error('CodeMirror loaded but not properly initialized');
+                case 8:
+                  logger.debug('CodeMirror loaded successfully');
+                  // @ts-expect-error not error
+                  return _context.abrupt("return", window.CodeMirror.default);
+                case 12:
+                  _context.prev = 12;
+                  _context.t0 = _context["catch"](0);
+                  // 加载失败时清除缓存，允许重试
+                  codeMirrorPromise = null;
+                  logger.error('Failed to load CodeMirror:', _context.t0);
+                  throw _context.t0;
+                case 17:
+                case "end":
+                  return _context.stop();
+              }
+            }, _callee, null, [[0, 12]]);
+          }))();
+          return _context2.abrupt("return", codeMirrorPromise);
+        case 9:
         case "end":
-          return _context.stop();
+          return _context2.stop();
       }
-    }, _callee, null, [[2, 7]]);
+    }, _callee2);
   }));
   return _loadCodeMirror.apply(this, arguments);
 }

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.0",
+  "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",
@@ -41,7 +41,6 @@
     "@lexical/selection": "^0.39.0",
     "@lexical/table": "^0.39.0",
     "@lexical/utils": "^0.39.0",
-    "@lobehub/codemirror": "^1.0.0",
     "@shikijs/core": "^3.20.0",
     "@shikijs/engine-javascript": "^3.20.0",
     "@xmldom/xmldom": "^0.8.11",