@ctzhian/tiptap 1.6.26 → 1.6.28

package/dist/Editor/demo.js

@@ -102,7 +102,7 @@ var Reader = function Reader() {
         }
         return onUpload;
       }(),
-      content: "<p></p><blockquote><p></p></blockquote><p></p>"
+      content: "<div class=\"tableWrapper\"><table style=\"min-width: 423px;\"><colgroup><col style=\"width: 100px;\"><col style=\"width: 123px;\"><col style=\"min-width: 100px;\"><col style=\"min-width: 100px;\"></colgroup><tbody><tr class=\"table-row\"><th class=\"table-header\" colspan=\"1\" rowspan=\"1\" colwidth=\"100\"><p>fasdfklj</p></th><th class=\"table-header\" colspan=\"1\" rowspan=\"1\" colwidth=\"123\"><p>fjkldsajflk</p></th><th class=\"table-header\" colspan=\"1\" rowspan=\"1\"><p>jlfjdlskajfl</p></th><th class=\"table-header\" colspan=\"1\" rowspan=\"1\"><p>kflasdjflk</p></th></tr><tr class=\"table-row\"><td colspan=\"1\" rowspan=\"1\" colwidth=\"100\" data-background-color=\"transparent\" style=\"background-color: transparent;\"><p>flfjladsjflkf</p></td><td colspan=\"1\" rowspan=\"1\" colwidth=\"123\" data-background-color=\"transparent\" style=\"background-color: transparent;\"><p>lfjlaskdjfkl</p></td><td colspan=\"1\" rowspan=\"1\" data-background-color=\"transparent\" style=\"background-color: transparent;\"><p>lkasdjfkl</p></td><td colspan=\"1\" rowspan=\"2\" data-background-color=\"transparent\" style=\"background-color: transparent;\"><p>jklfjalsdfjl</p></td></tr><tr class=\"table-row\"><td colspan=\"1\" rowspan=\"1\" colwidth=\"100\" data-background-color=\"transparent\" style=\"background-color: transparent;\"><p>fflkasdlfj</p></td><td colspan=\"1\" rowspan=\"1\" colwidth=\"123\" data-background-color=\"transparent\" style=\"background-color: transparent;\"><p>lfjldksajfl</p></td><td colspan=\"1\" rowspan=\"1\" data-background-color=\"transparent\" style=\"background-color: transparent;\"><p>flajdslfkj</p></td></tr><tr class=\"table-row\"><td colspan=\"1\" rowspan=\"1\" colwidth=\"100\" data-background-color=\"transparent\" style=\"background-color: transparent;\"><p>lfjadsjflds</p></td><td colspan=\"1\" rowspan=\"1\" colwidth=\"123\" data-background-color=\"transparent\" style=\"background-color: transparent;\"><p>dfjlajflsk</p></td><td colspan=\"1\" rowspan=\"1\" data-background-color=\"transparent\" style=\"background-color: transparent;\"><p>lkfdjajkdls</p></td><td colspan=\"1\" rowspan=\"1\" data-background-color=\"transparent\" style=\"background-color: transparent;\"><p>flasjflk</p></td></tr></tbody></table></div><p></p>"
     }),
     editor = _useTiptap.editor;
   return /*#__PURE__*/React.createElement(EditorThemeProvider, {

package/dist/Editor/index.d.ts

@@ -1,4 +1,5 @@
 import { EditorProps } from "../type";
 import React from 'react';
+import 'core-js/actual/array/find-last';
 declare const Editor: ({ editor, menuInDragHandle, menuInBubbleMenu, onTip }: EditorProps) => React.JSX.Element;
 export default Editor;

package/dist/Editor/index.js

@@ -1,8 +1,12 @@
+import "core-js/modules/es.array.find-last.js";
 import { EditorContent } from '@tiptap/react';
 import React from 'react';
 import { PhotoProvider } from 'react-photo-view';
 import SelectionText from "../component/CustomBubbleMenu/SelectionText";
 import CustomDragHandle from "../component/CustomDragHandle";
+
+// fix: https://github.com/ueberdosis/tiptap/issues/6785
+
 var Editor = function Editor(_ref) {
   var editor = _ref.editor,
     menuInDragHandle = _ref.menuInDragHandle,

package/dist/EditorDiff/index.d.ts

@@ -1,4 +1,5 @@
 import React from "react";
+import 'core-js/actual/array/find-last';
 interface EditorDiffProps {
     oldHtml: string;
     newHtml: string;

package/dist/EditorDiff/index.js

@@ -1,7 +1,11 @@
+import "core-js/modules/es.array.find-last.js";
 import { EditorContent } from "@tiptap/react";
 import React, { useEffect } from "react";
 import { PhotoProvider } from "react-photo-view";
 import useTiptap from "../hook";
+
+// fix: https://github.com/ueberdosis/tiptap/issues/6785
+
 var EditorDiff = function EditorDiff(_ref) {
   var oldHtml = _ref.oldHtml,
     newHtml = _ref.newHtml;

package/dist/component/CustomBubbleMenu/SelectionText.js

@@ -61,6 +61,16 @@ var SelectionText = function SelectionText(_ref) {
     },
     shouldShow: function shouldShow(_ref2) {
       var editorProps = _ref2.editor;
+      // 表格多选单元格时禁止弹出气泡菜单
+      if (editorProps.state.selection.constructor.name === '_CellSelection') {
+        var cellSelection = editorProps.state.selection;
+        if (cellSelection.ranges.length > 1) {
+          return false;
+        }
+        if (cellSelection.$anchorCell && cellSelection.$headCell) {
+          return cellSelection.$anchorCell.pos !== cellSelection.$headCell.pos;
+        }
+      }
       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/Menu/NestedList.js

@@ -105,7 +105,10 @@ var NestedList = function NestedList(_ref) {
       sx: {
         pointerEvents: 'none'
       },
-      disableScrollLock: true
+      disableScrollLock: true,
+      disableAutoFocus: true,
+      disableEnforceFocus: true,
+      disableRestoreFocus: true
     }, childrenProps), /*#__PURE__*/React.createElement(Box, {
       className: "menu-select-sub-list",
       sx: _objectSpread(_objectSpread(_objectSpread({

package/dist/component/Menu/index.js

@@ -69,7 +69,10 @@ var Menu = function Menu(_ref) {
     onClose: handleClose,
     anchorOrigin: anchorOrigin,
     transformOrigin: transformOrigin,
-    disableScrollLock: true
+    disableScrollLock: true,
+    disableAutoFocus: true,
+    disableEnforceFocus: true,
+    disableRestoreFocus: true
   }, /*#__PURE__*/React.createElement(Box, {
     sx: {
       p: 0.5

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

@@ -1,7 +1,6 @@
-import { ToolbarItem } from "../../../component/Toolbar";
-import { Box, Divider, MenuItem, MenuList, Stack } from '@mui/material';
+import { Box, MenuItem, MenuList, Stack } from '@mui/material';
 import React from 'react';
-import { BoldIcon, DeleteColumnIcon, DeleteLineIcon, DeleteRowIcon, InsertColumnLeftIcon, InsertColumnRightIcon, InsertRowBottomIcon, InsertRowTopIcon, ItalicIcon, LayoutLeft2LineIcon, LayoutTop2LineIcon, MergeCellsHorizontalIcon, SplitCellsHorizontalIcon, StrikethroughIcon, UnderlineIcon } from "../../../component/Icons";
+import { DeleteColumnIcon, DeleteLineIcon, DeleteRowIcon, InsertColumnLeftIcon, InsertColumnRightIcon, InsertRowBottomIcon, InsertRowTopIcon, LayoutLeft2LineIcon, LayoutTop2LineIcon, MergeCellsHorizontalIcon, SplitCellsHorizontalIcon } from "../../../component/Icons";
 var TableContextMenu = function TableContextMenu(_ref) {
   var editor = _ref.editor,
     onClose = _ref.onClose,
@@ -159,49 +158,7 @@ var TableContextMenu = function TableContextMenu(_ref) {
     },
     show: true
   }];
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Stack, {
-    direction: 'row',
-    alignItems: 'center',
-    sx: {
-      p: 0.5
-    }
-  }, /*#__PURE__*/React.createElement(ToolbarItem, {
-    onClick: function onClick() {
-      return editor.chain().focus().toggleBold().run();
-    },
-    icon: /*#__PURE__*/React.createElement(BoldIcon, {
-      sx: {
-        fontSize: '1rem'
-      }
-    })
-  }), /*#__PURE__*/React.createElement(ToolbarItem, {
-    onClick: function onClick() {
-      return editor.chain().focus().toggleItalic().run();
-    },
-    icon: /*#__PURE__*/React.createElement(ItalicIcon, {
-      sx: {
-        fontSize: '1rem'
-      }
-    })
-  }), /*#__PURE__*/React.createElement(ToolbarItem, {
-    onClick: function onClick() {
-      return editor.chain().focus().toggleStrike().run();
-    },
-    icon: /*#__PURE__*/React.createElement(StrikethroughIcon, {
-      sx: {
-        fontSize: '1rem'
-      }
-    })
-  }), /*#__PURE__*/React.createElement(ToolbarItem, {
-    onClick: function onClick() {
-      return editor.chain().focus().toggleUnderline().run();
-    },
-    icon: /*#__PURE__*/React.createElement(UnderlineIcon, {
-      sx: {
-        fontSize: '1rem'
-      }
-    })
-  })), /*#__PURE__*/React.createElement(Divider, null), /*#__PURE__*/React.createElement(MenuList, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(MenuList, {
     sx: {
       p: 0.5
     }

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

@@ -5,7 +5,7 @@ import { FloatingPopover } from "../../../component/FloatingPopover";
 import TableContextMenu from "./ContextMenu";
 var hasMultipleCellSelection = function hasMultipleCellSelection(editor) {
   var selection = editor.state.selection;
-  if (selection.constructor.name === 'CellSelection') {
+  if (selection.constructor.name === '_CellSelection') {
     var cellSelection = selection;
     if (cellSelection.ranges && cellSelection.ranges.length > 1) {
       return true;
@@ -117,12 +117,23 @@ export var createTableContextMenuPlugin = function createTableContextMenuPlugin(
   };
   var destroyMenuContainer = function destroyMenuContainer() {
     if (root) {
-      root.unmount();
+      // 保存当前的 root 引用，避免异步执行时访问 null
+      var currentRoot = root;
       root = null;
+      // 异步卸载以避免在 React 渲染期间卸载根节点
+      queueMicrotask(function () {
+        currentRoot.unmount();
+      });
     }
     if (menuContainer) {
-      document.body.removeChild(menuContainer);
+      // 保存当前的 menuContainer 引用
+      var currentContainer = menuContainer;
       menuContainer = null;
+      queueMicrotask(function () {
+        if (currentContainer && currentContainer.parentNode) {
+          document.body.removeChild(currentContainer);
+        }
+      });
     }
   };
   var hideContextMenu = function hideContextMenu() {
@@ -193,7 +204,7 @@ export var createTableContextMenuPlugin = function createTableContextMenuPlugin(
             restoreSelection(editor, savedSelection);
             setTimeout(function () {
               var selectedCells = document.querySelectorAll('.tiptap .selectedCell');
-              console.log('✅ Selected cells after restore:', selectedCells.length);
+              console.info('✅ Selected cells after restore:', selectedCells.length);
             }, 50);
           }
           var hasMultipleSelection = savedSelection ? true : hasMultipleCellSelection(editor);
@@ -217,7 +228,7 @@ export var createTableContextMenuPlugin = function createTableContextMenuPlugin(
                     event.stopPropagation();
                     return true;
                   } else {
-                    console.log('❌ Right-click outside selection, allowing normal behavior');
+                    console.info('❌ Right-click outside selection, allowing normal behavior');
                   }
                 }
               }
@@ -230,6 +241,17 @@ export var createTableContextMenuPlugin = function createTableContextMenuPlugin(
           return false;
         },
         mouseup: function mouseup(view, event) {
+          var target = event.target;
+          if (isInTableCell(target)) {
+            var cellElement = getTableCell(target);
+            if (cellElement) {
+              var currentHasMultipleSelection = hasMultipleCellSelection(editor);
+              if (currentHasMultipleSelection) {
+                var _window$getSelection;
+                (_window$getSelection = window.getSelection()) === null || _window$getSelection === void 0 || _window$getSelection.removeAllRanges();
+              }
+            }
+          }
           if (event.button === 2 && preventSelectionLoss) {
             setTimeout(function () {
               if (preventSelectionLoss) {

package/dist/extension/node/Table.js

@@ -56,11 +56,11 @@ export var TableExtension = function TableExtension(_ref) {
       var _this = this;
       return {
         'Mod-9': function Mod9() {
-          return _this.editor.commands.insertTable({
+          return _this.editor.chain().insertTable({
             rows: 3,
             cols: 4,
             withHeaderRow: true
-          });
+          }).focus().run();
         }
       };
     },
@@ -152,7 +152,7 @@ export var TableExtension = function TableExtension(_ref) {
       var _this2 = this;
       return {
         Tab: function Tab() {
-          if (_this2.editor.commands.goToNextCell()) {
+          if (_this2.editor.chain().goToNextCell().focus().run()) {
             return _this2.editor.chain().cancelSelection().run();
           } else if (!_this2.editor.can().addRowAfter()) {
             return false;

package/dist/index.css

@@ -361,8 +361,7 @@
   overflow: hidden;
   background-color: var(--mui-palette-background-paper);
   caption-side: top;
-  border-left: 1px solid transparent;
-  border-right: 1px solid transparent;
+  border-left: 1px dotted var(--mui-palette-divider);
 }
 
 .tiptap.ProseMirror table p {
@@ -375,7 +374,7 @@
 .tiptap.ProseMirror table th {
   border: none;
   border-bottom: 1px solid var(--mui-palette-divider);
-  border-right: 1px solid transparent;
+  border-right: 1px dotted var(--mui-palette-divider);
   box-sizing: border-box;
   padding: 12px 16px;
   position: relative;
@@ -406,24 +405,9 @@
   background-color: var(--mui-palette-background-default);
 }
 
-.tiptap.ProseMirror table {
-  border-left: 1px dotted var(--mui-palette-divider);
-  border-right: 1px dotted var(--mui-palette-divider);
-}
-
-.tiptap.ProseMirror table td,
-.tiptap.ProseMirror table th {
-  border-right-color: var(--mui-palette-divider);
-  border-right-style: dotted;
-}
-
-.tiptap.ProseMirror table td:last-child,
-.tiptap.ProseMirror table th:last-child {
-  border-right-color: transparent;
-}
-
 .tiptap.ProseMirror[contenteditable="true"] table .selectedCell * {
   pointer-events: none;
+  user-select: none;
 }
 
 /* 表格选择状态 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ctzhian/tiptap",
-  "version": "1.6.26",
+  "version": "1.6.28",
   "description": "基于 Tiptap 二次开发的编辑器组件",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -111,6 +111,7 @@
     "@tiptap/starter-kit": "3.5.3",
     "@tiptap/static-renderer": "3.5.3",
     "@tiptap/suggestion": "3.5.3",
+    "core-js": "^3.46.0",
     "diff-match-patch": "^1.0.5",
     "highlight.js": "^11.11.1",
     "jszip": "^3.10.1",