@ctzhian/tiptap 2.12.6 → 2.12.7

package/dist/extension/node/FileHandler.js

@@ -9,7 +9,7 @@ export var FileHandlerExtension = function FileHandlerExtension(props) {
   return FileHandler.configure({
     onDrop: function () {
       var _onDrop = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(editor, files, pos) {
-        var findNodePosition, _loop, i;
+        var findNodePosition, baseTime, content, _loop, i;
         return _regeneratorRuntime().wrap(function _callee$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -30,29 +30,39 @@ export var FileHandlerExtension = function FileHandlerExtension(props) {
                 });
                 return targetPos;
               };
+              baseTime = Date.now();
+              content = files.map(function (file, i) {
+                var fileType = getFileType(file);
+                var tempId = "upload-".concat(baseTime, "-").concat(i);
+                var isImage = fileType === 'image';
+                var progressNode = {
+                  type: isImage ? 'inlineUploadProgress' : 'uploadProgress',
+                  attrs: {
+                    fileName: file.name,
+                    fileType: fileType,
+                    progress: 0,
+                    tempId: tempId
+                  }
+                };
+                return isImage ? {
+                  type: 'paragraph',
+                  content: [progressNode]
+                } : progressNode;
+              });
+              editor.chain().insertContentAt(pos, content).focus().run();
               _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _loop() {
-                var file, fileType, tempId, insertPosition, isImage, progressNodeType, progressPos, url, chain, dimensions, fallbackChain, _progressPos, _chain;
+                var file, fileType, tempId, isImage, progressNodeType, progressPos, url, chain, dimensions, fallbackChain, _progressPos, _chain;
                 return _regeneratorRuntime().wrap(function _loop$(_context) {
                   while (1) switch (_context.prev = _context.next) {
                     case 0:
                       file = files[i];
                       fileType = getFileType(file);
-                      tempId = "upload-".concat(Date.now(), "-").concat(i);
-                      insertPosition = pos + i;
+                      tempId = "upload-".concat(baseTime, "-").concat(i);
                       isImage = fileType === 'image';
                       progressNodeType = isImage ? 'inlineUploadProgress' : 'uploadProgress';
-                      _context.prev = 6;
-                      editor.chain().insertContentAt(insertPosition, {
-                        type: progressNodeType,
-                        attrs: {
-                          fileName: file.name,
-                          fileType: fileType,
-                          progress: 0,
-                          tempId: tempId
-                        }
-                      }).focus().run();
+                      _context.prev = 5;
                       progressPos = findNodePosition(progressNodeType, tempId);
-                      _context.next = 11;
+                      _context.next = 9;
                       return props.onUpload(file, function (progressEvent) {
                         var progressValue = progressEvent.progress;
                         if (isImage) {
@@ -61,7 +71,7 @@ export var FileHandlerExtension = function FileHandlerExtension(props) {
                           editor.chain().updateUploadProgress(tempId, progressValue).focus().run();
                         }
                       });
-                    case 11:
+                    case 9:
                       url = _context.sent;
                       if (isImage) {
                         editor.chain().removeInlineUploadProgress(tempId).focus().run();
@@ -73,23 +83,23 @@ export var FileHandlerExtension = function FileHandlerExtension(props) {
                         chain.setTextSelection(progressPos);
                       }
                       _context.t0 = fileType;
-                      _context.next = _context.t0 === 'image' ? 18 : _context.t0 === 'video' ? 31 : 33;
+                      _context.next = _context.t0 === 'image' ? 16 : _context.t0 === 'video' ? 29 : 31;
                       break;
-                    case 18:
-                      _context.prev = 18;
-                      _context.next = 21;
+                    case 16:
+                      _context.prev = 16;
+                      _context.next = 19;
                       return getImageDimensionsFromFile(file);
-                    case 21:
+                    case 19:
                       dimensions = _context.sent;
                       chain.setImage({
                         src: url,
                         width: Math.min(dimensions.width, 760)
                       }).run();
-                      _context.next = 30;
+                      _context.next = 28;
                       break;
-                    case 25:
-                      _context.prev = 25;
-                      _context.t1 = _context["catch"](18);
+                    case 23:
+                      _context.prev = 23;
+                      _context.t1 = _context["catch"](16);
                       fallbackChain = editor.chain().focus();
                       if (progressPos !== null) {
                         fallbackChain.setTextSelection(progressPos);
@@ -98,29 +108,29 @@ export var FileHandlerExtension = function FileHandlerExtension(props) {
                         src: url,
                         width: 760
                       }).run();
-                    case 30:
-                      return _context.abrupt("break", 35);
-                    case 31:
+                    case 28:
+                      return _context.abrupt("break", 33);
+                    case 29:
                       chain.setVideo({
                         src: url,
                         width: 760,
                         controls: true,
                         autoplay: false
                       }).run();
-                      return _context.abrupt("break", 35);
-                    case 33:
+                      return _context.abrupt("break", 33);
+                    case 31:
                       chain.setBlockAttachment({
                         url: url,
                         title: file.name,
                         size: formatFileSize(file.size)
                       }).run();
-                      return _context.abrupt("break", 35);
-                    case 35:
-                      _context.next = 53;
+                      return _context.abrupt("break", 33);
+                    case 33:
+                      _context.next = 51;
                       break;
-                    case 37:
-                      _context.prev = 37;
-                      _context.t2 = _context["catch"](6);
+                    case 35:
+                      _context.prev = 35;
+                      _context.t2 = _context["catch"](5);
                       console.error('文件上传失败:', _context.t2);
                       if (isImage) {
                         editor.chain().removeInlineUploadProgress(tempId).focus().run();
@@ -133,47 +143,47 @@ export var FileHandlerExtension = function FileHandlerExtension(props) {
                         _chain.setTextSelection(_progressPos);
                       }
                       _context.t3 = fileType;
-                      _context.next = _context.t3 === 'image' ? 47 : _context.t3 === 'video' ? 49 : 51;
+                      _context.next = _context.t3 === 'image' ? 45 : _context.t3 === 'video' ? 47 : 49;
                       break;
-                    case 47:
+                    case 45:
                       _chain.setImage({
                         src: '',
                         width: 760
                       }).run();
-                      return _context.abrupt("break", 53);
-                    case 49:
+                      return _context.abrupt("break", 51);
+                    case 47:
                       _chain.setVideo({
                         src: '',
                         width: 760,
                         controls: true,
                         autoplay: false
                       }).run();
-                      return _context.abrupt("break", 53);
-                    case 51:
+                      return _context.abrupt("break", 51);
+                    case 49:
                       _chain.setBlockAttachment({
                         url: 'error',
                         title: "\u4E0A\u4F20\u5931\u8D25: ".concat(file.name),
                         size: formatFileSize(file.size)
                       }).run();
-                      return _context.abrupt("break", 53);
-                    case 53:
+                      return _context.abrupt("break", 51);
+                    case 51:
                     case "end":
                       return _context.stop();
                   }
-                }, _loop, null, [[6, 37], [18, 25]]);
+                }, _loop, null, [[5, 35], [16, 23]]);
               });
               i = 0;
-            case 5:
+            case 8:
               if (!(i < files.length)) {
-                _context2.next = 10;
+                _context2.next = 13;
                 break;
               }
-              return _context2.delegateYield(_loop(), "t0", 7);
-            case 7:
+              return _context2.delegateYield(_loop(), "t0", 10);
+            case 10:
               i++;
-              _context2.next = 5;
+              _context2.next = 8;
               break;
-            case 10:
+            case 13:
             case "end":
               return _context2.stop();
           }

package/dist/extension/node/Image.js

@@ -2,6 +2,12 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 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); }); }; }
+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 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 _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -11,7 +17,58 @@ import { getFileType, removeBaseUrl, withBaseUrl } from "../../util";
 import Image from "@tiptap/extension-image";
 import { Plugin, PluginKey } from "@tiptap/pm/state";
 import { ReactNodeViewRenderer } from "@tiptap/react";
