Skip to content

The open alternative to Salesforce, designed for AI.

fix(ai-chat) - fix AI chat drop zone flickering while dragging over its own content (#25307)

Etienne3c828606fedb
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatTab.tsx b/packages/twenty-front/src/modules/ai/components/AiChatTab.tsx
index ed13633a4cd..34f716c69c9 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatTab.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatTab.tsx
@@ -1,5 +1,5 @@
import { styled } from '@linaria/react';
-import { useState } from 'react';
+import { type DragEvent, useState } from 'react';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { DropZone } from '@/activities/files/components/DropZone';
@@ -40,11 +40,29 @@ export const AiChatTab = () => {
const { uploadFiles } = useAiChatFileUpload();
+ const handleDragLeave = (event: DragEvent<HTMLDivElement>) => {
+ if (
+ event.relatedTarget instanceof Node &&
+ event.currentTarget.contains(event.relatedTarget)
+ ) {
+ return;
+ }
+
+ setIsDraggingFile(false);
+ };
+
+ const handleDrop = (event: DragEvent<HTMLDivElement>) => {
+ event.preventDefault();
+ setIsDraggingFile(false);
+ };
+
return (
<StyledContainer
isDraggingFile={isDraggingFile}
onDragEnter={() => setIsDraggingFile(true)}
- onDragLeave={() => setIsDraggingFile(false)}
+ onDragLeave={handleDragLeave}
+ onDragOver={(event) => event.preventDefault()}
+ onDrop={handleDrop}
>
<AgentChatHasBeenOpenedEffect />
<AgentChatStreamingPartsDiffSyncEffect />