@ctzhian/tiptap 1.3.2 → 1.4.0

package/dist/extension/node/Alert.js

@@ -1,18 +1,15 @@
 import { mergeAttributes, Node } from '@tiptap/core';
-import { TextSelection } from '@tiptap/pm/state';
 import { ReactNodeViewRenderer } from '@tiptap/react';
 import AlertView from "../component/Alert";
 export var AlertExtension = Node.create({
   name: 'alert',
   group: 'block',
-  content: 'inline*',
+  content: 'block+',
   defining: true,
   draggable: true,
   addOptions: function addOptions() {
     return {
-      HTMLAttributes: {
-        class: 'cq-alert'
-      }
+      HTMLAttributes: {}
     };
   },
   addAttributes: function addAttributes() {
@@ -54,8 +51,6 @@ export var AlertExtension = Node.create({
   },
   parseHTML: function parseHTML() {
     return [{
-      tag: 'div.cq-alert'
-    }, {
       tag: 'div[data-node="alert"]'
     }];
   },
@@ -71,50 +66,15 @@ export var AlertExtension = Node.create({
       setAlert: function setAlert() {
         var attrs = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         return function (_ref2) {
-          var chain = _ref2.chain;
+          var commands = _ref2.commands;
           var id = "alert_".concat(Math.random().toString(36).slice(2));
           var variant = attrs.variant || 'info';
           var type = attrs.type || 'icon';
-          var ok = chain().focus().insertContent({
-            type: _this.name,
-            attrs: {
-              id: id,
-              variant: variant,
-              type: type
-            }
-          }).run();
-          if (!ok) {
-            // 尝试在当前块之后插入
-            var state = _this.editor.state;
-            var $from = state.selection.$from;
-            var afterPos = $from.after($from.depth);
-            var fallback = _this.editor.commands.insertContentAt(afterPos, {
-              type: _this.name,
-              attrs: {
-                id: id,
-                variant: variant,
-                type: type
-              }
-            });
-            if (!fallback) return false;
-          }
-
-          // 将光标移动到刚插入的 Alert 内部
-          try {
-            var doc = _this.editor.state.doc;
-            var posInside = null;
-            doc.descendants(function (node, pos) {
-              if (node.type.name === _this.name && node.attrs.id === id) {
-                posInside = pos + 1;
-                return false;
-              }
-              return true;
-            });
-            if (posInside != null) {
-              _this.editor.commands.setTextSelection(posInside);
-            }
-          } catch (_unused) {}
-          return true;
+          return commands.wrapIn(_this.name, {
+            id: id,
+            variant: variant,
+            type: type
+          });
         };
       },
       setAlertVariant: function setAlertVariant(variant) {
@@ -136,83 +96,19 @@ export var AlertExtension = Node.create({
       toggleAlert: function toggleAlert() {
         var attrs = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         return function (_ref5) {
-          var state = _ref5.state,
-            dispatch = _ref5.dispatch,
-            editor = _ref5.editor;
-          var tr = state.tr,
-            selection = state.selection,
-            schema = state.schema;
-          var $from = selection.$from;
-          var currentNode = $from.node($from.depth);
-          var posStart = $from.before($from.depth);
-          var posEnd = posStart + currentNode.nodeSize;
+          var commands = _ref5.commands;
+          var id = "alert_".concat(Math.random().toString(36).slice(2));
           var variant = attrs.variant || 'info';
           var type = attrs.type || 'icon';
-
-          // 已是 Alert -> 还原为段落
-          if (currentNode.type === _this.type) {
-            var paragraph = schema.nodes.paragraph.create(undefined, currentNode.content);
-            tr.replaceWith(posStart, posEnd, paragraph);
-            tr.setSelection(TextSelection.near(tr.doc.resolve(posStart + 1)));
-            if (dispatch) dispatch(tr);
-            editor.view.focus();
-            return true;
-          }
-
-          // 将当前块替换为 Alert，尽量保留 inline 内容
-          var inlineContent = null;
-          if (currentNode.isTextblock) {
-            inlineContent = currentNode.content;
-          } else {
-            var textContent = currentNode.textContent || '';
-            inlineContent = textContent ? schema.text(textContent) : undefined;
-          }
-          var id = "alert_".concat(Math.random().toString(36).slice(2));
-          var alertNode = schema.nodes.alert.create({
+          return commands.toggleWrap(_this.name, {
             id: id,
             variant: variant,
             type: type
-          }, inlineContent);
-          tr.replaceWith(posStart, posEnd, alertNode);
-          tr.setSelection(TextSelection.near(tr.doc.resolve(posStart + 1)));
-          if (dispatch) dispatch(tr);
-          editor.view.focus();
-          return true;
+          });
         };
       }
     };
   },
-  addKeyboardShortcuts: function addKeyboardShortcuts() {
-    var _this2 = this;
-    return {
-      Enter: function Enter() {
-        if (!_this2.editor.isActive(_this2.name)) return false;
-        // 按回车退出当前 Alert，并在后面新起一段落
-        return _this2.editor.chain().command(function (_ref6) {
-          var state = _ref6.state,
-            tr = _ref6.tr,
-            dispatch = _ref6.dispatch;
-          var $from = state.selection.$from;
-          // 寻找最近的 alert 节点位置
-          var pos = $from.before();
-          for (var depth = $from.depth; depth > 0; depth--) {
-            var _node = $from.node(depth);
-            if (_node.type === _this2.type) {
-              pos = $from.before(depth);
-              break;
-            }
-          }
-          var node = tr.doc.nodeAt(pos);
-          if (!node || node.type !== _this2.type) return false;
-          var insertPos = pos + node.nodeSize;
-          tr.insert(insertPos, _this2.editor.schema.nodes.paragraph.create());
-          tr.setSelection(TextSelection.near(tr.doc.resolve(insertPos + 1)));
-          if (dispatch) dispatch(tr);
-          return true;
-        }).run();
-      }
-    };
-  },
   addNodeView: function addNodeView() {
     return ReactNodeViewRenderer(AlertView);
   }

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/Table.js

@@ -1,4 +1,7 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -8,7 +11,7 @@ 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 { TextSelection } from '@tiptap/pm/state';
+import { Plugin, TextSelection } from '@tiptap/pm/state';
 import { createTableContextMenuPlugin } from "../component/Table";
 export var TableExtension = function TableExtension(_ref) {
   var editable = _ref.editable;
@@ -169,6 +172,81 @@ export var TableExtension = function TableExtension(_ref) {
     addProseMirrorPlugins: function addProseMirrorPlugins() {
       return editable ? [createTableContextMenuPlugin(this.editor)] : [];
     }
+  }),
+  // Safari 中文输入 deleteCompositionText 修复
+  Extension.create({
+    name: 'safariCompositionDeleteFix',
+    addProseMirrorPlugins: function addProseMirrorPlugins() {
+      if (!editable) return [];
+      var ZERO_WIDTH_SPACE = "\u200B";
+      var isSafari = function () {
+        if (typeof navigator === 'undefined') return false;
+        var ua = navigator.userAgent;
+        var isAppleMobile = /iP(ad|hone|od)/.test(ua);
+        var isMacSafari = /Safari\//.test(ua) && !/Chrome\//.test(ua);
+        return isAppleMobile || isMacSafari;
+      }();
+      if (!isSafari) return [];
+
+      // 注意：这里不能使用上面从 ProseMirror 导入的 Node 类型，需判断 DOM 文本节点
+      var isTextNode = function isTextNode(node) {
+        return !!node && node.nodeType === 3;
+      };
+      return [new Plugin({
+        props: {
+          handleDOMEvents: {
+            beforeinput: function beforeinput(_view, event) {
+              // 仅处理 Safari 在中文合成结束后触发的删除合成文本行为
+              if (event.inputType !== 'deleteCompositionText') {
+                return false;
+              }
+              var selection = window.getSelection();
+              if (!selection || selection.rangeCount === 0) return false;
+              var range = selection.getRangeAt(0);
+              var startContainer = range.startContainer,
+                endContainer = range.endContainer,
+                startOffset = range.startOffset,
+                endOffset = range.endOffset;
+              if (isTextNode(startContainer) && startContainer === endContainer && startOffset === 0 && endOffset === startContainer.length) {
+                var _startContainer$paren;
+                (_startContainer$paren = startContainer.parentElement) === null || _startContainer$paren === void 0 || _startContainer$paren.insertBefore(document.createTextNode(ZERO_WIDTH_SPACE), startContainer);
+              }
+              // 让 ProseMirror 照常处理
+              return false;
+            },
+            input: function input(_view, event) {
+              if (event.inputType !== 'deleteCompositionText') {
+                return false;
+              }
+              var selection = window.getSelection();
+              if (!selection || selection.rangeCount === 0) return false;
+              var range = selection.getRangeAt(0);
+              var node = range.startContainer;
+              var parentEl = (node === null || node === void 0 ? void 0 : node.parentElement) || null;
+              if (!parentEl) return false;
+              var textNodes = Array.from(parentEl.childNodes).filter(isTextNode);
+              var _iterator = _createForOfIteratorHelper(textNodes),
+                _step;
+              try {
+                for (_iterator.s(); !(_step = _iterator.n()).done;) {
+                  var textNode = _step.value;
+                  if (textNode.textContent === ZERO_WIDTH_SPACE) {
+                    textNode.remove();
+                  } else if (textNode.textContent && textNode.textContent.includes(ZERO_WIDTH_SPACE)) {
+                    textNode.textContent = textNode.textContent.split(ZERO_WIDTH_SPACE).join('');
+                  }
+                }
+              } catch (err) {
+                _iterator.e(err);
+              } finally {
+                _iterator.f();
+              }
+              return false;
+            }
+          }
+        }
+      })];
+    }
   })];
 };
 export default TableExtension;

package/dist/index.css

@@ -14,6 +14,10 @@
   margin-top: 0 !important;
 }
 
+.tiptap.ProseMirror :last-child {
+  margin-bottom: 0 !important;
+}
+
 .tiptap.ProseMirror a {
   text-decoration: underline;
 }
@@ -25,7 +29,8 @@
   margin-bottom: 20px;
 }
 
-.tiptap.ProseMirror blockquote p {
+.tiptap.ProseMirror blockquote p,
+.tiptap.ProseMirror .node-alert p {
   margin: 0;
 }
 

package/dist/util/linewiseConvert.d.ts

@@ -13,8 +13,6 @@ export type LinewiseTarget = {
     type: 'taskList';
 } | {
     type: 'blockquote';
-} | {
-    type: 'codeBlock';
 } | {
     type: 'alert';
     attrs?: {

package/dist/util/linewiseConvert.js

@@ -124,11 +124,6 @@ export function buildNodeFromLines(editor, lines, target) {
         });
         return schema.nodes.blockquote.create(undefined, Fragment.fromArray(paragraphs));
       }
-    case 'codeBlock':
-      {
-        var text = lines.join('\n');
-        return schema.nodes.codeBlock.create(undefined, text ? schema.text(text) : undefined);
-      }
     case 'alert':
       {
         var attrs = target.attrs || {
@@ -154,17 +149,73 @@ export function buildNodeFromLines(editor, lines, target) {
   }
 }
 
+/**
+ * 通用替换与派发
+ */
+function replaceRange(editor, from, to, content) {
+  var tr = editor.state.tr;
+  tr.replaceWith(from, to, content);
+  editor.view.dispatch(tr);
+  editor.view.focus();
+}
+function isContainerNode(node) {
+  var name = node.type.name;
+  return name === 'blockquote' || name === 'alert';
+}
+function isContainerTarget(target) {
+  return target.type === 'blockquote' || target.type === 'alert';
+}
+function createContainerWithContent(editor, target, content) {
+  var schema = editor.schema;
+  if (target.type === 'blockquote') {
+    return schema.nodes.blockquote.create(undefined, content);
+  }
+  if (target.type === 'alert') {
+    var attrs = target.attrs || {
+      variant: 'info',
+      type: 'icon'
+    };
+    return schema.nodes.alert.create(attrs, content);
+  }
+  throw new Error('createContainerWithContent: invalid container target');
+}
+
 /**
  * 将给定位置的节点转换为目标类型（按行规则）。
  */
 export function convertNodeAt(editor, pos, node, target) {
-  var lines = extractLinesFromNode(node);
-  var replacement = buildNodeFromLines(editor, lines, target);
   var from = pos;
   var to = pos + node.nodeSize;
-  var tr = editor.state.tr;
-  // Fragment 或 Node 均可传入 replaceWith
-  tr.replaceWith(from, to, replacement);
-  editor.view.dispatch(tr);
-  editor.view.focus();
+  var nodeType = node.type.name;
+
+  // 规则 1：目标为容器（blockquote/alert）
+  if (isContainerTarget(target)) {
+    // 再次点击同容器 -> 拆包
+    if (target.type === 'blockquote' && nodeType === 'blockquote' || target.type === 'alert' && nodeType === 'alert') {
+      replaceRange(editor, from, to, node.content);
+      return;
+    }
+    // 容器互转：用内部内容构造目标容器，避免嵌套
+    var content = isContainerNode(node) ? node.content : Fragment.from(node);
+    var wrapper = createContainerWithContent(editor, target, content);
+    replaceRange(editor, from, to, wrapper);
+    return;
+  }
+
+  // 规则 2：当前为容器，且目标为非容器 -> 子节点逐个转换
+  if (isContainerNode(node)) {
+    var nodesToInsert = [];
+    node.forEach(function (child) {
+      var built = buildNodeFromLines(editor, extractLinesFromNode(child), target);
+      Fragment.from(built).forEach(function (n) {
+        nodesToInsert.push(n);
+      });
+    });
+    replaceRange(editor, from, to, Fragment.fromArray(nodesToInsert));
+    return;
+  }
+
+  // 其他：按行构建单节点替换
+  var replacement = buildNodeFromLines(editor, extractLinesFromNode(node), target);
+  replaceRange(editor, from, to, replacement);
 }

package/package.json

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

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

@@ -1,7 +0,0 @@
-import { Editor } from '@tiptap/react';
-import React from 'react';
-interface ListHoverProps {
-    editor: Editor;
-}
-declare const ListHover: ({ editor }: ListHoverProps) => React.JSX.Element | null;
-export default ListHover;