@ctzhian/tiptap 2.1.11 → 2.1.13

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

@@ -25,7 +25,7 @@ var SlashCommandsList = /*#__PURE__*/forwardRef(function (_ref, ref) {
   }, /*#__PURE__*/React.createElement(Stack, {
     direction: 'row',
     flexWrap: 'wrap'
-  }, items.slice(0, 18).map(function (item, index) {
+  }, items.slice(0, 16).map(function (item, index) {
     return /*#__PURE__*/React.createElement(ToolbarItem, {
       key: index,
       shortcutKey: (item === null || item === void 0 ? void 0 : item.shortcutKey) || [],

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

@@ -13,7 +13,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 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 { Menu } from "../../../component";
-import { AlignBottomIcon, AlignCenterIcon, AlignJustifyIcon, AlignLeftIcon, AlignRightIcon, AlignTopIcon, ArrowDownSLineIcon, BrushLineIcon, MergeCellsVerticalIcon, MoreLineIcon, SplitCellsVerticalIcon } from "../../../component/Icons";
+import { AlignBottomIcon, AlignCenterIcon, AlignJustifyIcon, AlignLeftIcon, AlignRightIcon, AlignTopIcon, ArrowDownSLineIcon, BrushLineIcon, DeleteLineIcon, MergeCellsVerticalIcon, MoreLineIcon, SplitCellsVerticalIcon } from "../../../component/Icons";
 import { DeleteBack2LineIcon } from "../../../component/Icons/delete-back-2-line-icon";
 import { getThemeTextBgColor, getThemeTextColor } from "../../../contants/enums";
 import { Box, Divider, Typography } from '@mui/material';
@@ -429,6 +429,18 @@ export var TableCellHandleMenu = /*#__PURE__*/forwardRef(function (_ref, ref) {
           };
         }
       }()
+    }, {
+      key: 'delete-table',
+      label: '删除表格',
+      icon: /*#__PURE__*/React.createElement(DeleteLineIcon, {
+        sx: {
+          fontSize: '1rem'
+        }
+      }),
+      onClick: function onClick() {
+        if (!editor) return;
+        editor.chain().focus().deleteTable().run();
+      }
     });
     return menuItems;
   }, [editor, theme, editorState]);

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

@@ -48,9 +48,9 @@ export var TableExtendRowColumnButton = function TableExtendRowColumnButton(_ref
     runPreservingCursor(editor, function () {
       selectLastCell(editor, state.block, state.blockPos, orientation);
       if (isRowOrientation) {
-        editor.commands.addRowAfter();
+        editor.chain().focus().addRowAfter().run();
       } else {
-        editor.commands.addColumnAfter();
+        editor.chain().focus().addColumnAfter().run();
       }
     });
   }, [editor, isRowOrientation, orientation, state]);

package/dist/extension/component/TableHandle/TableHandleMenu.js

@@ -15,7 +15,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { AlignBottomIcon, AlignCenterIcon, AlignJustifyIcon, AlignLeftIcon, AlignRightIcon, AlignTopIcon, ArrowDownSLineIcon, BrushLineIcon, DeleteColumnIcon, DeleteRowIcon, FileCopyLineIcon, InsertColumnLeftIcon, InsertColumnRightIcon, InsertRowBottomIcon, InsertRowTopIcon, LayoutLeft2LineIcon, LayoutTop2LineIcon } from "../../../component/Icons";
+import { AlignBottomIcon, AlignCenterIcon, AlignJustifyIcon, AlignLeftIcon, AlignRightIcon, AlignTopIcon, ArrowDownSLineIcon, BrushLineIcon, DeleteColumnIcon, DeleteLineIcon, DeleteRowIcon, FileCopyLineIcon, InsertColumnLeftIcon, InsertColumnRightIcon, InsertRowBottomIcon, InsertRowTopIcon, LayoutLeft2LineIcon, LayoutTop2LineIcon } from "../../../component/Icons";
 import { DeleteBack2LineIcon } from "../../../component/Icons/delete-back-2-line-icon";
 import { getThemeTextBgColor, getThemeTextColor } from "../../../contants/enums";
 import { Box, Divider, Typography, useTheme } from '@mui/material';
@@ -592,6 +592,18 @@ export var TableHandleMenu = function TableHandleMenu(_ref) {
           editor.chain().focus().deleteColumn().run();
         }
       }
