Files
paint-ui/components/canvas/canvas-with-tools.tsx
Sebastian Krüger 7f1e69559f feat(phase-8): implement comprehensive selection system with marching ants
This commit completes Phase 8 of the paint-ui implementation, adding a full
selection system with multiple selection tools, operations, and visual feedback.

**New Files:**
- types/selection.ts: Selection types, masks, and state interfaces
- lib/selection-utils.ts: Selection mask generation and manipulation algorithms
- lib/selection-operations.ts: Copy/cut/paste/delete/fill/stroke operations
- store/selection-store.ts: Selection state management with Zustand
- core/commands/selection-command.ts: Undo/redo commands for selections
- tools/rectangular-selection-tool.ts: Rectangular marquee selection
- tools/elliptical-selection-tool.ts: Elliptical marquee selection
- tools/lasso-selection-tool.ts: Free-form polygon selection
- tools/magic-wand-tool.ts: Color-based flood-fill selection
- components/selection/selection-panel.tsx: Complete selection UI panel
- components/selection/index.ts: Selection components barrel export

**Updated Files:**
- components/canvas/canvas-with-tools.tsx: Added selection tools integration and marching ants animation
- components/editor/editor-layout.tsx: Integrated SelectionPanel into layout
- store/index.ts: Added selection-store export
- store/canvas-store.ts: Renamed Selection to CanvasSelection to avoid conflicts
- tools/index.ts: Added selection tool exports
- types/index.ts: Added selection types export
- types/canvas.ts: Renamed Selection interface to CanvasSelection

**Selection Tools:**

**Marquee Tools:**
-  Rectangular Selection: Click-drag rectangular regions
-  Elliptical Selection: Click-drag elliptical regions

**Free-form Tools:**
-  Lasso Selection: Draw free-form polygon selections
-  Magic Wand: Color-based flood-fill selection with tolerance

**Selection Modes:**
- 🔷 New: Replace existing selection
-  Add: Add to existing selection
-  Subtract: Remove from existing selection
-  Intersect: Keep only overlapping areas

**Selection Operations:**
- 📋 Copy/Cut/Paste: Standard clipboard operations with selection mask
- 🗑️ Delete: Remove selected pixels
- 🎨 Fill Selection: Fill with current color
- 🖌️ Stroke Selection: Outline selection with current color
- 🔄 Invert Selection: Invert selected/unselected pixels
-  Clear Selection: Deselect all

**Technical Features:**
- Marching ants animation (animated dashed outline at 50ms interval)
- Selection masks using Uint8Array (0-255 values for anti-aliasing)
- Feathering support (0-250px gaussian blur on selection edges)
- Tolerance control for magic wand (0-255 color difference threshold)
- Scanline polygon fill algorithm for lasso tool
- Flood-fill with Set-based visited tracking for magic wand
- Selection bounds calculation for optimized operations
- Keyboard shortcuts (Ctrl+C, Ctrl+X, Ctrl+V, Ctrl+D, Ctrl+Shift+I)
- Undo/redo integration via selection commands
- Non-destructive operations with proper history tracking

**Algorithm Implementations:**
- Rectangular mask: Simple bounds-based pixel marking
- Elliptical mask: Distance formula from ellipse center
- Lasso mask: Scanline polygon fill with edge intersection
- Magic wand: BFS flood-fill with color tolerance matching
- Mask combination: Per-pixel operations (max, subtract, AND)
- Feathering: Separable box blur (horizontal + vertical passes)
- Mask inversion: Per-pixel NOT operation with bounds recalculation

**UI/UX Features:**
- 264px wide selection panel with all tools and operations
- Tool selection with visual feedback (highlighted active tool)
- Selection mode toggles (new/add/subtract/intersect)
- Feather and tolerance sliders with live value display
- Disabled state when no selection exists
- Keyboard shortcut hints next to operations
- Visual marching ants animation (animated dashes)

Build verified: ✓ Compiled successfully in 1302ms

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-21 02:24:12 +01:00

315 lines
8.9 KiB
TypeScript

