@lobehub/editor 1.35.0 → 2.0.0

package/es/editor-kernel/inode/helper.d.ts

@@ -13,5 +13,5 @@ export declare const INodeHelper: {
     createTypeNode(type: string, attrs?: Record<string, unknown>): INode;
     isParagraphNode(node: INode): node is IParagraphNode;
     isRootNode(node: INode): node is IRootNode;
-    isTextNode(node: INode): node is import("lexical").SerializedTextNode;
+    isTextNode(node: INode): node is import("lexical/nodes/LexicalTextNode").SerializedTextNode;
 };

package/es/plugins/litexml/command/index.js

@@ -11,7 +11,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 import { mergeRegister } from '@lexical/utils';
 import { $createParagraphNode, $getNodeByKey, $insertNodes, $isElementNode, COMMAND_PRIORITY_EDITOR, createCommand } from 'lexical';
 import { $closest } from "../../../editor-kernel";
-import { $createDiffNode } from "../node/DiffNode";
+import { $createDiffNode, DiffNode } from "../node/DiffNode";
 import { $cloneNode, $parseSerializedNodeImpl, charToId } from "../utils";
 
 // Helpers to reduce duplication and improve readability
@@ -41,6 +41,13 @@ function handleReplaceForApplyDelay(oldNode, newNode, modifyBlockNodes, diffNode
   if (!oldBlock) {
     throw new Error('Old block node not found for diffing.');
   }
+  var originDiffNode = $closest(oldNode, function (node) {
+    return node.getType() === DiffNode.getType();
+  });
+  if (originDiffNode) {
+    oldNode.replace(newNode, false);
+    return;
+  }
   if (oldNode === oldBlock) {
     var diffNode = $createDiffNode('modify');
     diffNode.append($cloneNode(oldBlock, editor), newNode);
@@ -247,6 +254,32 @@ function handleRemove(editor, key, delay) {
 
     // delay removal: show a diff
     if (node.isInline() === false) {
+      var originDiffNode = $closest(node, function (node) {
+        return node.getType() === DiffNode.getType();
+      });
+      if (originDiffNode) {
+        switch (originDiffNode.diffType) {
+          case 'add':
+            {
+              originDiffNode.remove();
+              return;
+            }
+          case 'listItemModify':
+          case 'modify':
+            {
+              var children = originDiffNode.getChildren();
+              originDiffNode.replace(children[0], false).selectEnd();
+              return;
+            }
+          case 'remove':
+          case 'unchanged':
+            {
+              // do nothing special
+              break;
+            }
+        }
+        return;
+      }
       var diffNode = $createDiffNode('remove');
       diffNode.append($cloneNode(node, editor));
       node.replace(diffNode, false);
@@ -257,6 +290,13 @@ function handleRemove(editor, key, delay) {
       if (!oldBlock) {
         throw new Error('Old block node not found for removal.');
       }
+      var _originDiffNode = $closest(node, function (node) {
+        return node.getType() === DiffNode.getType();
+      });
+      if (_originDiffNode) {
+        node.remove();
+        return;
+      }
       // wrap changes inside a modify diff
       wrapBlockModify(oldBlock, editor, function () {
         node.remove();
@@ -299,6 +339,12 @@ function handleInsert(editor, payload, dataSource) {
       // delay insertion: show diffs or wrap block modifications
       if (isBefore) {
         if (referenceNode.isInline() === false) {
+          var originDiffNode = $closest(referenceNode, function (node) {
+            return node.getType() === DiffNode.getType();
+          });
+          if (originDiffNode) {
+            referenceNode = originDiffNode;
+          }
           var diffNodes = newNodes.map(function (node) {
             var diffNode = $createDiffNode('add');
             diffNode.append(node);
@@ -316,16 +362,34 @@ function handleInsert(editor, payload, dataSource) {
           if (!refBlock) {
             throw new Error('Reference block node not found for insertion.');
           }
-          wrapBlockModify(refBlock, editor, function () {
+          var _originDiffNode2 = $closest(referenceNode, function (node) {
+            return node.getType() === DiffNode.getType();
+          });
+          if (_originDiffNode2) {
+            // 可能是 modify / add，那么直接修改就好了
             newNodes.forEach(function (node) {
               if (referenceNode) {
                 referenceNode = referenceNode.insertBefore(node);
               }
             });
-          });
+          } else {
+            wrapBlockModify(refBlock, editor, function () {
+              newNodes.forEach(function (node) {
+                if (referenceNode) {
+                  referenceNode = referenceNode.insertBefore(node);
+                }
+              });
+            });
+          }
         }
       } else {
         if (referenceNode.isInline() === false) {
+          var _originDiffNode3 = $closest(referenceNode, function (node) {
+            return node.getType() === DiffNode.getType();
+          });
+          if (_originDiffNode3) {
+            referenceNode = _originDiffNode3;
+          }
           newNodes.forEach(function (node) {
             if (referenceNode) {
               var diffNode = $createDiffNode('add');
@@ -340,13 +404,25 @@ function handleInsert(editor, payload, dataSource) {
           if (!_refBlock) {
             throw new Error('Reference block node not found for insertion.');
           }
-          wrapBlockModify(_refBlock, editor, function () {
+          var _originDiffNode4 = $closest(referenceNode, function (node) {
+            return node.getType() === DiffNode.getType();
+          });
+          if (_originDiffNode4) {
+            // 可能是 modify / add，那么直接修改就好了
             newNodes.forEach(function (node) {
               if (referenceNode) {
                 referenceNode = referenceNode.insertAfter(node);
               }
             });
-          });
+          } else {
+            wrapBlockModify(_refBlock, editor, function () {
+              newNodes.forEach(function (node) {
+                if (referenceNode) {
+                  referenceNode = referenceNode.insertAfter(node);
+                }
+              });
+            });
+          }
         }
       }
     } catch (error) {

package/es/plugins/litexml/data-source/litexml-data-source.js

@@ -368,16 +368,19 @@ var LitexmlDataSource = /*#__PURE__*/function (_DataSource) {
         try {
           for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
             var writer = _step2.value;
-            var handled = writer(node, this.ctx, indent);
+            var handled = writer(node, this.ctx, indent, this.nodesToXML.bind(this));
             if (handled) {
+              if ('lines' in handled) {
+                lines.push.apply(lines, _toConsumableArray(handled.lines));
+                return;
+              }
               var attrs = this.buildXMLAttributes(_objectSpread({
                 id: idToChar(node.getKey())
               }, handled.attributes));
               var openTag = "".concat(indentStr, "<").concat(handled.tagName).concat(attrs, ">");
               var closeTag = "</".concat(handled.tagName, ">");
               if (handled.textContent) {
-                childLines.push(handled.textContent);
-                lines.push("".concat(openTag).concat(childLines.join('')).concat(closeTag));
+                lines.push("".concat(openTag).concat(handled.textContent).concat(closeTag));
               } else if ($isElementNode(node)) {
                 var children = node.getChildren();
                 children.forEach(function (child) {
@@ -399,7 +402,7 @@ var LitexmlDataSource = /*#__PURE__*/function (_DataSource) {
       if ($isElementNode(node)) {
         var _children = node.getChildren();
         _children.forEach(function (child) {
-          _this6.nodesToXML(child, childLines, indent + 1);
+          _this6.nodesToXML(child, childLines, indent);
         });
       }
       lines.push.apply(lines, childLines);

package/es/plugins/litexml/plugin/index.js

@@ -36,6 +36,7 @@ export var LitexmlPlugin = (_class = /*#__PURE__*/function (_KernelPlugin) {
     _classCallCheck(this, LitexmlPlugin);
     _this = _super.call(this);
     _defineProperty(_assertThisInitialized(_this), "datasource", void 0);
+    _defineProperty(_assertThisInitialized(_this), "service", void 0);
     _this.kernel = kernel;
     _this.config = config;
     kernel.registerThemes({
@@ -44,6 +45,7 @@ export var LitexmlPlugin = (_class = /*#__PURE__*/function (_KernelPlugin) {
 
     // Create and register the Litexml service
     var litexmlService = new LitexmlService();
+    _this.service = litexmlService;
     kernel.registerService(ILitexmlService, litexmlService);
     _this.datasource = new LitexmlDataSource('litexml', function (serviceId) {
       return kernel.requireService(serviceId);
@@ -72,6 +74,45 @@ export var LitexmlPlugin = (_class = /*#__PURE__*/function (_KernelPlugin) {
       // Plugin initialization logic can be added here if needed
       this.register(registerLiteXMLCommand(editor, this.datasource));
       this.register(registerLiteXMLDiffCommand(editor));
+      this.regiserLiteXml();
+    }
+  }, {
+    key: "regiserLiteXml",
+    value: function regiserLiteXml() {
+      this.service.registerXMLWriter(DiffNode.getType(), function (node, ctx, indent, nodeToXML) {
+        var diffNode = node;
+        var lines = [];
+        switch (diffNode.diffType) {
+          case 'modify':
+            {
+              nodeToXML(diffNode.getChildAtIndex(1), lines, indent);
+              break;
+            }
+          case 'add':
+            {
+              nodeToXML(diffNode.getChildAtIndex(0), lines, indent);
+              break;
+            }
+          case 'remove':
+            {
+              break;
+            }
+          case 'listItemModify':
+            {
+              diffNode.getChildAtIndex(1).getChildren().forEach(function (child) {
+                nodeToXML(child, lines, indent);
+              });
+              break;
+            }
+          default:
+            {
+              break;
+            }
+        }
+        return {
+          lines: lines
+        };
+      });
     }
   }]);
   return LitexmlPlugin;

package/es/plugins/litexml/service/litexml-service.d.ts

@@ -6,7 +6,7 @@ export type XMLReaderFunc = (xmlElement: Element, children: any[]) => any | any[
 /**
  * XML Writer function type - converts Lexical node to XML string
  */
-export type XMLWriterFunc = (node: LexicalNode, ctx: IWriterContext, indent: number) => IXmlNode | false;
+export type XMLWriterFunc = (node: LexicalNode, ctx: IWriterContext, indent: number, nodeToXML: (node: any, lines: string[], indent?: number) => void) => IXmlNode | HandleChildrenResult | false;
 /**
  * Record of XML readers indexed by tag name
  */
@@ -27,6 +27,9 @@ export interface IXmlNode {
     tagName: string;
     textContent?: string;
 }
+export interface HandleChildrenResult {
+    lines: string[];
+}
 export interface IWriterContext {
     createXmlNode(tagName: string, attributes?: {
         [key: string]: string;

package/es/react/ChatInputActions/components/CollapsedActions.js

@@ -25,7 +25,7 @@ var CollapsedActions = /*#__PURE__*/memo(function (_ref) {
         children: children
       }),
       styles: {
-        body: {
+        content: {
           padding: 4
         }
       },

package/es/react/FloatActions/components/CollapsedActions.js

@@ -25,7 +25,7 @@ var CollapsedActions = /*#__PURE__*/memo(function (_ref) {
         children: children
       }),
       styles: {
-        body: {
+        content: {
           padding: 4
         }
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/editor",
-  "version": "1.35.0",
+  "version": "2.0.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",
@@ -29,29 +29,29 @@
   "dependencies": {
     "@floating-ui/dom": "^1.7.4",
     "@floating-ui/react": "^0.27.16",
-    "@lexical/code": "^0.38.2",
-    "@lexical/code-shiki": "^0.38.2",
-    "@lexical/dragon": "^0.38.2",
-    "@lexical/history": "^0.38.2",
-    "@lexical/link": "^0.38.2",
-    "@lexical/list": "^0.38.2",
-    "@lexical/rich-text": "^0.38.2",
-    "@lexical/selection": "^0.38.2",
-    "@lexical/table": "^0.38.2",
-    "@lexical/utils": "^0.38.2",
-    "@shikijs/core": "^3.19.0",
-    "@shikijs/engine-javascript": "^3.19.0",
+    "@lexical/code": "^0.39.0",
+    "@lexical/code-shiki": "^0.39.0",
+    "@lexical/dragon": "^0.39.0",
+    "@lexical/history": "^0.39.0",
+    "@lexical/link": "^0.39.0",
+    "@lexical/list": "^0.39.0",
+    "@lexical/rich-text": "^0.39.0",
+    "@lexical/selection": "^0.39.0",
+    "@lexical/table": "^0.39.0",
+    "@lexical/utils": "^0.39.0",
+    "@shikijs/core": "^3.20.0",
+    "@shikijs/engine-javascript": "^3.20.0",
     "@xmldom/xmldom": "^0.8.11",
     "ahooks": "^3.9.6",
     "antd-style": "^3.7.1",
     "debug": "^4.4.3",
     "eventemitter3": "^5.0.1",
-    "framer-motion": "^12.23.25",
+    "framer-motion": "^12.23.26",
     "fuse.js": "^7.1.0",
-    "katex": "^0.16.25",
-    "lexical": "^0.38.2",
-    "lodash-es": "^4.17.21",
-    "lucide-react": "^0.553.0",
+    "katex": "^0.16.27",
+    "lexical": "^0.39.0",
+    "lodash-es": "^4.17.22",
+    "lucide-react": "^0.562.0",
     "polished": "^4.3.1",
     "re-resizable": "^6.11.2",
     "react-error-boundary": "^6.0.0",
@@ -59,13 +59,13 @@
     "react-merge-refs": "^3.0.2",
     "remark-cjk-friendly": "^1.2.3",
     "remark-supersub": "^1.0.0",
-    "shiki": "^3.19.0",
+    "shiki": "^3.20.0",
     "ts-key-enum": "^3.0.13",
     "use-merge-value": "^1.2.0"
   },
   "peerDependencies": {
-    "@lobehub/ui": "^2.0.0",
-    "antd": "^5.25.0",
+    "@lobehub/ui": "^3.0.0",
+    "antd": "^6.1.1",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   }