@ctzhian/tiptap 1.13.3 → 1.13.4

package/dist/extension/component/Attachment/AttachmentContent.js

@@ -91,7 +91,7 @@ export var AttachmentContent = function AttachmentContent(_ref) {
       fontSize: '0.875rem',
       fontWeight: 'bold'
     }
-  }, attrs.title), /*#__PURE__*/React.createElement(Box, {
+  }, attrs.title), Number(attrs.size) > 0 && /*#__PURE__*/React.createElement(Box, {
     sx: {
       fontSize: '0.75rem',
       color: 'text.secondary'

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

@@ -24,7 +24,6 @@ var AttachmentViewWrapper = function AttachmentViewWrapper(_ref) {
     _ref$attachmentType = _ref.attachmentType,
     attachmentType = _ref$attachmentType === void 0 ? 'icon' : _ref$attachmentType,
     getPos = _ref.getPos;
-  var isMarkdown = editor.options.contentType === 'markdown';
   var attrs = node.attrs;
   var attachmentDisplayType = attachmentType || attrs.type || 'icon';
   var _useState = useState(''),
@@ -117,7 +116,7 @@ var AttachmentViewWrapper = function AttachmentViewWrapper(_ref) {
       }),
       tip: "\u5220\u9664",
       onClick: handleDeleteAttachment
-    }), !isMarkdown && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Divider, {
+    }), /*#__PURE__*/React.createElement(Divider, {
       orientation: "vertical",
       flexItem: true,
       sx: {
@@ -154,7 +153,7 @@ var AttachmentViewWrapper = function AttachmentViewWrapper(_ref) {
           return handleConvertAttachmentType('block');
         }
       }]
-    })));
+    }));
   };
   var handleSave = function handleSave() {
     updateAttributes === null || updateAttributes === void 0 || updateAttributes({

package/dist/extension/index.js

@@ -14,7 +14,6 @@ import StarterKit from '@tiptap/starter-kit';
 import { PLACEHOLDER } from "../contants/placeholder";
 import { AiWritingExtension, SlashCommands, StructuredDiffExtension } from "./extension";
 import { CodeExtension } from "./mark/Code";
-import CustomLink from "./mark/Link";
 import { AlertExtension, AudioExtension, BlockAttachmentExtension, BlockLinkExtension, CodeBlockLowlightExtension, CustomBlockMathExtension, CustomHorizontalRule, CustomInlineMathExtension, CustomSubscript, CustomSuperscript, DetailsContentExtension, DetailsExtension, DetailsSummaryExtension, EmojiExtension, FileHandlerExtension, FlowExtension, IframeExtension, ImageExtension, Indent, InlineAttachmentExtension, InlineLinkExtension, InlineUploadProgressExtension, ListExtension, MentionExtension, TableExtension, TableOfContentsExtension, UploadProgressExtension, VerticalAlign, VideoExtension, YamlFormat, YoutubeExtension } from "./node";
 export var getExtensions = function getExtensions(_ref) {
   var contentType = _ref.contentType,
@@ -44,7 +43,7 @@ export var getExtensions = function getExtensions(_ref) {
       color: 'var(--mui-palette-primary-main)',
       width: 2
     }
-  }), TextStyleKit, CodeExtension, ListExtension, EmojiExtension, AlertExtension, CustomSubscript, DetailsExtension, CustomSuperscript, DetailsContentExtension, DetailsSummaryExtension, CodeBlockLowlightExtension, InlineUploadProgressExtension, YamlFormat, CustomHorizontalRule, IframeExtension({
+  }), TextStyleKit, CodeExtension, ListExtension, EmojiExtension, AlertExtension, CustomSubscript, DetailsExtension, CustomSuperscript, DetailsContentExtension, DetailsSummaryExtension, CodeBlockLowlightExtension, InlineUploadProgressExtension, YamlFormat, InlineLinkExtension, BlockLinkExtension, CustomHorizontalRule, IframeExtension({
     onError: onError,
     onValidateUrl: onValidateUrl
   }), VideoExtension({
@@ -67,6 +66,12 @@ export var getExtensions = function getExtensions(_ref) {
     onError: onError
   }), CustomInlineMathExtension({
     onError: onError
+  }), InlineAttachmentExtension({
+    onUpload: onUpload,
+    onError: onError
+  }), BlockAttachmentExtension({
+    onUpload: onUpload,
+    onError: onError
   }), Highlight.configure({
     multicolor: true
   }), CharacterCount.configure({
@@ -104,7 +109,7 @@ export var getExtensions = function getExtensions(_ref) {
     }
   })]);
   if (contentType === 'markdown') {
-    defaultExtensions.push(CustomLink, Markdown.configure({
+    defaultExtensions.push(Markdown.configure({
       indentation: {
         style: 'space',
         size: 2
@@ -115,14 +120,6 @@ export var getExtensions = function getExtensions(_ref) {
         pedantic: false
       }
     }));
-  } else {
-    defaultExtensions.push.apply(defaultExtensions, [InlineLinkExtension, BlockLinkExtension, InlineAttachmentExtension({
-      onUpload: onUpload,
-      onError: onError
-    }), BlockAttachmentExtension({
-      onUpload: onUpload,
-      onError: onError
-    })]);
   }
   if (!(exclude !== null && exclude !== void 0 && exclude.includes('indent'))) {
     defaultExtensions.push(Indent.configure({

package/dist/extension/node/Attachment.js

@@ -73,6 +73,25 @@ export var InlineAttachmentExtension = function InlineAttachmentExtension(props)
             size: dom.getAttribute('data-size') || '0'
           };
         }
+      }, {
+        tag: 'a[download]',
+        getAttrs: function getAttrs(dom) {
+          if (!(dom instanceof HTMLElement)) return false;
+          var download = dom.getAttribute('download');
+          var type = dom.getAttribute('type');
+
+          // 只解析 type 不是 block 的带 download 的 <a> 标签
+          if (download === null || type === 'block') {
+            return false;
+          }
+          var href = dom.getAttribute('href') || '';
+          var title = dom.textContent || dom.getAttribute('title') || dom.getAttribute('download') || '';
+          return {
+            url: href,
+            title: title,
+            size: '0'
+          };
+        }
       }];
     },
     renderHTML: function renderHTML(_ref) {
@@ -195,6 +214,25 @@ export var BlockAttachmentExtension = function BlockAttachmentExtension(props) {
             size: dom.getAttribute('data-size') || '0'
           };
         }
+      }, {
+        tag: 'a[download][type="block"]',
+        getAttrs: function getAttrs(dom) {
+          if (!(dom instanceof HTMLElement)) return false;
+          var download = dom.getAttribute('download');
+          var type = dom.getAttribute('type');
+
+          // 只解析 type="block" 的带 download 的 <a> 标签
+          if (download === null || type !== 'block') {
+            return false;
+          }
+          var href = dom.getAttribute('href') || '';
+          var title = dom.textContent || dom.getAttribute('title') || dom.getAttribute('download') || '';
+          return {
+            url: href,
+            title: title,
+            size: '0'
+          };
+        }
       }];
     },
     renderHTML: function renderHTML(_ref4) {
@@ -203,12 +241,19 @@ export var BlockAttachmentExtension = function BlockAttachmentExtension(props) {
         'data-tag': 'attachment'
       }, mergeAttributes(this.options.HTMLAttributes, HTMLAttributes))];
     },
