refactor(ascii): align layout and UX with Calculate blueprint
Rewrites all four ASCII tool components to share the same design language and spatial structure as the Calculator & Grapher tool. Layout - New responsive 2/5–3/5 grid (was fixed 2+1 col); matches Calculate - Left panel: text input card + font selector filling remaining height - Right panel: preview as the dominant full-height element - Mobile: tabbed Editor / Preview switcher (same pattern as Calculator) TextInput - Replace shadcn Textarea with native <textarea> - Glass border pattern (border-border/40, focus:border-primary/50) - Monospace font, consistent counter styling FontSelector - Replace Card + shadcn Tabs + Button + Input + Empty with native elements - Glass panel (glass rounded-xl) matching Calculate panel style - Custom tab strip mirrors Calculator mobile tab pattern - Native search input with glass border - Font list items: border-l-2 left accent for selected state, hover:bg-primary/8, rose heart for favorites - Auto-scrolls selected item into view on external changes - Simplified empty state to single italic line FontPreview - Replace Card + Button + Badge + ToggleGroup + Tooltip + Empty - Glass panel with header row (label + font tag + action buttons) - Controls row: native toggle buttons with primary/10 active state - Terminal window: dark #06060e background, macOS-style chrome (rose/amber/emerald dots), font name watermark — the hero element - PNG export captures entire terminal including chrome at 2x - Inline skeleton loader with pulse animation replaces Skeleton import Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -2,19 +2,8 @@
|
||||
|
||||
import * as React from 'react';
|
||||
import Fuse from 'fuse.js';
|
||||
import { Input } from '@/components/ui/input';
|
||||
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
|
||||
import {
|
||||
Empty,
|
||||
EmptyDescription,
|
||||
EmptyHeader,
|
||||
EmptyMedia,
|
||||
EmptyTitle,
|
||||
} from "@/components/ui/empty"
|
||||
import { Search, X, Heart, Clock, List, Shuffle } from 'lucide-react';
|
||||
import { cn } from '@/lib/utils/cn';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { Tabs, TabsList, TabsTrigger } from '@/components/ui/tabs';
|
||||
import type { ASCIIFont } from '@/types/ascii';
|
||||
import { getFavorites, getRecentFonts, toggleFavorite, isFavorite } from '@/lib/storage/favorites';
|
||||
|
||||
@@ -28,62 +17,52 @@ export interface FontSelectorProps {
|
||||
|
||||
type FilterType = 'all' | 'favorites' | 'recent';
|
||||
|
||||
const FILTERS: { value: FilterType; icon: React.ElementType; label: string }[] = [
|
||||
{ value: 'all', icon: List, label: 'All' },
|
||||
{ value: 'favorites', icon: Heart, label: 'Fav' },
|
||||
{ value: 'recent', icon: Clock, label: 'Recent' },
|
||||
];
|
||||
|
||||
export function FontSelector({
|
||||
fonts,
|
||||
selectedFont,
|
||||
onSelectFont,
|
||||
onRandomFont,
|
||||
className
|
||||
className,
|
||||
}: FontSelectorProps) {
|
||||
const [searchQuery, setSearchQuery] = React.useState('');
|
||||
const [filter, setFilter] = React.useState<FilterType>('all');
|
||||
const [favorites, setFavorites] = React.useState<string[]>([]);
|
||||
const [recentFonts, setRecentFonts] = React.useState<string[]>([]);
|
||||
const searchInputRef = React.useRef<HTMLInputElement>(null);
|
||||
const selectedRef = React.useRef<HTMLButtonElement>(null);
|
||||
|
||||
// Load favorites and recent fonts
|
||||
React.useEffect(() => {
|
||||
setFavorites(getFavorites());
|
||||
setRecentFonts(getRecentFonts());
|
||||
}, []);
|
||||
|
||||
// Initialize Fuse.js for fuzzy search
|
||||
const fuse = React.useMemo(() => {
|
||||
return new Fuse(fonts, {
|
||||
keys: ['name', 'fileName'],
|
||||
threshold: 0.3,
|
||||
includeScore: true,
|
||||
});
|
||||
}, [fonts]);
|
||||
// Keep selected item in view when font changes externally (e.g. random)
|
||||
React.useEffect(() => {
|
||||
selectedRef.current?.scrollIntoView({ block: 'nearest', behavior: 'smooth' });
|
||||
}, [selectedFont]);
|
||||
|
||||
const fuse = React.useMemo(
|
||||
() => new Fuse(fonts, { keys: ['name', 'fileName'], threshold: 0.3, includeScore: true }),
|
||||
[fonts]
|
||||
);
|
||||
|
||||
const filteredFonts = React.useMemo(() => {
|
||||
let fontsToFilter = fonts;
|
||||
|
||||
// Apply category filter
|
||||
let base = fonts;
|
||||
if (filter === 'favorites') {
|
||||
fontsToFilter = fonts.filter(f => favorites.includes(f.name));
|
||||
base = fonts.filter((f) => favorites.includes(f.name));
|
||||
} else if (filter === 'recent') {
|
||||
fontsToFilter = fonts.filter(f => recentFonts.includes(f.name));
|
||||
// Sort by recent order
|
||||
fontsToFilter.sort((a, b) => {
|
||||
return recentFonts.indexOf(a.name) - recentFonts.indexOf(b.name);
|
||||
});
|
||||
base = [...fonts.filter((f) => recentFonts.includes(f.name))].sort(
|
||||
(a, b) => recentFonts.indexOf(a.name) - recentFonts.indexOf(b.name)
|
||||
);
|
||||
}
|
||||
|
||||
// Apply search query
|
||||
if (!searchQuery) return fontsToFilter;
|
||||
|
||||
const results = fuse.search(searchQuery);
|
||||
const searchResults = results.map(result => result.item);
|
||||
|
||||
// Filter search results by category
|
||||
if (filter === 'favorites') {
|
||||
return searchResults.filter(f => favorites.includes(f.name));
|
||||
} else if (filter === 'recent') {
|
||||
return searchResults.filter(f => recentFonts.includes(f.name));
|
||||
}
|
||||
|
||||
return searchResults;
|
||||
if (!searchQuery) return base;
|
||||
const hits = fuse.search(searchQuery).map((r) => r.item);
|
||||
return filter === 'all' ? hits : hits.filter((f) => base.includes(f));
|
||||
}, [fonts, searchQuery, fuse, filter, favorites, recentFonts]);
|
||||
|
||||
const handleToggleFavorite = (fontName: string, e: React.MouseEvent) => {
|
||||
@@ -92,134 +71,140 @@ export function FontSelector({
|
||||
setFavorites(getFavorites());
|
||||
};
|
||||
|
||||
return (
|
||||
<Card className={cn("flex flex-col min-h-0 overflow-hidden", className)}>
|
||||
<CardHeader className="flex flex-row items-center justify-between flex-wrap gap-2 space-y-0">
|
||||
<CardTitle>Fonts</CardTitle>
|
||||
{onRandomFont && (
|
||||
<Button
|
||||
variant="outline"
|
||||
size="xs"
|
||||
onClick={onRandomFont}
|
||||
title="Random font"
|
||||
>
|
||||
<Shuffle className="h-3 w-3 mr-1" />
|
||||
Random
|
||||
</Button>
|
||||
)}
|
||||
</CardHeader>
|
||||
<CardContent className="flex flex-col flex-1 min-h-0 pt-0">
|
||||
<Tabs
|
||||
value={filter}
|
||||
onValueChange={(v) => setFilter(v as FilterType)}
|
||||
className="mb-3 shrink-0"
|
||||
>
|
||||
<TabsList className="w-full">
|
||||
<TabsTrigger value="all" className="flex-1">
|
||||
<List className="h-3 w-3" />
|
||||
All
|
||||
</TabsTrigger>
|
||||
<TabsTrigger value="favorites" className="flex-1">
|
||||
<Heart className="h-3 w-3" />
|
||||
Fav
|
||||
</TabsTrigger>
|
||||
<TabsTrigger value="recent" className="flex-1">
|
||||
<Clock className="h-3 w-3" />
|
||||
Recent
|
||||
</TabsTrigger>
|
||||
</TabsList>
|
||||
</Tabs>
|
||||
const emptyMessage =
|
||||
filter === 'favorites'
|
||||
? 'No favorites yet — click ♥ to save'
|
||||
: filter === 'recent'
|
||||
? 'No recent fonts'
|
||||
: searchQuery
|
||||
? 'No fonts match your search'
|
||||
: 'Loading fonts…';
|
||||
|
||||
{/* Search Input */}
|
||||
<div className="relative mb-3 shrink-0">
|
||||
<Search className="absolute left-3 top-1/2 -translate-y-1/2 h-3.5 w-3.5 text-muted-foreground pointer-events-none" />
|
||||
<Input
|
||||
ref={searchInputRef}
|
||||
type="text"
|
||||
placeholder="Search fonts..."
|
||||
value={searchQuery}
|
||||
onChange={(e) => setSearchQuery(e.target.value)}
|
||||
className="pl-8 pr-8 h-8 text-sm"
|
||||
/>
|
||||
{searchQuery && (
|
||||
return (
|
||||
<div className={cn('glass rounded-xl p-3 flex flex-col min-h-0 overflow-hidden', className)}>
|
||||
|
||||
{/* ── Header ────────────────────────────────────────────── */}
|
||||
<div className="flex items-center justify-between mb-3 shrink-0">
|
||||
<span className="text-[10px] font-semibold text-muted-foreground uppercase tracking-widest">
|
||||
Fonts
|
||||
</span>
|
||||
<div className="flex items-center gap-2.5">
|
||||
<span className="text-[10px] text-muted-foreground/35 font-mono tabular-nums">
|
||||
{fonts.length}
|
||||
</span>
|
||||
{onRandomFont && (
|
||||
<button
|
||||
onClick={() => setSearchQuery('')}
|
||||
className="absolute right-3 top-1/2 -translate-y-1/2 text-muted-foreground hover:text-foreground"
|
||||
aria-label="Clear search"
|
||||
onClick={onRandomFont}
|
||||
className="text-muted-foreground/50 hover:text-primary transition-colors"
|
||||
title="Random font"
|
||||
>
|
||||
<X className="h-3.5 w-3.5" />
|
||||
<Shuffle className="w-3.5 h-3.5" />
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Font List */}
|
||||
<div className="flex-1 overflow-y-auto space-y-0.5 pr-1 scrollbar">
|
||||
{filteredFonts.length === 0 ? (
|
||||
<Empty>
|
||||
<EmptyHeader>
|
||||
<EmptyMedia variant="icon">
|
||||
{filter === 'favorites' ? <Heart /> : (filter === 'recent' ? <Clock /> : <Search />)}
|
||||
</EmptyMedia>
|
||||
<EmptyTitle>{
|
||||
filter === 'favorites'
|
||||
? 'No favorite fonts yet'
|
||||
: filter === 'recent'
|
||||
? 'No recent fonts'
|
||||
: 'No fonts found'
|
||||
}</EmptyTitle>
|
||||
<EmptyDescription>
|
||||
{
|
||||
filter === 'favorites'
|
||||
? 'Click the heart icon on any font to add it to your favorites'
|
||||
: filter === 'recent'
|
||||
? 'Fonts you use will appear here'
|
||||
: searchQuery
|
||||
? 'Try a different search term'
|
||||
: 'Loading fonts...'
|
||||
}
|
||||
</EmptyDescription>
|
||||
</EmptyHeader>
|
||||
</Empty>
|
||||
) : (
|
||||
filteredFonts.map((font) => (
|
||||
{/* ── Filter tabs ───────────────────────────────────────── */}
|
||||
<div className="flex glass rounded-lg p-0.5 gap-0.5 mb-3 shrink-0">
|
||||
{FILTERS.map(({ value, icon: Icon, label }) => (
|
||||
<button
|
||||
key={value}
|
||||
onClick={() => setFilter(value)}
|
||||
className={cn(
|
||||
'flex-1 flex items-center justify-center gap-1.5 py-1.5 rounded-md text-xs font-medium transition-all',
|
||||
filter === value
|
||||
? 'bg-primary text-primary-foreground shadow-sm'
|
||||
: 'text-muted-foreground hover:text-foreground'
|
||||
)}
|
||||
>
|
||||
<Icon className="w-3 h-3" />
|
||||
{label}
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
|
||||
{/* ── Search ────────────────────────────────────────────── */}
|
||||
<div className="relative mb-3 shrink-0">
|
||||
<Search className="absolute left-3 top-1/2 -translate-y-1/2 w-3 h-3 text-muted-foreground/40 pointer-events-none" />
|
||||
<input
|
||||
type="text"
|
||||
placeholder="Search fonts…"
|
||||
value={searchQuery}
|
||||
onChange={(e) => setSearchQuery(e.target.value)}
|
||||
className="w-full bg-transparent border border-border/40 rounded-lg pl-8 pr-7 py-1.5 text-xs font-mono outline-none focus:border-primary/50 transition-colors placeholder:text-muted-foreground/30"
|
||||
/>
|
||||
{searchQuery && (
|
||||
<button
|
||||
onClick={() => setSearchQuery('')}
|
||||
className="absolute right-2.5 top-1/2 -translate-y-1/2 text-muted-foreground/40 hover:text-muted-foreground transition-colors"
|
||||
>
|
||||
<X className="w-3 h-3" />
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* ── Font list ─────────────────────────────────────────── */}
|
||||
<div className="flex-1 min-h-0 overflow-y-auto scrollbar-thin scrollbar-thumb-primary/20 scrollbar-track-transparent space-y-0.5 pr-0.5">
|
||||
{filteredFonts.length === 0 ? (
|
||||
<div className="py-10 text-center">
|
||||
<p className="text-xs text-muted-foreground/35 italic">{emptyMessage}</p>
|
||||
</div>
|
||||
) : (
|
||||
filteredFonts.map((font) => {
|
||||
const isSelected = selectedFont === font.name;
|
||||
const fav = isFavorite(font.name);
|
||||
return (
|
||||
<div
|
||||
key={font.name}
|
||||
className={cn(
|
||||
'group flex items-center gap-1 px-2 py-1.5 rounded text-xs transition-colors',
|
||||
'hover:bg-accent hover:text-accent-foreground',
|
||||
selectedFont === font.name && 'bg-accent text-accent-foreground font-medium'
|
||||
'group flex items-center gap-1.5 rounded-lg transition-all cursor-pointer',
|
||||
'border-l-2',
|
||||
isSelected
|
||||
? 'bg-primary/10 border-primary text-primary'
|
||||
: 'border-transparent text-foreground/65 hover:bg-primary/8 hover:text-foreground'
|
||||
)}
|
||||
>
|
||||
<button
|
||||
ref={isSelected ? selectedRef : undefined}
|
||||
onClick={() => onSelectFont(font.name)}
|
||||
className="flex-1 text-left truncate"
|
||||
className="flex-1 text-left text-xs font-mono truncate px-2 py-1.5"
|
||||
>
|
||||
{font.name}
|
||||
</button>
|
||||
<button
|
||||
onClick={(e) => handleToggleFavorite(font.name, e)}
|
||||
className="p-0.5 opacity-0 group-hover:opacity-100 transition-opacity shrink-0"
|
||||
aria-label={isFavorite(font.name) ? 'Remove from favorites' : 'Add to favorites'}
|
||||
className={cn(
|
||||
'shrink-0 pr-2 transition-all',
|
||||
fav ? 'opacity-100' : 'opacity-0 group-hover:opacity-100'
|
||||
)}
|
||||
aria-label={fav ? 'Remove from favorites' : 'Add to favorites'}
|
||||
>
|
||||
<Heart
|
||||
className={cn(
|
||||
'h-3 w-3 transition-colors',
|
||||
isFavorite(font.name) ? 'fill-red-500 text-red-500 !opacity-100' : 'text-muted-foreground/50 hover:text-red-500/50'
|
||||
'w-3 h-3 transition-colors',
|
||||
fav ? 'fill-rose-500 text-rose-500' : 'text-muted-foreground/40 hover:text-rose-400'
|
||||
)}
|
||||
/>
|
||||
</button>
|
||||
</div>
|
||||
))
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
})
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* Stats */}
|
||||
<div className="mt-3 pt-3 border-t text-[10px] text-muted-foreground shrink-0">
|
||||
{/* ── Footer ────────────────────────────────────────────── */}
|
||||
<div className="mt-3 pt-2.5 border-t border-border/25 flex items-center justify-between shrink-0">
|
||||
<span className="text-[10px] text-muted-foreground/35 font-mono tabular-nums">
|
||||
{filteredFonts.length} font{filteredFonts.length !== 1 ? 's' : ''}
|
||||
{filter === 'favorites' && ` · ${favorites.length} favorites`}
|
||||
{filter === 'recent' && ` · ${recentFonts.length} recent`}
|
||||
</div>
|
||||
</CardContent>
|
||||
</Card>
|
||||
</span>
|
||||
{filter === 'favorites' && (
|
||||
<span className="text-[10px] text-muted-foreground/35">{favorites.length} saved</span>
|
||||
)}
|
||||
{filter === 'recent' && (
|
||||
<span className="text-[10px] text-muted-foreground/35">{recentFonts.length} recent</span>
|
||||
)}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user