diff --git a/packages/ui/src/editor/views/database.tsx b/packages/ui/src/editor/views/database.tsx index b8940cab..9f0e1073 100644 --- a/packages/ui/src/editor/views/database.tsx +++ b/packages/ui/src/editor/views/database.tsx @@ -25,7 +25,19 @@ export const DatabaseNodeView = ({ node }: NodeViewProps) => { const { node: database, role } = data; if (node.attrs.inline) { return ( - + ) => { + e.stopPropagation(); + e.preventDefault(); + }} + onDragOver={(e: React.DragEvent) => { + e.preventDefault(); + e.stopPropagation(); + }} + > @@ -39,7 +51,7 @@ export const DatabaseNodeView = ({ node }: NodeViewProps) => { return ( { layout.previewLeft(id, true); }} diff --git a/packages/ui/src/lib/dnd-backend.ts b/packages/ui/src/lib/dnd-backend.ts index 7c4b4b77..b42d16ad 100644 --- a/packages/ui/src/lib/dnd-backend.ts +++ b/packages/ui/src/lib/dnd-backend.ts @@ -8,7 +8,12 @@ import { HTML5Backend as ReactDndHTML5Backend } from 'react-dnd-html5-backend'; // https://github.com/react-dnd/react-dnd/issues/802 const shouldIgnoreTarget = (domNode: HTMLElement) => { - return domNode.closest('.ProseMirror'); + const hasProseMirror = domNode.closest('.ProseMirror'); + if (hasProseMirror) { + return !domNode.closest('.react-renderer.node-database'); + } + + return false; }; export const HTML5Backend = (...args: unknown[]) => {