Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
{
"title": "scribl",
"width": 800,
"height": 600
"height": 600,
"dragDropEnabled": false
}
],
"security": {
Expand Down
18 changes: 17 additions & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ export function App() {
return;
}
e.preventDefault();
paste();
paste(e.clipboardData);
};

window.addEventListener('copy', handleCopy);
Expand All @@ -155,6 +155,22 @@ export function App() {
};
}, []);

// Prevent default browser dragover/drop navigation behavior across window
useEffect(() => {
const handleDragOver = (e: DragEvent) => {
e.preventDefault();
};
const handleDrop = (e: DragEvent) => {
e.preventDefault();
};
window.addEventListener('dragover', handleDragOver);
window.addEventListener('drop', handleDrop);
return () => {
window.removeEventListener('dragover', handleDragOver);
window.removeEventListener('drop', handleDrop);
};
}, []);

const handleSave = () => {
const doc = useDocumentStore.getState();
const camera = useCameraStore.getState().camera;
Expand Down
29 changes: 29 additions & 0 deletions src/AppImportIntegration.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,33 @@ describe('App Import Integration', () => {
expect(screen.getByText(/1 unsupported items \(note\) were discarded/i)).toBeTruthy();
});
});

it('imports dropped image file directly into canvas as an ImageElement', async () => {
const { container } = render(<App />);
const viewport = container.querySelector('[data-testid="canvas-viewport"]');
expect(viewport).toBeTruthy();

const fakeBlob = new Blob(['fakepngbytes'], { type: 'image/png' });
const imageFile = new File([fakeBlob], 'mockup.png', { type: 'image/png' });

fireEvent.drop(viewport!, {
dataTransfer: {
files: [imageFile],
types: ['Files'],
},
clientX: 400,
clientY: 300,
});

await vi.waitFor(() => {
const doc = useDocumentStore.getState();
expect(doc.elementIds.length).toBe(1);
const el = doc.elements[doc.elementIds[0]];
expect(el.type).toBe('image');
if (el.type === 'image') {
expect(el.fileName).toBe('mockup.png');
expect(el.mimeType).toBe('image/png');
}
});
});
});
182 changes: 99 additions & 83 deletions src/components/canvas/CanvasViewport.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import React, { useEffect, useRef, useState } from 'react';
import { screenToWorld, worldToScreen } from '../../core/camera/cameraMath';
import { renderCommittedCanvas } from '../../core/engine/CanvasRenderer';
import { createImageElementFromBlob } from '../../core/clipboard/clipboard';
import { imageCache, renderCommittedCanvas } from '../../core/engine/CanvasRenderer';
import { ScratchRenderer } from '../../core/engine/ScratchRenderer';
import {
computeSelectionBounds,
HandleType,
hitTestHandles,
} from '../../core/geometry/transformMath';
import { applyElementDelta } from '../../core/history/commands';
import { PointerRouter } from '../../core/input/PointerRouter';
import { MarqueeBox } from '../../core/input/ToolFSM';
import { importDrawingDocument } from '../../core/persistence/importers';
Expand Down Expand Up @@ -53,6 +55,14 @@ export const CanvasViewport: React.FC<CanvasViewportProps> = ({ onImportNotifica
const [isRotateKeyHeld, setIsRotateKeyHeld] = useState(false);
const [hoveredHandle, setHoveredHandle] = useState<HandleType | null>(null);
const [isDraggingFile, setIsDraggingFile] = useState(false);
const [imageTick, setImageTick] = useState(0);

// Subscribe to image decoding loads to re-render committed canvas
useEffect(() => {
return imageCache.subscribe(() => {
setImageTick((t) => t + 1);
});
}, []);

const scratchRendererRef = useRef<ScratchRenderer>(new ScratchRenderer());
const pointerRouterRef = useRef<PointerRouter | null>(null);
Expand Down Expand Up @@ -174,7 +184,7 @@ export const CanvasViewport: React.FC<CanvasViewportProps> = ({ onImportNotifica
editingText?.elementId,
themeMode,
);
}, [elements, elementIds, camera, width, height, editingText?.elementId, themeMode]);
}, [elements, elementIds, camera, width, height, editingText?.elementId, themeMode, imageTick]);

