@lobehub/editor 1.8.6 → 1.9.0

package/es/editor-kernel/utils.d.ts

@@ -23,3 +23,10 @@ export declare function isDocumentFragment(x: unknown): x is DocumentFragment;
 export declare function getParentElement(node: Node): HTMLElement | null;
 export declare function $getNearestNodeFromDOMNode(startingDOM: Node, editor: LexicalEditor, editorState?: ReturnType<LexicalEditor['getEditorState']>): LexicalNode | null;
 export declare function getKernelFromEditor(editor: LexicalEditor): IEditorKernel;
+/**
+ *
+ * @param nodeA
+ * @param nodeB
+ * @returns
+ */
+export declare function compareNodeOrder(nodeA: LexicalNode, nodeB: LexicalNode): number;

package/es/editor-kernel/utils.js

@@ -68,4 +68,44 @@ export function getKernelFromEditor(editor) {
   var _editor$_createEditor;
   // @ts-expect-error __kernel is injected into the lexical editor instance
   return ((_editor$_createEditor = editor._createEditorArgs) === null || _editor$_createEditor === void 0 ? void 0 : _editor$_createEditor.__kernel) || editor._kernel;
+}
+
+/**
+ *
+ * @param nodeA
+ * @param nodeB
+ * @returns
+ */
+export function compareNodeOrder(nodeA, nodeB) {
+  if (nodeA === nodeB) {
+    return 0;
+  }
+  var pathA = [];
+  var pathB = [];
+  var currentA = nodeA;
+  var currentB = nodeB;
+  while (currentA) {
+    pathA.unshift(currentA);
+    currentA = currentA.getParent();
+  }
+  while (currentB) {
+    pathB.unshift(currentB);
+    currentB = currentB.getParent();
+  }
+  var minLength = Math.min(pathA.length, pathB.length);
+  for (var i = 0; i < minLength; i++) {
+    if (pathA[i] !== pathB[i]) {
+      var _pathA$i$getParent;
+      var siblings = ((_pathA$i$getParent = pathA[i].getParent()) === null || _pathA$i$getParent === void 0 ? void 0 : _pathA$i$getParent.getChildren()) || [];
+      return siblings.indexOf(pathA[i]) - siblings.indexOf(pathB[i]);
+    }
+  }
+
+  // If all nodes in the shorter path are the same, the shorter path's node comes first
+  if (pathA.length !== pathB.length) {
+    return pathA.length - pathB.length;
+  }
+
+  // This case should not happen as we checked for equality at the start
+  return 0;
 }

package/es/plugins/common/plugin/register.js

@@ -202,7 +202,7 @@ export function registerRichKeydown(editor, kernel, options) {
         });
         event.preventDefault();
         return true;
-      } else if (possibleNode) {
+      } else if (possibleNode && possibleNode.getType() !== 'linebreak') {
         possibleNode === null || possibleNode === void 0 || possibleNode.selectEnd();
         event.preventDefault();
         return true;
@@ -254,7 +254,7 @@ export function registerRichKeydown(editor, kernel, options) {
         });
         event.preventDefault();
         return true;
-      } else if (possibleNode) {
+      } else if (possibleNode && possibleNode.getType() !== 'linebreak') {
         possibleNode === null || possibleNode === void 0 || possibleNode.selectStart();
         event.preventDefault();
         return true;

package/es/plugins/math/react/components/MathEditor.js

@@ -5,10 +5,11 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { mergeRegister } from '@lexical/utils';
-import { $getSelection, $isElementNode, $isNodeSelection, $isRangeSelection, $isTextNode } from 'lexical';
+import { $getNodeByKey, $getSelection, $isNodeSelection, $isRangeSelection } from 'lexical';
 import { memo, useCallback, useEffect, useRef, useState } from 'react';
 import { useLexicalComposerContext, useLexicalEditor } from "../../../../editor-kernel/react";
 import PortalAnchor from "../../../../editor-kernel/react/PortalAnchor";
+import { compareNodeOrder } from "../../../../editor-kernel/utils";
 import { SELECT_MATH_SIDE_COMMAND, UPDATE_MATH_COMMAND } from "../../command";
 import { $isMathNode, MathBlockNode } from "../../node";
 import MathEditorContainer from "./MathEditorContainer";
@@ -64,8 +65,10 @@ var MathEdit = /*#__PURE__*/memo(function (_ref) {
             return lexicalEditor.getElementByKey(mathNode.getKey());
           });
           if (currentNode) {
-            var writableNode = mathNode.getWritable();
-            writableNode.__code = value;
+            lexicalEditor.update(function () {
+              var writableNode = mathNode.getWritable();
+              writableNode.__code = value;
+            });
           }
           return;
         }
