feat: implement Phase 2 - Core Canvas Engine with layer system
Complete canvas rendering infrastructure and state management: **Type System (types/)** - Layer interface with blend modes, opacity, visibility - Canvas state with zoom, pan, grid, rulers - Tool types and settings interfaces - Selection and pointer state types **State Management (store/)** - Layer store: CRUD operations, reordering, merging, flattening - Canvas store: zoom (0.1x-10x), pan, grid, rulers, coordinate conversion - Tool store: active tool, brush settings (size, opacity, hardness, flow) - Full Zustand integration with selectors **Utilities (lib/)** - Canvas utils: create, clone, resize, load images, draw grid/checkerboard - General utils: cn, clamp, lerp, distance, snap to grid, debounce, throttle - Image data handling with error safety **Components** - CanvasWrapper: Multi-layer rendering with transformations - Checkerboard transparency background - Layer compositing with blend modes and opacity - Grid overlay support - Selection visualization - Mouse wheel zoom (Ctrl+scroll) - Middle-click or Shift+click panning - LayersPanel: Interactive layer management - Visibility toggle with eye icon - Active layer selection - Opacity display - Delete with confirmation - Sorted by z-order - EditorLayout: Full editor interface - Top toolbar with zoom controls (±, fit to screen, percentage) - Canvas area with full viewport - Right sidebar for layers panel - "New Layer" button with auto-naming **Features Implemented** ✓ Multi-layer canvas with proper z-ordering ✓ Layer visibility, opacity, blend modes ✓ Zoom: 10%-1000% with Ctrl+wheel ✓ Pan: Middle-click or Shift+drag ✓ Grid overlay (toggleable) ✓ Selection rendering ✓ Background color support ✓ Create/delete/duplicate layers ✓ Layer merging and flattening **Performance** - Dev server: 451ms startup - Efficient canvas rendering with transformations - Debounced/throttled event handlers ready - Memory-safe image data operations Ready for Phase 3: History & Undo System 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
150
components/canvas/canvas-wrapper.tsx
Normal file
150
components/canvas/canvas-wrapper.tsx
Normal file
@@ -0,0 +1,150 @@
|
||||
'use client';
|
||||
|
||||
import { useEffect, useRef, useState } from 'react';
|
||||
import { useCanvasStore, useLayerStore } from '@/store';
|
||||
import { getContext, drawGrid, drawCheckerboard } from '@/lib/canvas-utils';
|
||||
import { cn } from '@/lib/utils';
|
||||
|
||||
export function CanvasWrapper() {
|
||||
const canvasRef = useRef<HTMLCanvasElement>(null);
|
||||
const containerRef = useRef<HTMLDivElement>(null);
|
||||
|
||||
const {
|
||||
width,
|
||||
height,
|
||||
zoom,
|
||||
offsetX,
|
||||
offsetY,
|
||||
showGrid,
|
||||
gridSize,
|
||||
backgroundColor,
|
||||
selection,
|
||||
} = useCanvasStore();
|
||||
|
||||
const { layers } = useLayerStore();
|
||||
|
||||
const [isPanning, setIsPanning] = useState(false);
|
||||
const [panStart, setPanStart] = useState({ x: 0, y: 0 });
|
||||
|
||||
// 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
|
||||
if (selection.active) {
|
||||
ctx.strokeStyle = '#0066ff';
|
||||
ctx.lineWidth = 1 / zoom;
|
||||
ctx.setLineDash([4 / zoom, 4 / zoom]);
|
||||
ctx.strokeRect(selection.x, selection.y, selection.width, selection.height);
|
||||
ctx.setLineDash([]);
|
||||
}
|
||||
|
||||
// Restore context state
|
||||
ctx.restore();
|
||||
}, [layers, width, height, zoom, offsetX, offsetY, showGrid, gridSize, backgroundColor, selection]);
|
||||
|
||||
// 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 panning
|
||||
const handleMouseDown = (e: React.MouseEvent) => {
|
||||
if (e.button === 1 || (e.button === 0 && e.shiftKey)) {
|
||||
// Middle mouse or Shift + Left mouse for panning
|
||||
setIsPanning(true);
|
||||
setPanStart({ x: e.clientX - offsetX, y: e.clientY - offsetY });
|
||||
e.preventDefault();
|
||||
}
|
||||
};
|
||||
|
||||
const handleMouseMove = (e: React.MouseEvent) => {
|
||||
if (isPanning) {
|
||||
const { setPanOffset } = useCanvasStore.getState();
|
||||
setPanOffset(e.clientX - panStart.x, e.clientY - panStart.y);
|
||||
}
|
||||
};
|
||||
|
||||
const handleMouseUp = () => {
|
||||
setIsPanning(false);
|
||||
};
|
||||
|
||||
return (
|
||||
<div
|
||||
ref={containerRef}
|
||||
className={cn(
|
||||
'relative h-full w-full overflow-hidden bg-canvas-bg',
|
||||
isPanning && 'cursor-grabbing'
|
||||
)}
|
||||
onWheel={handleWheel}
|
||||
onMouseDown={handleMouseDown}
|
||||
onMouseMove={handleMouseMove}
|
||||
onMouseUp={handleMouseUp}
|
||||
onMouseLeave={handleMouseUp}
|
||||
>
|
||||
<canvas
|
||||
ref={canvasRef}
|
||||
className="absolute inset-0"
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
1
components/canvas/index.ts
Normal file
1
components/canvas/index.ts
Normal file
@@ -0,0 +1 @@
|
||||
export * from './canvas-wrapper';
|
||||
106
components/editor/editor-layout.tsx
Normal file
106
components/editor/editor-layout.tsx
Normal file
@@ -0,0 +1,106 @@
|
||||
'use client';
|
||||
|
||||
import { useEffect } from 'react';
|
||||
import { useCanvasStore, useLayerStore } from '@/store';
|
||||
import { CanvasWrapper } from '@/components/canvas/canvas-wrapper';
|
||||
import { LayersPanel } from '@/components/layers/layers-panel';
|
||||
import { Plus, ZoomIn, ZoomOut, Maximize } from 'lucide-react';
|
||||
|
||||
export function EditorLayout() {
|
||||
const { zoom, zoomIn, zoomOut, zoomToFit, setDimensions } = useCanvasStore();
|
||||
const { createLayer, layers } = useLayerStore();
|
||||
|
||||
// Initialize with a default layer
|
||||
useEffect(() => {
|
||||
if (layers.length === 0) {
|
||||
createLayer({
|
||||
name: 'Background',
|
||||
width: 800,
|
||||
height: 600,
|
||||
fillColor: '#ffffff',
|
||||
});
|
||||
}
|
||||
}, []);
|
||||
|
||||
const handleNewLayer = () => {
|
||||
createLayer({
|
||||
name: `Layer ${layers.length + 1}`,
|
||||
width: 800,
|
||||
height: 600,
|
||||
});
|
||||
};
|
||||
|
||||
const handleZoomToFit = () => {
|
||||
// Approximate viewport size (accounting for panels)
|
||||
const viewportWidth = window.innerWidth - 320; // Subtract sidebar width
|
||||
const viewportHeight = window.innerHeight - 60; // Subtract toolbar height
|
||||
zoomToFit(viewportWidth, viewportHeight);
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="flex h-screen flex-col overflow-hidden">
|
||||
{/* Toolbar */}
|
||||
<div className="flex h-14 items-center justify-between border-b border-border bg-card px-4">
|
||||
<div className="flex items-center gap-2">
|
||||
<h1 className="text-lg font-semibold bg-gradient-to-r from-primary via-accent to-primary bg-clip-text text-transparent">
|
||||
Paint UI
|
||||
</h1>
|
||||
</div>
|
||||
|
||||
{/* Zoom controls */}
|
||||
<div className="flex items-center gap-2">
|
||||
<button
|
||||
onClick={zoomOut}
|
||||
className="rounded-md p-2 hover:bg-accent transition-colors"
|
||||
title="Zoom Out"
|
||||
>
|
||||
<ZoomOut className="h-4 w-4" />
|
||||
</button>
|
||||
|
||||
<span className="min-w-[4rem] text-center text-sm text-muted-foreground">
|
||||
{Math.round(zoom * 100)}%
|
||||
</span>
|
||||
|
||||
<button
|
||||
onClick={zoomIn}
|
||||
className="rounded-md p-2 hover:bg-accent transition-colors"
|
||||
title="Zoom In"
|
||||
>
|
||||
<ZoomIn className="h-4 w-4" />
|
||||
</button>
|
||||
|
||||
<button
|
||||
onClick={handleZoomToFit}
|
||||
className="rounded-md p-2 hover:bg-accent transition-colors"
|
||||
title="Fit to Screen"
|
||||
>
|
||||
<Maximize className="h-4 w-4" />
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div className="flex items-center gap-2">
|
||||
<button
|
||||
onClick={handleNewLayer}
|
||||
className="flex items-center gap-2 rounded-md bg-primary px-3 py-2 text-sm font-medium text-primary-foreground hover:bg-primary/90 transition-colors"
|
||||
>
|
||||
<Plus className="h-4 w-4" />
|
||||
New Layer
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Main content */}
|
||||
<div className="flex flex-1 overflow-hidden">
|
||||
{/* Canvas area */}
|
||||
<div className="flex-1">
|
||||
<CanvasWrapper />
|
||||
</div>
|
||||
|
||||
{/* Right sidebar */}
|
||||
<div className="w-80 border-l border-border">
|
||||
<LayersPanel />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
1
components/editor/index.ts
Normal file
1
components/editor/index.ts
Normal file
@@ -0,0 +1 @@
|
||||
export * from './editor-layout';
|
||||
1
components/layers/index.ts
Normal file
1
components/layers/index.ts
Normal file
@@ -0,0 +1 @@
|
||||
export * from './layers-panel';
|
||||
82
components/layers/layers-panel.tsx
Normal file
82
components/layers/layers-panel.tsx
Normal file
@@ -0,0 +1,82 @@
|
||||
'use client';
|
||||
|
||||
import { useLayerStore } from '@/store';
|
||||
import { Eye, EyeOff, Trash2 } from 'lucide-react';
|
||||
import { cn } from '@/lib/utils';
|
||||
|
||||
export function LayersPanel() {
|
||||
const { layers, activeLayerId, setActiveLayer, updateLayer, deleteLayer } = useLayerStore();
|
||||
|
||||
// Sort layers by order (highest first)
|
||||
const sortedLayers = [...layers].sort((a, b) => b.order - a.order);
|
||||
|
||||
return (
|
||||
<div className="flex h-full flex-col bg-card">
|
||||
<div className="border-b border-border p-3">
|
||||
<h2 className="text-sm font-semibold text-card-foreground">Layers</h2>
|
||||
</div>
|
||||
|
||||
<div className="flex-1 overflow-y-auto p-2 space-y-1">
|
||||
{sortedLayers.length === 0 ? (
|
||||
<div className="flex h-full items-center justify-center">
|
||||
<p className="text-sm text-muted-foreground">No layers</p>
|
||||
</div>
|
||||
) : (
|
||||
sortedLayers.map((layer) => (
|
||||
<div
|
||||
key={layer.id}
|
||||
className={cn(
|
||||
'group flex items-center gap-2 rounded-md border p-2 transition-colors cursor-pointer',
|
||||
activeLayerId === layer.id
|
||||
? 'border-primary bg-primary/10'
|
||||
: 'border-border hover:border-primary/50 hover:bg-accent/50'
|
||||
)}
|
||||
onClick={() => setActiveLayer(layer.id)}
|
||||
>
|
||||
<button
|
||||
className="shrink-0 text-muted-foreground hover:text-foreground"
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
updateLayer(layer.id, { visible: !layer.visible });
|
||||
}}
|
||||
>
|
||||
{layer.visible ? (
|
||||
<Eye className="h-4 w-4" />
|
||||
) : (
|
||||
<EyeOff className="h-4 w-4" />
|
||||
)}
|
||||
</button>
|
||||
|
||||
<div className="flex-1 min-w-0">
|
||||
<p className="text-sm font-medium text-card-foreground truncate">
|
||||
{layer.name}
|
||||
</p>
|
||||
<p className="text-xs text-muted-foreground">
|
||||
{layer.width} × {layer.height}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div className="flex items-center gap-1 opacity-0 group-hover:opacity-100 transition-opacity">
|
||||
<button
|
||||
className="shrink-0 text-muted-foreground hover:text-destructive"
|
||||
onClick={(e) => {
|
||||
e.stopPropagation();
|
||||
if (confirm('Delete this layer?')) {
|
||||
deleteLayer(layer.id);
|
||||
}
|
||||
}}
|
||||
>
|
||||
<Trash2 className="h-4 w-4" />
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div className="shrink-0 text-xs text-muted-foreground">
|
||||
{Math.round(layer.opacity * 100)}%
|
||||
</div>
|
||||
</div>
|
||||
))
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user