@ctzhian/tiptap 1.7.0 → 1.7.2

package/dist/extension/component/Table/ContextMenu.d.ts

@@ -5,6 +5,7 @@ interface TableContextMenuProps {
     onClose: () => void;
     onCommandExecute?: () => void;
     hasMultipleSelection: boolean;
+    hasMultipleCellElements: boolean;
 }
 declare const TableContextMenu: React.FC<TableContextMenuProps>;
 export default TableContextMenu;

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

@@ -5,6 +5,7 @@ var TableContextMenu = function TableContextMenu(_ref) {
   var editor = _ref.editor,
     onClose = _ref.onClose,
     hasMultipleSelection = _ref.hasMultipleSelection,
+    hasMultipleCellElements = _ref.hasMultipleCellElements,
     onCommandExecute = _ref.onCommandExecute;
   var handleCommand = function handleCommand(command) {
     command();
@@ -88,7 +89,7 @@ var TableContextMenu = function TableContextMenu(_ref) {
         return editor.chain().focus().splitCell().run();
       });
     },
-    show: true
+    show: !hasMultipleSelection && hasMultipleCellElements
   }, {
     label: '切换表头行',
     icon: /*#__PURE__*/React.createElement(LayoutTop2LineIcon, {

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

@@ -19,32 +19,33 @@ var hasMultipleCellSelection = function hasMultipleCellSelection(editor) {
       return cellSelection.$anchorCell.pos !== cellSelection.$headCell.pos;
     }
   }
-  var selectionAny = selection;
-  var isColSelection = selectionAny.isColSelection();
-  var isRowSelection = selectionAny.isRowSelection();
-  // console.log('3️⃣ selectionAny.isColSelection', isColSelection)
-  // console.log('3️⃣ selectionAny.isRowSelection', isRowSelection)
-  if (isColSelection || isRowSelection) {
-    return true;
-  }
+  return false;
+  // const selectionAny = selection as any;
+  // const isColSelection = selectionAny.isColSelection;
+  // const isRowSelection = selectionAny.isRowSelection;
+  // // console.log('3️⃣ selectionAny.isColSelection', isColSelection)
+  // // console.log('3️⃣ selectionAny.isRowSelection', isRowSelection)
+  // if (isColSelection || isRowSelection) {
+  //   return true;
+  // }
   // console.log('3️⃣ selection.from', selection.from)
   // console.log('3️⃣ selection.to', selection.to)
-  if (selection.from !== selection.to) {
-    var resolvedFrom = editor.state.doc.resolve(selection.from);
-    var resolvedTo = editor.state.doc.resolve(selection.to);
-    // console.log('4️⃣ resolvedFrom.nodeAfter', resolvedFrom.nodeAfter)
-    // console.log('4️⃣ resolvedTo.nodeBefore', resolvedTo.nodeBefore)
-    if (resolvedFrom.nodeAfter && resolvedTo.nodeBefore) {
-      var fromCell = resolvedFrom.node();
-      var toCell = resolvedTo.node();
-      // console.log('5️⃣ fromCell', fromCell)
-      // console.log('5️⃣ toCell', toCell)
-      if (fromCell !== toCell && (fromCell.type.name === 'tableCell' || fromCell.type.name === 'tableHeader')) {
-        return true;
-      }
-    }
-  }
-  return false;
+  // if (selection.from !== selection.to) {
+  //   const resolvedFrom = editor.state.doc.resolve(selection.from);
+  //   const resolvedTo = editor.state.doc.resolve(selection.to);
+  //   console.log('4️⃣ resolvedFrom.nodeAfter', resolvedFrom.nodeAfter)
+  //   console.log('4️⃣ resolvedTo.nodeBefore', resolvedTo.nodeBefore)
+  //   if (resolvedFrom.nodeAfter && resolvedTo.nodeBefore) {
+  //     const fromCell = resolvedFrom.node();
+  //     const toCell = resolvedTo.node();
+  //     console.log('5️⃣ fromCell', fromCell)
+  //     console.log('5️⃣ toCell', toCell)
+  //     if (fromCell !== toCell && (fromCell.type.name === 'tableCell' || fromCell.type.name === 'tableHeader')) {
+  //       return true;
+  //     }
+  //   }
+  // }
+  // return false;
 };
 var isClickedCellInSelection = function isClickedCellInSelection(editor, clickedElement) {
   var selection = editor.state.selection;
@@ -179,7 +180,7 @@ export var createTableContextMenuPlugin = function createTableContextMenuPlugin(
     commandExecuted = false;
     preventSelectionLoss = false;
   };
-  var showContextMenu = function showContextMenu(anchorEl, hasMultipleSelection) {
+  var showContextMenu = function showContextMenu(anchorEl, hasMultipleSelection, hasMultipleCellElements) {
     // console.log('🍊 showContextMenu', anchorEl, 'hasMultipleSelection', hasMultipleSelection)
     var _createMenuContainer = createMenuContainer(),
       root = _createMenuContainer.root;
@@ -199,6 +200,7 @@ export var createTableContextMenuPlugin = function createTableContextMenuPlugin(
     }, /*#__PURE__*/React.createElement(TableContextMenu, {
       editor: editor,
       hasMultipleSelection: hasMultipleSelection,
+      hasMultipleCellElements: hasMultipleCellElements,
       onClose: handleClose,
       onCommandExecute: handleCommandExecute
     })));
@@ -233,6 +235,7 @@ export var createTableContextMenuPlugin = function createTableContextMenuPlugin(
           event.preventDefault();
           event.stopPropagation();
           var cellElement = getTableCell(target);
+          console.log('🍊 cellElement', cellElement === null || cellElement === void 0 ? void 0 : cellElement.getAttribute('colspan'), cellElement === null || cellElement === void 0 ? void 0 : cellElement.getAttribute('rowspan'));
           if (!cellElement) {
             preventSelectionLoss = false;
             return false;
@@ -246,8 +249,9 @@ export var createTableContextMenuPlugin = function createTableContextMenuPlugin(
             }, 50);
           }
           var hasMultipleSelection = savedSelection ? true : hasMultipleCellSelection(editor);
+          var hasMultipleCellElements = (cellElement === null || cellElement === void 0 ? void 0 : cellElement.getAttribute('colspan')) && parseInt(cellElement.getAttribute('colspan') || '1') > 1 || (cellElement === null || cellElement === void 0 ? void 0 : cellElement.getAttribute('rowspan')) && parseInt(cellElement.getAttribute('rowspan') || '1') > 1 || false;
           // console.log('🍊 contextmenu hasMultipleSelection', hasMultipleSelection)
-          showContextMenu(cellElement, hasMultipleSelection);
+          showContextMenu(cellElement, hasMultipleSelection, hasMultipleCellElements);
           preventSelectionLoss = false;
           return true;
         },

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

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

package/dist/index.css

@@ -369,6 +369,11 @@
   line-height: 24px;
 }
 
+.tiptap.ProseMirror table th *,
+.tiptap.ProseMirror table td * {
+  word-break: break-all;
+}
+
 /* 表格单元格基础样式 */
 .tiptap.ProseMirror table td,
 .tiptap.ProseMirror table th {

package/package.json

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