Open-source and local-first Slack and Notion alternative that puts you in control of your data
TypeScript chatchat-applicationcrdteditorelectronknowledge-baselocal-firstnotionnotion-alternativerealtime-collaborationself-hostedslacksqliteteam-collaborationwikiyjs
Fix drag and drop for inline databases (#181)
Hakan Shehub31684b7cdd6
diff --git a/packages/ui/src/editor/views/database.tsx b/packages/ui/src/editor/views/database.tsxindex 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 (- <NodeViewWrapper data-id={node.attrs.id} className="my-4 w-full">+ <NodeViewWrapper+ data-id={node.attrs.id}+ className="my-4 w-full"+ contentEditable={false}+ onDragStart={(e: React.DragEvent<HTMLDivElement>) => {+ e.stopPropagation();+ e.preventDefault();+ }}+ onDragOver={(e: React.DragEvent<HTMLDivElement>) => {+ e.preventDefault();+ e.stopPropagation();+ }}+ ><Database database={database} role={role}><DatabaseViews inline /></Database>@@ -39,7 +51,7 @@ export const DatabaseNodeView = ({ node }: NodeViewProps) => {return (<NodeViewWrapperdata-id={node.attrs.id}- className="my-0.5 w-full cursor-pointer flex-row items-center gap-1 rounded-md bg-gray-50 p-2 hover:bg-gray-100"+ className="my-0.5 flex h-12 w-full cursor-pointer flex-row items-center gap-1 rounded-md bg-gray-50 p-2 hover:bg-gray-100"onClick={() => {layout.previewLeft(id, true);}}diff --git a/packages/ui/src/lib/dnd-backend.ts b/packages/ui/src/lib/dnd-backend.tsindex 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/802const 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[]) => {