@lobehub/editor 3.6.0 → 3.7.0

package/es/global.d.ts

@@ -0,0 +1,5 @@
+declare module 'lexical' {
+  export function resetRandomKey(key?: number): void;
+}
+
+export {};

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

@@ -1,5 +1,5 @@
 import { $findMatchingParent, mergeRegister } from '@lexical/utils';
-import { $getNodeByKey, $getSelection, $insertNodes, $isRangeSelection, $setSelection, COMMAND_PRIORITY_EDITOR, createCommand } from 'lexical';
+import { $createNodeSelection, $createParagraphNode, $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');
@@ -10,6 +10,12 @@ export function registerCodeMirrorCommand(editor) {
     editor.update(function () {
       var codeMirrorNode = $createCodeMirrorNode('', '');
       $insertNodes([codeMirrorNode]);
+
+      // Select the inserted CodeMirror node so the React decorator can
+      // focus into the CodeMirror instance (caret stays "inside" the block).
+      var selection = $createNodeSelection();
+      selection.add(codeMirrorNode.getKey());
+      $setSelection(selection);
     });
     return true;
   }, COMMAND_PRIORITY_EDITOR // Priority
@@ -65,10 +71,19 @@ export function registerCodeMirrorCommand(editor) {
         return;
       }
       var nextNode = node.getNextSibling();
-      var sel = nextNode === null || nextNode === void 0 ? void 0 : nextNode.selectStart();
-      console.info('SELECT_AFTER_CODEMIRROR_COMMAND', sel, nextNode, node);
-      if (sel) {
-        $setSelection(sel);
+      var selection = nextNode === null || nextNode === void 0 ? void 0 : nextNode.selectStart();
+
+      // If there is no next sibling (e.g. codeblock at end), create a new paragraph
+      // after the codeblock and move caret into it.
+      if (selection) {
+        $setSelection(selection);
+      } else {
+        var paragraph = $createParagraphNode();
+        node.insertAfter(paragraph);
+        var paragraphSelection = paragraph.selectStart();
+        if (paragraphSelection) {
+          $setSelection(paragraphSelection);
+        }
       }
       editor.focus();
     });

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

@@ -197,6 +197,20 @@ var ReactCodemirrorNode = function ReactCodemirrorNode(_ref) {
         instance.on('keydown', function (instance, e) {
           e.stopPropagation();
 
+          // Cmd+Enter / Ctrl+Enter: exit codeblock (move caret after the block)
+          if ((e.key === 'Enter' || e.keyCode === 13) && (e.metaKey || e.ctrlKey)) {
+            var _instanceRef$current3;
+            e.preventDefault();
+            (_instanceRef$current3 = instanceRef.current) === null || _instanceRef$current3 === void 0 || _instanceRef$current3.blur();
+            editor.dispatchCommand(SELECT_AFTER_CODEMIRROR_COMMAND, {
+              key: node.getKey()
+            });
+            queueMicrotask(function () {
+              editor.focus();
+            });
+            return;
+          }
+
           // 当代码块为空且按退格键时，删除代码块节点
           if (e.key === 'Backspace' || e.keyCode === 8) {
             // 检查代码内容是否为空（使用 ref 中存储的状态）
@@ -222,8 +236,8 @@ var ReactCodemirrorNode = function ReactCodemirrorNode(_ref) {
           }
         });
         instance.on('leftOut', function () {
-          var _instanceRef$current3;
-          (_instanceRef$current3 = instanceRef.current) === null || _instanceRef$current3 === void 0 || _instanceRef$current3.blur();
+          var _instanceRef$current4;
+          (_instanceRef$current4 = instanceRef.current) === null || _instanceRef$current4 === void 0 || _instanceRef$current4.blur();
           editor.dispatchCommand(SELECT_BEFORE_CODEMIRROR_COMMAND, {
             key: node.getKey()
           });
@@ -232,8 +246,8 @@ var ReactCodemirrorNode = function ReactCodemirrorNode(_ref) {
           });
         });
         instance.on('rightOut', function () {
-          var _instanceRef$current4;
-          (_instanceRef$current4 = instanceRef.current) === null || _instanceRef$current4 === void 0 || _instanceRef$current4.blur();
+          var _instanceRef$current5;
+          (_instanceRef$current5 = instanceRef.current) === null || _instanceRef$current5 === void 0 || _instanceRef$current5.blur();
           editor.dispatchCommand(SELECT_AFTER_CODEMIRROR_COMMAND, {
             key: node.getKey()
           });

package/package.json

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