STYLED - Flatten media picker and use a two-column media layout
Fix the deeply nested cards in the project form (screenshot: Cover Media > Cover > preview card, with duplicate labels): - MediaFieldPicker no longer wraps itself in AppCards. It renders one flat bordered box laid out in two columns (preview | controls), dropping two nested card layers and the duplicate title. - Cover Media and Assets now sit side by side in a two-column grid instead of stacked with a separator. All 375 tests pass; tsc and eslint clean.
This commit is contained in:
@@ -6,7 +6,6 @@ import type { MediaKind } from "@/lib/db/enums";
|
|||||||
import { Check, ImageIcon, Search, Trash2 } from "lucide-react";
|
import { Check, ImageIcon, Search, Trash2 } from "lucide-react";
|
||||||
import { useEffect, useMemo, useRef, useState } from "react";
|
import { useEffect, useMemo, useRef, useState } from "react";
|
||||||
|
|
||||||
import { AppCard } from "@/components/ui/app-card";
|
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import {
|
import {
|
||||||
Dialog,
|
Dialog,
|
||||||
@@ -17,7 +16,6 @@ import {
|
|||||||
DialogTitle,
|
DialogTitle,
|
||||||
} from "@/components/ui/dialog";
|
} from "@/components/ui/dialog";
|
||||||
import { Input } from "@/components/ui/input";
|
import { Input } from "@/components/ui/input";
|
||||||
import { Label } from "@/components/ui/label";
|
|
||||||
import type { MediaOption } from "@/lib/media";
|
import type { MediaOption } from "@/lib/media";
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
@@ -89,29 +87,45 @@ export function MediaFieldPicker({
|
|||||||
}, [serializedValue]);
|
}, [serializedValue]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<AppCard level={2} padding="sm" contentClassName="space-y-4">
|
<div className="space-y-2">
|
||||||
<input ref={hiddenInputRef} type="hidden" name={inputName} value={serializedValue} />
|
<input ref={hiddenInputRef} type="hidden" name={inputName} value={serializedValue} />
|
||||||
|
|
||||||
<div className="flex items-start justify-between gap-4">
|
<div className="flex flex-col gap-3 rounded-nested border border-border/70 bg-background p-3 sm:flex-row sm:items-center sm:justify-between">
|
||||||
<div className="space-y-1">
|
<div className="flex min-w-0 items-center gap-3">
|
||||||
<Label className="text-sm font-semibold text-foreground">{title}</Label>
|
{selectedOption ? (
|
||||||
<p className="text-sm text-muted-foreground">
|
<>
|
||||||
Media must be selected from the
|
<img
|
||||||
{" "}
|
src={selectedOption.url}
|
||||||
Media Library
|
alt={selectedOption.label}
|
||||||
.
|
className="h-14 w-14 shrink-0 rounded-nested border border-border/60 object-cover"
|
||||||
</p>
|
/>
|
||||||
|
<div className="min-w-0">
|
||||||
|
<p className="truncate text-sm font-medium text-foreground">{selectedOption.label}</p>
|
||||||
|
<p className="truncate text-xs text-muted-foreground">{selectedOption.source}</p>
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
<div className="flex items-center gap-3 text-muted-foreground">
|
||||||
|
<div className="flex h-14 w-14 shrink-0 items-center justify-center rounded-nested border border-dashed border-border/70">
|
||||||
|
<ImageIcon className="h-5 w-5" />
|
||||||
|
</div>
|
||||||
|
<span className="text-sm">Kein Medium ausgewählt</span>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
<div className="flex gap-2">
|
|
||||||
<Button type="button" variant="outline" onClick={() => setOpen(true)}>
|
<div className="flex shrink-0 gap-2">
|
||||||
|
<Button type="button" variant="outline" size="sm" onClick={() => setOpen(true)}>
|
||||||
<ImageIcon className="h-4 w-4" />
|
<ImageIcon className="h-4 w-4" />
|
||||||
Select from Media
|
{selectedOption ? "Ändern" : "Auswählen"}
|
||||||
</Button>
|
</Button>
|
||||||
{canClear ? (
|
{canClear ? (
|
||||||
<Button
|
<Button
|
||||||
type="button"
|
type="button"
|
||||||
variant="ghost"
|
variant="ghost"
|
||||||
|
size="sm"
|
||||||
className="text-destructive hover:text-destructive"
|
className="text-destructive hover:text-destructive"
|
||||||
|
title={clearLabel}
|
||||||
onClick={() =>
|
onClick={() =>
|
||||||
onChange({
|
onChange({
|
||||||
...value,
|
...value,
|
||||||
@@ -124,32 +138,12 @@ export function MediaFieldPicker({
|
|||||||
}
|
}
|
||||||
>
|
>
|
||||||
<Trash2 className="h-4 w-4" />
|
<Trash2 className="h-4 w-4" />
|
||||||
{clearLabel}
|
<span className="sr-only">{clearLabel}</span>
|
||||||
</Button>
|
</Button>
|
||||||
) : null}
|
) : null}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<AppCard layer="single" padding="sm" className="rounded-nested border-border/70">
|
|
||||||
{selectedOption ? (
|
|
||||||
<div className="flex items-center gap-4">
|
|
||||||
<img
|
|
||||||
src={selectedOption.url}
|
|
||||||
alt={selectedOption.label}
|
|
||||||
className="h-16 w-16 rounded-nested object-cover"
|
|
||||||
/>
|
|
||||||
<div className="min-w-0">
|
|
||||||
<p className="truncate text-sm font-medium text-foreground">{selectedOption.label}</p>
|
|
||||||
<p className="truncate text-xs text-muted-foreground">{selectedOption.source}</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
) : (
|
|
||||||
<div className="rounded-nested border border-dashed border-border/70 px-4 py-6 text-sm text-muted-foreground">
|
|
||||||
No media selected.
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</AppCard>
|
|
||||||
|
|
||||||
<Dialog open={open} onOpenChange={setOpen}>
|
<Dialog open={open} onOpenChange={setOpen}>
|
||||||
<DialogContent className="max-w-4xl">
|
<DialogContent className="max-w-4xl">
|
||||||
<DialogHeader>
|
<DialogHeader>
|
||||||
@@ -215,6 +209,6 @@ export function MediaFieldPicker({
|
|||||||
</DialogFooter>
|
</DialogFooter>
|
||||||
</DialogContent>
|
</DialogContent>
|
||||||
</Dialog>
|
</Dialog>
|
||||||
</AppCard>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -36,7 +36,6 @@ import { Button } from "@/components/ui/button";
|
|||||||
import { Checkbox } from "@/components/ui/checkbox";
|
import { Checkbox } from "@/components/ui/checkbox";
|
||||||
import { Input } from "@/components/ui/input";
|
import { Input } from "@/components/ui/input";
|
||||||
import { Label } from "@/components/ui/label";
|
import { Label } from "@/components/ui/label";
|
||||||
import { Separator } from "@/components/ui/separator";
|
|
||||||
import {
|
import {
|
||||||
Select,
|
Select,
|
||||||
SelectContent,
|
SelectContent,
|
||||||
@@ -1072,7 +1071,8 @@ export function PortfolioProjectForm({
|
|||||||
|
|
||||||
<div>
|
<div>
|
||||||
<AppCard level={3} padding="md">
|
<AppCard level={3} padding="md">
|
||||||
<section className="space-y-5">
|
<div className="grid gap-6 lg:grid-cols-2">
|
||||||
|
<section className="space-y-4">
|
||||||
<SectionHeader
|
<SectionHeader
|
||||||
title="Cover Media"
|
title="Cover Media"
|
||||||
description="Wähle das Titelbild, das das Projekt in Listen repräsentiert."
|
description="Wähle das Titelbild, das das Projekt in Listen repräsentiert."
|
||||||
@@ -1090,9 +1090,9 @@ export function PortfolioProjectForm({
|
|||||||
clearLabel="Remove Cover"
|
clearLabel="Remove Cover"
|
||||||
emptyValue={{ mode: "upload", assetId: "", url: "", label: "" }}
|
emptyValue={{ mode: "upload", assetId: "", url: "", label: "" }}
|
||||||
/>
|
/>
|
||||||
|
</section>
|
||||||
|
|
||||||
<Separator />
|
<section className="space-y-4">
|
||||||
|
|
||||||
<SectionHeader
|
<SectionHeader
|
||||||
title="Assets"
|
title="Assets"
|
||||||
description="Optional — Galeriebilder mit lokalisiertem Alt-Text."
|
description="Optional — Galeriebilder mit lokalisiertem Alt-Text."
|
||||||
@@ -1221,7 +1221,8 @@ export function PortfolioProjectForm({
|
|||||||
})}
|
})}
|
||||||
</Accordion>
|
</Accordion>
|
||||||
)}
|
)}
|
||||||
</section>
|
</section>
|
||||||
|
</div>
|
||||||
</AppCard>
|
</AppCard>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user