'use client';
import { useEffect, useRef, useState } from 'react';
import { useCanvasStore, useLayerStore, useToolStore } from '@/store';
import { useHistoryStore } from '@/store/history-store';
import { useSelectionStore } from '@/store/selection-store';
import { drawMarchingAnts } from '@/lib/selection-utils';
import { getContext, drawGrid, drawCheckerboard } from '@/lib/canvas-utils';
import { DrawCommand } from '@/core/commands';
import {
PencilTool,
BrushTool,
EraserTool,
FillTool,
EyedropperTool,
RectangularSelectionTool,
EllipticalSelectionTool,
LassoSelectionTool,
MagicWandTool,
type BaseTool,
} from '@/tools';
import type { PointerState } from '@/types';
import { cn } from '@/lib/utils';
// Tool instances
const tools: Record<string, BaseTool> = {
pencil: new PencilTool(),
brush: new BrushTool(),
eraser: new EraserTool(),
fill: new FillTool(),
eyedropper: new EyedropperTool(),
select: new RectangularSelectionTool(),
'rectangular-select': new RectangularSelectionTool(),
'elliptical-select': new EllipticalSelectionTool(),
'lasso-select': new LassoSelectionTool(),
'magic-wand': new MagicWandTool(),
};
export function CanvasWithTools() {
const canvasRef = useRef<HTMLCanvasElement>(null);
const containerRef = useRef<HTMLDivElement>(null);
const drawCommandRef = useRef<DrawCommand | null>(null);
const {
width,
height,
zoom,
offsetX,
offsetY,
showGrid,
gridSize,
backgroundColor,
selection,
screenToCanvas,
} = useCanvasStore();
const { layers, getActiveLayer } = useLayerStore();
const { activeTool, settings } = useToolStore();
const { executeCommand } = useHistoryStore();
const { activeSelection, selectionType, isMarching } = useSelectionStore();
const [marchingOffset, setMarchingOffset] = useState(0);
const [isPanning, setIsPanning] = useState(false);
const [panStart, setPanStart] = useState({ x: 0, y: 0 });
const [pointer, setPointer] = useState<PointerState>({
isDown: false,
x: 0,
y: 0,
prevX: 0,
prevY: 0,
pressure: 1,
});
// Render canvas
useEffect(() => {
const canvas = canvasRef.current;
if (!canvas) return;
const ctx = getContext(canvas);
const container = containerRef.current;
if (!container) return;
// Set canvas size to match container
const rect = container.getBoundingClientRect();
canvas.width = rect.width;
canvas.height = rect.height;
// Clear canvas
ctx.clearRect(0, 0, canvas.width, canvas.height);
// Save context state
ctx.save();
// Apply transformations
ctx.translate(offsetX + canvas.width / 2, offsetY + canvas.height / 2);
ctx.scale(zoom, zoom);
ctx.translate(-width / 2, -height / 2);
// Draw checkerboard background
drawCheckerboard(ctx, 10, '#ffffff', '#e0e0e0');
// Draw background color if not transparent
if (backgroundColor && backgroundColor !== 'transparent') {
ctx.fillStyle = backgroundColor;
ctx.fillRect(0, 0, width, height);
}
// Draw all visible layers
layers
.filter((layer) => layer.visible && layer.canvas)
.sort((a, b) => a.order - b.order)
.forEach((layer) => {
if (!layer.canvas) return;
ctx.globalAlpha = layer.opacity;
ctx.globalCompositeOperation = layer.blendMode as GlobalCompositeOperation;
ctx.drawImage(layer.canvas, layer.x, layer.y);
});
// Reset composite operation
ctx.globalAlpha = 1;
ctx.globalCompositeOperation = 'source-over';
// Draw grid if enabled
if (showGrid) {
drawGrid(ctx, gridSize, 'rgba(0, 0, 0, 0.15)');
}
// Draw selection if active (marching ants)
if (activeSelection && isMarching) {
drawMarchingAnts(ctx, activeSelection.mask, marchingOffset);
}
// Restore context state
ctx.restore();
}, [layers, width, height, zoom, offsetX, offsetY, showGrid, gridSize, backgroundColor, selection, pointer, activeSelection, isMarching, marchingOffset]);
// Marching ants animation
useEffect(() => {
if (!activeSelection || !isMarching) return;
const interval = setInterval(() => {
setMarchingOffset((prev) => (prev + 1) % 8);
}, 50);
return () => clearInterval(interval);
}, [activeSelection, isMarching]);
// Handle mouse wheel for zooming
const handleWheel = (e: React.WheelEvent) => {
if (e.ctrlKey || e.metaKey) {
e.preventDefault();
const { zoomIn, zoomOut } = useCanvasStore.getState();
if (e.deltaY < 0) {
zoomIn();
} else {
zoomOut();
}
}
};
// Handle pointer down
const handlePointerDown = (e: React.PointerEvent) => {
const rect = canvasRef.current?.getBoundingClientRect();
if (!rect) return;
const screenX = e.clientX - rect.left;
const screenY = e.clientY - rect.top;
const canvasPos = screenToCanvas(screenX, screenY);
// Check for panning
if (e.button === 1 || (e.button === 0 && e.shiftKey)) {
setIsPanning(true);
setPanStart({ x: e.clientX - offsetX, y: e.clientY - offsetY });
e.preventDefault();
return;
}
// Selection tools
const selectionTools = ['select', 'rectangular-select', 'elliptical-select', 'lasso-select', 'magic-wand'];
if (e.button === 0 && !e.shiftKey && selectionTools.includes(activeTool)) {
const activeLayer = getActiveLayer();
if (!activeLayer || !activeLayer.canvas) return;
const tool = tools[`${selectionType}-select`] || tools['select'];
const newPointer: PointerState = {
isDown: true,
x: canvasPos.x,
y: canvasPos.y,
prevX: canvasPos.x,
prevY: canvasPos.y,
pressure: e.pressure || 1,
};
setPointer(newPointer);
const ctx = activeLayer.canvas.getContext('2d');
if (ctx) {
tool.onPointerDown(newPointer, ctx, settings);
}
return;
}
// Drawing tools
if (e.button === 0 && !e.shiftKey && ['pencil', 'brush', 'eraser', 'fill', 'eyedropper'].includes(activeTool)) {
const activeLayer = getActiveLayer();
if (!activeLayer || !activeLayer.canvas || activeLayer.locked) return;
const newPointer: PointerState = {
isDown: true,
x: canvasPos.x,
y: canvasPos.y,
prevX: canvasPos.x,
prevY: canvasPos.y,
pressure: e.pressure || 1,
};
setPointer(newPointer);
// Create draw command for history
drawCommandRef.current = new DrawCommand(activeLayer.id, tools[activeTool].name);
// Call tool's onPointerDown
const ctx = activeLayer.canvas.getContext('2d');
if (ctx) {
tools[activeTool].onPointerDown(newPointer, ctx, settings);
}
}
};
// Handle pointer move
const handlePointerMove = (e: React.PointerEvent) => {
const rect = canvasRef.current?.getBoundingClientRect();
if (!rect) return;
const screenX = e.clientX - rect.left;
const screenY = e.clientY - rect.top;
const canvasPos = screenToCanvas(screenX, screenY);
// Panning
if (isPanning) {
const { setPanOffset } = useCanvasStore.getState();
setPanOffset(e.clientX - panStart.x, e.clientY - panStart.y);
return;
}
// Drawing
if (pointer.isDown && ['pencil', 'brush', 'eraser', 'eyedropper'].includes(activeTool)) {
const activeLayer = getActiveLayer();
if (!activeLayer || !activeLayer.canvas) return;
const newPointer: PointerState = {
...pointer,
x: canvasPos.x,
y: canvasPos.y,
pressure: e.pressure || 1,
};
setPointer(newPointer);
const ctx = activeLayer.canvas.getContext('2d');
if (ctx) {
tools[activeTool].onPointerMove(newPointer, ctx, settings);
}
}
};
// Handle pointer up
const handlePointerUp = (e: React.PointerEvent) => {
if (isPanning) {
setIsPanning(false);
return;
}
if (pointer.isDown && ['pencil', 'brush', 'eraser', 'fill', 'eyedropper'].includes(activeTool)) {
const activeLayer = getActiveLayer();
if (!activeLayer || !activeLayer.canvas) return;
const ctx = activeLayer.canvas.getContext('2d');
if (ctx) {
tools[activeTool].onPointerUp(pointer, ctx, settings);
}
// Capture after state and add to history
if (drawCommandRef.current) {
drawCommandRef.current.captureAfterState();
executeCommand(drawCommandRef.current);
drawCommandRef.current = null;
}
setPointer({ ...pointer, isDown: false });
}
};
return (
<div
ref={containerRef}
className={cn(
'relative h-full w-full overflow-hidden bg-canvas-bg',
isPanning ? 'cursor-grabbing' : `cursor-${tools[activeTool]?.getCursor(settings) || 'default'}`
)}
onWheel={handleWheel}
onPointerDown={handlePointerDown}
onPointerMove={handlePointerMove}
onPointerUp={handlePointerUp}
onPointerLeave={handlePointerUp}
>
<canvas
ref={canvasRef}
className="absolute inset-0"
/>
</div>
);
}