Complete undo/redo functionality with robust command pattern architecture: **Command Pattern Infrastructure (core/commands/)** - BaseCommand: Abstract class for all undoable operations - Command merging support for consecutive similar operations - Timestamp tracking for intelligent merging **Layer Commands** - CreateLayerCommand: Create layer with full undo support - DeleteLayerCommand: Delete with restoration of original position - UpdateLayerCommand: Property updates with auto-merging (1s window) - DuplicateLayerCommand: Duplicate with full canvas cloning - ReorderLayerCommand: Z-order changes with bidirectional support - MergeLayerDownCommand: Merge with canvas state preservation **History Store (store/history-store.ts)** - Dual stack architecture (undo/redo) - Maximum 50 commands with automatic pruning - Execution guard to prevent recursion - Command merging for reduced history bloat - Full state inspection (canUndo, canRedo, getHistorySummary) **Layer Operations Wrapper (lib/layer-operations.ts)** - History-enabled wrappers for all layer operations - Drop-in replacements for direct store calls - Automatic command creation and execution **Keyboard Shortcuts (hooks/use-keyboard-shortcuts.ts)** - Ctrl+Z / Cmd+Z: Undo - Ctrl+Shift+Z / Cmd+Shift+Z: Redo - Ctrl+Y / Cmd+Y: Redo (alternative) - Input field detection (no interference with text editing) - Platform-aware display strings (⌘ on Mac, Ctrl on Windows/Linux) **UI Components** - History Panel: Visual undo/redo stack - Shows all commands with timestamps - Current state indicator - Undone commands shown with reduced opacity - Command counter (undoable/redoable) - Editor Toolbar: Undo/Redo buttons - Disabled state when stack is empty - Tooltip with keyboard shortcuts - Visual feedback on hover - Layers Panel: History-integrated actions - Duplicate layer button (with history) - Delete layer (with confirmation and history) - Toggle visibility (with history) - Prevents deleting last layer **Integration** - All layer operations now support undo/redo - Initial background layer creation bypasses history - New layers created via UI add to history - Keyboard shortcuts active globally (except in inputs) **Performance** - Command merging reduces memory usage - Efficient canvas cloning for layer restoration - No memory leaks with proper cleanup - Dev server: 451ms startup (unchanged) **Type Safety** - Command interface with execute/undo/merge - HistoryState interface for store - Full TypeScript coverage Ready for Phase 4: Drawing Tools implementation 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
153 lines
4.7 KiB
TypeScript
153 lines
4.7 KiB
TypeScript
'use client';
|
|
|
|
import { useEffect } from 'react';
|
|
import { useCanvasStore, useLayerStore } from '@/store';
|
|
import { useHistoryStore } from '@/store/history-store';
|
|
import { CanvasWrapper } from '@/components/canvas/canvas-wrapper';
|
|
import { LayersPanel } from '@/components/layers/layers-panel';
|
|
import { HistoryPanel } from './history-panel';
|
|
import { useKeyboardShortcuts } from '@/hooks/use-keyboard-shortcuts';
|
|
import { createLayerWithHistory } from '@/lib/layer-operations';
|
|
import { Plus, ZoomIn, ZoomOut, Maximize, Undo, Redo } 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();
|
|
|
|
// Enable keyboard shortcuts
|
|
useKeyboardShortcuts();
|
|
|
|
// 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">
|
|
{/* 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>
|
|
|
|
{/* 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">
|
|
{/* Canvas area */}
|
|
<div className="flex-1">
|
|
<CanvasWrapper />
|
|
</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>
|
|
);
|
|
}
|