+    }, {
+      key: 'delete-table',
+      label: '删除表格',
+      icon: /*#__PURE__*/React.createElement(DeleteLineIcon, {
+        sx: {
+          fontSize: '1rem'
+        }
+      }),
+      onClick: function onClick() {
+        if (!editor || typeof tablePos !== 'number' || !tableNode) return;
+        editor.chain().focus().deleteTable().run();
+      }
     });
     return menuItems;
   }, [editor, orientation, isFirstRowOrColumn, isHeader, selectRowOrColumn, canDuplicate, duplicateRowOrColumn]);

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

@@ -382,7 +382,7 @@ export var TableSelectionOverlay = function TableSelectionOverlay(_ref2) {
     };
   }, [editor, updateSelectionRect, updateTableDom]);
   useEffect(function () {
-    var c = tableDom === null || tableDom === void 0 ? void 0 : tableDom.querySelector('.table-selection-overlay-container');
+    var c = tableDom === null || tableDom === void 0 ? void 0 : tableDom.querySelector(':scope > .tableWrapper > .table-selection-overlay-container');
     containerRef.current = c !== null && c !== void 0 ? c : null;
   }, [tableDom]);
   if (!isVisible || !selectionRect || !editor || !editor.isEditable) {

package/dist/extension/node/CodeBlockLowlight.js

@@ -11,7 +11,6 @@ import { ReactNodeViewRenderer } from "@tiptap/react";
 import { all, createLowlight } from 'lowlight';
 import CodeBlockView from "../component/CodeBlock";
 var lowlight = createLowlight(all);
-console.log(lowlight.listLanguages());
 var CustomCodeBlock = CodeBlockLowlight.configure({
   enableTabIndentation: true,
   tabSize: 1,

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/dist/extension/node/Iframe.d.ts

@@ -4,9 +4,11 @@ declare module '@tiptap/core' {
     interface Commands<ReturnType> {
         iframe: {
             setIframe: (options: {
+                type?: 'iframe' | 'bilibili';
                 src: string;
-                width?: number;
+                width?: number | string;
                 height?: number;
+                align?: 'left' | 'center' | 'right';
             }) => ReturnType;
         };
     }

package/dist/extension/node/Iframe.js

@@ -35,10 +35,15 @@ export var IframeExtension = function IframeExtension(props) {
           }
         },
         width: {
-          default: 760,
+          default: '100%',
           parseHTML: function parseHTML(element) {
             var width = element.getAttribute('width');
-            return width ? parseInt(width, 10) : 760;
+            if (width) {
+              if (width.endsWith('%')) return width;
+              var numWidth = parseInt(width, 10);
+              return isNaN(numWidth) ? '100%' : numWidth;
+            }
+            return '100%';
           },
           renderHTML: function renderHTML(attributes) {
             return {
@@ -57,6 +62,29 @@ export var IframeExtension = function IframeExtension(props) {
               height: attributes.height
             };
           }
+        },
+        type: {
+          default: 'iframe',
+          parseHTML: function parseHTML(element) {
+            return element.getAttribute('data-type');
+          },
+          renderHTML: function renderHTML(attributes) {
+            return {
+              'data-type': attributes.type
+            };
+          }
+        },
+        align: {
+          default: null,
+          parseHTML: function parseHTML(element) {
+            return element.getAttribute('data-align');
+          },
+          renderHTML: function renderHTML(attributes) {
+            if (!attributes.align) return {};
+            return {
+              'data-align': attributes.align
+            };
+          }
         }
       };
     },
@@ -67,12 +95,24 @@ export var IframeExtension = function IframeExtension(props) {
           if (!(dom instanceof HTMLElement)) return false;
           var src = dom.getAttribute('src');
           if (!src) return false;
-          var width = dom.getAttribute('width') ? parseInt(dom.getAttribute('width'), 10) : dom.style.width ? parseInt(dom.style.width, 10) : 760;
+          var widthAttr = dom.getAttribute('width');
+          var width = '100%';
+          if (widthAttr) {
+            // 如果是百分比，保留字符串格式
+            if (widthAttr.endsWith('%')) {
+              width = widthAttr;
+            } else {
+              // 否则解析为数字
+              var numWidth = parseInt(widthAttr, 10);
+              width = isNaN(numWidth) ? '100%' : numWidth;
+            }
+          }
           var height = dom.getAttribute('height') ? parseInt(dom.getAttribute('height'), 10) : dom.style.height ? parseInt(dom.style.height, 10) : 400;
           return {
             src: src,
             width: width,
-            height: height
+            height: height,
+            align: dom.getAttribute('data-align') || dom.getAttribute('align')
           };
         }
       }];
