@ctzhian/tiptap 3.0.2 → 3.0.3

package/README.md

@@ -117,6 +117,10 @@ const { editor } = useTiptap({
 以只读方式展示两段 HTML 的结构化差异。
 
 - Props：`{ oldHtml: string; newHtml: string }`
+- 可选增强：支持 `diffOptions`，例如通过 `ignoreAttrs` 忽略节点或 mark 上的指定属性差异，或通过 `engine: 'enhanced'` 为特殊 inline block 和重排场景启用更细粒度的 diff；未传时默认行为保持不变。
+- 兼容性：现有接入方式无需调整，`v3.x` 内默认仍保持零配置升级。
+- 当前定位：只读结构化 diff 展示，不等同于修订模式或 track changes。
+- 本轮优化：自动清理“无差异时残留高亮”，并增强图片、附件、公式、音视频等删除节点的预览文案。
 
 ```tsx
 <EditorDiff oldHtml={'<p>old</p>'} newHtml={'<p><strong>new</strong></p>'} />

package/dist/EditorDiff/index.d.ts

@@ -1,9 +1,11 @@
 import React from "react";
+import type { StructuredDiffOptions } from "../util/structuredDiff";
 import 'core-js/actual/array/find-last';
 interface EditorDiffProps {
     oldHtml: string;
     newHtml: string;
     baseUrl?: string;
+    diffOptions?: Partial<StructuredDiffOptions>;
 }
-declare const EditorDiff: ({ oldHtml, newHtml, baseUrl }: EditorDiffProps) => React.JSX.Element;
+declare const EditorDiff: ({ oldHtml, newHtml, baseUrl, diffOptions }: EditorDiffProps) => React.JSX.Element;
 export default EditorDiff;

package/dist/EditorDiff/index.js

@@ -9,11 +9,13 @@ import useTiptap from "../hook";
 var EditorDiff = function EditorDiff(_ref) {
   var oldHtml = _ref.oldHtml,
     newHtml = _ref.newHtml,
-    baseUrl = _ref.baseUrl;
+    baseUrl = _ref.baseUrl,
+    diffOptions = _ref.diffOptions;
   var editorRef = useTiptap({
     editable: false,
     content: newHtml,
     baseUrl: baseUrl,
+    structuredDiffOptions: diffOptions,
     exclude: ['youtube', 'mention']
   });
   useEffect(function () {

package/dist/extension/component/UploadProgress/index.d.ts

@@ -7,6 +7,6 @@ export interface UploadProgressAttributes {
     tempId: string;
 }
 export declare const getFileIcon: (fileType: string) => React.JSX.Element;
-export declare const getFileTypeText: (fileType: string) => "视频" | "音频" | "图片" | "文件";
+export declare const getFileTypeText: (fileType: string) => "图片" | "视频" | "音频" | "文件";
 declare const UploadProgressView: React.FC<NodeViewProps>;
 export default UploadProgressView;

package/dist/extension/extension/StructuredDiff.d.ts

@@ -1,5 +1,7 @@
-import { Editor, Extension } from '@tiptap/core';
+import { Extension } from '@tiptap/core';
+import type { Editor } from '@tiptap/core';
 import { PluginKey } from '@tiptap/pm/state';
+import type { StructuredDiffOptions } from '../../util/structuredDiff';
 declare const diffPluginKey: PluginKey<any>;
 declare module '@tiptap/core' {
     interface Commands<ReturnType> {
@@ -9,7 +11,7 @@ declare module '@tiptap/core' {
         };
     }
 }
-export declare const StructuredDiffExtension: Extension<any, any>;
+export declare const StructuredDiffExtension: Extension<StructuredDiffOptions, any>;
 export { diffPluginKey };
 export declare function getDiffState(editor: Editor): {
     isActive: any;

package/dist/extension/extension/StructuredDiff.js

@@ -10,6 +10,11 @@ import { Plugin, PluginKey } from '@tiptap/pm/state';
 import { createDecorationsFromDiffs, createEmptyDecorationSet } from "../../util/decorations";
 import { compareDocuments } from "../../util/structuredDiff";
 var diffPluginKey = new PluginKey('structuredDiff');
+function createHideDiffTransaction(tr) {
+  return tr.setMeta(diffPluginKey, {
+    type: 'hideDiff'
+  });
+}
 var DiffPluginState = /*#__PURE__*/function () {
   function DiffPluginState(decorations) {
     var diffs = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
@@ -52,6 +57,13 @@ var DiffPluginState = /*#__PURE__*/function () {
 }();
 export var StructuredDiffExtension = Extension.create({
   name: 'structuredDiff',
+  addOptions: function addOptions() {
+    return {
+      engine: 'legacy',
+      ignoreAttrs: [],
+      nodePreviewSerializer: undefined
+    };
+  },
   addProseMirrorPlugins: function addProseMirrorPlugins() {
     return [new Plugin({
       key: diffPluginKey,
@@ -68,6 +80,7 @@ export var StructuredDiffExtension = Extension.create({
     })];
   },
   addCommands: function addCommands() {
+    var diffOptions = this.options;
     return {
       showStructuredDiff: function showStructuredDiff(oldHtml, newHtml) {
         return function (_ref) {
@@ -77,11 +90,14 @@ export var StructuredDiffExtension = Extension.create({
             editor = _ref.editor;
           try {
             var extensions = editor.extensionManager.extensions;
-            var comparison = compareDocuments(oldHtml, newHtml, extensions);
+            var comparison = compareDocuments(oldHtml, newHtml, extensions, diffOptions);
             if (!comparison.hasChanges) {
+              if (dispatch) {
+                dispatch(createHideDiffTransaction(tr));
+              }
               return false;
             }
-            var decorations = createDecorationsFromDiffs(comparison.diffs, state.doc);
+            var decorations = createDecorationsFromDiffs(comparison.diffs, state.doc, diffOptions);
             var newTr = tr.setMeta(diffPluginKey, {
               type: 'showDiff',
               decorations: decorations,
@@ -100,12 +116,9 @@ export var StructuredDiffExtension = Extension.create({
       hideStructuredDiff: function hideStructuredDiff() {
         return function (_ref2) {
           var tr = _ref2.tr,
-            state = _ref2.state,
             dispatch = _ref2.dispatch;
           try {
-            var newTr = tr.setMeta(diffPluginKey, {
-              type: 'hideDiff'
-            });
+            var newTr = createHideDiffTransaction(tr);
             if (dispatch) dispatch(newTr);
             return true;
           } catch (error) {

package/dist/extension/index.d.ts

@@ -1,2 +1,2 @@
 import { GetExtensionsProps } from '../type';
-export declare const getExtensions: ({ limit, exclude, extensions: extensionsProps, editable, mentionItems, baseUrl, onMentionFilter, onUpload, onUploadImgUrl, onError, onTocUpdate, onAiWritingGetSuggestion, onValidateUrl, placeholder, mermaidOptions, youtubeOptions, tableOfContentsOptions, }: GetExtensionsProps) => any;
+export declare const getExtensions: ({ limit, exclude, extensions: extensionsProps, editable, mentionItems, baseUrl, onMentionFilter, onUpload, onUploadImgUrl, onError, onTocUpdate, onAiWritingGetSuggestion, onValidateUrl, placeholder, mermaidOptions, youtubeOptions, tableOfContentsOptions, structuredDiffOptions, }: GetExtensionsProps) => any;

package/dist/extension/index.js

@@ -34,7 +34,8 @@ export var getExtensions = function getExtensions(_ref) {
     _placeholder = _ref.placeholder,
     mermaidOptions = _ref.mermaidOptions,
     youtubeOptions = _ref.youtubeOptions,
-    tableOfContentsOptions = _ref.tableOfContentsOptions;
+    tableOfContentsOptions = _ref.tableOfContentsOptions,
+    structuredDiffOptions = _ref.structuredDiffOptions;
   var defaultExtensions = [ImeComposition, StarterKit.configure({
     link: false,
     code: false,
@@ -170,7 +171,7 @@ export var getExtensions = function getExtensions(_ref) {
   } else {
     // 只读模式
     if (!(exclude !== null && exclude !== void 0 && exclude.includes('structuredDiff'))) {
-      defaultExtensions.push(StructuredDiffExtension);
+      defaultExtensions.push(StructuredDiffExtension.configure(structuredDiffOptions || {}));
     }
   }
   if (!(exclude !== null && exclude !== void 0 && exclude.includes('mention')) && (mentionItems && mentionItems.length > 0 || onMentionFilter)) {

package/dist/type/index.d.ts

@@ -5,7 +5,9 @@ import { TableOfContentsOptions } from '@tiptap/extension-table-of-contents';
 import { YoutubeOptions } from '@tiptap/extension-youtube';
 import { UseEditorOptions } from '@tiptap/react';
 import { MermaidConfig } from 'mermaid';
+import type { StructuredDiffOptions } from '../util/structuredDiff';
 export type { Editor } from '@tiptap/react';
+export type { StructuredDiffEngine, StructuredDiffOptions } from '../util/structuredDiff';
 export interface MenuItem {
     label?: React.ReactNode;
     customLabel?: React.ReactNode;
@@ -118,6 +120,7 @@ export type NodeOrMetaOrSuggestionOrExtensionOptions = {
     mermaidOptions?: Partial<MermaidConfig>;
     youtubeOptions?: Partial<YoutubeOptions>;
     tableOfContentsOptions?: Partial<TableOfContentsOptions>;
+    structuredDiffOptions?: Partial<StructuredDiffOptions>;
 };
 export type BaseExtensionOptions = {
     /**

package/dist/util/decorations.d.ts

@@ -1,13 +1,14 @@
 import { Node as PMNode } from '@tiptap/pm/model';
 import { DecorationSet } from '@tiptap/pm/view';
-import { DiffItem, ProseMirrorNode } from './structuredDiff';
+import type { DiffItem, ProseMirrorNode, StructuredDiffOptions } from './structuredDiff';
+export declare function getDeletedNodePreviewText(node: ProseMirrorNode, options?: StructuredDiffOptions): string;
 /**
  * 根据差异数组创建装饰集合
  * @param {Array} diffs - 差异数组
  * @param {Object} doc - ProseMirror文档
  * @returns {DecorationSet} 装饰集合
  */
-export declare function createDecorationsFromDiffs(diffs: DiffItem[], doc: PMNode): DecorationSet;
+export declare function createDecorationsFromDiffs(diffs: DiffItem[], doc: PMNode, options?: StructuredDiffOptions): DecorationSet;
 /**
  * 创建空的装饰集合
  * @param {Object} doc - ProseMirror文档

package/dist/util/decorations.js

@@ -1,9 +1,10 @@
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+/* eslint-disable @typescript-eslint/no-use-before-define */
+
 import { Decoration, DecorationSet } from '@tiptap/pm/view';
 import { pathToPos } from "./structuredDiff";
-
 /**
  * 创建插入内容的装饰
  * @param {number} from - 开始位置
@@ -36,13 +37,13 @@ function createModifyDecoration(from, to) {
  * @param {Object} deletedNode - 被删除的节点
  * @returns {Decoration} widget装饰对象
  */
-function createDeleteWidget(pos, deletedNode) {
+function createDeleteWidget(pos, deletedNode, options) {
   var widget = document.createElement('span');
   widget.className = 'diff-delete-widget';
   widget.style.cssText = "\n    background-color: rgba(220, 53, 69, 0.1);\n    color: #dc3545;\n    text-decoration: line-through;\n    padding: 2px 4px;\n    border-radius: 3px;\n    margin: 0 1px;\n    border: 1px dashed #dc3545;\n    font-style: italic;\n  ";
 
   // 提取删除内容的文本
-  var deletedText = extractTextFromNode(deletedNode);
+  var deletedText = getDeletedNodePreviewText(deletedNode, options);
   widget.textContent = deletedText || '[已删除]';
 
   // 添加工具提示
@@ -51,6 +52,43 @@ function createDeleteWidget(pos, deletedNode) {
     side: 1
   });
 }
+function normalizePreviewText(value) {
+  if (typeof value === 'string') {
+    return value.replace(/\s+/g, ' ').trim();
+  }
+  if (typeof value === 'number') {
+    return String(value);
+  }
+  return '';
+}
+function truncatePreviewText(text) {
+  var maxLength = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 60;
+  if (text.length <= maxLength) {
+    return text;
+  }
+  return "".concat(text.slice(0, maxLength - 1), "...");
+}
+function getFileNameFromUrl(url) {
+  var normalizedUrl = normalizePreviewText(url);
+  if (!normalizedUrl) {
+    return '';
+  }
+  try {
+    var parsedUrl = new URL(normalizedUrl, 'https://placeholder.local');
+    var segments = parsedUrl.pathname.split('/').filter(Boolean);
+    return decodeURIComponent(segments[segments.length - 1] || '');
+  } catch (_unused) {
+    var _segments = normalizedUrl.split('/').filter(Boolean);
+    return _segments[_segments.length - 1] || normalizedUrl;
+  }
+}
+function formatDeletedNodeLabel(typeLabel, detail) {
+  var normalizedDetail = normalizePreviewText(detail);
+  if (!normalizedDetail) {
+    return "[\u5DF2\u5220\u9664".concat(typeLabel, "]");
+  }
+  return "[\u5DF2\u5220\u9664".concat(typeLabel, ": ").concat(truncatePreviewText(normalizedDetail), "]");
+}
 
 /**
  * 从节点中提取文本内容
@@ -69,6 +107,59 @@ function extractTextFromNode(node) {
   }
   return '';
 }
+export function getDeletedNodePreviewText(node, options) {
+  var _options$nodePreviewS;
+  if (!node) {
+    return '';
+  }
+  var customPreview = normalizePreviewText(options === null || options === void 0 || (_options$nodePreviewS = options.nodePreviewSerializer) === null || _options$nodePreviewS === void 0 ? void 0 : _options$nodePreviewS.call(options, node));
+  if (customPreview) {
+    return truncatePreviewText(customPreview);
+  }
+  var textContent = truncatePreviewText(normalizePreviewText(extractTextFromNode(node)));
+  if (textContent) {
+    return textContent;
+  }
+  var attrs = node.attrs || {};
+  var nodeType = node.type || 'content';
+  var namedDetail = function namedDetail(value, fallback) {
+    var detail = normalizePreviewText(value) || normalizePreviewText(fallback);
+    return detail || '';
+  };
+  switch (nodeType) {
+    case 'image':
+      return formatDeletedNodeLabel('图片', namedDetail(attrs.alt, attrs.src && getFileNameFromUrl(attrs.src)));
+    case 'inlineAttachment':
+    case 'blockAttachment':
+      return formatDeletedNodeLabel('附件', namedDetail(attrs.title, attrs.url && getFileNameFromUrl(attrs.url)));
+    case 'video':
+      return formatDeletedNodeLabel('视频', namedDetail(attrs.title, attrs.src && getFileNameFromUrl(attrs.src)));
+    case 'audio':
+      return formatDeletedNodeLabel('音频', namedDetail(attrs.title, attrs.src && getFileNameFromUrl(attrs.src)));
+    case 'iframe':
+      return formatDeletedNodeLabel('嵌入内容', namedDetail(attrs.title, attrs.src));
+    case 'inlineMath':
+      return formatDeletedNodeLabel('行内公式', attrs.latex);
+    case 'blockMath':
+      return formatDeletedNodeLabel('公式', attrs.latex);
+    case 'inlineLink':
+    case 'blockLink':
+      return formatDeletedNodeLabel('链接', namedDetail(attrs.title, attrs.href));
+    case 'details':
+      return formatDeletedNodeLabel('折叠块');
+    case 'detailsSummary':
+      return formatDeletedNodeLabel('折叠标题');
+    case 'detailsContent':
+      return formatDeletedNodeLabel('折叠内容');
+    case 'table':
+      return formatDeletedNodeLabel('表格');
+    case 'codeBlock':
+    case 'code_block':
+      return formatDeletedNodeLabel('代码块', attrs.language || attrs.lang);
+    default:
+      return formatDeletedNodeLabel('内容');
+  }
+}
 
 /**
  * 根据差异数组创建装饰集合
@@ -76,7 +167,7 @@ function extractTextFromNode(node) {
  * @param {Object} doc - ProseMirror文档
  * @returns {DecorationSet} 装饰集合
  */
-export function createDecorationsFromDiffs(diffs, doc) {
+export function createDecorationsFromDiffs(diffs, doc, options) {
   var decorations = [];
   diffs.forEach(function (diff) {
     try {
@@ -126,10 +217,10 @@ export function createDecorationsFromDiffs(diffs, doc) {
             decorations.push(createDeleteWidget(widgetPos, {
               type: 'text',
               text: diff.textDiff.text
-            }));
+            }, options));
           } else if (diff.node) {
             // 节点级别的删除 - 使用widget显示
-            decorations.push(createDeleteWidget(pos, diff.node));
+            decorations.push(createDeleteWidget(pos, diff.node, options));
           }
           break;
         case 'modify':
@@ -172,50 +263,23 @@ export function createDecorationsFromDiffs(diffs, doc) {
   });
   return DecorationSet.create(doc, decorations);
 }
-
-/**
- * 获取指定路径节点的大小
- * @param {Array} path - 节点路径
- * @param {Object} doc - ProseMirror文档
- * @returns {number} 节点大小
- */
-function getNodeSizeAtPath(path, doc) {
-  var currentNode = doc;
+function getPMNodeAtPath(path, doc) {
+  var current = doc;
   var _iterator = _createForOfIteratorHelper(path),
     _step;
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var index = _step.value;
-      if (currentNode.content && currentNode.content[index]) {
-        currentNode = currentNode.content[index];
-      } else {
-        return 1; // 默认大小
-      }
-    }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
-  }
-  return getNodeSize(currentNode);
-}
-function getPMNodeAtPath(path, doc) {
-  var current = doc;
-  var _iterator2 = _createForOfIteratorHelper(path),
-    _step2;
-  try {
-    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
       var _childCount;
-      var index = _step2.value;
+      var index = _step.value;
       if (!current) return null;
       var childCount = (_childCount = current.childCount) !== null && _childCount !== void 0 ? _childCount : 0;
       if (index >= childCount) return null;
       current = current.child(index);
     }
   } catch (err) {
-    _iterator2.e(err);
+    _iterator.e(err);
   } finally {
-    _iterator2.f();
+    _iterator.f();
   }
   return current;
 }
@@ -285,17 +349,17 @@ export function getNodeSize(node) {
   }
   var size = 2; // 开始和结束标记
   if (node.content && Array.isArray(node.content)) {
-    var _iterator3 = _createForOfIteratorHelper(node.content),
-      _step3;
+    var _iterator2 = _createForOfIteratorHelper(node.content),
+      _step2;
     try {
-      for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-        var child = _step3.value;
+      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+        var child = _step2.value;
         size += getNodeSize(child);
       }
     } catch (err) {
-      _iterator3.e(err);
+      _iterator2.e(err);
     } finally {
-      _iterator3.f();
+      _iterator2.f();
     }
   }
   return size;

package/dist/util/structuredDiff.d.ts

@@ -1,4 +1,4 @@
-import { Extensions } from '@tiptap/core';
+import type { Extensions } from '@tiptap/core';
 export interface TextDiff {
     offset: number;
     length: number;
@@ -35,6 +35,12 @@ export interface ProseMirrorNode {
         attrs?: Record<string, any>;
     }>;
 }
+export type StructuredDiffEngine = 'legacy' | 'enhanced';
+export interface StructuredDiffOptions {
+    engine?: StructuredDiffEngine;
+    ignoreAttrs?: string[];
+    nodePreviewSerializer?: (node: ProseMirrorNode) => string | null | undefined;
+}
 /**
  * 将HTML转换为ProseMirror文档结构
  * @param {string} html - HTML字符串
@@ -49,7 +55,7 @@ export declare function parseHtmlToDoc(html: string, extensions: Extensions): an
  * @param {Array} extensions - Tiptap扩展数组
  * @returns {Object} 包含差异信息的对象
  */
-export declare function compareDocuments(oldHtml: string, newHtml: string, extensions: Extensions): DocumentComparison;
+export declare function compareDocuments(oldHtml: string, newHtml: string, extensions: Extensions, options?: StructuredDiffOptions): DocumentComparison;
 /**
  * 将路径转换为ProseMirror位置
  * @param {Array} path - 节点路径

package/dist/util/structuredDiff.js

@@ -1,14 +1,16 @@
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-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; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+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; }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+/* eslint-disable @typescript-eslint/no-use-before-define */
+
 import { generateJSON } from '@tiptap/html';
 import DiffMatchPatch from 'diff-match-patch';
 
@@ -17,6 +19,10 @@ var dmp = new DiffMatchPatch();
 
 // 类型定义
 
+var LEGACY_INLINE_CONTAINER_TYPES = new Set(['paragraph', 'heading']);
+var NON_INLINE_LEAF_CONTAINER_TYPES = new Set(['doc', 'table', 'tableRow', 'table_row', 'tableCell', 'table_cell', 'tableHeader', 'table_header', 'orderedList', 'ordered_list', 'bulletList', 'bullet_list', 'taskList', 'task_list', 'taskItem', 'task_item', 'listItem', 'list_item', 'blockquote', 'details', 'detailsContent', 'details_content', 'codeBlock', 'code_block', 'alert', 'horizontalRule', 'horizontal_rule', 'flow', 'flipGrid', 'flip_grid', 'flipGridColumn', 'flip_grid_column', 'yamlFrontmatter', 'yaml_frontmatter']);
+var BLOCKISH_CHILD_NODE_TYPES = new Set(['image', 'video', 'audio', 'iframe', 'flow', 'blockAttachment', 'blockLink', 'blockMath', 'table', 'horizontalRule', 'horizontal_rule', 'codeBlock', 'code_block', 'details', 'detailsContent', 'details_content', 'orderedList', 'ordered_list', 'bulletList', 'bullet_list', 'taskList', 'task_list', 'taskItem', 'task_item', 'listItem', 'list_item', 'blockquote', 'alert', 'flipGrid', 'flip_grid', 'flipGridColumn', 'flip_grid_column', 'yamlFrontmatter', 'yaml_frontmatter']);
+
 /**
  * 将HTML转换为ProseMirror文档结构
  * @param {string} html - HTML字符串
@@ -26,20 +32,25 @@ var dmp = new DiffMatchPatch();
 export function parseHtmlToDoc(html, extensions) {
   return generateJSON(html, extensions);
 }
-function haveSameMarks(a, b) {
+function serializeMark(mark, options) {
+  return JSON.stringify({
+    type: mark.type,
+    attrs: getFilteredAttrs(mark.attrs, options)
+  });
+}
+function haveSameMarks(a, b, options) {
   var arrA = a || [];
   var arrB = b || [];
   if (arrA.length !== arrB.length) return false;
-  var serialize = function serialize(m) {
-    return "".concat(m.type, ":").concat(JSON.stringify(m.attrs || {}));
-  };
-  var setA = new Set(arrA.map(serialize));
+  var setA = new Set(arrA.map(function (mark) {
+    return serializeMark(mark, options);
+  }));
   var _iterator = _createForOfIteratorHelper(arrB),
     _step;
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var m = _step.value;
-      if (!setA.has(serialize(m))) return false;
+      if (!setA.has(serializeMark(m, options))) return false;
     }
   } catch (err) {
     _iterator.e(err);
@@ -56,8 +67,88 @@ function haveSameMarks(a, b) {
  * @param {Array} path - 当前节点路径
  * @returns {Array} 差异数组
  */
+function isIgnoredAttr(key, options) {
+  var _options$ignoreAttrs;
+  return !!(options !== null && options !== void 0 && (_options$ignoreAttrs = options.ignoreAttrs) !== null && _options$ignoreAttrs !== void 0 && _options$ignoreAttrs.includes(key));
+}
+function getFilteredAttrs(attrs, options) {
+  var _options$ignoreAttrs2;
+  var source = attrs || {};
+  if (!(options !== null && options !== void 0 && (_options$ignoreAttrs2 = options.ignoreAttrs) !== null && _options$ignoreAttrs2 !== void 0 && _options$ignoreAttrs2.length)) {
+    return source;
+  }
+  return Object.fromEntries(Object.entries(source).filter(function (_ref) {
+    var _ref2 = _slicedToArray(_ref, 1),
+      key = _ref2[0];
+    return !isIgnoredAttr(key, options);
+  }));
+}
+function areAttrsEqual(attrsA, attrsB, options) {
+  return JSON.stringify(getFilteredAttrs(attrsA, options)) === JSON.stringify(getFilteredAttrs(attrsB, options));
+}
+function getStructuredDiffEngine(options) {
+  var _options$engine;
+  return (_options$engine = options === null || options === void 0 ? void 0 : options.engine) !== null && _options$engine !== void 0 ? _options$engine : 'legacy';
+}
+function getNodeSignatureForAlign(node, options) {
+  if (!node) {
+    return '';
+  }
+  if (node.type === 'text') {
+    return JSON.stringify({
+      type: node.type,
+      text: node.text || '',
+      marks: (node.marks || []).map(function (mark) {
+        return serializeMark(mark, options);
+      })
+    });
+  }
+  return JSON.stringify({
+    type: node.type,
+    attrs: getFilteredAttrs(node.attrs, options),
+    content: (node.content || []).map(function (child) {
+      return getNodeSignatureForAlign(child, options);
+    })
+  });
+}
+function createAlignPredicate(a, b, getNode, options) {
+  if (getStructuredDiffEngine(options) !== 'enhanced') {
+    return function (x, y) {
+      return nodesEqualForAlign(getNode(x), getNode(y), options);
+    };
+  }
+  var countSignatures = function countSignatures(items) {
+    var counts = new Map();
+    items.forEach(function (item) {
+      var signature = getNodeSignatureForAlign(getNode(item), options);
+      if (!signature) {
+        return;
+      }
+      counts.set(signature, (counts.get(signature) || 0) + 1);
+    });
+    return counts;
+  };
+  var countsA = countSignatures(a);
+  var countsB = countSignatures(b);
+  var uniqueSharedSignatures = new Set(Array.from(countsA.keys()).filter(function (signature) {
+    return countsA.get(signature) === 1 && countsB.get(signature) === 1;
+  }));
+  return function (x, y) {
+    var nodeX = getNode(x);
+    var nodeY = getNode(y);
+    var signatureX = getNodeSignatureForAlign(nodeX, options);
+    var signatureY = getNodeSignatureForAlign(nodeY, options);
+    var isXUnique = uniqueSharedSignatures.has(signatureX);
+    var isYUnique = uniqueSharedSignatures.has(signatureY);
+    if (isXUnique || isYUnique) {
+      return isXUnique && isYUnique && signatureX === signatureY;
+    }
+    return nodesEqualForAlign(nodeX, nodeY, options);
+  };
+}
 function compareNodes(nodeA, nodeB) {
   var path = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+  var options = arguments.length > 3 ? arguments[3] : undefined;
   var diffs = [];
 
   // 如果节点类型不同，标记整个节点为变更
@@ -93,10 +184,10 @@ function compareNodes(nodeA, nodeB) {
 
       var textOffset = 0; // offset in the NEW text node
 
-      textDiffs.forEach(function (_ref) {
-        var _ref2 = _slicedToArray(_ref, 2),
-          operation = _ref2[0],
-          text = _ref2[1];
+      textDiffs.forEach(function (_ref3) {
+        var _ref4 = _slicedToArray(_ref3, 2),
+          operation = _ref4[0],
+          text = _ref4[1];
         if (operation === -1) {
           // Delete
           // The widget should be placed at the current position in the new text.
@@ -133,7 +224,7 @@ function compareNodes(nodeA, nodeB) {
       });
     }
     // 文本相等或不相等时都可检查 marks 差异（粗粒度：节点级）
-    if (!haveSameMarks(nodeA.marks, nodeB.marks)) {
+    if (!haveSameMarks(nodeA.marks, nodeB.marks, options)) {
       diffs.push({
         type: 'modify',
         path: _toConsumableArray(path),
@@ -148,11 +239,11 @@ function compareNodes(nodeA, nodeB) {
   }
 
   // 优先：段落/标题等内联容器执行字符级 diff 和 marks 区间对比
-  if (nodeA && nodeB && isInlineContainer(nodeA) && isInlineContainer(nodeB)) {
+  if (nodeA && nodeB && isInlineContainer(nodeA, options) && isInlineContainer(nodeB, options)) {
     // 文本与 marks 的字符级 diff
-    diffs.push.apply(diffs, _toConsumableArray(compareInlineContainer(nodeA, nodeB, path)));
+    diffs.push.apply(diffs, _toConsumableArray(compareInlineContainer(nodeA, nodeB, path, options)));
     // 非文本内联节点（如行内数学、行内公式等）的结构化对比
-    diffs.push.apply(diffs, _toConsumableArray(compareInlineContainerChildren(nodeA, nodeB, path)));
+    diffs.push.apply(diffs, _toConsumableArray(compareInlineContainerChildren(nodeA, nodeB, path, options)));
     return diffs;
   }
 
@@ -162,6 +253,9 @@ function compareNodes(nodeA, nodeB) {
   var allAttrKeys = new Set([].concat(_toConsumableArray(Object.keys(attrsA)), _toConsumableArray(Object.keys(attrsB))));
   for (var _i = 0, _Array$from = Array.from(allAttrKeys); _i < _Array$from.length; _i++) {
     var key = _Array$from[_i];
+    if (isIgnoredAttr(key, options)) {
+      continue;
+    }
     if (attrsA[key] !== attrsB[key]) {
       diffs.push({
         type: 'modify',
@@ -178,7 +272,9 @@ function compareNodes(nodeA, nodeB) {
   // 使用 LCS 对齐子节点，减少错配
   var contentA = (nodeA === null || nodeA === void 0 ? void 0 : nodeA.content) || [];
   var contentB = (nodeB === null || nodeB === void 0 ? void 0 : nodeB.content) || [];
-  var pairs = lcsAlign(contentA, contentB, nodesEqualForAlign);
+  var pairs = lcsAlign(contentA, contentB, createAlignPredicate(contentA, contentB, function (node) {
+    return node;
+  }, options));
   var ai = 0;
   var bi = 0;
   for (var _i2 = 0, _pairs = pairs; _i2 < _pairs.length; _i2++) {
@@ -208,7 +304,7 @@ function compareNodes(nodeA, nodeB) {
     // 匹配上的成对递归，路径以新文档索引为准
     var childA = contentA[i];
     var childB = contentB[j];
-    diffs.push.apply(diffs, _toConsumableArray(compareNodes(childA, childB, [].concat(_toConsumableArray(path), [j]))));
+    diffs.push.apply(diffs, _toConsumableArray(compareNodes(childA, childB, [].concat(_toConsumableArray(path), [j]), options)));
     ai = i + 1;
     bi = j + 1;
   }
@@ -233,8 +329,31 @@ function compareNodes(nodeA, nodeB) {
   }
   return diffs;
 }
-function isInlineContainer(node) {
-  return node.type === 'paragraph' || node.type === 'heading';
+function isInlineLikeChildNode(node) {
+  var _node$content;
+  if (node.type === 'text') {
+    return true;
+  }
+  if (BLOCKISH_CHILD_NODE_TYPES.has(node.type)) {
+    return false;
+  }
+  return !((_node$content = node.content) !== null && _node$content !== void 0 && _node$content.length);
+}
+function isInlineLeafContainer(node) {
+  if (NON_INLINE_LEAF_CONTAINER_TYPES.has(node.type)) {
+    return false;
+  }
+  var content = node.content || [];
+  if (content.length === 0) {
+    return false;
+  }
+  return content.every(isInlineLikeChildNode);
+}
+function isInlineContainer(node, options) {
+  if (getStructuredDiffEngine(options) === 'legacy') {
+    return LEGACY_INLINE_CONTAINER_TYPES.has(node.type);
+  }
+  return isInlineLeafContainer(node);
 }
 function extractInlineTextAndMarks(node) {
   var resultChars = [];
@@ -263,7 +382,7 @@ function extractInlineTextAndMarks(node) {
     marksMap: marksMap
   };
 }
-function compareInlineContainer(nodeA, nodeB, path) {
+function compareInlineContainer(nodeA, nodeB, path, options) {
   var diffs = [];
   var _extractInlineTextAnd = extractInlineTextAndMarks(nodeA),
     oldText = _extractInlineTextAnd.text,
@@ -312,7 +431,7 @@ function compareInlineContainer(nodeA, nodeB, path) {
       for (var i = 0; i < len; i++) {
         var oldIdx = oldOffset + i;
         var newIdx = newOffset + i;
-        var same = haveSameMarks(oldMarks[oldIdx] || [], newMarks[newIdx] || []);
+        var same = haveSameMarks(oldMarks[oldIdx] || [], newMarks[newIdx] || [], options);
         if (!same) {
           if (runStart === null) runStart = i;
         } else if (runStart !== null) {
@@ -350,32 +469,40 @@ function compareInlineContainer(nodeA, nodeB, path) {
   }
   return diffs;
 }
-function nodesEqualForAlign(a, b) {
+function nodesEqualForAlign(a, b, options) {
   if (!a || !b) return false;
   if (a.type !== b.type) return false;
   // 对部分结构节点使用关键属性辅助匹配
   if (a.type === 'heading') {
     var _a$attrs$level, _a$attrs, _b$attrs$level, _b$attrs;
+    if (isIgnoredAttr('level', options)) {
+      return true;
+    }
     return ((_a$attrs$level = (_a$attrs = a.attrs) === null || _a$attrs === void 0 ? void 0 : _a$attrs.level) !== null && _a$attrs$level !== void 0 ? _a$attrs$level : null) === ((_b$attrs$level = (_b$attrs = b.attrs) === null || _b$attrs === void 0 ? void 0 : _b$attrs.level) !== null && _b$attrs$level !== void 0 ? _b$attrs$level : null);
   }
   if (a.type === 'codeBlock' || a.type === 'code_block') {
-    var _ref3, _a$attrs$language, _a$attrs2, _a$attrs3, _ref4, _b$attrs$language, _b$attrs2, _b$attrs3;
-    var langA = (_ref3 = (_a$attrs$language = (_a$attrs2 = a.attrs) === null || _a$attrs2 === void 0 ? void 0 : _a$attrs2.language) !== null && _a$attrs$language !== void 0 ? _a$attrs$language : (_a$attrs3 = a.attrs) === null || _a$attrs3 === void 0 ? void 0 : _a$attrs3.lang) !== null && _ref3 !== void 0 ? _ref3 : null;
-    var langB = (_ref4 = (_b$attrs$language = (_b$attrs2 = b.attrs) === null || _b$attrs2 === void 0 ? void 0 : _b$attrs2.language) !== null && _b$attrs$language !== void 0 ? _b$attrs$language : (_b$attrs3 = b.attrs) === null || _b$attrs3 === void 0 ? void 0 : _b$attrs3.lang) !== null && _ref4 !== void 0 ? _ref4 : null;
+    var _ref5, _a$attrs$language, _a$attrs2, _a$attrs3, _ref6, _b$attrs$language, _b$attrs2, _b$attrs3;
+    if (isIgnoredAttr('language', options) || isIgnoredAttr('lang', options)) {
+      return true;
+    }
+    var langA = (_ref5 = (_a$attrs$language = (_a$attrs2 = a.attrs) === null || _a$attrs2 === void 0 ? void 0 : _a$attrs2.language) !== null && _a$attrs$language !== void 0 ? _a$attrs$language : (_a$attrs3 = a.attrs) === null || _a$attrs3 === void 0 ? void 0 : _a$attrs3.lang) !== null && _ref5 !== void 0 ? _ref5 : null;
+    var langB = (_ref6 = (_b$attrs$language = (_b$attrs2 = b.attrs) === null || _b$attrs2 === void 0 ? void 0 : _b$attrs2.language) !== null && _b$attrs$language !== void 0 ? _b$attrs$language : (_b$attrs3 = b.attrs) === null || _b$attrs3 === void 0 ? void 0 : _b$attrs3.lang) !== null && _ref6 !== void 0 ? _ref6 : null;
     return langA === langB;
   }
   if (a.type === 'table_cell' || a.type === 'tableHeader' || a.type === 'table_header') {
     var _a$attrs$colspan, _a$attrs4, _b$attrs$colspan, _b$attrs4, _a$attrs$rowspan, _a$attrs5, _b$attrs$rowspan, _b$attrs5;
+    var compareColspan = !isIgnoredAttr('colspan', options);
+    var compareRowspan = !isIgnoredAttr('rowspan', options);
     var colspanA = (_a$attrs$colspan = (_a$attrs4 = a.attrs) === null || _a$attrs4 === void 0 ? void 0 : _a$attrs4.colspan) !== null && _a$attrs$colspan !== void 0 ? _a$attrs$colspan : 1;
     var colspanB = (_b$attrs$colspan = (_b$attrs4 = b.attrs) === null || _b$attrs4 === void 0 ? void 0 : _b$attrs4.colspan) !== null && _b$attrs$colspan !== void 0 ? _b$attrs$colspan : 1;
     var rowspanA = (_a$attrs$rowspan = (_a$attrs5 = a.attrs) === null || _a$attrs5 === void 0 ? void 0 : _a$attrs5.rowspan) !== null && _a$attrs$rowspan !== void 0 ? _a$attrs$rowspan : 1;
     var rowspanB = (_b$attrs$rowspan = (_b$attrs5 = b.attrs) === null || _b$attrs5 === void 0 ? void 0 : _b$attrs5.rowspan) !== null && _b$attrs$rowspan !== void 0 ? _b$attrs$rowspan : 1;
-    return colspanA === colspanB && rowspanA === rowspanB;
+    return (!compareColspan || colspanA === colspanB) && (!compareRowspan || rowspanA === rowspanB);
   }
   // 默认仅按类型
   return true;
 }
-function compareInlineContainerChildren(nodeA, nodeB, path) {
+function compareInlineContainerChildren(nodeA, nodeB, path, options) {
   var diffs = [];
   var aList = (nodeA.content || []).map(function (n, idx) {
     return {
@@ -398,7 +525,9 @@ function compareInlineContainerChildren(nodeA, nodeB, path) {
     // 仅按类型对齐，属性差异作为 modify 处理
     return x.n.type === y.n.type;
   };
-  var pairs = lcsAlign(aList, bList, equals);
+  var pairs = lcsAlign(aList, bList, getStructuredDiffEngine(options) === 'enhanced' ? createAlignPredicate(aList, bList, function (item) {
+    return item.n;
+  }, options) : equals);
   var ai = 0,
     bi = 0;
   for (var _i5 = 0, _pairs2 = pairs; _i5 < _pairs2.length; _i5++) {
@@ -432,14 +561,14 @@ function compareInlineContainerChildren(nodeA, nodeB, path) {
     if (aItem && bItem) {
       var oldAttrs = aItem.n.attrs || {};
       var newAttrs = bItem.n.attrs || {};
-      if (JSON.stringify(oldAttrs) !== JSON.stringify(newAttrs)) {
+      if (!areAttrsEqual(oldAttrs, newAttrs, options)) {
         diffs.push({
           type: 'modify',
           path: [].concat(_toConsumableArray(path), [bItem.idx]),
           attrChange: {
             key: 'attrs',
-            oldValue: oldAttrs,
-            newValue: newAttrs
+            oldValue: getFilteredAttrs(oldAttrs, options),
+            newValue: getFilteredAttrs(newAttrs, options)
           }
         });
       }
@@ -506,10 +635,10 @@ function lcsAlign(a, b, equals) {
  * @param {Array} extensions - Tiptap扩展数组
  * @returns {Object} 包含差异信息的对象
  */
-export function compareDocuments(oldHtml, newHtml, extensions) {
+export function compareDocuments(oldHtml, newHtml, extensions, options) {
   var docA = parseHtmlToDoc(oldHtml, extensions);
   var docB = parseHtmlToDoc(newHtml, extensions);
-  var diffs = compareNodes(docA, docB);
+  var diffs = compareNodes(docA, docB, [], options);
   return {
     oldDoc: docA,
     newDoc: docB,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ctzhian/tiptap",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "description": "基于 Tiptap 二次开发的编辑器组件",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -139,6 +139,7 @@
     "docs:build": "dumi build",
     "docs:preview": "dumi preview",
     "doctor": "father doctor",
+    "test:smoke": "pnpm build && node --loader ./test/esm-loader.mjs --test test/*.test.mjs",
     "lint": "npm run lint:es && npm run lint:css",
     "lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
     "lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",