summaryrefslogtreecommitdiff
path: root/apps/web/src/components/editor/media-panel
diff options
context:
space:
mode:
authorMaze Winther <mazewinther@gmail.com>2025-08-01 19:57:26 +0200
committerMaze Winther <mazewinther@gmail.com>2025-08-01 19:57:26 +0200
commit68da487f304018b6e8d06459def8fb45514ab7d4 (patch)
treeb20bd61558254b358e298554ecde005f498b17b3 /apps/web/src/components/editor/media-panel
parent09cb8c8d984e3e82f60e28b352508c876423fbdf (diff)
downloadopencut-68da487f304018b6e8d06459def8fb45514ab7d4.tar.gz
style: complete re-design of whole editor
Diffstat (limited to 'apps/web/src/components/editor/media-panel')
-rw-r--r--apps/web/src/components/editor/media-panel/index.tsx6
-rw-r--r--apps/web/src/components/editor/media-panel/tabbar.tsx5
-rw-r--r--apps/web/src/components/editor/media-panel/views/audio.tsx1
-rw-r--r--apps/web/src/components/editor/media-panel/views/media.tsx507
-rw-r--r--apps/web/src/components/editor/media-panel/views/text.tsx2
5 files changed, 385 insertions, 136 deletions
diff --git a/apps/web/src/components/editor/media-panel/index.tsx b/apps/web/src/components/editor/media-panel/index.tsx
index 359612f8..a5cd6686 100644
--- a/apps/web/src/components/editor/media-panel/index.tsx
+++ b/apps/web/src/components/editor/media-panel/index.tsx
@@ -5,6 +5,7 @@ import { MediaView } from "./views/media";
import { useMediaPanelStore, Tab } from "./store";
import { TextView } from "./views/text";
import { AudioView } from "./views/audio";
+import { Separator } from "@/components/ui/separator";
export function MediaPanel() {
const { activeTab } = useMediaPanelStore();
@@ -46,9 +47,10 @@ export function MediaPanel() {
};
return (
- <div className="h-full flex flex-col bg-panel rounded-sm">
+ <div className="h-full flex bg-panel">
<TabBar />
- <div className="flex-1 overflow-y-auto">{viewMap[activeTab]}</div>
+ <Separator orientation="vertical" />
+ <div className="flex-1 overflow-hidden">{viewMap[activeTab]}</div>
</div>
);
}
diff --git a/apps/web/src/components/editor/media-panel/tabbar.tsx b/apps/web/src/components/editor/media-panel/tabbar.tsx
index 92482559..a3733e4d 100644
--- a/apps/web/src/components/editor/media-panel/tabbar.tsx
+++ b/apps/web/src/components/editor/media-panel/tabbar.tsx
@@ -61,7 +61,7 @@ export function TabBar() {
}, []);
return (
- <div className="flex">
+ <div className="flex pt-4">
<ScrollButton
direction="left"
onClick={scrollToStart}
@@ -69,7 +69,7 @@ export function TabBar() {
/>
<div
ref={scrollContainerRef}
- className="h-12 bg-panel-accent px-3 flex justify-start items-center gap-5 overflow-x-auto scrollbar-x-hidden relative w-full"
+ className="h-full px-4 flex flex-col justify-start items-center gap-5 overflow-x-auto scrollbar-x-hidden relative w-full"
>
{(Object.keys(tabs) as Tab[]).map((tabKey) => {
const tab = tabs[tabKey];
@@ -83,7 +83,6 @@ export function TabBar() {
key={tabKey}
>
<tab.icon className="size-[1.1rem]!" />
- <span className="text-[0.65rem]">{tab.label}</span>
</div>
);
})}
diff --git a/apps/web/src/components/editor/media-panel/views/audio.tsx b/apps/web/src/components/editor/media-panel/views/audio.tsx
index ba64d749..0d3c3f1e 100644
--- a/apps/web/src/components/editor/media-panel/views/audio.tsx
+++ b/apps/web/src/components/editor/media-panel/views/audio.tsx
@@ -9,6 +9,7 @@ export function AudioView() {
<div className="h-full flex flex-col gap-2 p-4">
<Input
placeholder="Search songs and artists"
+ className="bg-panel-accent"
value={search}
onChange={(e) => setSearch(e.target.value)}
/>
diff --git a/apps/web/src/components/editor/media-panel/views/media.tsx b/apps/web/src/components/editor/media-panel/views/media.tsx
index d1533736..772ef4ab 100644
--- a/apps/web/src/components/editor/media-panel/views/media.tsx
+++ b/apps/web/src/components/editor/media-panel/views/media.tsx
@@ -3,8 +3,18 @@
import { useDragDrop } from "@/hooks/use-drag-drop";
import { processMediaFiles } from "@/lib/media-processing";
import { useMediaStore, type MediaItem } from "@/stores/media-store";
-import { Image, Loader2, Music, Plus, Video } from "lucide-react";
-import { useEffect, useRef, useState } from "react";
+import {
+ ArrowDown01,
+ CloudUpload,
+ Grid2X2,
+ Image,
+ List,
+ Loader2,
+ Music,
+ Search,
+ Video,
+} from "lucide-react";
+import { useEffect, useRef, useState, useMemo } from "react";
import { toast } from "sonner";
import { Button } from "@/components/ui/button";
import { MediaDragOverlay } from "@/components/editor/media-panel/drag-overlay";
@@ -14,27 +24,62 @@ import {
ContextMenuItem,
ContextMenuTrigger,
} from "@/components/ui/context-menu";
-import { Input } from "@/components/ui/input";
import {
- Select,
- SelectContent,
- SelectItem,
- SelectTrigger,
- SelectValue,
-} from "@/components/ui/select";
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu";
import { DraggableMediaItem } from "@/components/ui/draggable-item";
import { useProjectStore } from "@/stores/project-store";
import { useTimelineStore } from "@/stores/timeline-store";
import { ScrollArea } from "@/components/ui/scroll-area";
+import {
+ Tooltip,
+ TooltipContent,
+ TooltipProvider,
+ TooltipTrigger,
+} from "@/components/ui/tooltip";
+import { usePanelStore } from "@/stores/panel-store";
+
+function MediaItemWithContextMenu({
+ item,
+ children,
+ onRemove,
+}: {
+ item: MediaItem;
+ children: React.ReactNode;
+ onRemove: (e: React.MouseEvent, id: string) => Promise<void>;
+}) {
+ return (
+ <ContextMenu>
+ <ContextMenuTrigger>{children}</ContextMenuTrigger>
+ <ContextMenuContent>
+ <ContextMenuItem>Export clips</ContextMenuItem>
+ <ContextMenuItem
+ variant="destructive"
+ onClick={(e) => onRemove(e, item.id)}
+ >
+ Delete
+ </ContextMenuItem>
+ </ContextMenuContent>
+ </ContextMenu>
+ );
+}
export function MediaView() {
const { mediaItems, addMediaItem, removeMediaItem } = useMediaStore();
const { activeProject } = useProjectStore();
+ const { mediaViewMode, setMediaViewMode } = usePanelStore();
const fileInputRef = useRef<HTMLInputElement>(null);
const [isProcessing, setIsProcessing] = useState(false);
const [progress, setProgress] = useState(0);
const [searchQuery, setSearchQuery] = useState("");
const [mediaFilter, setMediaFilter] = useState("all");
+ const [sortBy, setSortBy] = useState<"name" | "type" | "duration" | "size">(
+ "name"
+ );
+ const [sortOrder, setSortOrder] = useState<"asc" | "desc">("asc");
const processFiles = async (files: FileList | File[]) => {
if (!files || files.length === 0) return;
@@ -100,7 +145,7 @@ export function MediaView() {
const [filteredMediaItems, setFilteredMediaItems] = useState(mediaItems);
useEffect(() => {
- const filtered = mediaItems.filter((item) => {
+ let filtered = mediaItems.filter((item) => {
if (mediaFilter && mediaFilter !== "all" && item.type !== mediaFilter) {
return false;
}
@@ -115,79 +160,117 @@ export function MediaView() {
return true;
});
+ filtered.sort((a, b) => {
+ let valueA: any;
+ let valueB: any;
+
+ switch (sortBy) {
+ case "name":
+ valueA = a.name.toLowerCase();
+ valueB = b.name.toLowerCase();
+ break;
+ case "type":
+ valueA = a.type;
+ valueB = b.type;
+ break;
+ case "duration":
+ valueA = a.duration || 0;
+ valueB = b.duration || 0;
+ break;
+ case "size":
+ valueA = a.file.size;
+ valueB = b.file.size;
+ break;
+ default:
+ return 0;
+ }
+
+ if (valueA < valueB) return sortOrder === "asc" ? -1 : 1;
+ if (valueA > valueB) return sortOrder === "asc" ? 1 : -1;
+ return 0;
+ });
+
setFilteredMediaItems(filtered);
- }, [mediaItems, mediaFilter, searchQuery]);
+ }, [mediaItems, mediaFilter, searchQuery, sortBy, sortOrder]);
- const renderPreview = (item: MediaItem) => {
- // Render a preview for each media type (image, video, audio, unknown)
- if (item.type === "image") {
- return (
- <div className="w-full h-full flex items-center justify-center">
- <img
- src={item.url}
- alt={item.name}
- className="max-w-full max-h-full object-contain"
- loading="lazy"
- />
- </div>
- );
- }
+ const previewComponents = useMemo(() => {
+ const previews = new Map<string, React.ReactNode>();
- if (item.type === "video") {
- if (item.thumbnailUrl) {
- return (
- <div className="relative w-full h-full">
+ filteredMediaItems.forEach((item) => {
+ let preview: React.ReactNode;
+
+ if (item.type === "image") {
+ preview = (
+ <div className="w-full h-full flex items-center justify-center">
<img
- src={item.thumbnailUrl}
+ src={item.url}
alt={item.name}
- className="w-full h-full object-cover rounded"
+ className="max-w-full max-h-full object-contain"
loading="lazy"
/>
- <div className="absolute inset-0 flex items-center justify-center bg-black/20 rounded">
- <Video className="h-6 w-6 text-white drop-shadow-md" />
+ </div>
+ );
+ } else if (item.type === "video") {
+ if (item.thumbnailUrl) {
+ preview = (
+ <div className="relative w-full h-full">
+ <img
+ src={item.thumbnailUrl}
+ alt={item.name}
+ className="w-full h-full object-cover rounded"
+ loading="lazy"
+ />
+ <div className="absolute inset-0 flex items-center justify-center bg-black/20 rounded">
+ <Video className="h-6 w-6 text-white drop-shadow-md" />
+ </div>
+ {item.duration && (
+ <div className="absolute bottom-1 right-1 bg-black/70 text-white text-xs px-1 rounded">
+ {formatDuration(item.duration)}
+ </div>
+ )}
+ </div>
+ );
+ } else {
+ preview = (
+ <div className="w-full h-full bg-muted/30 flex flex-col items-center justify-center text-muted-foreground rounded">
+ <Video className="h-6 w-6 mb-1" />
+ <span className="text-xs">Video</span>
+ {item.duration && (
+ <span className="text-xs opacity-70">
+ {formatDuration(item.duration)}
+ </span>
+ )}
</div>
+ );
+ }
+ } else if (item.type === "audio") {
+ preview = (
+ <div className="w-full h-full bg-linear-to-br from-green-500/20 to-emerald-500/20 flex flex-col items-center justify-center text-muted-foreground rounded border border-green-500/20">
+ <Music className="h-6 w-6 mb-1" />
+ <span className="text-xs">Audio</span>
{item.duration && (
- <div className="absolute bottom-1 right-1 bg-black/70 text-white text-xs px-1 rounded">
+ <span className="text-xs opacity-70">
{formatDuration(item.duration)}
- </div>
+ </span>
)}
</div>
);
+ } else {
+ preview = (
+ <div className="w-full h-full bg-muted/30 flex flex-col items-center justify-center text-muted-foreground rounded">
+ <Image className="h-6 w-6" />
+ <span className="text-xs mt-1">Unknown</span>
+ </div>
+ );
}
- return (
- <div className="w-full h-full bg-muted/30 flex flex-col items-center justify-center text-muted-foreground rounded">
- <Video className="h-6 w-6 mb-1" />
- <span className="text-xs">Video</span>
- {item.duration && (
- <span className="text-xs opacity-70">
- {formatDuration(item.duration)}
- </span>
- )}
- </div>
- );
- }
- if (item.type === "audio") {
- return (
- <div className="w-full h-full bg-linear-to-br from-green-500/20 to-emerald-500/20 flex flex-col items-center justify-center text-muted-foreground rounded border border-green-500/20">
- <Music className="h-6 w-6 mb-1" />
- <span className="text-xs">Audio</span>
- {item.duration && (
- <span className="text-xs opacity-70">
- {formatDuration(item.duration)}
- </span>
- )}
- </div>
- );
- }
+ previews.set(item.id, preview);
+ });
- return (
- <div className="w-full h-full bg-muted/30 flex flex-col items-center justify-center text-muted-foreground rounded">
- <Image className="h-6 w-6" />
- <span className="text-xs mt-1">Unknown</span>
- </div>
- );
- };
+ return previews;
+ }, [filteredMediaItems]);
+
+ const renderPreview = (item: MediaItem) => previewComponents.get(item.id);
return (
<>
@@ -207,43 +290,152 @@ export function MediaView() {
>
<div className="p-3 pb-2 bg-panel">
{/* Search and filter controls */}
- <div className="flex gap-2">
- <Select value={mediaFilter} onValueChange={setMediaFilter}>
- <SelectTrigger className="w-[80px] h-9 text-xs">
- <SelectValue />
- </SelectTrigger>
- <SelectContent>
- <SelectItem value="all">All</SelectItem>
- <SelectItem value="video">Video</SelectItem>
- <SelectItem value="audio">Audio</SelectItem>
- <SelectItem value="image">Image</SelectItem>
- </SelectContent>
- </Select>
- <Input
- type="text"
- placeholder="Search media..."
- className="min-w-[60px] flex-1 h-9 text-xs"
- value={searchQuery}
- onChange={(e) => setSearchQuery(e.target.value)}
- />
+ <div className="flex items-center gap-2">
<Button
variant="outline"
size="lg"
onClick={handleFileSelect}
disabled={isProcessing}
- className="flex-none bg-transparent min-w-[30px] whitespace-nowrap overflow-hidden px-2 justify-center items-center h-9"
+ className="!bg-background px-4 flex-1 justify-center items-center h-9 opacity-100 hover:opacity-75 transition-opacity"
>
{isProcessing ? (
<Loader2 className="h-4 w-4 animate-spin" />
) : (
- <Plus className="h-4 w-4" />
+ <CloudUpload className="h-4 w-4" />
)}
+ <span>Upload</span>
</Button>
+ <div className="flex items-center gap-0">
+ <TooltipProvider>
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <Button
+ size="icon"
+ variant="text"
+ onClick={() =>
+ setMediaViewMode(
+ mediaViewMode === "grid" ? "list" : "grid"
+ )
+ }
+ disabled={isProcessing}
+ className="justify-center items-center"
+ >
+ {mediaViewMode === "grid" ? (
+ <List strokeWidth={1.5} className="!size-[1.05rem]" />
+ ) : (
+ <Grid2X2
+ strokeWidth={1.5}
+ className="!size-[1.05rem]"
+ />
+ )}
+ </Button>
+ </TooltipTrigger>
+ <TooltipContent>
+ <p>
+ {mediaViewMode === "grid"
+ ? "Switch to list view"
+ : "Switch to grid view"}
+ </p>
+ </TooltipContent>
+ <Tooltip>
+ <DropdownMenu>
+ <TooltipTrigger asChild>
+ <DropdownMenuTrigger asChild>
+ <Button
+ size="icon"
+ variant="text"
+ disabled={isProcessing}
+ className="justify-center items-center"
+ >
+ <ArrowDown01
+ strokeWidth={1.5}
+ className="!size-[1.05rem]"
+ />
+ </Button>
+ </DropdownMenuTrigger>
+ </TooltipTrigger>
+ <DropdownMenuContent align="end">
+ <DropdownMenuItem
+ onClick={() => {
+ if (sortBy === "name") {
+ setSortOrder(
+ sortOrder === "asc" ? "desc" : "asc"
+ );
+ } else {
+ setSortBy("name");
+ setSortOrder("asc");
+ }
+ }}
+ >
+ Name{" "}
+ {sortBy === "name" &&
+ (sortOrder === "asc" ? "↑" : "↓")}
+ </DropdownMenuItem>
+ <DropdownMenuItem
+ onClick={() => {
+ if (sortBy === "type") {
+ setSortOrder(
+ sortOrder === "asc" ? "desc" : "asc"
+ );
+ } else {
+ setSortBy("type");
+ setSortOrder("asc");
+ }
+ }}
+ >
+ Type{" "}
+ {sortBy === "type" &&
+ (sortOrder === "asc" ? "↑" : "↓")}
+ </DropdownMenuItem>
+ <DropdownMenuItem
+ onClick={() => {
+ if (sortBy === "duration") {
+ setSortOrder(
+ sortOrder === "asc" ? "desc" : "asc"
+ );
+ } else {
+ setSortBy("duration");
+ setSortOrder("asc");
+ }
+ }}
+ >
+ Duration{" "}
+ {sortBy === "duration" &&
+ (sortOrder === "asc" ? "↑" : "↓")}
+ </DropdownMenuItem>
+ <DropdownMenuItem
+ onClick={() => {
+ if (sortBy === "size") {
+ setSortOrder(
+ sortOrder === "asc" ? "desc" : "asc"
+ );
+ } else {
+ setSortBy("size");
+ setSortOrder("asc");
+ }
+ }}
+ >
+ File Size{" "}
+ {sortBy === "size" &&
+ (sortOrder === "asc" ? "↑" : "↓")}
+ </DropdownMenuItem>
+ </DropdownMenuContent>
+ </DropdownMenu>
+ <TooltipContent>
+ <p>
+ Sort by {sortBy} (
+ {sortOrder === "asc" ? "ascending" : "descending"})
+ </p>
+ </TooltipContent>
+ </Tooltip>
+ </Tooltip>
+ </TooltipProvider>
+ </div>
</div>
</div>
- <ScrollArea className="h-full">
- <div className="flex-1 p-3 pt-0">
+ <div className="h-full w-full overflow-y-auto scrollbar-thin">
+ <div className="flex-1 p-3 pt-0 w-full">
{isDragOver || filteredMediaItems.length === 0 ? (
<MediaDragOverlay
isVisible={true}
@@ -252,50 +444,105 @@ export function MediaView() {
onClick={handleFileSelect}
isEmptyState={filteredMediaItems.length === 0 && !isDragOver}
/>
+ ) : mediaViewMode === "grid" ? (
+ <GridView
+ filteredMediaItems={filteredMediaItems}
+ renderPreview={renderPreview}
+ handleRemove={handleRemove}
+ />
) : (
- <div
- className="grid gap-2"
- style={{
- gridTemplateColumns: "repeat(auto-fill, 160px)",
- }}
- >
- {/* Render each media item as a draggable button */}
- {filteredMediaItems.map((item) => (
- <ContextMenu key={item.id}>
- <ContextMenuTrigger>
- <DraggableMediaItem
- name={item.name}
- preview={renderPreview(item)}
- dragData={{
- id: item.id,
- type: item.type,
- name: item.name,
- }}
- showPlusOnDrag={false}
- onAddToTimeline={(currentTime) =>
- useTimelineStore
- .getState()
- .addMediaAtTime(item, currentTime)
- }
- rounded={false}
- />
- </ContextMenuTrigger>
- <ContextMenuContent>
- <ContextMenuItem>Export clips</ContextMenuItem>
- <ContextMenuItem
- variant="destructive"
- onClick={(e) => handleRemove(e, item.id)}
- >
- Delete
- </ContextMenuItem>
- </ContextMenuContent>
- </ContextMenu>
- ))}
- </div>
+ <ListView
+ filteredMediaItems={filteredMediaItems}
+ renderPreview={renderPreview}
+ handleRemove={handleRemove}
+ formatDuration={formatDuration}
+ />
)}
</div>
- </ScrollArea>
+ </div>
</div>
</>
);
}
+
+function GridView({
+ filteredMediaItems,
+ renderPreview,
+ handleRemove,
+}: {
+ filteredMediaItems: MediaItem[];
+ renderPreview: (item: MediaItem) => React.ReactNode;
+ handleRemove: (e: React.MouseEvent, id: string) => Promise<void>;
+}) {
+ return (
+ <div
+ className="grid gap-2"
+ style={{
+ gridTemplateColumns: "repeat(auto-fill, 160px)",
+ }}
+ >
+ {filteredMediaItems.map((item) => (
+ <MediaItemWithContextMenu
+ key={item.id}
+ item={item}
+ onRemove={handleRemove}
+ >
+ <DraggableMediaItem
+ name={item.name}
+ preview={renderPreview(item)}
+ dragData={{
+ id: item.id,
+ type: item.type,
+ name: item.name,
+ }}
+ showPlusOnDrag={false}
+ onAddToTimeline={(currentTime) =>
+ useTimelineStore.getState().addMediaAtTime(item, currentTime)
+ }
+ rounded={false}
+ variant="card"
+ />
+ </MediaItemWithContextMenu>
+ ))}
+ </div>
+ );
+}
+
+function ListView({
+ filteredMediaItems,
+ renderPreview,
+ handleRemove,
+ formatDuration,
+}: {
+ filteredMediaItems: MediaItem[];
+ renderPreview: (item: MediaItem) => React.ReactNode;
+ handleRemove: (e: React.MouseEvent, id: string) => Promise<void>;
+ formatDuration: (duration: number) => string;
+}) {
+ return (
+ <div className="space-y-1">
+ {filteredMediaItems.map((item) => (
+ <MediaItemWithContextMenu
+ key={item.id}
+ item={item}
+ onRemove={handleRemove}
+ >
+ <DraggableMediaItem
+ name={item.name}
+ preview={renderPreview(item)}
+ dragData={{
+ id: item.id,
+ type: item.type,
+ name: item.name,
+ }}
+ showPlusOnDrag={false}
+ onAddToTimeline={(currentTime) =>
+ useTimelineStore.getState().addMediaAtTime(item, currentTime)
+ }
+ variant="compact"
+ />
+ </MediaItemWithContextMenu>
+ ))}
+ </div>
+ );
+}
diff --git a/apps/web/src/components/editor/media-panel/views/text.tsx b/apps/web/src/components/editor/media-panel/views/text.tsx
index 0686190e..ca8e88c9 100644
--- a/apps/web/src/components/editor/media-panel/views/text.tsx
+++ b/apps/web/src/components/editor/media-panel/views/text.tsx
@@ -32,7 +32,7 @@ export function TextView() {
<DraggableMediaItem
name="Default text"
preview={
- <div className="flex items-center justify-center w-full h-full bg-accent rounded">
+ <div className="flex items-center justify-center w-full h-full bg-panel-accent rounded">
<span className="text-xs select-none">Default text</span>
</div>
}