@ctzhian/tiptap 2.5.0 → 2.5.2

package/dist/EditorDiff/index.d.ts

@@ -3,6 +3,7 @@ import 'core-js/actual/array/find-last';
 interface EditorDiffProps {
     oldHtml: string;
     newHtml: string;
+    baseUrl?: string;
 }
-declare const EditorDiff: ({ oldHtml, newHtml }: EditorDiffProps) => React.JSX.Element;
+declare const EditorDiff: ({ oldHtml, newHtml, baseUrl }: EditorDiffProps) => React.JSX.Element;
 export default EditorDiff;

package/dist/EditorDiff/index.js

@@ -8,10 +8,12 @@ import useTiptap from "../hook";
 
 var EditorDiff = function EditorDiff(_ref) {
   var oldHtml = _ref.oldHtml,
-    newHtml = _ref.newHtml;
+    newHtml = _ref.newHtml,
+    baseUrl = _ref.baseUrl;
   var editorRef = useTiptap({
     editable: false,
     content: newHtml,
+    baseUrl: baseUrl,
     exclude: ['youtube', 'mention']
   });
   useEffect(function () {

package/dist/EditorMarkdown/index.js

@@ -375,10 +375,14 @@ var EditorMarkdown = /*#__PURE__*/forwardRef(function (_ref, ref) {
     var textarea = (_aceEditor$textInput = aceEditor.textInput) === null || _aceEditor$textInput === void 0 ? void 0 : _aceEditor$textInput.getElement();
     if (!textarea) return;
     var handleCompositionStart = function handleCompositionStart() {
-      setIsComposing(true);
+      setTimeout(function () {
+        return setIsComposing(true);
+      }, 0);
     };
     var handleCompositionEnd = function handleCompositionEnd() {
-      setIsComposing(false);
+      setTimeout(function () {
+        return setIsComposing(false);
+      }, 0);
     };
     textarea.addEventListener('compositionstart', handleCompositionStart);
     textarea.addEventListener('compositionend', handleCompositionEnd);
@@ -386,7 +390,7 @@ var EditorMarkdown = /*#__PURE__*/forwardRef(function (_ref, ref) {
       textarea.removeEventListener('compositionstart', handleCompositionStart);
       textarea.removeEventListener('compositionend', handleCompositionEnd);
     };
-  }, [displayMode]);
+  }, []);
   return /*#__PURE__*/React.createElement(Box, {
     sx: _objectSpread({
       position: 'relative',

package/dist/component/CustomBubbleMenu/index.js

@@ -73,18 +73,10 @@ var CustomBubbleMenu = function CustomBubbleMenu(_ref) {
       offset: 8,
       flip: true
     },
-    shouldShow: function shouldShow() {
-      // 表格多选单元格时禁止弹出气泡菜单
-      // if (editor.state.selection.constructor.name === '_CellSelection') {
-      //   const cellSelection = editor.state.selection as any;
-      //   if (cellSelection.ranges.length > 1) {
-      //     return false
-      //   }
-      //   if (cellSelection.$anchorCell && cellSelection.$headCell) {
-      //     return cellSelection.$anchorCell.pos !== cellSelection.$headCell.pos;
-      //   }
-      // }
-      if (editor.state.selection.empty || editor.isActive('image') || editor.isActive('video') || editor.isActive('audio') || editor.isActive('emoji') || editor.isActive('codeBlock') || editor.isActive('blockMath') || editor.isActive('inlineMath') || editor.isActive('blockLink') || editor.isActive('inlineLink') || editor.isActive('blockAttachment') || editor.isActive('inlineAttachment') || editor.isActive('horizontalRule') || editor.isActive('iframe') || editor.isActive('yamlFormat') || editor.isActive('flow') || editor.isActive('table')) {
+    shouldShow: function shouldShow(_ref2) {
+      var editor = _ref2.editor;
+      // 在某些特定节点类型时不显示
+      if (editor.state.selection.empty || editor.isEmpty || editor.isActive('image') || editor.isActive('video') || editor.isActive('audio') || editor.isActive('emoji') || editor.isActive('codeBlock') || editor.isActive('blockMath') || editor.isActive('inlineMath') || editor.isActive('blockLink') || editor.isActive('inlineLink') || editor.isActive('blockAttachment') || editor.isActive('inlineAttachment') || editor.isActive('horizontalRule') || editor.isActive('iframe') || editor.isActive('yamlFormat') || editor.isActive('flow') || editor.isActive('table')) {
         return false;
       }
       return true;

package/dist/component/Icons/{flip-horizontal-2-line-icon.d.ts → flip-grid-icon.d.ts}

@@ -1,6 +1,6 @@
 import { SvgIconProps } from "@mui/material";
 import * as React from "react";
-export declare const FlipHorizontal2LineIcon: {
+export declare const FlipGridIcon: {
     (props: SvgIconProps): React.JSX.Element;
     displayName: string;
 };

package/dist/component/Icons/{flip-horizontal-2-line-icon.js → flip-grid-icon.js}

@@ -1,13 +1,13 @@
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 import { SvgIcon } from "@mui/material";
 import * as React from "react";
-export var FlipHorizontal2LineIcon = function FlipHorizontal2LineIcon(props) {
+export var FlipGridIcon = function FlipGridIcon(props) {
   return /*#__PURE__*/React.createElement(SvgIcon, _extends({
     viewBox: "0 0 24 24",
     version: "1.1",
     xmlns: "http://www.w3.org/2000/svg"
   }, props), /*#__PURE__*/React.createElement("path", {
-    d: "M5 19H19V5H5V19ZM3 4C3 3.44772 3.44772 3 4 3H20C20.5523 3 21 3.44772 21 4V20C21 20.5523 20.5523 21 20 21H4C3.44772 21 3 20.5523 3 20V4ZM10 8V11H14V8L18 12L14 16V13H10V16L6 12L10 8Z"
+    d: "M7 6V18H4L4 6H7ZM4 4C2.89543 4 2 4.89543 2 6V18C2 19.1046 2.89543 20 4 20H7C8.10457 20 9 19.1046 9 18V6C9 4.89543 8.10457 4 7 4H4ZM11 2V22H13V2H11ZM20 6V18H17V6H20ZM17 4C15.8954 4 15 4.89543 15 6V18C15 19.1046 15.8954 20 17 20H20C21.1046 20 22 19.1046 22 18V6C22 4.89543 21.1046 4 20 4H17Z"
   }));
 };
-FlipHorizontal2LineIcon.displayName = 'icon-flip-horizontal-2-line';
+FlipGridIcon.displayName = 'icon-flip-grid';

package/dist/component/Icons/index.d.ts

@@ -54,7 +54,7 @@ export { ExportLineIcon } from './export-line-icon';
 export { FileCopyLineIcon } from './file-copy-line-icon';
 export { FileIcon } from './file-icon';
 export { FileUploadLineIcon } from './file-upload-line-icon';
-export { FlipHorizontal2LineIcon } from './flip-horizontal-2-line-icon';
+export { FlipGridIcon } from './flip-grid-icon';
 export { FlowChartIcon } from './flow-chart-icon';
 export { Folder2LineIcon } from './folder-2-line-icon';
 export { FontColorIcon } from './font-color-icon';

package/dist/component/Icons/index.js

@@ -57,7 +57,7 @@ export { ExportLineIcon } from "./export-line-icon";
 export { FileCopyLineIcon } from "./file-copy-line-icon";
 export { FileIcon } from "./file-icon";
 export { FileUploadLineIcon } from "./file-upload-line-icon";
-export { FlipHorizontal2LineIcon } from "./flip-horizontal-2-line-icon";
+export { FlipGridIcon } from "./flip-grid-icon";
 export { FlowChartIcon } from "./flow-chart-icon";
 export { Folder2LineIcon } from "./folder-2-line-icon";
 export { FontColorIcon } from "./font-color-icon";

package/dist/component/Toolbar/EditorInsert/index.js

@@ -145,43 +145,6 @@ var EditorInsert = function EditorInsert(_ref) {
           size: '0'
         });
       }
-    }, {
-      label: '流程图',
-      key: 'flow',
-      icon: /*#__PURE__*/React.createElement(FlowChartIcon, {
-        sx: {
-          fontSize: '1rem'
-        }
-      }),
-      onClick: function onClick() {
-        return editor.commands.setFlow({});
-      }
-    }, {
-      label: '表格',
-      key: 'table',
-      icon: /*#__PURE__*/React.createElement(Table2Icon, {
-        sx: {
-          fontSize: '1rem'
-        }
-      }),
-      extra: /*#__PURE__*/React.createElement(Typography, {
-        sx: {
-          fontSize: '12px',
-          color: 'text.disabled'
-        }
-      }, getShortcutKeyText(['ctrl', '9'], '+')),
-      children: [{
-        key: 'table-size-picker',
-        customLabel: /*#__PURE__*/React.createElement(TableSizePicker, {
-          onConfirm: function onConfirm(cols, rows) {
-            editor.commands.insertTable({
-              rows: rows,
-              cols: cols,
-              withHeaderRow: false
-            });
-          }
-        })
-      }]
     }, {
       customLabel: /*#__PURE__*/React.createElement(Typography, {
         sx: {
@@ -192,17 +155,6 @@ var EditorInsert = function EditorInsert(_ref) {
         }
       }, "\u6A21\u5757"),
       key: 'style'
-    }, {
-      label: '分割线',
-      key: 'separator',
-      icon: /*#__PURE__*/React.createElement(SeparatorIcon, {
-        sx: {
-          fontSize: '1rem'
-        }
-      }),
-      onClick: function onClick() {
-        return editor.chain().focus().setHorizontalRule().run();
-      }
     }, {
       label: '引用',
       key: 'blockquote',
@@ -220,10 +172,17 @@ var EditorInsert = function EditorInsert(_ref) {
       onClick: function onClick() {
         return editor.chain().focus().toggleBlockquote().run();
       }
-    }, {
-      label: '折叠面板',
-      key: 'details',
-      icon: /*#__PURE__*/React.createElement(MenuFold2FillIcon, {
+    },
+    // {
+    //   label: '分栏',
+    //   key: 'flipGrid',
+    //   icon: <FlipGridIcon sx={{ fontSize: '1rem' }} />,
+    //   onClick: () => editor.chain().focus().setFlipGrid().run(),
+    // },
+    {
+      label: '表格',
+      key: 'table',
+      icon: /*#__PURE__*/React.createElement(Table2Icon, {
         sx: {
           fontSize: '1rem'
         }
@@ -233,10 +192,19 @@ var EditorInsert = function EditorInsert(_ref) {
           fontSize: '12px',
           color: 'text.disabled'
         }
-      }, getShortcutKeyText(['ctrl', '8'], '+')),
-      onClick: function onClick() {
-        return editor.chain().focus().setDetails().run();
-      }
+      }, getShortcutKeyText(['ctrl', '9'], '+')),
+      children: [{
+        key: 'table-size-picker',
+        customLabel: /*#__PURE__*/React.createElement(TableSizePicker, {
+          onConfirm: function onConfirm(cols, rows) {
+            editor.commands.insertTable({
+              rows: rows,
+              cols: cols,
+              withHeaderRow: false
+            });
+          }
+        })
+      }]
     }, {
       label: '警告块',
       key: 'highlight',
@@ -321,6 +289,34 @@ var EditorInsert = function EditorInsert(_ref) {
           }).run();
         }
       }]
+    }, {
+      label: '折叠面板',
+      key: 'details',
+      icon: /*#__PURE__*/React.createElement(MenuFold2FillIcon, {
+        sx: {
+          fontSize: '1rem'
+        }
+      }),
+      extra: /*#__PURE__*/React.createElement(Typography, {
+        sx: {
+          fontSize: '12px',
+          color: 'text.disabled'
+        }
+      }, getShortcutKeyText(['ctrl', '8'], '+')),
+      onClick: function onClick() {
+        return editor.chain().focus().setDetails().run();
+      }
+    }, {
+      label: '分割线',
+      key: 'separator',
+      icon: /*#__PURE__*/React.createElement(SeparatorIcon, {
+        sx: {
+          fontSize: '1rem'
+        }
+      }),
+      onClick: function onClick() {
+        return editor.chain().focus().setHorizontalRule().run();
+      }
     }, {
       customLabel: /*#__PURE__*/React.createElement(Typography, {
         sx: {
@@ -331,6 +327,17 @@ var EditorInsert = function EditorInsert(_ref) {
         }
       }, "\u4E13\u4E1A"),
       key: 'programmer'
+    }, {
+      label: '流程图',
+      key: 'flow',
+      icon: /*#__PURE__*/React.createElement(FlowChartIcon, {
+        sx: {
+          fontSize: '1rem'
+        }
+      }),
+      onClick: function onClick() {
+        return editor.commands.setFlow({});
+      }
     }, {
       label: '代码',
       key: 'code',

package/dist/extension/node/Alert.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 { createBlockMarkdownSpec, mergeAttributes, Node } from '@tiptap/core';
 import { ReactNodeViewRenderer } from '@tiptap/react';
+import { v4 as uuid } from 'uuid';
 import AlertView from "../component/Alert";
 export var AlertExtension = Node.create(_objectSpread(_objectSpread({
   name: 'alert',
@@ -76,7 +77,7 @@ export var AlertExtension = Node.create(_objectSpread(_objectSpread({
         var attrs = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         return function (_ref2) {
           var commands = _ref2.commands;
-          var id = "alert_".concat(Math.random().toString(36).slice(2));
+          var id = "alert_".concat(uuid());
           var variant = attrs.variant || 'default';
           var type = attrs.type || 'icon';
           return commands.wrapIn(_this.name, {
@@ -106,11 +107,9 @@ export var AlertExtension = Node.create(_objectSpread(_objectSpread({
         var attrs = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         return function (_ref5) {
           var commands = _ref5.commands;
-          var id = "alert_".concat(Math.random().toString(36).slice(2));
           var variant = attrs.variant || 'default';
           var type = attrs.type || 'icon';
           return commands.toggleWrap(_this.name, {
-            id: id,
             variant: variant,
             type: type
           });

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/package.json

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