@@ -81,8 +84,8 @@ var MathEdit = /*#__PURE__*/memo(function (_ref) {
             return lexicalEditor.getElementByKey(mathNode.getKey());
           });
           if (currentNode) {
-            var _writableNode = mathNode.getWritable();
-            _writableNode.__code = value;
+            var writableNode = mathNode.getWritable();
+            writableNode.__code = value;
           }
         });
         // 延迟重置更新标志，确保更新监听器不会立即触发
@@ -204,25 +207,23 @@ var MathEdit = /*#__PURE__*/memo(function (_ref) {
         return node;
       });
       if (canEdit) {
-        var node = prevEditorState.read(function () {
+        var anchorNodeKey = prevEditorState.read(function () {
           var sel = prevEditorState._selection;
-          if (!$isRangeSelection(sel) || !sel.isCollapsed()) {
+          if (!$isRangeSelection(sel)) {
             return false;
           }
-          var node = sel.anchor.getNode();
-          if ($isTextNode(node)) {
-            return node.getNextSibling();
-          }
-          if (!$isElementNode(node)) {
-            return false;
+          var node = sel.anchor.key;
+          return node;
+        });
+        editor.read(function () {
+          var anchorNode = anchorNodeKey ? $getNodeByKey(anchorNodeKey) : null;
+          var isPrev = anchorNode && compareNodeOrder(anchorNode, canEdit) < 0;
+          if (isPrev) {
+            setPrev(true);
+          } else {
+            setPrev(false);
           }
-          return node.getChildAtIndex(sel.anchor.offset);
         });
-        if (canEdit === node) {
-          setPrev(true);
-        } else {
-          setPrev(false);
-        }
         setIsOpen(true);
       }
       if (!canEdit) {
@@ -252,8 +253,9 @@ var MathEdit = /*#__PURE__*/memo(function (_ref) {
         lastValidRef.current = value;
       }
     },
-    onValueChange: setValue,
-    prev: prev,
+    onValueChange: setValue
+    // prev={prev}
+    ,
     value: value
   });
 

package/es/plugins/math/react/components/MathEditorContainer.js

@@ -16,6 +16,8 @@ var MathEditorContainer = /*#__PURE__*/memo(function (_ref) {
     return updatePosition({
       callback: function callback() {
         if (!divRef.current || !mathDOM) return;
+        // 展示的时候聚焦
+        onFocus === null || onFocus === void 0 || onFocus();
         if (!isBlockMode) {
           divRef.current.style.width = '';
           return;

package/es/plugins/math/react/components/MathEditorContent.d.ts

@@ -21,7 +21,6 @@ export interface MathEditorContentProps {
     /** 值变化回调 */
     onValueChange: (value: string) => void;
     /** 是否从前一个位置进入 */
-    prev: boolean;
     /** 当前输入值 */
     value: string;
 }

package/es/plugins/math/react/components/MathEditorContent.js

@@ -25,7 +25,6 @@ var MathEditorContent = /*#__PURE__*/memo(function (_ref) {
     onSubmit = _ref.onSubmit,
     onValidationChange = _ref.onValidationChange,
     onValueChange = _ref.onValueChange,
-    prev = _ref.prev,
     value = _ref.value;
   var t = useTranslation();
   var textareaRef = useRef(null);
@@ -41,16 +40,15 @@ var MathEditorContent = /*#__PURE__*/memo(function (_ref) {
     focusRef === null || focusRef === void 0 || focusRef(textareaRef.current);
   }, [focusRef]);
 
-  // 聚焦和光标位置处理
-  useEffect(function () {
-    if (textareaRef.current) {
-      textareaRef.current.focus();
-      if (prev) {
-        var _textareaRef$current$;
-        (_textareaRef$current$ = textareaRef.current.resizableTextArea) === null || _textareaRef$current$ === void 0 || (_textareaRef$current$ = _textareaRef$current$.textArea) === null || _textareaRef$current$ === void 0 || _textareaRef$current$.setSelectionRange(0, 0);
-      }
-    }
-  }, [prev]);
+  // // 聚焦和光标位置处理
+  // useEffect(() => {
+  //   if (textareaRef.current) {
+  //     textareaRef.current.focus();
+  //     if (prev) {
+  //       textareaRef.current.resizableTextArea?.textArea?.setSelectionRange(0, 0);
+  //     }
+  //   }
+  // }, [prev]);
 
   // 实时验证 LaTeX 语法
   useEffect(function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/editor",
-  "version": "1.8.6",
+  "version": "1.9.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",