@@ -94,9 +134,10 @@ export var IframeExtension = function IframeExtension(props) {
       var _ref3 = node.attrs,
         src = _ref3.src,
         width = _ref3.width,
-        height = _ref3.height;
+        height = _ref3.height,
+        align = _ref3['data-align'];
       if (!src || src.trim() === '') return '';
-      return "<iframe src=\"".concat(src, "\" ").concat(width ? "width=\"".concat(width, "\"") : '', " ").concat(height ? "height=\"".concat(height, "\"") : '', " frameborder=\"0\" allowfullscreen=\"true\" autoplay=\"0\" loop=\"0\"></iframe>");
+      return "<iframe src=\"".concat(src, "\" ").concat(width ? "width=\"".concat(width, "\"") : '', " ").concat(height ? "height=\"".concat(height, "\"") : '', " ").concat(align ? "data-align=\"".concat(align, "\"") : '', " frameborder=\"0\" allowfullscreen=\"true\" autoplay=\"0\" loop=\"0\"></iframe>");
     },
     addCommands: function addCommands() {
       var _this = this;
@@ -107,9 +148,11 @@ export var IframeExtension = function IframeExtension(props) {
             return commands.insertContent({
               type: _this.name,
               attrs: {
+                type: options.type || 'iframe',
                 src: options.src,
-                width: options.width || 760,
-                height: options.height || 400
+                width: options.width || '100%',
+                height: options.height || 400,
+                align: options.align || null
               }
             });
           };

package/dist/extension/node/Table.js

@@ -116,8 +116,8 @@ export var TableExtension = function TableExtension(_ref) {
             key: "ignoreMutation",
             value: function ignoreMutation(mutation) {
               var target = mutation.target;
-              var isInsideTable = target.closest('.table-container');
-              return !isInsideTable || _get(_getPrototypeOf(TiptapTableView.prototype), "ignoreMutation", this).call(this, mutation);
+              var isInsideThisTable = this.innerTableContainer.contains(target);
+              return !isInsideThisTable || _get(_getPrototypeOf(TiptapTableView.prototype), "ignoreMutation", this).call(this, mutation);
             }
           }]);
           return TiptapTableView;
