@ctzhian/tiptap 2.4.4 → 2.5.0

package/dist/extension/index.d.ts

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

package/dist/extension/index.js

@@ -21,6 +21,8 @@ export var getExtensions = function getExtensions(_ref) {
     extensionsProps = _ref.extensions,
     editable = _ref.editable,
     mentionItems = _ref.mentionItems,
+    _ref$baseUrl = _ref.baseUrl,
+    baseUrl = _ref$baseUrl === void 0 ? '' : _ref$baseUrl,
     onMentionFilter = _ref.onMentionFilter,
     onUpload = _ref.onUpload,
     onError = _ref.onError,
@@ -57,21 +59,26 @@ export var getExtensions = function getExtensions(_ref) {
     onError: onError,
     onValidateUrl: onValidateUrl
   }), VideoExtension({
+    baseUrl: baseUrl,
     onUpload: onUpload,
     onError: onError,
     onValidateUrl: onValidateUrl
   }), AudioExtension({
+    baseUrl: baseUrl,
     onUpload: onUpload,
     onError: onError,
     onValidateUrl: onValidateUrl
   }), ImageExtension({
+    baseUrl: baseUrl,
     onUpload: onUpload,
     onError: onError,
     onValidateUrl: onValidateUrl
   }), InlineAttachmentExtension({
+    baseUrl: baseUrl,
     onUpload: onUpload,
     onError: onError
   }), BlockAttachmentExtension({
+    baseUrl: baseUrl,
     onUpload: onUpload,
     onError: onError
   }), Highlight.configure({

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

@@ -24,5 +24,8 @@ declare module '@tiptap/core' {
         };
     }
 }
-export declare const InlineAttachmentExtension: (props: EditorFnProps) => Node<any, any>;
-export declare const BlockAttachmentExtension: (props: EditorFnProps) => Node<any, any>;
+export type AttachmentExtensionProps = EditorFnProps & {
+    baseUrl: string;
+};
+export declare const InlineAttachmentExtension: (props: AttachmentExtensionProps) => Node<any, any>;
+export declare const BlockAttachmentExtension: (props: AttachmentExtensionProps) => Node<any, any>;

package/dist/extension/node/Attachment.js

@@ -4,6 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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); }
+import { removeBaseUrl, withBaseUrl } from "../../util";
 import { mergeAttributes, Node } from "@tiptap/core";
 import { ReactNodeViewRenderer } from "@tiptap/react";
 import AttachmentViewWrapper from "../component/Attachment";
@@ -16,30 +17,21 @@ export var InlineAttachmentExtension = function InlineAttachmentExtension(props)
     atom: true,
     draggable: true,
     selectable: true,
