@ctzhian/tiptap 2.13.3 → 2.13.4

package/dist/extension/node/Image.js

@@ -15,11 +15,10 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import { getFileType, removeBaseUrl, withBaseUrl } from "../../util";
 import Image from "@tiptap/extension-image";
+import { generateJSON } from "@tiptap/html";
 import { Plugin, PluginKey } from "@tiptap/pm/state";
 import { ReactNodeViewRenderer } from "@tiptap/react";
-import { generateJSON } from "@tiptap/html";
 import ImageViewWrapper, { getImageDimensionsFromFile } from "../component/Image";
-/** 从 URL 下载图片并转换为 File 对象 */
 function downloadImageAsFile(_x, _x2) {
   return _downloadImageAsFile.apply(this, arguments);
 }
@@ -69,7 +68,7 @@ function _downloadImageAsFile() {
           fileName = "image-".concat(index + 1, ".").concat(blob.type.split('/')[1] || 'png');
           file = new File([blob], fileName, {
             type: blob.type
-          }); // console.log(`[下载] 图片 ${index + 1} 下载成功:`, { name: file.name, type: file.type, size: file.size });
+          });
           return _context5.abrupt("return", file);
         case 22:
           _context5.prev = 22;
@@ -202,7 +201,7 @@ var customImage = function customImage(props) {
         key: new PluginKey('imagePasteHandler'),
         props: {
           handlePaste: function handlePaste(view, event) {
-            var _event$clipboardData, _event$clipboardData2;
+            var _event$clipboardData, _event$clipboardData2, _event$clipboardData3;
             if (!props.onUpload) return false;
             var items = Array.from(((_event$clipboardData = event.clipboardData) === null || _event$clipboardData === void 0 ? void 0 : _event$clipboardData.items) || []);
             var imageFiles = items.map(function (item) {
@@ -211,13 +210,44 @@ var customImage = function customImage(props) {
               return file !== null && getFileType(file) === 'image';
             });
             var htmlData = (_event$clipboardData2 = event.clipboardData) === null || _event$clipboardData2 === void 0 ? void 0 : _event$clipboardData2.getData('text/html');
-
-            // 提前声明变量和函数，避免在异步回调中出现 TDZ 错误
+            var plainText = (_event$clipboardData3 = event.clipboardData) === null || _event$clipboardData3 === void 0 ? void 0 : _event$clipboardData3.getData('text/plain');
             var _view$state$selection = view.state.selection,
               from = _view$state$selection.from,
               to = _view$state$selection.to;
             var editor = _this2.editor;
 
+            // 辅助函数：检查内容是否包含有效文本
+            var hasValidTextContent = function hasValidTextContent(content) {
+              var _content$some;
+              return (_content$some = content === null || content === void 0 ? void 0 : content.some(function (node) {
+                if (node.type === 'text' || node.text && node.text.trim()) {
+                  return true;
+                }
+                if (node.content && Array.isArray(node.content)) {
+                  return hasValidTextContent(node.content);
+                }
+                return false;
+              })) !== null && _content$some !== void 0 ? _content$some : false;
+            };
+
+            // 辅助函数：插入纯文本内容
+            var insertPlainText = function insertPlainText(text) {
+              event.preventDefault();
+              editor.chain().insertContentAt({
+                from: from,
+                to: to
+              }, {
+                type: 'doc',
+                content: [{
+                  type: 'paragraph',
+                  content: [{
+                    type: 'text',
+                    text: text
+                  }]
+                }]
+              }).focus().run();
+            };
+
             // 定义辅助函数
             var findNodePosition = function findNodePosition(typeName, tempId) {
               var targetPos = null;
@@ -397,16 +427,18 @@ var customImage = function customImage(props) {
               };
             }();
 
-            // 如果没有 File 对象，尝试从 HTML 中提取图片 URL
-            var finalImageFiles = imageFiles;
-            if (imageFiles.length === 0 && htmlData) {
+            // 如果没有图片文件，尝试从 HTML 中提取图片 URL 或处理文本粘贴
+            if (imageFiles.length === 0) {
+              if (!htmlData) {
+                return false; // 没有 HTML 数据，让默认粘贴处理
+              }
               var imageUrls = extractImageUrls(htmlData);
-              if (imageUrls.length > 0) {
-                event.preventDefault(); // 阻止默认粘贴行为
 
-                // 异步下载所有图片
+              // 如果找到图片 URL，下载并处理图片
+              if (imageUrls.length > 0) {
+                event.preventDefault();
                 _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-                  var downloadedFiles, validFiles, _parsed$content2, extensions, parsed;
+                  var downloadedFiles, validFiles;
                   return _regeneratorRuntime().wrap(function _callee3$(_context3) {
                     while (1) switch (_context3.prev = _context3.next) {
                       case 0:
@@ -420,72 +452,71 @@ var customImage = function customImage(props) {
                           return f !== null;
                         });
                         if (!(validFiles.length === 0)) {
-                          _context3.next = 19;
+                          _context3.next = 6;
                           break;
                         }
-                        _context3.prev = 5;
-                        extensions = editor.extensionManager.extensions;
-                        parsed = generateJSON(htmlData, extensions);
-                        if (!(parsed !== null && parsed !== void 0 && (_parsed$content2 = parsed.content) !== null && _parsed$content2 !== void 0 && _parsed$content2.length)) {
-                          _context3.next = 12;
-                          break;
-                        }
-                        editor.chain().insertContentAt({
-                          from: from,
-                          to: to
-                        }, parsed).focus().run();
-                        _context3.next = 13;
-                        break;
-                      case 12:
-                        throw new Error('解析失败');
-                      case 13:
-                        _context3.next = 18;
-                        break;
-                      case 15:
-                        _context3.prev = 15;
-                        _context3.t0 = _context3["catch"](5);
-                        return _context3.abrupt("return");
-                      case 18:
                         return _context3.abrupt("return");
-                      case 19:
-                        _context3.next = 21;
+                      case 6:
+                        _context3.next = 8;
                         return processImagePaste(validFiles, htmlData, from, to);
-                      case 21:
+                      case 8:
                       case "end":
                         return _context3.stop();
                     }
-                  }, _callee3, null, [[5, 15]]);
+                  }, _callee3);
                 }))();
-                return true; // 已处理
-              } else {
-                return false;
+                return true;
               }
+
+              // 没有图片 URL，尝试处理 HTML 或纯文本
+              // 先尝试使用 generateJSON 解析 HTML
+              try {
+                var _parsed$content2;
+                var extensions = editor.extensionManager.extensions;
+                var parsed = generateJSON(htmlData, extensions);
+
+                // 检查解析后的内容是否包含有效文本
+                if (parsed !== null && parsed !== void 0 && (_parsed$content2 = parsed.content) !== null && _parsed$content2 !== void 0 && _parsed$content2.length && hasValidTextContent(parsed.content)) {
+                  event.preventDefault();
+                  editor.chain().insertContentAt({
+                    from: from,
+                    to: to
+                  }, parsed).focus().run();
+                  return true;
+                }
+              } catch (error) {
+                // HTML 解析失败，继续尝试纯文本
+              }
+
+              // HTML 解析失败或内容无效（如包含特殊格式 data-clipboard-cangjie），使用纯文本
+              if (plainText !== null && plainText !== void 0 && plainText.trim()) {
+                insertPlainText(plainText.trim());
+                return true;
+              }
+              return false; // 让默认粘贴处理
             }
