@ctzhian/tiptap 2.1.12 → 2.1.14

package/dist/extension/component/SlashCommandsList/index.js

@@ -25,7 +25,7 @@ var SlashCommandsList = /*#__PURE__*/forwardRef(function (_ref, ref) {
   }, /*#__PURE__*/React.createElement(Stack, {
     direction: 'row',
     flexWrap: 'wrap'
-  }, items.slice(0, 18).map(function (item, index) {
+  }, items.slice(0, 16).map(function (item, index) {
     return /*#__PURE__*/React.createElement(ToolbarItem, {
       key: index,
       shortcutKey: (item === null || item === void 0 ? void 0 : item.shortcutKey) || [],

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

@@ -9,7 +9,13 @@ declare module '@tiptap/core' {
         };
     }
 }
-export declare const StructuredDiffExtension: Extension<any, any>;
+import { GetExtensionsProps } from '../../type';
+export interface StructuredDiffOptions {
+    getExtensionConfig?: () => Omit<GetExtensionsProps, 'editable'> & {
+        editable: false;
+    };
+}
+export declare const StructuredDiffExtension: Extension<StructuredDiffOptions, any>;
 export { diffPluginKey };
 export declare function getDiffState(editor: Editor): {
     isActive: any;

package/dist/extension/extension/StructuredDiff.js

@@ -1,4 +1,12 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+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 _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 _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 _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; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -9,6 +17,7 @@ import { Extension } from '@tiptap/core';
 import { Plugin, PluginKey } from '@tiptap/pm/state';
 import { createDecorationsFromDiffs, createEmptyDecorationSet } from "../../util/decorations";
 import { compareDocuments } from "../../util/structuredDiff";
+import { getExtensions } from "../index";
 var diffPluginKey = new PluginKey('structuredDiff');
 var DiffPluginState = /*#__PURE__*/function () {
   function DiffPluginState(decorations) {
@@ -44,20 +53,40 @@ var DiffPluginState = /*#__PURE__*/function () {
     }
   }], [{
     key: "init",
-    value: function init(config, state) {
+    value: function init(_config, state) {
       return new DiffPluginState(createEmptyDecorationSet(state.doc), [], false);
     }
   }]);
   return DiffPluginState;
 }();
+function getExtensionsForParsing(editor, getExtensionConfig) {
+  if (getExtensionConfig) {
+    var config = getExtensionConfig();
+    if (config) {
+      var exclude = [].concat(_toConsumableArray(config.exclude || []), ['structuredDiff']);
+      return getExtensions(_objectSpread(_objectSpread({}, config), {}, {
+        exclude: exclude,
+        editable: false
+      }));
+    }
+  }
+  return editor.extensionManager.extensions.filter(function (ext) {
+    return ext.name !== 'structuredDiff';
+  });
+}
 export var StructuredDiffExtension = Extension.create({
   name: 'structuredDiff',
+  addOptions: function addOptions() {
+    return {
+      getExtensionConfig: undefined
+    };
+  },
   addProseMirrorPlugins: function addProseMirrorPlugins() {
     return [new Plugin({
       key: diffPluginKey,
       state: {
         init: DiffPluginState.init,
-        apply: DiffPluginState.prototype.apply
+        apply: DiffPluginState.prototype.apply.bind(DiffPluginState.prototype)
       },
       props: {
         decorations: function decorations(state) {
@@ -68,6 +97,7 @@ export var StructuredDiffExtension = Extension.create({
     })];
   },
   addCommands: function addCommands() {
+    var _this = this;
     return {
       showStructuredDiff: function showStructuredDiff(oldHtml, newHtml) {
         return function (_ref) {
@@ -76,8 +106,8 @@ export var StructuredDiffExtension = Extension.create({
             dispatch = _ref.dispatch,
             editor = _ref.editor;
           try {
-            var extensions = editor.extensionManager.extensions;
-            var comparison = compareDocuments(oldHtml, newHtml, extensions);
+            var extensionsForParsing = getExtensionsForParsing(editor, _this.options.getExtensionConfig);
+            var comparison = compareDocuments(oldHtml, newHtml, extensionsForParsing);
             if (!comparison.hasChanges) {
               return false;
             }

package/dist/extension/index.js

@@ -150,7 +150,26 @@ export var getExtensions = function getExtensions(_ref) {
   } else {
     // 只读模式
     if (!(exclude !== null && exclude !== void 0 && exclude.includes('structuredDiff'))) {
-      defaultExtensions.push(StructuredDiffExtension);
+      defaultExtensions.push(StructuredDiffExtension.configure({
+        getExtensionConfig: function getExtensionConfig() {
+          return {
+            contentType: contentType,
+            limit: limit,
+            exclude: [].concat(_toConsumableArray(exclude || []), ['structuredDiff']),
+            extensions: extensionsProps,
+            youtube: youtube,
+            editable: false,
+            mentionItems: mentionItems,
+            onMentionFilter: onMentionFilter,
+            onUpload: onUpload,
+            onError: onError,
+            onTocUpdate: onTocUpdate,
+            onAiWritingGetSuggestion: onAiWritingGetSuggestion,
+            onValidateUrl: onValidateUrl,
+            placeholder: _placeholder
+          };
+        }
+      }));
     }
   }
   if (!(exclude !== null && exclude !== void 0 && exclude.includes('mention')) && (mentionItems && mentionItems.length > 0 || onMentionFilter)) {

package/dist/extension/node/FileHandler.d.ts

@@ -1,4 +1,4 @@
 import { UploadFunction } from "../../type";
 export declare const FileHandlerExtension: (props: {
     onUpload?: UploadFunction;
-}) => import("@tiptap/core").Extension<Omit<import("@tiptap/extension-file-handler").FileHandlePluginOptions, "editor" | "key">, any>;
+}) => import("@tiptap/core").Extension<Omit<import("@tiptap/extension-file-handler").FileHandlePluginOptions, "key" | "editor">, any>;

package/dist/extension/node/Iframe.d.ts

@@ -4,9 +4,11 @@ declare module '@tiptap/core' {
     interface Commands<ReturnType> {
         iframe: {
             setIframe: (options: {
+                type?: 'iframe' | 'bilibili';
                 src: string;
-                width?: number;
+                width?: number | string;
                 height?: number;
+                align?: 'left' | 'center' | 'right';
             }) => ReturnType;
         };
     }

package/dist/extension/node/Iframe.js

@@ -35,10 +35,15 @@ export var IframeExtension = function IframeExtension(props) {
           }
         },
         width: {
-          default: 760,
+          default: '100%',
           parseHTML: function parseHTML(element) {
             var width = element.getAttribute('width');
-            return width ? parseInt(width, 10) : 760;
+            if (width) {
+              if (width.endsWith('%')) return width;
+              var numWidth = parseInt(width, 10);
+              return isNaN(numWidth) ? '100%' : numWidth;
+            }
+            return '100%';
           },
           renderHTML: function renderHTML(attributes) {
             return {
@@ -57,6 +62,29 @@ export var IframeExtension = function IframeExtension(props) {
               height: attributes.height
             };
           }
+        },
+        type: {
+          default: 'iframe',
+          parseHTML: function parseHTML(element) {
+            return element.getAttribute('data-type');
+          },
+          renderHTML: function renderHTML(attributes) {
+            return {
+              'data-type': attributes.type
+            };
+          }
+        },
+        align: {
+          default: null,
+          parseHTML: function parseHTML(element) {
+            return element.getAttribute('data-align');
+          },
+          renderHTML: function renderHTML(attributes) {
+            if (!attributes.align) return {};
+            return {
+              'data-align': attributes.align
+            };
+          }
         }
       };
     },
@@ -67,12 +95,24 @@ export var IframeExtension = function IframeExtension(props) {
           if (!(dom instanceof HTMLElement)) return false;
           var src = dom.getAttribute('src');
           if (!src) return false;
-          var width = dom.getAttribute('width') ? parseInt(dom.getAttribute('width'), 10) : dom.style.width ? parseInt(dom.style.width, 10) : 760;
+          var widthAttr = dom.getAttribute('width');
+          var width = '100%';
+          if (widthAttr) {
+            // 如果是百分比，保留字符串格式
+            if (widthAttr.endsWith('%')) {
+              width = widthAttr;
+            } else {
+              // 否则解析为数字
+              var numWidth = parseInt(widthAttr, 10);
+              width = isNaN(numWidth) ? '100%' : numWidth;
+            }
+          }
           var height = dom.getAttribute('height') ? parseInt(dom.getAttribute('height'), 10) : dom.style.height ? parseInt(dom.style.height, 10) : 400;
           return {
             src: src,
             width: width,
-            height: height
+            height: height,
+            align: dom.getAttribute('data-align') || dom.getAttribute('align')
           };
         }
       }];
@@ -94,9 +134,10 @@ export var IframeExtension = function IframeExtension(props) {
       var _ref3 = node.attrs,
         src = _ref3.src,
         width = _ref3.width,
-        height = _ref3.height;
+        height = _ref3.height,
+        align = _ref3['data-align'];
       if (!src || src.trim() === '') return '';
-      return "<iframe src=\"".concat(src, "\" ").concat(width ? "width=\"".concat(width, "\"") : '', " ").concat(height ? "height=\"".concat(height, "\"") : '', " frameborder=\"0\" allowfullscreen=\"true\" autoplay=\"0\" loop=\"0\"></iframe>");
+      return "<iframe src=\"".concat(src, "\" ").concat(width ? "width=\"".concat(width, "\"") : '', " ").concat(height ? "height=\"".concat(height, "\"") : '', " ").concat(align ? "data-align=\"".concat(align, "\"") : '', " frameborder=\"0\" allowfullscreen=\"true\" autoplay=\"0\" loop=\"0\"></iframe>");
     },
     addCommands: function addCommands() {
       var _this = this;
@@ -107,9 +148,11 @@ export var IframeExtension = function IframeExtension(props) {
             return commands.insertContent({
               type: _this.name,
               attrs: {
+                type: options.type || 'iframe',
                 src: options.src,
-                width: options.width || 760,
-                height: options.height || 400
+                width: options.width || '100%',
+                height: options.height || 400,
+                align: options.align || null
               }
             });
           };

package/dist/extension/node/Table.d.ts

@@ -1,5 +1,5 @@
 import { Extension } from '@tiptap/core';
 export declare const TableExtension: ({ editable }: {
     editable: boolean;
-}) => (import("@tiptap/core").Node<import("@tiptap/extension-table").TableOptions, any> | import("@tiptap/core").Node<import("@tiptap/extension-table").TableHeaderOptions, any> | Extension<any, any>)[];
+}) => (Extension<any, any> | import("@tiptap/core").Node<import("@tiptap/extension-table").TableOptions, any> | import("@tiptap/core").Node<import("@tiptap/extension-table").TableHeaderOptions, any>)[];
 export default TableExtension;

package/dist/index.css

@@ -448,7 +448,6 @@
   overflow-x: auto;
   overflow-y: hidden;
   position: relative;
-  margin: 20px 0;
 }
 
 .tiptap.ProseMirror[contenteditable="true"] .tableWrapper {

package/dist/util/index.d.ts

@@ -22,3 +22,4 @@ export declare const getLinkTitle: (href: string) => string;
 export declare const getLinkAttributesWithSelectedText: (editor: Editor) => {
     title?: string;
 };
+export declare const extractSrcFromIframe: (input: string) => string;

package/dist/util/index.js

@@ -88,4 +88,12 @@ export var getLinkAttributesWithSelectedText = function getLinkAttributesWithSel
     };
   }
   return {};
+};
+export var extractSrcFromIframe = function extractSrcFromIframe(input) {
+  var trimmed = input.trim();
+  var iframeMatch = trimmed.match(/<iframe[^>]*\ssrc\s*=\s*["']([^"']+)["'][^>]*>/i) || trimmed.match(/<iframe[^>]*\ssrc\s*=\s*([^\s>]+)[^>]*>/i);
+  if (iframeMatch && iframeMatch[1]) {
+    return iframeMatch[1].trim();
+  }
+  return trimmed;
 };

package/dist/util/structuredDiff.d.ts

@@ -35,25 +35,6 @@ export interface ProseMirrorNode {
         attrs?: Record<string, any>;
     }>;
 }
-/**
- * 将HTML转换为ProseMirror文档结构
- * @param {string} html - HTML字符串
- * @param {Array} extensions - Tiptap扩展数组
- * @returns {Object} ProseMirror文档对象
- */
 export declare function parseHtmlToDoc(html: string, extensions: Extensions): any;
-/**
- * 对比两个HTML文档并生成结构化差异
- * @param {string} oldHtml - 旧HTML
- * @param {string} newHtml - 新HTML
- * @param {Array} extensions - Tiptap扩展数组
- * @returns {Object} 包含差异信息的对象
- */
 export declare function compareDocuments(oldHtml: string, newHtml: string, extensions: Extensions): DocumentComparison;
-/**
- * 将路径转换为ProseMirror位置
- * @param {Array} path - 节点路径
- * @param {Object} doc - ProseMirror文档
- * @returns {number} 文档位置
- */
 export declare function pathToPos(path: number[], doc: any): number;