-    addOptions: function addOptions() {
-      return {
-        HTMLAttributes: {
-          url: '',
-          title: '',
-          size: '0'
-        }
-      };
-    },
     addAttributes: function addAttributes() {
       return {
         url: {
-          default: this.options.HTMLAttributes.url,
+          default: '',
           parseHTML: function parseHTML(element) {
-            return element.getAttribute('data-url');
+            return withBaseUrl(element.getAttribute('data-url') || '', props.baseUrl);
           },
           renderHTML: function renderHTML(attributes) {
             return {
-              'data-url': attributes.url
+              'data-url': removeBaseUrl(attributes.url, props.baseUrl)
             };
           }
         },
         title: {
-          default: this.options.HTMLAttributes.title,
+          default: '',
           parseHTML: function parseHTML(element) {
             return element.getAttribute('data-title');
           },
@@ -50,7 +42,7 @@ export var InlineAttachmentExtension = function InlineAttachmentExtension(props)
           }
         },
         size: {
-          default: this.options.HTMLAttributes.size,
+          default: '0',
           parseHTML: function parseHTML(element) {
             return element.getAttribute('data-size') || '0';
           },
@@ -157,30 +149,22 @@ export var BlockAttachmentExtension = function BlockAttachmentExtension(props) {
     atom: true,
     draggable: true,
     selectable: true,
-    addOptions: function addOptions() {
-      return {
-        HTMLAttributes: {
-          url: '',
-          title: '',
-          size: '0'
-        }
-      };
-    },
     addAttributes: function addAttributes() {
       return {
         url: {
-          default: this.options.HTMLAttributes.url,
+          default: '',
           parseHTML: function parseHTML(element) {
-            return element.getAttribute('data-url');
+            return withBaseUrl(element.getAttribute('data-url') || '', props.baseUrl);
           },
           renderHTML: function renderHTML(attributes) {
+            if (!attributes.url) return {};
             return {
-              'data-url': attributes.url
+              'data-url': removeBaseUrl(attributes.url, props.baseUrl)
             };
           }
         },
         title: {
-          default: this.options.HTMLAttributes.title,
+          default: '',
           parseHTML: function parseHTML(element) {
             return element.getAttribute('data-title');
           },
@@ -191,7 +175,7 @@ export var BlockAttachmentExtension = function BlockAttachmentExtension(props) {
           }
         },
         size: {
-          default: this.options.HTMLAttributes.size,
+          default: '0',
           parseHTML: function parseHTML(element) {
             return element.getAttribute('data-size') || '0';
           },

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

@@ -18,6 +18,8 @@ declare module '@tiptap/core' {
         };
     }
 }
-export type AudioExtensionProps = EditorFnProps;
+export type AudioExtensionProps = EditorFnProps & {
+    baseUrl: string;
+};
 export declare const AudioExtension: (props: AudioExtensionProps) => Node<any, any>;
 export default AudioExtension;

package/dist/extension/node/Audio.js

@@ -4,6 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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); }
+import { removeBaseUrl, withBaseUrl } from "../../util";
 import { InputRule, mergeAttributes, Node } from '@tiptap/core';
 import { ReactNodeViewRenderer } from '@tiptap/react';
 import AudioViewWrapper from "../component/Audio";
@@ -31,12 +32,12 @@ export var AudioExtension = function AudioExtension(props) {
         src: {
           default: null,
           parseHTML: function parseHTML(element) {
-            return element.getAttribute('src');
+            return withBaseUrl(element.getAttribute('src') || '', props.baseUrl);
           },
           renderHTML: function renderHTML(attributes) {
             if (!attributes.src) return {};
             return {
-              src: attributes.src
+              src: removeBaseUrl(attributes.src, props.baseUrl)
             };
           }
         },

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

@@ -1,3 +1,5 @@
 import { EditorFnProps } from "../../type";
-export type ImageExtensionProps = EditorFnProps;
+export type ImageExtensionProps = EditorFnProps & {
+    baseUrl: string;
+};
 export declare const ImageExtension: (props: ImageExtensionProps) => import("@tiptap/core").Node<import("@tiptap/extension-image").ImageOptions, any>;

package/dist/extension/node/Image.js

@@ -7,13 +7,30 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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); }
-import { getFileType } from "../../util";
+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 ImageViewWrapper, { getImageDimensionsFromFile } from "../component/Image";
 var customImage = function customImage(props) {
   return Image.extend({
+    addAttributes: function addAttributes() {
+      var _this$parent;
+      return _objectSpread(_objectSpread({}, (_this$parent = this.parent) === null || _this$parent === void 0 ? void 0 : _this$parent.call(this)), {}, {
+        src: {
+          default: null,
+          parseHTML: function parseHTML(element) {
+            return withBaseUrl(element.getAttribute('src') || '', props.baseUrl);
+          },
+          renderHTML: function renderHTML(attributes) {
+            if (!attributes.src) return {};
+            return {
+              src: removeBaseUrl(attributes.src, props.baseUrl)
+            };
+          }
+        }
+      });
+    },
     addKeyboardShortcuts: function addKeyboardShortcuts() {
       var _this = this;
       return {

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

@@ -19,6 +19,8 @@ declare module '@tiptap/core' {
         };
     }
 }
-export type VideoExtensionProps = EditorFnProps;
+export type VideoExtensionProps = EditorFnProps & {
+    baseUrl: string;
+};
 export declare const VideoExtension: (props: VideoExtensionProps) => Node<any, any>;
 export default VideoExtension;

package/dist/extension/node/Video.js

@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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); }
-import { getFileType } from "../../util";
+import { getFileType, removeBaseUrl, withBaseUrl } from "../../util";
 import { InputRule, mergeAttributes, Node } from '@tiptap/core';
 import { Plugin, PluginKey } from '@tiptap/pm/state';
 import { ReactNodeViewRenderer } from '@tiptap/react';
@@ -37,12 +37,12 @@ export var VideoExtension = function VideoExtension(props) {
         src: {
           default: null,
           parseHTML: function parseHTML(element) {
-            return element.getAttribute('src');
+            return withBaseUrl(element.getAttribute('src') || '', props.baseUrl);
           },
           renderHTML: function renderHTML(attributes) {
             if (!attributes.src) return {};
             return {
-              src: attributes.src
+              src: removeBaseUrl(attributes.src, props.baseUrl)
             };
           }
         },

package/dist/hook/index.d.ts

@@ -1,4 +1,4 @@
 import { UseTiptapProps, UseTiptapReturn } from "../type";
 import { UseEditorOptions } from '@tiptap/react';
-declare const useTiptap: ({ editable, contentType, onSave, onError, ...options }: UseTiptapProps & UseEditorOptions) => UseTiptapReturn;
+declare const useTiptap: ({ editable, contentType, onSave, onError, onUpload, baseUrl, ...options }: UseTiptapProps & UseEditorOptions) => UseTiptapReturn;
 export default useTiptap;

package/dist/hook/index.js

@@ -1,5 +1,5 @@
 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); }
-var _excluded = ["editable", "contentType", "onSave", "onError"];
+var _excluded = ["editable", "contentType", "onSave", "onError", "onUpload", "baseUrl"];
 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; }