-            if (imageFiles.length === 0) {
-              return false;
-            }
-            if (htmlData && htmlData.trim().length > 0) {
+
+            // 有图片文件，直接处理
+            // 如果包含表格，让默认粘贴处理
+            if (htmlData !== null && htmlData !== void 0 && htmlData.trim()) {
               var htmlLower = htmlData.toLowerCase();
               if (htmlLower.includes('<table') || htmlLower.includes('<tr') || htmlLower.includes('<td') || htmlLower.includes('<th')) {
                 return false;
               }
             }
-
-            // 如果有 File 对象，直接处理
-            if (finalImageFiles.length > 0) {
-              _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-                return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-                  while (1) switch (_context4.prev = _context4.next) {
-                    case 0:
-                      _context4.next = 2;
-                      return processImagePaste(finalImageFiles, htmlData, from, to);
-                    case 2:
-                    case "end":
-                      return _context4.stop();
-                  }
-                }, _callee4);
-              }))();
-            }
+            event.preventDefault();
+            _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+              return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+                while (1) switch (_context4.prev = _context4.next) {
+                  case 0:
+                    _context4.next = 2;
+                    return processImagePaste(imageFiles, htmlData, from, to);
+                  case 2:
+                  case "end":
+                    return _context4.stop();
+                }
+              }, _callee4);
+            }))();
             return true;
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ctzhian/tiptap",
-  "version": "2.13.3",
+  "version": "2.13.4",
   "description": "基于 Tiptap 二次开发的编辑器组件",
   "main": "dist/index.js",
   "module": "dist/index.js",