@ctzhian/tiptap 1.6.9 → 1.6.10

package/dist/component/CustomDragHandle/index.js

@@ -23,7 +23,7 @@ import { Box, Divider, Stack, Typography, useTheme } from '@mui/material';
 import DragHandle from '@tiptap/extension-drag-handle-react';
 import { Fragment, Slice } from '@tiptap/pm/model';
 import { NodeSelection } from '@tiptap/pm/state';
-import React, { useCallback, useState } from 'react';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { convertNodeAt, downloadFiles, filterResourcesByType, getAllResources, getShortcutKeyText } from "../../util";
 import Menu from "../Menu";
 import { ToolbarItem } from "../Toolbar";
@@ -122,6 +122,105 @@ var CustomDragHandle = function CustomDragHandle(_ref3) {
     _useState8 = _slicedToArray(_useState7, 2),
     currentNode = _useState8[0],
     setCurrentNode = _useState8[1];
+
+  // 利用插件支持的元信息，在捕获阶段锁定/解锁拖拽句柄，避免在行内/无效区域触发内部 posAtDOM 计算
+  var lockedRef = useRef(true);
+  useEffect(function () {
+    if (!editor || editor !== null && editor !== void 0 && editor.isDestroyed) return;
+    var disposed = false;
+    var cleanup = null;
+    var onMouseMoveCapture = function onMouseMoveCapture(e) {
+      if (!editor.isEditable) return;
+      var viewAny;
+      var root;
+      try {
+        var _viewAny;
+        viewAny = editor.view;
+        root = (_viewAny = viewAny) === null || _viewAny === void 0 ? void 0 : _viewAny.dom;
+      } catch (_unused) {
+        return;
+      }
+      if (!root) return;
+      var el = document.elementFromPoint(e.clientX, e.clientY);
+      if (!el) return;
+      var cur = el;
+      var allowed = false;
+      while (cur && root.contains(cur)) {
+        var _desc$node;
+        var desc = cur.pmViewDesc;
+        if (desc !== null && desc !== void 0 && (_desc$node = desc.node) !== null && _desc$node !== void 0 && _desc$node.isBlock) {
+          allowed = true;
+          break;
+        }
+        if (cur.hasAttribute && cur.hasAttribute('data-drag-handle')) {
+          allowed = true;
+          break;
+        }
+        cur = cur.parentElement;
+      }
+      var shouldLock = !allowed;
+      if (shouldLock !== lockedRef.current) {
+        lockedRef.current = shouldLock;
+        try {
+          var _viewAny2, _viewAny2$dispatch;
+          var tr = editor.state.tr.setMeta('lockDragHandle', shouldLock);
+          if (shouldLock) tr.setMeta('hideDragHandle', true);
+          (_viewAny2 = viewAny) === null || _viewAny2 === void 0 || (_viewAny2$dispatch = _viewAny2.dispatch) === null || _viewAny2$dispatch === void 0 || _viewAny2$dispatch.call(_viewAny2, tr);
+        } catch (_unused2) {}
+      }
+    };
+    var bind = function bind() {
+      if (disposed) return false;
+      var viewAny;
+      var root;
+      try {
+        var _viewAny3;
+        viewAny = editor.view;
+        root = (_viewAny3 = viewAny) === null || _viewAny3 === void 0 ? void 0 : _viewAny3.dom;
+      } catch (_unused3) {
+        return false;
+      }
+      if (!root) return false;
+      try {
+        var _viewAny4, _viewAny4$dispatch;
+        lockedRef.current = true;
+        var tr0 = editor.state.tr.setMeta('lockDragHandle', true).setMeta('hideDragHandle', true);
+        (_viewAny4 = viewAny) === null || _viewAny4 === void 0 || (_viewAny4$dispatch = _viewAny4.dispatch) === null || _viewAny4$dispatch === void 0 || _viewAny4$dispatch.call(_viewAny4, tr0);
+      } catch (_unused4) {}
+      root.addEventListener('mousemove', onMouseMoveCapture, {
+        capture: true
+      });
+      cleanup = function cleanup() {
+        root && root.removeEventListener('mousemove', onMouseMoveCapture, {
+          capture: true
+        });
+      };
+      return true;
+    };
+    if (!bind()) {
+      var onCreate = function onCreate() {
+        bind();
+      };
+      try {
+        var _on, _ref4;
+        (_on = (_ref4 = editor).on) === null || _on === void 0 || _on.call(_ref4, 'create', onCreate);
+      } catch (_unused5) {}
+      return function () {
+        var _cleanup;
+        disposed = true;
+        try {
+          var _off, _ref5;
+          (_off = (_ref5 = editor).off) === null || _off === void 0 || _off.call(_ref5, 'create', onCreate);
+        } catch (_unused6) {}
+        (_cleanup = cleanup) === null || _cleanup === void 0 || _cleanup();
+      };
+    }
+    return function () {
+      var _cleanup2;
+      disposed = true;
+      (_cleanup2 = cleanup) === null || _cleanup2 === void 0 || _cleanup2();
+    };
+  }, [editor]);
   var THEME_TEXT_COLOR = [{
     label: '默认色',
     value: theme.palette.text.primary
@@ -240,9 +339,9 @@ 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;
+  var shouldShowButton = function shouldShowButton(_ref6) {
+    var editor = _ref6.editor,
+      data = _ref6.data;
     if (!editor || !editor.isEditable) return false;
     var currentNode = data.node;
     var empty = (currentNode === null || currentNode === void 0 ? void 0 : currentNode.textContent) === '';

package/package.json

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