+import { generateJSON } from "@tiptap/html";
 import ImageViewWrapper, { getImageDimensionsFromFile } from "../component/Image";
+/** 在 JSON 结构中用 progress 节点替换 image 节点，按顺序匹配 Files */
+function replaceImagesWithProgressNodes(node, imageFiles, fileIndex, tempIds) {
+  if (node.type === 'image' && fileIndex.current < imageFiles.length) {
+    var idx = fileIndex.current++;
+    var tempId = "upload-".concat(Date.now(), "-").concat(idx);
+    tempIds.push(tempId);
+    return {
+      type: 'inlineUploadProgress',
+      attrs: {
+        fileName: imageFiles[idx].name,
+        fileType: 'image',
+        progress: 0,
+        tempId: tempId
+      }
+    };
+  }
+  if (node.content && Array.isArray(node.content)) {
+    return _objectSpread(_objectSpread({}, node), {}, {
+      content: node.content.map(function (child) {
+        return replaceImagesWithProgressNodes(child, imageFiles, fileIndex, tempIds);
+      })
+    });
+  }
+  return node;
+}
+
+/** 在 doc 末尾追加多余的图片（当 Files 数量多于 HTML 中的 img 时） */
+function appendExtraImagesToDoc(doc, imageFiles, startIndex, tempIds) {
+  var content = _toConsumableArray(doc.content || []);
+  for (var i = startIndex; i < imageFiles.length; i++) {
+    var tempId = "upload-".concat(Date.now(), "-").concat(i);
+    tempIds.push(tempId);
+    var progressNode = {
+      type: 'inlineUploadProgress',
+      attrs: {
+        fileName: imageFiles[i].name,
+        fileType: 'image',
+        progress: 0,
+        tempId: tempId
+      }
+    };
+    content.push({
+      type: 'paragraph',
+      content: [progressNode]
+    });
+  }
+  return _objectSpread(_objectSpread({}, doc), {}, {
+    content: content
+  });
+}
 var customImage = function customImage(props) {
   return Image.extend({
     addAttributes: function addAttributes() {
@@ -57,7 +114,7 @@ var customImage = function customImage(props) {
         key: new PluginKey('imagePasteHandler'),
         props: {
           handlePaste: function handlePaste(view, event) {
-            var _event$clipboardData, _event$clipboardData2, _event$clipboardData3;
+            var _event$clipboardData, _event$clipboardData2;
             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) {
@@ -73,17 +130,9 @@ var customImage = function customImage(props) {
                 return false;
               }
             }
-            var textData = (_event$clipboardData3 = event.clipboardData) === null || _event$clipboardData3 === void 0 ? void 0 : _event$clipboardData3.getData('text/plain');
-            if (textData && textData.trim().length > 0) {
-              var trimmedText = textData.trim();
-              var hasTab = trimmedText.includes('\t');
-              var lineCount = trimmedText.split('\n').length;
-              var isLikelyFileName = /\.(jpg|jpeg|png|gif|webp|svg|bmp)$/i.test(trimmedText);
-              if ((hasTab || lineCount > 2) && !isLikelyFileName) {
-                return false;
-              }
-            }
-            var from = view.state.selection.from;
+            var _view$state$selection = view.state.selection,
+              from = _view$state$selection.from,
+              to = _view$state$selection.to;
             var editor = _this2.editor;
             var findNodePosition = function findNodePosition(typeName, tempId) {
               var targetPos = null;
@@ -96,108 +145,163 @@ var customImage = function customImage(props) {
               });
               return targetPos;
             };
-            _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-              var _loop, i;
-              return _regeneratorRuntime().wrap(function _callee$(_context2) {
+            var uploadSingleImage = /*#__PURE__*/function () {
+              var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(file, tempId) {
+                var progressPos, url, chain, dimensions, fallbackChain, _progressPos, _chain;
+                return _regeneratorRuntime().wrap(function _callee$(_context) {
+                  while (1) switch (_context.prev = _context.next) {
+                    case 0:
+                      _context.prev = 0;
+                      progressPos = findNodePosition('inlineUploadProgress', tempId);
+                      _context.next = 4;
+                      return props.onUpload(file, function (progressEvent) {
+                        editor.chain().updateInlineUploadProgress(tempId, progressEvent.progress).focus().run();
+                      });
+                    case 4:
+                      url = _context.sent;
+                      editor.chain().removeInlineUploadProgress(tempId).focus().run();
+                      chain = editor.chain().focus();
+                      if (progressPos !== null) {
+                        chain.setTextSelection(progressPos);
+                      }
+                      _context.prev = 8;
+                      _context.next = 11;
+                      return getImageDimensionsFromFile(file);
+                    case 11:
+                      dimensions = _context.sent;
+                      chain.setImage({
+                        src: url,
+                        width: Math.min(dimensions.width, 760)
+                      }).run();
+                      _context.next = 20;
+                      break;
+                    case 15:
+                      _context.prev = 15;
+                      _context.t0 = _context["catch"](8);
+                      fallbackChain = editor.chain().focus();
+                      if (progressPos !== null) {
+                        fallbackChain.setTextSelection(progressPos);
+                      }
+                      fallbackChain.setImage({
+                        src: url,
+                        width: 760
+                      }).run();
+                    case 20:
+                      _context.next = 29;
+                      break;
+                    case 22:
+                      _context.prev = 22;
+                      _context.t1 = _context["catch"](0);
+                      editor.chain().removeInlineUploadProgress(tempId).focus().run();
+                      _progressPos = findNodePosition('inlineUploadProgress', tempId);
+                      _chain = editor.chain().focus();
+                      if (_progressPos !== null) {
+                        _chain.setTextSelection(_progressPos);
+                      }
+                      _chain.setImage({
+                        src: '',
+                        width: 760
+                      }).run();
+                    case 29:
+                    case "end":
+                      return _context.stop();
+                  }
+                }, _callee, null, [[0, 22], [8, 15]]);
+              }));
+              return function uploadSingleImage(_x, _x2) {
+                return _ref.apply(this, arguments);
+              };
+            }();
+            _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+              var _htmlTrimmed$match;
+              var htmlTrimmed, hasRichHtml, _parsed$content, extensions, parsed, tempIds, fileIndex, modifiedDoc, finalDoc, i, useSimpleInsert;
+              return _regeneratorRuntime().wrap(function _callee2$(_context2) {
                 while (1) switch (_context2.prev = _context2.next) {
                   case 0:
+                    useSimpleInsert = function _useSimpleInsert() {
+                      var baseTime = Date.now();
+                      var content = imageFiles.map(function (file, i) {
+                        return {
+                          type: 'paragraph',
+                          content: [{
+                            type: 'inlineUploadProgress',
+                            attrs: {
+                              fileName: file.name,
+                              fileType: 'image',
+                              progress: 0,
+                              tempId: "upload-".concat(baseTime, "-").concat(i)
+                            }
+                          }]
+                        };
+                      });
+                      editor.chain().insertContentAt({
+                        from: from,
+                        to: to
+                      }, content).focus().run();
+                      imageFiles.forEach(function (file, i) {
+                        uploadSingleImage(file, "upload-".concat(baseTime, "-").concat(i));
+                      });
+                    };
                     if (props.onUpload) {
-                      _context2.next = 2;
+                      _context2.next = 3;
                       break;
                     }
                     return _context2.abrupt("return");
-                  case 2:
-                    _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _loop() {
-                      var file, tempId, insertPosition, progressPos, url, chain, dimensions, fallbackChain, _progressPos, _chain;
-                      return _regeneratorRuntime().wrap(function _loop$(_context) {
-                        while (1) switch (_context.prev = _context.next) {
-                          case 0:
-                            file = imageFiles[i];
-                            tempId = "upload-".concat(Date.now(), "-").concat(i);
-                            insertPosition = from + i;
-                            _context.prev = 3;
-                            editor.chain().insertContentAt(insertPosition, {
-                              type: 'inlineUploadProgress',
-                              attrs: {
-                                fileName: file.name,
-                                fileType: 'image',
-                                progress: 0,
-                                tempId: tempId
-                              }
-                            }).focus().run();
-                            progressPos = findNodePosition('inlineUploadProgress', tempId);
-                            _context.next = 8;
-                            return props.onUpload(file, function (progressEvent) {
-                              var progressValue = progressEvent.progress;
-                              editor.chain().updateInlineUploadProgress(tempId, progressValue).focus().run();
-                            });
-                          case 8:
-                            url = _context.sent;
-                            editor.chain().removeInlineUploadProgress(tempId).focus().run();
-                            chain = editor.chain().focus();
-                            if (progressPos !== null) {
-                              chain.setTextSelection(progressPos);
-                            }
-                            _context.prev = 12;
-                            _context.next = 15;
-                            return getImageDimensionsFromFile(file);
-                          case 15:
-                            dimensions = _context.sent;
-                            chain.setImage({
-                              src: url,
-                              width: Math.min(dimensions.width, 760)
-                            }).run();
-                            _context.next = 24;
-                            break;
-                          case 19:
-                            _context.prev = 19;
-                            _context.t0 = _context["catch"](12);
-                            fallbackChain = editor.chain().focus();
-                            if (progressPos !== null) {
-                              fallbackChain.setTextSelection(progressPos);
-                            }
-                            fallbackChain.setImage({
-                              src: url,
-                              width: 760
-                            }).run();
-                          case 24:
-                            _context.next = 33;
-                            break;
-                          case 26:
-                            _context.prev = 26;
-                            _context.t1 = _context["catch"](3);
-                            editor.chain().removeInlineUploadProgress(tempId).focus().run();
-                            _progressPos = findNodePosition('inlineUploadProgress', tempId);
-                            _chain = editor.chain().focus();
-                            if (_progressPos !== null) {
-                              _chain.setTextSelection(_progressPos);
-                            }
-                            _chain.setImage({
-                              src: '',
-                              width: 760
-                            }).run();
-                          case 33:
-                          case "end":
-                            return _context.stop();
-                        }
-                      }, _loop, null, [[3, 26], [12, 19]]);
-                    });
+                  case 3:
+                    htmlTrimmed = (htmlData === null || htmlData === void 0 ? void 0 : htmlData.trim()) || '';
+                    hasRichHtml = htmlTrimmed.length > 0 && (htmlTrimmed.includes('<p') || htmlTrimmed.includes('<div') || htmlTrimmed.includes('<br') || htmlTrimmed.includes('<span') || ((_htmlTrimmed$match = htmlTrimmed.match(/<img/gi)) === null || _htmlTrimmed$match === void 0 ? void 0 : _htmlTrimmed$match.length) !== 1);
+                    if (!hasRichHtml) {
+                      _context2.next = 30;
+                      break;
+                    }
+                    _context2.prev = 6;
+                    extensions = editor.extensionManager.extensions;
+                    parsed = generateJSON(htmlTrimmed, extensions);
+                    if (parsed !== null && parsed !== void 0 && (_parsed$content = parsed.content) !== null && _parsed$content !== void 0 && _parsed$content.length) {
+                      _context2.next = 11;
+                      break;
+                    }
+                    throw new Error('Empty parsed content');
+                  case 11:
+                    tempIds = [];
+                    fileIndex = {
+                      current: 0
+                    };
+                    modifiedDoc = replaceImagesWithProgressNodes(parsed, imageFiles, fileIndex, tempIds);
+                    finalDoc = appendExtraImagesToDoc(modifiedDoc, imageFiles, fileIndex.current, tempIds);
+                    editor.chain().insertContentAt({
+                      from: from,
+                      to: to
+                    }, finalDoc).focus().run();
                     i = 0;
-                  case 4:
-                    if (!(i < imageFiles.length)) {
-                      _context2.next = 9;
+                  case 17:
+                    if (!(i < tempIds.length)) {
+                      _context2.next = 23;
                       break;
                     }
-                    return _context2.delegateYield(_loop(), "t0", 6);
-                  case 6:
+                    _context2.next = 20;
+                    return uploadSingleImage(imageFiles[i], tempIds[i]);
+                  case 20:
                     i++;
-                    _context2.next = 4;
+                    _context2.next = 17;
+                    break;
+                  case 23:
+                    _context2.next = 28;
+                    break;
+                  case 25:
+                    _context2.prev = 25;
+                    _context2.t0 = _context2["catch"](6);
+                    useSimpleInsert();
+                  case 28:
+                    _context2.next = 31;
                     break;
-                  case 9:
+                  case 30:
+                    useSimpleInsert();
+                  case 31:
                   case "end":
                     return _context2.stop();
                 }
-              }, _callee);
+              }, _callee2, null, [[6, 25]]);
             }))();
             return true;
           }

package/package.json

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