@@ -8,6 +8,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { getExtensions } from "../extension";
+import { withBaseUrl } from "../util";
 import { migrateMathStrings } from '@tiptap/extension-mathematics';
 import { useEditor } from '@tiptap/react';
 var useTiptap = function useTiptap(_ref) {
@@ -17,10 +18,20 @@ var useTiptap = function useTiptap(_ref) {
     contentType = _ref$contentType === void 0 ? 'html' : _ref$contentType,
     onSave = _ref.onSave,
     onError = _ref.onError,
+    onUpload = _ref.onUpload,
+    _ref$baseUrl = _ref.baseUrl,
+    baseUrl = _ref$baseUrl === void 0 ? '' : _ref$baseUrl,
     options = _objectWithoutProperties(_ref, _excluded);
+  var handleUpload = onUpload ? function (file, onProgress, abortSignal) {
+    return onUpload(file, onProgress, abortSignal).then(function (url) {
+      return withBaseUrl(url, baseUrl);
+    });
+  } : undefined;
   var extensions = getExtensions(_objectSpread({
     editable: editable,
-    onError: onError
+    onError: onError,
+    baseUrl: baseUrl,
+    onUpload: handleUpload
   }, options));
   var editor = useEditor(_objectSpread(_objectSpread(_objectSpread({
     editable: editable,

package/dist/type/index.d.ts

@@ -140,6 +140,10 @@ export type BaseExtensionOptions = {
      * 占位符
      */
     placeholder?: string;
+    /**
+     * 静态资源基础路径
+     */
+    baseUrl?: string;
 };
 export type ExtensionRelativeProps = MentionExtensionProps & NodeOrMetaOrSuggestionOrExtensionOptions & EditorFnProps & BaseExtensionOptions;
 export type UseTiptapProps = {

package/dist/util/index.d.ts

@@ -7,6 +7,8 @@ export * from './shortcutKey';
 import { Node } from '@tiptap/pm/model';
 import { EditorState } from '@tiptap/pm/state';
 import { Editor } from '@tiptap/react';
+export declare const withBaseUrl: (url: string, baseUrl: string) => string;
+export declare const removeBaseUrl: (url: string, baseUrl: string) => string;
 export declare const formatFileSize: (bytes: number) => string;
 export declare const insertNodeAfterPosition: (editor: Editor, pos: number, nodeContent: any) => void;
 export declare const hasMarksInBlock: (node: Node | null | undefined) => boolean;

package/dist/util/index.js

@@ -4,6 +4,44 @@ export * from "./floating";
 export * from "./linewiseConvert";
 export * from "./resourceExtractor";
 export * from "./shortcutKey";
+export var withBaseUrl = function withBaseUrl(url, baseUrl) {
+  var _url$trim, _baseUrl$trim;
+  var trimmedUrl = (_url$trim = url === null || url === void 0 ? void 0 : url.trim()) !== null && _url$trim !== void 0 ? _url$trim : '';
+  if (!trimmedUrl) return trimmedUrl;
+  var isAbsolute = /^([a-z][a-z\d+\-.]*:)?\/\//i.test(trimmedUrl) || trimmedUrl.startsWith('data:');
+  if (isAbsolute) {
+    return trimmedUrl;
+  }
+  var trimmedBase = (_baseUrl$trim = baseUrl === null || baseUrl === void 0 ? void 0 : baseUrl.trim()) !== null && _baseUrl$trim !== void 0 ? _baseUrl$trim : '';
+  if (!trimmedBase) {
+    return trimmedUrl;
+  }
+  if (trimmedUrl.startsWith(trimmedBase)) {
+    return trimmedUrl;
+  }
+  var baseEndsWithSlash = trimmedBase.endsWith('/');
+  var urlStartsWithSlash = trimmedUrl.startsWith('/');
+  if (baseEndsWithSlash && urlStartsWithSlash) {
+    return "".concat(trimmedBase.slice(0, -1)).concat(trimmedUrl);
+  } else if (!baseEndsWithSlash && !urlStartsWithSlash) {
+    return "".concat(trimmedBase, "/").concat(trimmedUrl);
+  } else {
+    return "".concat(trimmedBase).concat(trimmedUrl);
+  }
+};
+export var removeBaseUrl = function removeBaseUrl(url, baseUrl) {
+  var _url$trim2, _baseUrl$trim2;
+  var trimmedUrl = (_url$trim2 = url === null || url === void 0 ? void 0 : url.trim()) !== null && _url$trim2 !== void 0 ? _url$trim2 : '';
+  if (!trimmedUrl) return trimmedUrl;
+  var trimmedBase = (_baseUrl$trim2 = baseUrl === null || baseUrl === void 0 ? void 0 : baseUrl.trim()) !== null && _baseUrl$trim2 !== void 0 ? _baseUrl$trim2 : '';
+  if (!trimmedBase) {
+    return trimmedUrl;
+  }
+  if (trimmedUrl.startsWith(trimmedBase)) {
+    return trimmedUrl.slice(trimmedBase.length);
+  }
+  return trimmedUrl;
+};
 export var formatFileSize = function formatFileSize(bytes) {
   if (bytes === 0) return '0 B';
   var k = 1024;

package/package.json

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