@ctzhian/tiptap 1.6.23 → 1.6.25

package/dist/Editor/demo.js

@@ -102,7 +102,7 @@ var Reader = function Reader() {
         }
         return onUpload;
       }(),
-      content: ""
+      content: "<blockquote><p></p></blockquote><p></p>"
     }),
     editor = _useTiptap.editor;
   return /*#__PURE__*/React.createElement(EditorThemeProvider, {

package/dist/component/CustomBubbleMenu/SelectionText.js

@@ -54,14 +54,13 @@ var SelectionText = function SelectionText(_ref) {
   return /*#__PURE__*/React.createElement(BubbleMenu, {
     editor: editor,
     pluginKey: 'bubble-menu',
+    updateDelay: 750,
     options: {
       placement: 'bottom',
       offset: 8
     },
     shouldShow: function shouldShow(_ref2) {
-      var editorProps = _ref2.editor,
-        from = _ref2.from,
-        to = _ref2.to;
+      var editorProps = _ref2.editor;
       if (editorProps.state.selection.empty || editorProps.isActive('image') || editorProps.isActive('video') || editorProps.isActive('audio') || editorProps.isActive('emoji') || editorProps.isActive('codeBlock') || editorProps.isActive('blockMath') || editorProps.isActive('inlineMath') || editorProps.isActive('blockLink') || editorProps.isActive('inlineLink') || editorProps.isActive('blockAttachment') || editorProps.isActive('inlineAttachment') || editorProps.isActive('horizontalRule') || editorProps.isActive('iframe')) {
         return false;
       }

package/dist/component/CustomDragHandle/index.js

@@ -240,21 +240,6 @@ var CustomDragHandle = function CustomDragHandle(_ref3) {
     var attrs = current.editor.getAttributes(node.type.name);
     return Number(attrs.indent) || 0;
   };
-  var shouldShowButton = function shouldShowButton(_ref4) {
-    var editor = _ref4.editor,
-      data = _ref4.data;
-    if (!editor || !editor.isEditable) return false;
-    var currentNode = data.node;
-    var empty = (currentNode === null || currentNode === void 0 ? void 0 : currentNode.textContent) === '';
-    if (empty) return false;
-    var content = currentNode === null || currentNode === void 0 ? void 0 : currentNode.content.content;
-    if (content && content.length > 0) {
-      return content.some(function (item) {
-        return hasMarksDeep(item);
-      });
-    }
-    return false;
-  };
   var updateNodeChange = useCallback(function (data) {
     var _data$node, _current$node2;
     if ((data.pos !== current.pos || ((_data$node = data.node) === null || _data$node === void 0 ? void 0 : _data$node.type.name) !== ((_current$node2 = current.node) === null || _current$node2 === void 0 ? void 0 : _current$node2.type.name)) && data.pos !== -1 || data.node === null && data.pos >= 0) {
@@ -286,20 +271,57 @@ var CustomDragHandle = function CustomDragHandle(_ref3) {
       mr: 1,
       height: '1.625rem'
     }
-  }, /*#__PURE__*/React.createElement(AddIcon, {
-    onClick: function onClick(event) {
-      event.stopPropagation();
-      if (current.node && current.pos !== undefined) {
-        if (current.pos === 0) {
-          current.editor.chain().focus().insertContentAt(current.pos, {
+  }, /*#__PURE__*/React.createElement(Menu, {
+    context: /*#__PURE__*/React.createElement(AddIcon, null),
+    anchorOrigin: {
+      vertical: 'bottom',
+      horizontal: 'left'
+    },
+    transformOrigin: {
+      vertical: 'top',
+      horizontal: 'left'
+    },
+    arrowIcon: /*#__PURE__*/React.createElement(ArrowDownSLineIcon, {
+      sx: {
+        fontSize: '1rem',
+        transform: 'rotate(-90deg)'
+      }
+    }),
+    list: [{
+      label: '上方插入行',
+      key: 'insert-line-break-top',
+      icon: /*#__PURE__*/React.createElement(TextWrapIcon, {
+        sx: {
+          fontSize: '1rem',
+          transform: 'rotate(180deg)'
+        }
+      }),
+      onClick: function onClick() {
+        if (current.node && current.pos !== undefined) {
+          var afterPos = current.pos;
+          current.editor.chain().focus().insertContentAt(afterPos, {
             type: 'paragraph',
             content: [{
               type: 'text',
               text: '/'
             }]
+          }, {
+            updateSelection: true
           }).run();
-        } else {
-          current.editor.chain().focus().insertContentAt(current.pos + current.node.nodeSize, {
+        }
+      }
+    }, {
+      label: '下方插入行',
+      key: 'insert-line-break',
+      icon: /*#__PURE__*/React.createElement(TextWrapIcon, {
+        sx: {
+          fontSize: '1rem'
+        }
+      }),
+      onClick: function onClick() {
+        if (current.node && current.pos !== undefined) {
+          var afterPos = current.pos + current.node.nodeSize;
+          current.editor.chain().focus().insertContentAt(afterPos, {
             type: 'paragraph',
             content: [{
               type: 'text',
@@ -308,9 +330,9 @@ var CustomDragHandle = function CustomDragHandle(_ref3) {
           }).run();
         }
       }
-    }
+    }]
   }), currentNode ? /*#__PURE__*/React.createElement(Menu, {
-    width: 224,
+    width: 216,
     context: /*#__PURE__*/React.createElement(DragIcon, null),
     anchorOrigin: {
       vertical: 'bottom',
@@ -503,47 +525,6 @@ var CustomDragHandle = function CustomDragHandle(_ref3) {
         }
       }),
       tip: "\u5220\u9664".concat(currentNode === null || currentNode === void 0 ? void 0 : currentNode.label)
-    })), /*#__PURE__*/React.createElement(Stack, {
-      direction: 'row',
-      flexWrap: 'wrap',
-      sx: {
-        fontSize: 14
-      }
-    }, /*#__PURE__*/React.createElement(ToolbarItem, {
-      key: 'insert-line-break-top',
-      onClick: function onClick() {
-        if (current.node && current.pos !== undefined) {
-          var afterPos = current.pos;
-          current.editor.chain().focus().insertContentAt(afterPos, {
-            type: 'paragraph'
-          }, {
-            updateSelection: true
-          }).run();
-        }
-      },
-      icon: /*#__PURE__*/React.createElement(TextWrapIcon, {
-        sx: {
-          fontSize: '1rem',
-          transform: 'rotate(180deg)'
-        }
-      }),
-      text: '上方插入行'
-    }), /*#__PURE__*/React.createElement(ToolbarItem, {
-      key: 'insert-line-break',
-      onClick: function onClick() {
-        if (current.node && current.pos !== undefined) {
-          var afterPos = current.pos + current.node.nodeSize;
-          current.editor.chain().focus().insertContentAt(afterPos, {
-            type: 'paragraph'
-          }).run();
-        }
-      },
-      icon: /*#__PURE__*/React.createElement(TextWrapIcon, {
-        sx: {
-          fontSize: '1rem'
-        }
-      }),
-      text: '下方插入行'
     })), /*#__PURE__*/React.createElement(Divider, {
       sx: {
         my: 0.5

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

@@ -83,7 +83,7 @@ var AlertView = function AlertView(_ref) {
       marginLeft: (_node$attrs = node.attrs) !== null && _node$attrs !== void 0 && _node$attrs.indent ? node.attrs.indent * 32 : undefined,
       border: '1px solid',
       borderColor: variantData.color,
-      color: attrs.variant === 'default' ? 'var(--mui-palette-text-primary)' : variantData.color,
+      // color: attrs.variant === 'default' ? 'var(--mui-palette-text-primary)' : variantData.color,
       borderRadius: '10px',
       padding: '12px 16px',
       lineHeight: 1.625,
@@ -103,7 +103,8 @@ var AlertView = function AlertView(_ref) {
     sx: {
       flex: 1,
       'code': {
-        bgcolor: attrs.variant === 'default' ? '' : "color-mix(in srgb, ".concat(variantData.color, " 20%, transparent) !important")
+        borderColor: attrs.variant === 'default' ? '' : "color-mix(in srgb, ".concat(variantData.color, " 30%, transparent) !important"),
+        bgcolor: attrs.variant === 'default' ? '' : "color-mix(in srgb, ".concat(variantData.color, " 10%, transparent) !important")
       }
     }
   }, /*#__PURE__*/React.createElement(NodeViewContent, {

package/dist/extension/component/Table/ContextMenu.js

@@ -185,18 +185,18 @@ var TableContextMenu = function TableContextMenu(_ref) {
     })
   }), /*#__PURE__*/React.createElement(ToolbarItem, {
     onClick: function onClick() {
-      return editor.chain().focus().toggleUnderline().run();
+      return editor.chain().focus().toggleStrike().run();
     },
-    icon: /*#__PURE__*/React.createElement(UnderlineIcon, {
+    icon: /*#__PURE__*/React.createElement(StrikethroughIcon, {
       sx: {
         fontSize: '1rem'
       }
     })
   }), /*#__PURE__*/React.createElement(ToolbarItem, {
     onClick: function onClick() {
-      return editor.chain().focus().toggleStrike().run();
+      return editor.chain().focus().toggleUnderline().run();
     },
-    icon: /*#__PURE__*/React.createElement(StrikethroughIcon, {
+    icon: /*#__PURE__*/React.createElement(UnderlineIcon, {
       sx: {
         fontSize: '1rem'
       }

package/dist/extension/component/Table/TableContextMenuPlugin.js

@@ -51,19 +51,10 @@ var isClickedCellInSelection = function isClickedCellInSelection(editor, clicked
       return false;
     }
     var cellSelection = selection;
-    // 使用范围判断不精确，直接使用ranges判断
     var ranges = cellSelection.ranges.map(function (it) {
       return it.$from.pos;
     });
     return ranges.includes(domPosition);
-    // if (cellSelection.$anchorCell && cellSelection.$headCell) {
-    //   const anchorPos = cellSelection.$anchorCell.pos;
-    //   const headPos = cellSelection.$headCell.pos;
-    //   const minPos = Math.min(anchorPos, headPos);
-    //   const maxPos = Math.max(anchorPos, headPos);
-    //   return domPosition >= minPos && domPosition <= maxPos;
-    // }
-    // return domPosition >= selection.from && domPosition <= selection.to;
   } catch (error) {
     console.warn('Error checking if clicked cell is in selection:', error);
     return false;

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

@@ -1,5 +1,5 @@
 import { Extension } from '@tiptap/core';
 export declare const TableExtension: ({ editable }: {
     editable: boolean;
-}) => (Extension<any, any> | import("@tiptap/core").Node<import("@tiptap/extension-table").TableOptions, any> | import("@tiptap/core").Node<import("@tiptap/extension-table").TableHeaderOptions, any>)[];
+}) => (import("@tiptap/core").Node<import("@tiptap/extension-table").TableOptions, any> | import("@tiptap/core").Node<import("@tiptap/extension-table").TableHeaderOptions, any> | Extension<any, any>)[];
 export default TableExtension;

package/dist/extension/node/Table.js

@@ -12,7 +12,6 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { Extension } from '@tiptap/core';
 import { Table, TableCell, TableHeader, TableRow } from '@tiptap/extension-table';
 import { Plugin, TextSelection } from '@tiptap/pm/state';
-import { Decoration, DecorationSet } from '@tiptap/pm/view';
 import { createTableContextMenuPlugin } from "../component/Table";
 export var TableExtension = function TableExtension(_ref) {
   var editable = _ref.editable;
@@ -174,36 +173,6 @@ export var TableExtension = function TableExtension(_ref) {
       return editable ? [createTableContextMenuPlugin(this.editor)] : [];
     }
   }),
-  // 选中表格时为 table 添加聚焦样式类名
-  Extension.create({
-    name: 'tableActiveClass',
-    addProseMirrorPlugins: function addProseMirrorPlugins() {
-      if (!editable) return [];
-      return [new Plugin({
-        props: {
-          decorations: function decorations(state) {
-            var selection = state.selection,
-              doc = state.doc;
-            var $from = selection.$from;
-            // 如果当前不在表格内，移除装饰
-            // 通过向上寻找最近的 table 节点
-            for (var depth = $from.depth; depth > 0; depth--) {
-              var node = $from.node(depth);
-              if (node.type.name === 'table') {
-                var from = $from.before(depth);
-                var to = $from.after(depth);
-                var deco = Decoration.node(from, to, {
-                  class: 'table-focus'
-                });
-                return DecorationSet.create(doc, [deco]);
-              }
-            }
-            return null;
-          }
-        }
-      })];
-    }
-  }),
   // Safari 中文输入 deleteCompositionText 修复
   Extension.create({
     name: 'safariCompositionDeleteFix',

package/dist/index.css

@@ -72,11 +72,19 @@
   position: relative;
   padding: 8px 16px;
   margin: 0 0 20px;
-  border-radius: 10px;
-  border: 1px solid var(--mui-palette-divider);
   background-color: var(--mui-palette-background-paper3);
 }
 
+.tiptap.ProseMirror blockquote::before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 4px;
+  height: 100%;
+  background-color: var(--mui-palette-action-selected);
+}
+
 /* list */
 .tiptap.ProseMirror ol,
 .tiptap.ProseMirror ul {
@@ -188,8 +196,10 @@
   line-height: 1.625;
   font-size: inherit;
   word-break: break-all;
-  font-weight: 500;
-  background-color: var(--mui-palette-background-paper2);
+  /* font-weight: 500; */
+  border: 1px solid;
+  border-color: var(--mui-palette-divider);
+  background-color: var(--mui-palette-background-paper3);
   border-radius: 6px;
 }
 
@@ -412,7 +422,7 @@
   border-right-color: transparent;
 }
 
-.tiptap.ProseMirror[contenteditable="true"] table .selectedCell {
+.tiptap.ProseMirror[contenteditable="true"] table .selectedCell * {
   pointer-events: none;
 }
 

package/package.json

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