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 in editor
Hakan Shehuc96592802277
diff --git a/apps/desktop/src/renderer/editor/menus/action-menu.tsx b/apps/desktop/src/renderer/editor/menus/action-menu.tsxindex b08838a9..ac0ac83c 100644--- a/apps/desktop/src/renderer/editor/menus/action-menu.tsx+++ b/apps/desktop/src/renderer/editor/menus/action-menu.tsx@@ -1,4 +1,4 @@-import { useFloating, shift, offset } from '@floating-ui/react';+import { useFloating, shift, offset, FloatingPortal } from '@floating-ui/react';import { GripVertical, Plus } from 'lucide-react';import { useState, useEffect, useRef } from 'react';import { Node as ProseMirrorNode } from '@tiptap/pm/model';@@ -163,62 +163,64 @@ export const ActionMenu = ({ editor }: ActionMenuProps) => {}return (- <div- ref={refs.setFloating}- style={floatingStyles}- className="flex items-center text-muted-foreground p-1 mr-2"- >- <Plus- className="size-4 cursor-pointer hover:text-primary"- onClick={() => {- if (menuState.pos === undefined || !menuState.domNode) {- return;- }-- editor- .chain()- .insertContentAt(menuState.pos, { type: 'paragraph' })- .focus()- .run();- }}- />+ <FloatingPortal><div- draggable={true}- onDragStart={(event) => {- if (menuState.pos === undefined || !menuState.domNode) {- return;- }-- view.current.focus();- view.current.dispatch(- view.current.state.tr.setSelection(- NodeSelection.create(view.current.state.doc, menuState.pos)- )- );-- const slice = view.current.state.selection.content();- const { dom, text } = __serializeForClipboard(view.current, slice);-- event.dataTransfer.clearData();- event.dataTransfer.effectAllowed = 'copyMove';- event.dataTransfer.setData('text/html', dom.innerHTML);- event.dataTransfer.setData('text/plain', text);- event.dataTransfer.setDragImage(menuState.domNode, 0, 0);-- view.current.dragging = { slice, move: true };- }}- onDragEnd={() => {- view.current.dispatch(- view.current.state.tr.setSelection(- TextSelection.create(view.current.state.doc, 1)- )- );-- view.current.dom.blur();- }}+ ref={refs.setFloating}+ style={floatingStyles}+ className="flex items-center text-muted-foreground p-1 mr-2">- <GripVertical className="size-4 cursor-pointer hover:text-primary" />+ <Plus+ className="size-4 cursor-pointer hover:text-primary"+ onClick={() => {+ if (menuState.pos === undefined || !menuState.domNode) {+ return;+ }++ editor+ .chain()+ .insertContentAt(menuState.pos, { type: 'paragraph' })+ .focus()+ .run();+ }}+ />+ <div+ draggable={true}+ onDragStart={(event) => {+ if (menuState.pos === undefined || !menuState.domNode) {+ return;+ }++ view.current.focus();+ view.current.dispatch(+ view.current.state.tr.setSelection(+ NodeSelection.create(view.current.state.doc, menuState.pos)+ )+ );++ const slice = view.current.state.selection.content();+ const { dom, text } = __serializeForClipboard(view.current, slice);++ event.dataTransfer.clearData();+ event.dataTransfer.effectAllowed = 'copyMove';+ event.dataTransfer.setData('text/html', dom.innerHTML);+ event.dataTransfer.setData('text/plain', text);+ event.dataTransfer.setDragImage(menuState.domNode, 0, 0);++ view.current.dragging = { slice, move: true };+ }}+ onDragEnd={() => {+ view.current.dispatch(+ view.current.state.tr.setSelection(+ TextSelection.create(view.current.state.doc, 1)+ )+ );++ view.current.dom.blur();+ }}+ >+ <GripVertical className="size-4 cursor-pointer hover:text-primary" />+ </div></div>- </div>+ </FloatingPortal>);};diff --git a/apps/desktop/src/renderer/root.tsx b/apps/desktop/src/renderer/root.tsxindex 815752d4..1397b86e 100644--- a/apps/desktop/src/renderer/root.tsx+++ b/apps/desktop/src/renderer/root.tsx@@ -3,10 +3,10 @@ import '@/renderer/styles/index.css';import { QueryClient, QueryClientProvider } from '@tanstack/react-query';import React from 'react';import { DndProvider } from 'react-dnd';-import { HTML5Backend } from 'react-dnd-html5-backend';import { createRoot } from 'react-dom/client';import { createHashRouter, RouterProvider } from 'react-router-dom';+import { HTML5Backend } from '@/shared/lib/dnd-backend';import { App } from '@/renderer/app';import { Account } from '@/renderer/components/accounts/account';import { AccountRedirect } from '@/renderer/components/accounts/account-redirect';diff --git a/apps/desktop/src/shared/lib/dnd-backend.ts b/apps/desktop/src/shared/lib/dnd-backend.tsnew file mode 100644index 00000000..7c4b4b77--- /dev/null+++ b/apps/desktop/src/shared/lib/dnd-backend.ts@@ -0,0 +1,40 @@+import { HTML5Backend as ReactDndHTML5Backend } from 'react-dnd-html5-backend';++// We need to create a modified version of the HTML5Backend that ignores+// events that are part of the ProseMirror editor, because it intercepts+// them and causes issues with the drag and drop in the editor.++// For more information, see:+// https://github.com/react-dnd/react-dnd/issues/802++const shouldIgnoreTarget = (domNode: HTMLElement) => {+ return domNode.closest('.ProseMirror');+};++export const HTML5Backend = (...args: unknown[]) => {+ // @ts-expect-error - HTML5Backend is not typed+ const instance = new ReactDndHTML5Backend(...args);++ const listeners = [+ 'handleTopDragStart',+ 'handleTopDragStartCapture',+ 'handleTopDragEndCapture',+ 'handleTopDragEnter',+ 'handleTopDragEnterCapture',+ 'handleTopDragLeaveCapture',+ 'handleTopDragOver',+ 'handleTopDragOverCapture',+ 'handleTopDrop',+ 'handleTopDropCapture',+ ];+ listeners.forEach((name) => {+ const original = instance[name];+ instance[name] = (e: Event, ...extraArgs: unknown[]) => {+ if (!shouldIgnoreTarget(e.target as HTMLElement)) {+ original(e, ...extraArgs);+ }+ };+ });++ return instance;+};