// Mouse wheel zoom
const handleWheel = (e: React.WheelEvent) => {
Expand Down Expand Up @@ -239,103 +249,109 @@ export const CanvasViewport: React.FC<CanvasViewportProps> = ({ onImportNotifica
}
};

const handleDrop = (e: React.DragEvent) => {
const handleDrop = async (e: React.DragEvent) => {
e.preventDefault();
setIsDraggingFile(false);

const file = e.dataTransfer.files?.[0];
if (!file) return;
const files = Array.from(e.dataTransfer.files || []);
if (files.length === 0) return;

const reader = new FileReader();
reader.onload = (event) => {
try {
const text = event.target?.result as string;
const result = importDrawingDocument(text, file.name);
useToolStore.getState().setTool('select');

if (result.elements.length === 0) {
if (result.discardedCount > 0) {
const rect = containerRef.current?.getBoundingClientRect();
const screenX = rect ? e.clientX - rect.left : e.clientX;
const screenY = rect ? e.clientY - rect.top : e.clientY;
const dropWorld = screenToWorld(screenX, screenY, camera, width, height);

let imageOffset = 0;

for (const file of files) {
const isImage = file.type.startsWith('image/')
|| /\.(png|jpe?g|webp|svg|gif|avif|bmp|ico)$/i.test(file.name);

if (isImage) {
const offsetPos = {
x: dropWorld.x + imageOffset * 24,
y: dropWorld.y + imageOffset * 24,
};
try {
const success = await createImageElementFromBlob(file, offsetPos, file.name);
if (success) {
onImportNotification?.({
id: String(Date.now()),
type: 'warning',
message: `No supported elements found in ${file.name}`,
details: `${result.discardedCount} unsupported items (${
result.discardedTypes.join(', ')
}) were discarded.`,
type: 'success',
message: `Imported image ${file.name}`,
});
}
return;
} catch (err) {
onImportNotification?.({
id: String(Date.now()),
type: 'error',
message: `Failed to import image ${file.name}`,
details: err instanceof Error ? err.message : String(err),
});
}
imageOffset++;
continue;
}

// Compute drop position in world coordinates
const rect = containerRef.current?.getBoundingClientRect();
const screenX = rect ? e.clientX - rect.left : e.clientX;
const screenY = rect ? e.clientY - rect.top : e.clientY;
const dropWorld = screenToWorld(screenX, screenY, camera, width, height);

// Center elements at drop position
const origCenterX = (result.bounds.minX + result.bounds.maxX) / 2;
const origCenterY = (result.bounds.minY + result.bounds.maxY) / 2;
const dx = dropWorld.x - origCenterX;
const dy = dropWorld.y - origCenterY;

const translatedElements = result.elements.map((el) => {
if (el.type === 'stroke') {
return {
...el,
x: el.x + dx,
y: el.y + dy,
points: el.points.map((pt) => ({ ...pt, x: pt.x + dx, y: pt.y + dy })),
};
} else if (el.type === 'shape') {
return {
...el,
x: el.x + dx,
y: el.y + dy,
startPoint: el.startPoint
? { x: el.startPoint.x + dx, y: el.startPoint.y + dy }
: undefined,
endPoint: el.endPoint
? { x: el.endPoint.x + dx, y: el.endPoint.y + dy }
: undefined,
};
} else if (el.type === 'text') {
return {
...el,
x: el.x + dx,
y: el.y + dy,
};
const reader = new FileReader();
reader.onload = (event) => {
try {
const text = event.target?.result as string;
const result = importDrawingDocument(text, file.name);

if (result.elements.length === 0) {
if (result.discardedCount > 0) {
onImportNotification?.({
id: String(Date.now()),
type: 'warning',
message: `No supported elements found in ${file.name}`,
details: `${result.discardedCount} unsupported items (${
result.discardedTypes.join(', ')
}) were discarded.`,
});
}
return;
}
return el;
});

useDocumentStore.getState().insertElements(translatedElements);
// Center elements at drop position
const origCenterX = (result.bounds.minX + result.bounds.maxX) / 2;
const origCenterY = (result.bounds.minY + result.bounds.maxY) / 2;
const dx = dropWorld.x - origCenterX;
const dy = dropWorld.y - origCenterY;

if (result.discardedCount > 0) {
onImportNotification?.({
id: String(Date.now()),
type: 'warning',
message: `Imported ${result.elements.length} elements from ${file.name}`,
details: `${result.discardedCount} unsupported items (${
result.discardedTypes.join(', ')
}) were discarded.`,
});
} else {
const translatedElements = result.elements.map((el) => applyElementDelta(el, dx, dy));

useDocumentStore.getState().insertElements(translatedElements);

if (result.discardedCount > 0) {
onImportNotification?.({
id: String(Date.now()),
type: 'warning',
message: `Imported ${result.elements.length} elements from ${file.name}`,
details: `${result.discardedCount} unsupported items (${
result.discardedTypes.join(', ')
}) were discarded.`,
});
} else {
onImportNotification?.({
id: String(Date.now()),
type: 'success',
message: `Imported ${result.elements.length} elements from ${file.name}`,
});
}
} catch (err) {
onImportNotification?.({
id: String(Date.now()),
type: 'success',
message: `Imported ${result.elements.length} elements from ${file.name}`,
type: 'error',
message: `Failed to import ${file.name}`,
details: err instanceof Error ? err.message : String(err),
});
}
} catch (err) {
onImportNotification?.({
id: String(Date.now()),
type: 'error',
message: `Failed to import ${file.name}`,
details: err instanceof Error ? err.message : String(err),
});
}
};
reader.readAsText(file);
};
reader.readAsText(file);
}
};

const dpr = window.devicePixelRatio || 1;
Expand Down Expand Up @@ -495,7 +511,7 @@ export const CanvasViewport: React.FC<CanvasViewportProps> = ({ onImportNotifica
color: 'var(--color-text-primary, #f8fafc)',
}}
>
Drop drawing to insert
Drop image or drawing to insert
</p>
<p
style={{
Expand All @@ -504,7 +520,7 @@ export const CanvasViewport: React.FC<CanvasViewportProps> = ({ onImportNotifica
color: 'var(--color-text-secondary, #94a3b8)',
}}
>
Supports .scribl, .excalidraw, and .tldr files
Supports images (PNG, JPG, SVG, WebP) and drawings (.scribl, .excalidraw, .tldr)
</p>
</div>
</div>
Expand Down
63 changes: 63 additions & 0 deletions src/components/canvas/CanvasViewportDragDrop.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,67 @@ describe('CanvasViewport Drag and Drop', () => {
}),
);
});

it('imports dropped image file and creates an ImageElement', async () => {
render(<CanvasViewport />);
const viewport = screen.getByTestId('canvas-viewport');

const imageFile = new File(['fake-png-binary-data'], 'test-image.png', {
type: 'image/png',
});

fireEvent.drop(viewport, {
clientX: 300,
clientY: 300,
dataTransfer: {
files: [imageFile],
},
});

await vi.waitFor(() => {
const doc = useDocumentStore.getState();
const imageEl = Object.values(doc.elements).find((el) => el.type === 'image');
expect(imageEl).toBeDefined();
expect(imageEl?.type).toBe('image');
expect((imageEl as any)?.fileName).toBe('test-image.png');
});
});

it('imports image, erases it, then imports another image', async () => {
render(<CanvasViewport />);
const viewport = screen.getByTestId('canvas-viewport');

const file1 = new File(['fake-png-1'], 'image-1.png', { type: 'image/png' });
fireEvent.drop(viewport, {
clientX: 300,
clientY: 300,
dataTransfer: { files: [file1] },
});

let firstImageId = '';
await vi.waitFor(() => {
const doc = useDocumentStore.getState();
const img = Object.values(doc.elements).find((el) => el.type === 'image');
expect(img).toBeDefined();
firstImageId = img!.id;
});

// Erase the first image
useDocumentStore.getState().deleteElements([firstImageId]);
expect(useDocumentStore.getState().elements[firstImageId]).toBeUndefined();

// Now drop second image
const file2 = new File(['fake-png-2'], 'image-2.png', { type: 'image/png' });
fireEvent.drop(viewport, {
clientX: 400,
clientY: 400,
dataTransfer: { files: [file2] },
});

await vi.waitFor(() => {
const doc = useDocumentStore.getState();
const img = Object.values(doc.elements).find((el) => (el as any).fileName === 'image-2.png');
expect(img).toBeDefined();
});
});
});
Loading
Loading