+    renderMarkdown: function renderMarkdown(node) {
+      var _ref5 = node.attrs,
+        url = _ref5.url,
+        title = _ref5.title;
+      if (!url) return '';
+      return "<a href=\"".concat(url, "\" type=\"block\" target=\"_blank\" download=\"").concat(title, "\">").concat(title, "</a>");
+    },
     addCommands: function addCommands() {
       var _this3 = this;
       return {
         setBlockAttachment: function setBlockAttachment(options) {
-          return function (_ref5) {
-            var commands = _ref5.commands;
+          return function (_ref6) {
+            var commands = _ref6.commands;
             return commands.insertContent({
               type: _this3.name,
               attrs: {

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, "key" | "editor">, any>;
+}) => import("@tiptap/core").Extension<Omit<import("@tiptap/extension-file-handler").FileHandlePluginOptions, "editor" | "key">, any>;

package/dist/extension/node/Link/index.d.ts

@@ -119,6 +119,7 @@ declare module '@tiptap/core' {
                 class?: string | null;
                 title?: string | null;
                 type?: string | null;
+                download?: string | null;
             }) => ReturnType;
             /**
              * Toggle a link mark
@@ -132,6 +133,7 @@ declare module '@tiptap/core' {
                 class?: string | null;
                 title?: string | null;
                 type?: string | null;
+                download?: string | null;
             }) => ReturnType;
             /**
              * Unset a link mark
@@ -152,6 +154,7 @@ declare module '@tiptap/core' {
                 class?: string | null;
                 title?: string | null;
                 type?: string | null;
+                download?: string | null;
             }) => ReturnType;
         };
     }

package/dist/extension/node/Link/index.js

@@ -6,6 +6,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { getLinkTitle } from "../../../util";
 import { mergeAttributes, Node, nodePasteRule } from '@tiptap/core';
+import { Plugin, PluginKey } from '@tiptap/pm/state';
 import { ReactNodeViewRenderer } from '@tiptap/react';
 import { find as _find, registerCustomProtocol, reset } from 'linkifyjs';
 import LinkViewWrapper from "../../component/Link";
@@ -68,7 +69,8 @@ export var InlineLinkExtension = Node.create({
         class: null,
         type: 'icon',
         rel: null,
-        title: null
+        title: null,
+        download: null
       },
       isAllowedUri: function isAllowedUri(url, ctx) {
         return !!_isAllowedUri(url, ctx.protocols);
@@ -148,6 +150,20 @@ export var InlineLinkExtension = Node.create({
             'type': attributes.type
           };
         }
+      },
+      download: {
+        default: null,
+        parseHTML: function parseHTML(element) {
+          return element.getAttribute('download');
+        },
+        renderHTML: function renderHTML(attributes) {
+          if (!attributes.download) {
+            return {};
+          }
+          return {
+            download: attributes.download
+          };
+        }
       }
     };
   },
@@ -158,6 +174,12 @@ export var InlineLinkExtension = Node.create({
       getAttrs: function getAttrs(dom) {
         var href = dom.getAttribute('href');
         var dataType = dom.getAttribute('type');
+        var download = dom.getAttribute('download');
+
+        // 如果存在 download 属性，认为是附件，不解析为链接
+        if (download !== null) {
+          return false;
+        }
         if (dataType === 'block') {
           return false;
         }
@@ -179,7 +201,8 @@ export var InlineLinkExtension = Node.create({
           class: dom.getAttribute('class') || _this.options.HTMLAttributes.class,
           rel: dom.getAttribute('rel'),
           title: dom.textContent || dom.getAttribute('title'),
-          type: dom.getAttribute('type') || 'icon'
+          type: dom.getAttribute('type') || 'icon',
+          download: dom.getAttribute('download')
         };
       }
     }];
@@ -270,7 +293,32 @@ export var InlineLinkExtension = Node.create({
   },
   addProseMirrorPlugins: function addProseMirrorPlugins() {
     var _this5 = this;
-    var plugins = [];
+    var plugins = [new Plugin({
+      key: new PluginKey('linkDownloadHandler'),
+      props: {
+        handleDOMEvents: {
+          click: function click(view, event) {
+            var target = event.target;
+            var link = target.closest('a[download]');
+            if (link) {
+              var downloadAttr = link.getAttribute('download');
+              var href = link.getAttribute('href');
+              if (href && downloadAttr !== null) {
+                event.preventDefault();
+                var downloadLink = document.createElement('a');
+                downloadLink.href = href;
+                downloadLink.download = downloadAttr === '' ? href.split('/').pop() || 'download' : downloadAttr;
+                document.body.appendChild(downloadLink);
+                downloadLink.click();
+                document.body.removeChild(downloadLink);
+                return true;
+              }
+            }
+            return false;
+          }
+        }
+      }
+    })];
     var _this$options = this.options,
       protocols = _this$options.protocols,
       defaultProtocol = _this$options.defaultProtocol;
@@ -332,7 +380,8 @@ export var BlockLinkExtension = Node.create({
       HTMLAttributes: {
         target: '_blank',
         class: null,
-        type: 'block'
+        type: 'block',
+        download: null
       }
     };
   },
@@ -418,6 +467,20 @@ export var BlockLinkExtension = Node.create({
             'type': attributes.type
           };
         }
+      },
+      download: {
+        default: null,
+        parseHTML: function parseHTML(element) {
+          return element.getAttribute('download');
+        },
+        renderHTML: function renderHTML(attributes) {
+          if (!attributes.download) {
+            return {};
+          }
+          return {
+            download: attributes.download
+          };
+        }
       }
     };
   },
@@ -427,13 +490,20 @@ export var BlockLinkExtension = Node.create({
       tag: 'a[type="block"]',
       getAttrs: function getAttrs(dom) {
         if (!(dom instanceof HTMLElement)) return false;
+        var download = dom.getAttribute('download');
+
+        // 如果存在 download 属性，认为是附件，不解析为链接
+        if (download !== null) {
+          return false;
+        }
         return {
           href: dom.getAttribute('href') || '',
           target: dom.getAttribute('target') || _this7.options.HTMLAttributes.target,
           class: dom.getAttribute('class') || _this7.options.HTMLAttributes.class,
           title: dom.textContent || dom.getAttribute('title') || '',
           rel: dom.getAttribute('rel') || '',
-          type: dom.getAttribute('type') || 'block'
+          type: dom.getAttribute('type') || 'block',
+          download: dom.getAttribute('download')
         };
       }
     }];

package/package.json

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

package/dist/extension/mark/Link.d.ts

@@ -1,2 +0,0 @@
-declare const CustomLink: import("@tiptap/core").Mark<import("@tiptap/extension-link").LinkOptions, any>;
-export default CustomLink;

package/dist/extension/mark/Link.js

@@ -1,85 +0,0 @@
-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 _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; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-// @ts-nocheck
-
-import { Link } from "@tiptap/extension-link";
-import { Plugin, PluginKey } from '@tiptap/pm/state';
-import { ReactMarkViewRenderer } from "@tiptap/react";
-import LinkViewWrapper from "../component/Link/Markdown";
-var CustomLink = Link.extend({
-  addMarkView: function addMarkView() {
-    return ReactMarkViewRenderer(LinkViewWrapper);
-  },
-  addAttributes: function addAttributes() {
-    var _this$parent;
-    return _objectSpread(_objectSpread({}, (_this$parent = this.parent) === null || _this$parent === void 0 ? void 0 : _this$parent.call(this)), {}, {
-      download: {
-        default: null,
-        parseHTML: function parseHTML(element) {
-          return element.getAttribute('download');
-        },
-        renderHTML: function renderHTML(attributes) {
-          if (!attributes.download) {
-            return {};
-          }
-          return {
-            download: attributes.download
-          };
-        }
-      }
-    });
-  },
-  // 确保能够解析 HTML 中的 <a> 标签
-  parseHTML: function parseHTML() {
-    return [{
-      tag: 'a[href]',
-      getAttrs: function getAttrs(element) {
-        if (typeof element === 'string') return false;
-        var href = element.getAttribute('href');
-        if (!href) return false;
-        return {
-          href: href,
-          target: element.getAttribute('target') || '_blank',
-          download: element.getAttribute('download')
-        };
-      }
-    }];
-  },
-  renderHTML: function renderHTML(_ref) {
-    var HTMLAttributes = _ref.HTMLAttributes;
-    return ['a', HTMLAttributes, 0];
-  },
-  addProseMirrorPlugins: function addProseMirrorPlugins() {
-    return [new Plugin({
-      key: new PluginKey('linkDownloadHandler'),
-      props: {
-        handleDOMEvents: {
-          click: function click(view, event) {
-            var target = event.target;
-            var link = target.closest('a[download]');
-            if (link) {
-              var downloadAttr = link.getAttribute('download');
-              var href = link.getAttribute('href');
-              if (href && downloadAttr !== null) {
-                event.preventDefault();
-                var downloadLink = document.createElement('a');
-                downloadLink.href = href;
-                downloadLink.download = downloadAttr === '' ? href.split('/').pop() || 'download' : downloadAttr;
-                document.body.appendChild(downloadLink);
-                downloadLink.click();
-                document.body.removeChild(downloadLink);
-                return true;
-              }
-            }
-            return false;
-          }
-        }
-      }
-    })];
-  }
-});
-export default CustomLink;

package/dist/extension/mark/index.js

@@ -1 +0,0 @@
-// export * from './Link';