@@ -127,27 +127,23 @@ export var TableExtension = function TableExtension(_ref) {
       };
     },
     renderHTML: function renderHTML(_ref5) {
-      var _this$parent;
       var node = _ref5.node,
         HTMLAttributes = _ref5.HTMLAttributes;
-      var originalRender = (_this$parent = this.parent) === null || _this$parent === void 0 ? void 0 : _this$parent.call(this, {
-        node: node,
-        HTMLAttributes: HTMLAttributes
+      var firstRow = node.content.firstChild;
+      var colCount = firstRow ? firstRow.childCount : 0;
+      var style = "--default-cell-min-width: 100px; min-width: ".concat(colCount * 100, "px;");
+      var attrs = _objectSpread(_objectSpread({}, HTMLAttributes), {}, {
+        style: HTMLAttributes.style ? "".concat(HTMLAttributes.style, " ").concat(style) : style
       });
-      var wrapper = ['div', {
-        class: 'tableWrapper'
-      }, ['div', {
-        class: 'table-container'
-      }, originalRender], ['div', {
-        class: 'table-controls'
-      }], ['div', {
-        class: 'table-selection-overlay-container'
-      }]];
-      return wrapper;
+      var cols = [];
+      for (var i = 0; i < colCount; i++) {
+        cols.push(['col', {}]);
+      }
+      return ['table', attrs, ['colgroup', {}].concat(cols), ['tbody', 0]];
     },
     addCommands: function addCommands() {
-      var _this$parent2;
-      return _objectSpread(_objectSpread({}, (_this$parent2 = this.parent) === null || _this$parent2 === void 0 ? void 0 : _this$parent2.call(this)), {}, {
+      var _this$parent;
+      return _objectSpread(_objectSpread({}, (_this$parent = this.parent) === null || _this$parent === void 0 ? void 0 : _this$parent.call(this)), {}, {
         cancelSelection: function cancelSelection() {
           return function (_ref6) {
             var state = _ref6.state,
@@ -201,8 +197,8 @@ export var TableExtension = function TableExtension(_ref) {
     allowTableNodeSelection: editable
   }), TableHeader.extend({
     addAttributes: function addAttributes() {
-      var _this$parent3;
-      return _objectSpread(_objectSpread({}, (_this$parent3 = this.parent) === null || _this$parent3 === void 0 ? void 0 : _this$parent3.call(this)), {}, {
+      var _this$parent2;
+      return _objectSpread(_objectSpread({}, (_this$parent2 = this.parent) === null || _this$parent2 === void 0 ? void 0 : _this$parent2.call(this)), {}, {
         bgcolor: {
           default: null,
           parseHTML: function parseHTML(element) {
@@ -279,8 +275,8 @@ export var TableExtension = function TableExtension(_ref) {
     }
   }), TableCell.extend({
     addAttributes: function addAttributes() {
-      var _this$parent4;
-      return _objectSpread(_objectSpread({}, (_this$parent4 = this.parent) === null || _this$parent4 === void 0 ? void 0 : _this$parent4.call(this)), {}, {
+      var _this$parent3;
+      return _objectSpread(_objectSpread({}, (_this$parent3 = this.parent) === null || _this$parent3 === void 0 ? void 0 : _this$parent3.call(this)), {}, {
         bgcolor: {
           default: null,
           parseHTML: function parseHTML(element) {

package/dist/extension/node/TableHandler/plugin.js

@@ -313,7 +313,7 @@ var TableHandleView = /*#__PURE__*/function () {
       this.tablePos = blockInfo.pos;
       this.tableId = blockInfo.node.attrs.id;
       var wrapper = safeClosest(around.domNode, '.tableWrapper');
-      var widgetContainer = wrapper === null || wrapper === void 0 ? void 0 : wrapper.querySelector('.table-controls');
+      var widgetContainer = wrapper === null || wrapper === void 0 ? void 0 : wrapper.querySelector(':scope > .table-controls');
 
       // Hovering around the table (outside cells)
       if (around.type === 'wrapper') {

package/dist/index.css

@@ -381,6 +381,7 @@
   position: relative;
   vertical-align: top;
   transition: all 0.2s ease-in-out;
+  min-width: var(--default-cell-min-width, 100px);
 }
 
 .tiptap.ProseMirror table tbody tr:first-child th,
@@ -447,7 +448,6 @@
   overflow-x: auto;
   overflow-y: hidden;
   position: relative;
-  margin: 20px 0;
 }
 
 .tiptap.ProseMirror[contenteditable="true"] .tableWrapper {

package/dist/util/index.d.ts

@@ -22,3 +22,4 @@ export declare const getLinkTitle: (href: string) => string;
 export declare const getLinkAttributesWithSelectedText: (editor: Editor) => {
     title?: string;
 };
+export declare const extractSrcFromIframe: (input: string) => string;

package/dist/util/index.js

@@ -88,4 +88,12 @@ export var getLinkAttributesWithSelectedText = function getLinkAttributesWithSel
     };
   }
   return {};
+};
+export var extractSrcFromIframe = function extractSrcFromIframe(input) {
+  var trimmed = input.trim();
+  var iframeMatch = trimmed.match(/<iframe[^>]*\ssrc\s*=\s*["']([^"']+)["'][^>]*>/i) || trimmed.match(/<iframe[^>]*\ssrc\s*=\s*([^\s>]+)[^>]*>/i);
+  if (iframeMatch && iframeMatch[1]) {
+    return iframeMatch[1].trim();
+  }
+  return trimmed;
 };

package/package.json

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