Add comprehensive shape drawing system with support for 7 shape types: rectangle, ellipse, line, arrow, polygon, star, and triangle. Features: - Created types/shape.ts with ShapeType and ShapeSettings interfaces - Implemented lib/shape-utils.ts with drawing algorithms for all shapes: * Rectangle with optional corner radius * Ellipse with independent x/y radii * Line with stroke support * Arrow with configurable head size and angle * Polygon with adjustable sides (3-20) * Star with points and inner radius control * Triangle (equilateral style) - Created store/shape-store.ts for shape state management - Implemented tools/shape-tool.ts as unified tool handling all shapes - Built components/shapes/shape-panel.tsx with comprehensive UI: * Grid selector for all 7 shape types * Fill/stroke toggles with color pickers * Dynamic properties panel (corner radius, sides, inner radius, etc.) * Real-time stroke width adjustment - Integrated ShapeTool into canvas-with-tools.tsx - Added ShapePanel to editor-layout.tsx sidebar - Removed duplicate ShapeType/ShapeSettings from types/tool.ts All shapes support: - Fill with color selection - Stroke with color and width controls - Shape-specific properties (corners, sides, arrow heads, etc.) - Undo/redo via DrawCommand integration Build Status: ✓ Successful (1290ms) 🤖 Generated with Claude Code Co-Authored-By: Claude <noreply@anthropic.com>
212 lines
6.6 KiB
TypeScript
212 lines
6.6 KiB
TypeScript
'use client';
|
|
|
|
import { useEffect } from 'react';
|
|
import { useCanvasStore, useLayerStore } from '@/store';
|
|
import { useHistoryStore } from '@/store/history-store';
|
|
import { CanvasWithTools } from '@/components/canvas/canvas-with-tools';
|
|
import { LayersPanel } from '@/components/layers/layers-panel';
|
|
import { HistoryPanel } from './history-panel';
|
|
import { FileMenu } from './file-menu';
|
|
import { ToolPalette, ToolSettings } from '@/components/tools';
|
|
import { ColorPanel } from '@/components/colors';
|
|
import { FilterPanel } from '@/components/filters';
|
|
import { SelectionPanel } from '@/components/selection';
|
|
import { TransformPanel } from '@/components/transform';
|
|
import { ShapePanel } from '@/components/shapes';
|
|
import { useKeyboardShortcuts } from '@/hooks/use-keyboard-shortcuts';
|
|
import { useFileOperations } from '@/hooks/use-file-operations';
|
|
import { useDragDrop } from '@/hooks/use-drag-drop';
|
|
import { useClipboard } from '@/hooks/use-clipboard';
|
|
import { createLayerWithHistory } from '@/lib/layer-operations';
|
|
import { Plus, ZoomIn, ZoomOut, Maximize, Undo, Redo, Upload } from 'lucide-react';
|
|
import { cn } from '@/lib/utils';
|
|
|
|
export function EditorLayout() {
|
|
const { zoom, zoomIn, zoomOut, zoomToFit } = useCanvasStore();
|
|
const { layers } = useLayerStore();
|
|
const { undo, redo, canUndo, canRedo } = useHistoryStore();
|
|
const { handleDataTransfer } = useFileOperations();
|
|
|
|
// Enable keyboard shortcuts
|
|
useKeyboardShortcuts();
|
|
|
|
// Enable drag & drop
|
|
const { isDragging, handleDragOver, handleDragLeave, handleDrop } = useDragDrop(handleDataTransfer);
|
|
|
|
// Enable clipboard paste
|
|
useClipboard(handleDataTransfer);
|
|
|
|
// Initialize with a default layer (without history)
|
|
useEffect(() => {
|
|
if (layers.length === 0) {
|
|
const { createLayer } = useLayerStore.getState();
|
|
createLayer({
|
|
name: 'Background',
|
|
width: 800,
|
|
height: 600,
|
|
fillColor: '#ffffff',
|
|
});
|
|
}
|
|
}, []);
|
|
|
|
const handleNewLayer = () => {
|
|
createLayerWithHistory({
|
|
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"
|
|
onDragOver={handleDragOver}
|
|
onDragLeave={handleDragLeave}
|
|
onDrop={handleDrop}
|
|
>
|
|
{/* Drag overlay */}
|
|
{isDragging && (
|
|
<div className="fixed inset-0 z-50 flex items-center justify-center bg-black/50 backdrop-blur-sm">
|
|
<div className="flex flex-col items-center gap-4 p-8 bg-card border-2 border-dashed border-primary rounded-lg">
|
|
<Upload className="h-16 w-16 text-primary" />
|
|
<p className="text-lg font-semibold text-foreground">
|
|
Drop image or project file
|
|
</p>
|
|
<p className="text-sm text-muted-foreground">
|
|
Supports: PNG, JPG, WEBP, .paint
|
|
</p>
|
|
</div>
|
|
</div>
|
|
)}
|
|
|
|
{/* Toolbar */}
|
|
<div className="flex h-14 items-center justify-between border-b border-border bg-card px-4">
|
|
<div className="flex items-center gap-4">
|
|
<h1 className="text-lg font-semibold bg-gradient-to-r from-primary via-accent to-primary bg-clip-text text-transparent">
|
|
Paint UI
|
|
</h1>
|
|
<FileMenu />
|
|
</div>
|
|
|
|
{/* History controls */}
|
|
<div className="flex items-center gap-1 border-r border-border pr-2">
|
|
<button
|
|
onClick={undo}
|
|
disabled={!canUndo()}
|
|
className={cn(
|
|
'rounded-md p-2 transition-colors',
|
|
canUndo()
|
|
? 'hover:bg-accent text-foreground'
|
|
: 'text-muted-foreground cursor-not-allowed'
|
|
)}
|
|
title="Undo (Ctrl+Z)"
|
|
>
|
|
<Undo className="h-4 w-4" />
|
|
</button>
|
|
|
|
<button
|
|
onClick={redo}
|
|
disabled={!canRedo()}
|
|
className={cn(
|
|
'rounded-md p-2 transition-colors',
|
|
canRedo()
|
|
? 'hover:bg-accent text-foreground'
|
|
: 'text-muted-foreground cursor-not-allowed'
|
|
)}
|
|
title="Redo (Ctrl+Shift+Z)"
|
|
>
|
|
<Redo className="h-4 w-4" />
|
|
</button>
|
|
</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">
|
|
{/* Left sidebar - Tool Palette */}
|
|
<ToolPalette />
|
|
|
|
{/* Tool Settings */}
|
|
<ToolSettings />
|
|
|
|
{/* Color Panel */}
|
|
<ColorPanel />
|
|
|
|
{/* Filter Panel */}
|
|
<FilterPanel />
|
|
|
|
{/* Selection Panel */}
|
|
<SelectionPanel />
|
|
|
|
{/* Transform Panel */}
|
|
<TransformPanel />
|
|
|
|
{/* Shape Panel */}
|
|
<ShapePanel />
|
|
|
|
{/* Canvas area */}
|
|
<div className="flex-1">
|
|
<CanvasWithTools />
|
|
</div>
|
|
|
|
{/* Right sidebar */}
|
|
<div className="w-80 border-l border-border flex flex-col">
|
|
<div className="flex-1 overflow-hidden">
|
|
<LayersPanel />
|
|
</div>
|
|
<div className="h-64 border-t border-border">
|
|
<HistoryPanel />
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|