Skip to content

Create professional demos and 3D mockups in seconds, directly in your browser

refactor: remove unused image upload functionality and related components

CristianOlivera134d3966e0435
diff --git a/app/[locale]/(editor)/editor/page.tsx b/app/[locale]/(editor)/editor/page.tsx
index 2d26293..cf9b97e 100644
--- a/app/[locale]/(editor)/editor/page.tsx
+++ b/app/[locale]/(editor)/editor/page.tsx
@@ -45,7 +45,6 @@ import { VIDEO_Z_INDEX } from "@/lib/constants";
import Image from "next/image";
import Link from "next/link";
import { TooltipAction } from "@/components/ui/tooltip-action";
-import { bgImagesDelete, bgImagesGetAll, bgImagesSave } from "@/lib/bg-images-idb";
import { DEFAULT_MOCKUP_MOTION_CONFIG, findValidMotionPlacement, MockupMotionFragment, MockupMotionPresetId } from "@/lib/mockup-motion";
const ControlPanel = lazy(() => import("@/app/components/ui/editor/ControlPanel").then(mod => ({ default: mod.ControlPanel })));
@@ -163,8 +162,6 @@ export default function Editor() {
translateY: 0,
});
- const [uploadedImages, setUploadedImages] = useState<string[]>([]);
- const bgImgUrlToIdRef = useRef<Map<string, string>>(new Map());
const [selectedImageUrl, setSelectedImageUrl] = useState<string>("");
const [unsplashBgUrl, setUnsplashBgUrl] = useState<string>("");
@@ -2036,15 +2033,6 @@ export default function Editor() {
return () => document.removeEventListener("visibilitychange", handleVisibilityChange);
}, [loadUploadedVideo, clearHistory, isPhotoMode, setClipUrl]);
- useEffect(() => {
- bgImagesGetAll()
- .then(entries => {
- setUploadedImages(entries.map(e => e.dataUrl));
- entries.forEach(e => bgImgUrlToIdRef.current.set(e.dataUrl, e.id));
- })
- .catch(err => console.error("Error loading bg images:", err));
- }, []);
-
useEffect(() => {
if (videoRef.current) {
videoRef.current.muted = muteOriginalAudio;
@@ -2673,23 +2661,6 @@ export default function Editor() {
}
}, [isDraggingPlayhead, isPlaying, syncAudioPlayback, findActiveClipAtTime, timelineToClipTime, scheduleUpdateFrame]);
- // Handler for background image upload (for ControlPanel)
- const handleImageUpload = useCallback(async (file: File) => {
- const reader = new FileReader();
- reader.onload = (e) => {
- const dataUrl = e.target?.result as string;
- if (dataUrl) {
- const id = crypto.randomUUID();
- bgImgUrlToIdRef.current.set(dataUrl, id);
- bgImagesSave({ id, dataUrl, uploadedAt: Date.now() })
- .catch(err => console.error("Error saving bg image:", err));
- setUploadedImages(prev => [dataUrl, ...prev]);
- setSelectedImageUrl(dataUrl);
- }
- };
- reader.readAsDataURL(file);
- }, []);
-
const handleImageSelect = useCallback((url: string) => {
if (backgroundTab === "wallpaper") setUnsplashBgUrl(url);
else setSelectedImageUrl(url);
@@ -2700,16 +2671,6 @@ export default function Editor() {
setUnsplashBgUrl("");
}, []);
- const handleImageRemove = useCallback((url: string) => {
- const id = bgImgUrlToIdRef.current.get(url);
- if (id) {
- bgImagesDelete(id).catch(err => console.error("Error deleting bg image:", err));
- bgImgUrlToIdRef.current.delete(url);
- }
- setUploadedImages(prev => prev.filter(img => img !== url));
- if (selectedImageUrl === url) setSelectedImageUrl("");
- }, [selectedImageUrl]);
-
// Background tab change handler
const handleBackgroundTabChange = useCallback((tab: BackgroundTab) => setBackgroundTab(tab), []);
@@ -3065,11 +3026,8 @@ export default function Editor() {
onRoundedCornersChange={handleRoundedCornersChange}
shadows={shadows}
onShadowsChange={setShadows}
- uploadedImages={uploadedImages}
selectedImageUrl={selectedImageUrl}
- onImageUpload={handleImageUpload}
onImageSelect={handleImageSelect}
- onImageRemove={handleImageRemove}
backgroundColorConfig={backgroundColorConfig}
backgroundColorCss={backgroundColorCss}
onBackgroundColorChange={handleBackgroundColorChange}
@@ -3360,11 +3318,8 @@ export default function Editor() {
onRoundedCornersChange={handleRoundedCornersChange}
shadows={shadows}
onShadowsChange={setShadows}
- uploadedImages={uploadedImages}
selectedImageUrl={selectedImageUrl}
- onImageUpload={handleImageUpload}
onImageSelect={handleImageSelect}
- onImageRemove={handleImageRemove}
backgroundColorConfig={backgroundColorConfig}
onBackgroundColorChange={handleBackgroundColorChange}
zoomFragments={zoomFragments}
diff --git a/app/components/ui/ImageRecentBackgroundGrid.tsx b/app/components/ui/ImageRecentBackgroundGrid.tsx
deleted file mode 100644
index 70e4980..0000000
--- a/app/components/ui/ImageRecentBackgroundGrid.tsx
+++ /dev/null
@@ -1,128 +0,0 @@
-"use client";
-
-import { Icon } from "@iconify/react";
-import { useRef } from "react";
-import Image from "next/image";
-import { useTranslations } from "next-intl";
-
-interface ImageRecentBackgroundGridProps {
- images: string[];
- onSelect: (url: string) => void;
- onRemove: (url: string) => void;
- onUpload: (file: File) => void;
- selectedUrl?: string;
-}
-
-export function ImageRecentBackgroundGrid({
- images,
- onSelect,
- onRemove,
- onUpload,
- selectedUrl
-}: ImageRecentBackgroundGridProps) {
- const t = useTranslations("imageRecentGrid");
- const fileInputRef = useRef<HTMLInputElement>(null);
-
- const handleFileSelect = (e: React.ChangeEvent<HTMLInputElement>) => {
- const file = e.target.files?.[0];
- if (file && file.type.startsWith('image/')) {
- onUpload(file);
- }
- };
-
- const handleDragOver = (e: React.DragEvent) => {
- e.preventDefault();
- e.stopPropagation();
- };
-
- const handleDrop = (e: React.DragEvent) => {
- e.preventDefault();
- e.stopPropagation();
- const file = e.dataTransfer.files?.[0];
- if (file && file.type.startsWith('image/')) {
- onUpload(file);
- }
- };
-
- return (
- <div className="space-y-6">
- <input
- ref={fileInputRef}
- type="file"
- accept="image/*"
- className="hidden"
- onChange={handleFileSelect}
- aria-label={t("upload.action")}
- />
-
- <div
- className="border-2 border-dashed border-white/10 rounded-lg p-6 text-center hover:border-white/20 transition cursor-pointer group bg-white/2"
- onClick={() => fileInputRef.current?.click()}
- onDragOver={handleDragOver}
- onDrop={handleDrop}
- role="button"
- aria-label={t("upload.instruction")}
- tabIndex={0}
- >
- <Icon icon="mdi:cloud-upload" className="text-3xl mx-auto mb-2 text-white/60 group-hover:text-white/70 transition-colors" aria-hidden="true" />
- <p className="text-xs text-white/70">
- {t("upload.instruction")} <span className="text-white">{t("upload.action")}</span>
- </p>
- </div>
-
- {images.length > 0 && (
- <div>
- <div className="text-[11px] uppercase tracking-widest text-white/70 font-bold mb-3 flex items-center gap-2">
- <Icon icon="mdi:history" width="14" aria-hidden="true" />
- <span>{t("sections.recent")}</span>
- </div>
-
- <div className="grid grid-cols-4 gap-2">
- {images.map((url, i) => (
- <div
- key={i}
- onClick={() => onSelect(url)}
- className={`aspect-square squircle-element cursor-pointer hover:ring-2 ring-white/60 transition relative overflow-hidden group border border-white/10 ${
- selectedUrl === url ? "ring-2 ring-white-500" : ""
- }`}
- role="button"
- aria-label={t("alt.recent", { index: i + 1 })}
- aria-pressed={selectedUrl === url}
- >
- <div className={`absolute inset-0 bg-white-500/20 transition-opacity z-10 flex items-center justify-center ${
- selectedUrl === url ? "opacity-100" : "opacity-0 group-hover:opacity-100"
- }`}>
- <Icon icon="mdi:check" className="text-white" width="14" aria-hidden="true" />
- </div>
-
- <button
- className="absolute top-1 right-1 z-20 p-1 rounded-md bg-black/40 text-white/70 hover:bg-red-500 hover:text-white opacity-0 group-hover:opacity-100 transition-all backdrop-blur-sm"
- onClick={(e) => {
- e.stopPropagation();
- onRemove(url);
- }}
- aria-label={t("alt.recent", { index: i + 1 }) + " - Remove"}
- >
- <Icon icon="lucide:trash-2" width="12" aria-hidden="true" />
- </button>
-
- {url ? (
- <Image
- src={url}
- alt={t("alt.recent", { index: i })}
- fill
- className="object-cover grayscale-[0.5] group-hover:grayscale-0 transition-all"
- />
- ) : (
- <div className="absolute inset-0 bg-white/5 flex items-center justify-center">
- <Icon icon="mdi:image-broken-variant" className="text-white/20" width="24" aria-hidden="true" />
- </div>
- )}
- </div>
- ))}
- </div>
- </div>
- )}
- </div>
- );
-}
\ No newline at end of file
diff --git a/app/components/ui/Skeleton.tsx b/app/components/ui/Skeleton.tsx
index e00a528..252eb25 100644
--- a/app/components/ui/Skeleton.tsx
+++ b/app/components/ui/Skeleton.tsx
@@ -311,25 +311,6 @@ export function BackgroundColorSkeleton() {
);
}
-export function ImageBackgroundSkeleton() {
- return (
- <div className="space-y-6">
- <div className="border-2 border-dashed border-white/10 rounded-lg p-6 flex flex-col items-center gap-2">
- <Skeleton width={32} height={32} variant="circle" />
- <Skeleton height={10} width="70%" />
- </div>
-
- <div className="space-y-3">
- <div className="flex items-center gap-2">
- <Skeleton width={14} height={14} variant="circle" />
- <Skeleton height={10} width={70} />
- </div>
- <SkeletonGrid columns={4} rows={2} gap={2} itemHeight={72} variant="square" />
- </div>
- </div>
- );
-}
-
export function TimelineSkeleton() {
return (
<div className="h-38 shrink-0 bg-[#0D0D11] border-t border-white/10 flex flex-col font-mono text-[11px]">
diff --git a/app/components/ui/WalpaperSections.tsx b/app/components/ui/WalpaperSections.tsx
index 05af295..3de4950 100644
--- a/app/components/ui/WalpaperSections.tsx
+++ b/app/components/ui/WalpaperSections.tsx
@@ -1,6 +1,5 @@
"use client";
-
-import { useState } from "react";
+import { useState, useRef } from "react";
import { Icon } from "@iconify/react";
import { motion, AnimatePresence } from "framer-motion";
import { WALLPAPER_CATEGORIES, type WallpaperCategory, type WallpaperItem } from "@/lib/wallpaper.catalog";
@@ -15,30 +14,73 @@ interface WallpaperGridProps {
selectedIndex?: number;
onSelect?: (index: number) => void;
onUnsplashSelect?: (url: string) => void;
+ onCustomImageSelect?: (url: string) => void;
showAll?: boolean;
onShowAllChange?: (value: boolean) => void;
}
-export function OptionsGrid({ selectedIndex = -1, onSelect, onUnsplashSelect }: WallpaperGridProps) {
+function CustomImagePickerButton({ onSelect }: { onSelect?: (url: string) => void }) {
const t = useTranslations("wallpapers");
+ const inputRef = useRef<HTMLInputElement>(null);
+
+ const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+ const file = e.target.files?.[0];
+ if (!file || !file.type.startsWith("image/")) return;
+ const reader = new FileReader();
+ reader.onload = (ev) => {
+ const dataUrl = ev.target?.result as string;
+ if (dataUrl) onSelect?.(dataUrl);
+ };
+ reader.readAsDataURL(file);
+ e.target.value = "";
+ };
+
+ return (
+ <>
+ <input
+ ref={inputRef}
+ type="file"
+ accept="image/*"
+ className="hidden"
+ onChange={handleChange}
+ aria-label={t("options.upload")}
+ />
+ <TooltipAction label={t("options.upload")}>
+ <button
+ onClick={() => inputRef.current?.click()}
+ className="aspect-square bg-white/3 hover:bg-white/8 border border-dashed border-white/30 squircle-element flex items-center justify-center transition-all active:scale-90 group disabled:opacity-50"
+ aria-label={t("options.upload")}
+ >
+ <Icon icon="hugeicons:image-upload" width="24" className="text-white-70 group-hover:text-white transition-colors" aria-hidden="true" />
+ </button>
+ </TooltipAction>
+ </>
+ );
+}
+export function OptionsGrid({ selectedIndex = -1, onSelect, onUnsplashSelect, onCustomImageSelect }: WallpaperGridProps) {
+ const t = useTranslations("wallpapers");
return (
<div className="grid grid-cols-6 gap-2">
<TooltipAction label={t("options.none")}>
<button
onClick={() => onSelect?.(-1)}
- className={`aspect-square squircle-element cursor-pointer transition-all flex items-center justify-center relative overflow-hidden ${selectedIndex === -1 ? "ring-2 ring-white/90 shadow-lg shadow-black/40" : "hover:ring-2 ring-white/60"
+ className={`aspect-square squircle-element cursor-pointer transition-all flex items-center justify-center relative overflow-hidden ${selectedIndex === -1
+ ? "ring-2 ring-white/90 shadow-lg shadow-black/40"
+ : "hover:ring-2 ring-white/60"
}`}
style={{
- backgroundImage: "linear-gradient(45deg,#444 25%,transparent 25%),linear-gradient(-45deg,#444 25%,transparent 25%),linear-gradient(45deg,transparent 75%,#444 75%),linear-gradient(-45deg,transparent 75%,#444 75%)",
+ backgroundImage:
+ "linear-gradient(45deg,#444 25%,transparent 25%),linear-gradient(-45deg,#444 25%,transparent 25%),linear-gradient(45deg,transparent 75%,#444 75%),linear-gradient(-45deg,transparent 75%,#444 75%)",
backgroundSize: "12px 12px",
backgroundPosition: "0 0,0 6px,6px -6px,-6px 0",
- backgroundColor: "#ccc",
+ backgroundColor: "#FFFFFF",
}}
aria-label={t("options.none")}
aria-pressed={selectedIndex === -1}
/>
</TooltipAction>
+ <CustomImagePickerButton onSelect={onCustomImageSelect} />
<PhotoPickerPopover onSelect={(url) => onUnsplashSelect?.(url)} />
</div>
);
@@ -47,9 +89,7 @@ export function OptionsGrid({ selectedIndex = -1, onSelect, onUnsplashSelect }:
function CategoryPopover({ category, selectedIndex, onSelect }: { category: WallpaperCategory; selectedIndex: number; onSelect?: (index: number) => void; }) {
const [open, setOpen] = useState(false);
const t = useTranslations("wallpapers");
-
const categoryName = t(`categories.${category.id}`);
-
return (
<Popover open={open} onOpenChange={setOpen}>
<TooltipAction label={t("popover.seeMore", { name: categoryName })}>
@@ -59,7 +99,6 @@ function CategoryPopover({ category, selectedIndex, onSelect }: { category: Wall
</button>
</PopoverTrigger>
</TooltipAction>
-
<PopoverContent side="right" align="start" sideOffset={12} className="w-126 p-0 border-0 shadow-2xl">
<div className="flex flex-col bg-[#111113] border border-white/10 rounded-xl overflow-hidden shadow-2xl">
<div className="flex items-center gap-2 px-4 py-3 border-b border-white/10 bg-white/2">
@@ -85,7 +124,6 @@ function CategoryPopover({ category, selectedIndex, onSelect }: { category: Wall
function PrimaryCategoryGrid({ category, selectedIndex, onSelect }: { category: WallpaperCategory; selectedIndex: number; onSelect?: (index: number) => void; }) {
const t = useTranslations("wallpapers");
const visible = category.items.slice(0, PREVIEW_LIMIT);
-
return (
<div className="flex flex-col gap-2">
<div className="flex items-center gap-1.5 text-[11px] uppercase tracking-widest text-white/70 font-bold">
@@ -105,7 +143,6 @@ function PrimaryCategoryGrid({ category, selectedIndex, onSelect }: { category:
function SecondaryCategoryGrid({ category, selectedIndex, onSelect }: { category: WallpaperCategory; selectedIndex: number; onSelect?: (index: number) => void; }) {
const t = useTranslations("wallpapers");
const visible = category.items.slice(0, PREVIEW_LIMIT);
-
return (
<motion.div
initial={{ opacity: 0, height: 0, marginTop: 0 }}
@@ -137,7 +174,6 @@ export function WallpaperCatalogGrid({
onShowAllChange,
}: WallpaperGridProps) {
const t = useTranslations("wallpapers");
-
const primary = WALLPAPER_CATEGORIES.filter((c) => c.primary);
const secondary = WALLPAPER_CATEGORIES.filter((c) => !c.primary);
@@ -146,7 +182,6 @@ export function WallpaperCatalogGrid({
{primary.map((cat) => (
<PrimaryCategoryGrid key={cat.id} category={cat} selectedIndex={selectedIndex} onSelect={onSelect} />
))}
-
{secondary.length > 0 && (
<motion.button
onClick={() => onShowAllChange?.(!showAll)}
@@ -160,7 +195,6 @@ export function WallpaperCatalogGrid({
<span>{showAll ? t("options.showLess") : t("options.showMore")}</span>
</motion.button>
)}
-
<AnimatePresence mode="sync">
{showAll && secondary.map((cat) => (
<SecondaryCategoryGrid key={cat.id} category={cat} selectedIndex={selectedIndex} onSelect={onSelect} />
@@ -174,7 +208,9 @@ function WallpaperThumb({ item, isSelected, onSelect }: { item: WallpaperItem; i
return (
<button
onClick={() => onSelect?.(item.index)}
- className={`aspect-square squircle-element cursor-pointer transition-all bg-cover bg-center border ${isSelected ? "ring-2 ring-white/90 border-white/40 shadow-md shadow-black/50" : "border-white/10 hover:border-white/30 hover:ring-1 ring-white/20"
+ className={`aspect-square squircle-element cursor-pointer transition-all bg-cover bg-center border ${isSelected
+ ? "ring-2 ring-white/90 border-white/40 shadow-md shadow-black/50"
+ : "border-white/10 hover:border-white/30 hover:ring-1 ring-white/20"
}`}
style={{ backgroundImage: `url('${item.previewUrl}')` }}
aria-label={item.filename}
@@ -188,7 +224,9 @@ function WallpaperThumbProgressive({ item, isSelected, onSelect }: { item: Wallp
return (
<button
onClick={() => onSelect?.(item.index)}
- className={`aspect-square squircle-element cursor-pointer transition-all bg-cover bg-center border overflow-hidden relative ${isSelected ? "ring-2 ring-white/90 border-white/40 shadow-md shadow-black/50" : "border-white/10 hover:border-white/30 hover:ring-1 ring-white/20"
+ className={`aspect-square squircle-element cursor-pointer transition-all bg-cover bg-center border overflow-hidden relative ${isSelected
+ ? "ring-2 ring-white/90 border-white/40 shadow-md shadow-black/50"
+ : "border-white/10 hover:border-white/30 hover:ring-1 ring-white/20"
}`}
aria-label={item.filename}
aria-pressed={isSelected}
diff --git a/app/components/ui/editor/ControlPanel.tsx b/app/components/ui/editor/ControlPanel.tsx
index 97446ff..f31680e 100644
--- a/app/components/ui/editor/ControlPanel.tsx
+++ b/app/components/ui/editor/ControlPanel.tsx
@@ -10,19 +10,7 @@ import Image from "next/image";
import { lazy, Suspense, useState } from "react";
import { useTranslations } from "next-intl";
-import {
- ElementsMenuSkeleton,
- ZoomGlobalConfigSkeleton,
- MockupMenuSkeleton,
- WallpaperSkeleton,
- BackgroundColorSkeleton,
- ImageBackgroundSkeleton,
- ZoomFragmentEditorSkeleton,
- AudioMenuSkeleton,
- VideosMenuSkeleton,
- HistoryMenuSkeleton,
- MotionMenuSkeleton
-} from "../Skeleton";
+import { ElementsMenuSkeleton, ZoomGlobalConfigSkeleton, MockupMenuSkeleton, WallpaperSkeleton, BackgroundColorSkeleton, ZoomFragmentEditorSkeleton, AudioMenuSkeleton, VideosMenuSkeleton, HistoryMenuSkeleton, MotionMenuSkeleton } from "../Skeleton";
import { ElementsMenu } from "./ElementsMenu";
import { TooltipAction } from "@/components/ui/tooltip-action";
@@ -30,7 +18,6 @@ import { CameraMenu } from "./CameraMenu";
import { useMockup3dContext } from "@/app/contexts/Mockup3dContext";
import { MotionMenu } from "./MotionMenu";
-const ImageRecentBackgroundGrid = lazy(() => import("../ImageRecentBackgroundGrid").then(mod => ({ default: mod.ImageRecentBackgroundGrid })));
const BackgroundColorEditor = lazy(() => import("../BackgroundColorEditor").then(mod => ({ default: mod.BackgroundColorEditor })));
const ZoomFragmentEditor = lazy(() => import("./ZoomFragmentEditor").then(mod => ({ default: mod.ZoomFragmentEditor })));
const ZoomGlobalConfig = lazy(() => import("./ZoomGlobalConfig").then(mod => ({ default: mod.ZoomGlobalConfig })));
@@ -55,7 +42,6 @@ export function ControlPanel({
padding,
roundedCorners,
shadows,
- uploadedImages,
selectedImageUrl,
backgroundColorConfig,
backgroundColorCss,
@@ -67,9 +53,7 @@ export function ControlPanel({
onPaddingChange,
onRoundedCornersChange,
onShadowsChange,
- onImageUpload,
onImageSelect,
- onImageRemove,
onBackgroundColorChange,
onTogglePanel,
elementsTextTabTrigger = 0,
@@ -184,21 +168,8 @@ export function ControlPanel({
<span>{t("screenshot.background")}</span>
</div>
<div className="flex bg-[#09090B] rounded-lg p-1 text-xs font-medium">
- <TabButton
- label={t("screenshot.tabs.wallpaper")}
- isActive={backgroundTab === "wallpaper"}
- onClick={() => onBackgroundTabChange("wallpaper")}
- />
- <TabButton
- label={t("screenshot.tabs.color")}
- isActive={backgroundTab === "color"}
- onClick={() => onBackgroundTabChange("color")}
- />
- <TabButton
- label={t("screenshot.tabs.image")}
- isActive={backgroundTab === "image"}
- onClick={() => onBackgroundTabChange("image")}
- />
+ <TabButton label={t("screenshot.tabs.wallpaper")} isActive={backgroundTab === "wallpaper"} onClick={() => onBackgroundTabChange("wallpaper")} />
+ <TabButton label={t("screenshot.tabs.color")} isActive={backgroundTab === "color"} onClick={() => onBackgroundTabChange("color")} />
</div>
</div>
@@ -217,6 +188,10 @@ export function ControlPanel({
onWallpaperSelect?.(-2);
onImageSelect?.(url);
}}
+ onCustomImageSelect={(url) => {
+ onWallpaperSelect?.(-2);
+ onImageSelect?.(url);
+ }}
/>
</div>
<WallpaperCatalogGrid
@@ -233,18 +208,6 @@ export function ControlPanel({
</Suspense>
)}
- {backgroundTab === "image" && (
- <Suspense fallback={<ImageBackgroundSkeleton />}>
- <ImageRecentBackgroundGrid
- images={uploadedImages?.filter(url => typeof url === 'string' && url.trim() !== "") || []}
- selectedUrl={selectedImageUrl}
- onSelect={onImageSelect}
- onRemove={onImageRemove}
- onUpload={onImageUpload}
- />
- </Suspense>
- )}
-
{backgroundTab === "color" && (
<Suspense fallback={<BackgroundColorSkeleton />}>
<BackgroundColorEditor value={backgroundColorConfig} onChange={onBackgroundColorChange} />
diff --git a/app/components/ui/editor/ElementsMenu.tsx b/app/components/ui/editor/ElementsMenu.tsx
index 7e09db1..c19c78f 100644
--- a/app/components/ui/editor/ElementsMenu.tsx
+++ b/app/components/ui/editor/ElementsMenu.tsx
@@ -5,14 +5,13 @@ import { useState, useEffect, useRef, startTransition, useCallback, useLayoutEff
import { useTranslations } from "next-intl";
import { SliderControl } from "../../../../components/ui/SliderControl";
import { SVG_CATEGORIES, IMAGE_CATEGORIES, PINNED_SVG_ITEMS, PINNED_IMAGE_ITEMS, getImagePreviewPath } from "@/lib/canvas-elements.config";
-import { SvgElement, TextElement, ImageElement, ElementsMenuProps, PRESET_COLORS, TEXT_PRESETS, FONT_FAMILIES, FONT_WEIGHTS, UploadedImage, ACCEPTED_FORMATS, MAX_FILE_SIZE } from "@/types/canvas-elements.types";
+import { SvgElement, TextElement, ImageElement, ElementsMenuProps, PRESET_COLORS, TEXT_PRESETS, FONT_FAMILIES, FONT_WEIGHTS, ACCEPTED_FORMATS, MAX_FILE_SIZE } from "@/types/canvas-elements.types";
import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
import { Button } from "@/components/ui/button";
import { SVG_COMPONENTS } from "@/components/canvas-svg";
import { TooltipAction } from "@/components/ui/tooltip-action";
import { ProgressiveImg } from "@/components/ui/ProgressiveImg";
-import { canvasUploadsClear, canvasUploadsDelete, canvasUploadsGetAll, canvasUploadsSave } from "@/lib/canvas-uploads-idb";
interface ExtendedElementsMenuProps extends ElementsMenuProps {
textTabTrigger?: number;
@@ -30,7 +29,7 @@ export function ElementsMenu({
}: ExtendedElementsMenuProps) {
const t = useTranslations("elementsMenu");
- const [mode, setMode] = useState<"text" | "elements" | "uploads">("elements");
+ const [mode, setMode] = useState<"text" | "elements">("elements");
const [shapeColor, setShapeColor] = useState("#FFFFFF");
const [shapeOpacity, setShapeOpacity] = useState(100);
const [textContent, setTextContent] = useState("Texto");
@@ -47,9 +46,7 @@ export function ElementsMenu({
onUpdateElementRef.current = onUpdateElement;
});
- const [uploadedImages, setUploadedImages] = useState<UploadedImage[]>([]);
const [isUploading, setIsUploading] = useState(false);
-
const isSyncing = useRef(false);
const lastSelectedId = useRef<string | null>(null);
@@ -120,16 +117,9 @@ export function ElementsMenu({
}, [textContent, textFontSize, textColor, textOpacity, textFontFamily,
textFontWeight, selectedElement?.id, selectedElement?.type]);
- useEffect(() => {
- canvasUploadsGetAll()
- .then(entries => setUploadedImages(entries))
- .catch(err => console.error("Error loading canvas uploads:", err));
- }, []);
-
const handleImageUpload = useCallback(async (files: FileList | null) => {
if (!files || files.length === 0) return;
setIsUploading(true);
- const newImages: UploadedImage[] = [];
for (let i = 0; i < files.length; i++) {
const file = files[i];
if (!ACCEPTED_FORMATS.includes(file.type)) continue;
@@ -141,66 +131,44 @@ export function ElementsMenu({
reader.onerror = reject;
reader.readAsDataURL(file);
});
- const uploadedImage: UploadedImage = {
- id: `upload-${Date.now()}-${Math.random().toString(36).substring(2, 9)}`,
- name: file.name, dataUrl, uploadedAt: Date.now(),
- };
- canvasUploadsSave(uploadedImage).catch(err => console.error("Error saving canvas upload:", err));
- newImages.push(uploadedImage);
+
+ let width = DEFAULT_IMAGE_SIZE;
+ let height = DEFAULT_IMAGE_SIZE;
+ await new Promise<void>((resolve) => {
+ const img = new Image();
+ img.onload = () => {
+ if (img.naturalWidth && img.naturalHeight) {
+ const ar = img.naturalWidth / img.naturalHeight;
+ if (ar >= 1) { height = DEFAULT_IMAGE_SIZE / ar; } else { width = DEFAULT_IMAGE_SIZE * ar; }
+ }
+ resolve();
+ };
+ img.onerror = () => resolve();
+ img.src = dataUrl;
+ });
+
const timestamp = Date.now() + i;
const newElement: ImageElement = {
id: `image-${timestamp}-${Math.random().toString(36).substring(2, 9)}`,
- type: "image", category: "uploads", x: 50, y: 50,
- width: DEFAULT_IMAGE_SIZE, height: DEFAULT_IMAGE_SIZE, rotation: 0,
- opacity: imageOpacity / 100, zIndex: timestamp, imagePath: dataUrl,
+ type: "image",
+ category: "uploads",
+ x: 50,
+ y: 50,
+ width,
+ height,
+ rotation: 0,
+ opacity: imageOpacity / 100,
+ zIndex: timestamp,
+ imagePath: dataUrl,
};
onAddElement(newElement);
- } catch (error) { console.error(`Error uploading ${file.name}:`, error); }
+ } catch (error) {
+ console.error(`Error uploading ${file.name}:`, error);
+ }
}
- if (newImages.length > 0) setUploadedImages(prev => [...prev, ...newImages]);
setIsUploading(false);
}, [imageOpacity, onAddElement]);
- const handleDeleteUploadedImage = useCallback((id: string) => {
- canvasUploadsDelete(id).catch(err => console.error("Error deleting canvas upload:", err));
- setUploadedImages(prev => prev.filter(img => img.id !== id));
- }, []);
-
- const handleAddUploadedImage = useCallback(async (image: UploadedImage) => {
- const timestamp = Date.now();
- let width = DEFAULT_IMAGE_SIZE;
- let height = DEFAULT_IMAGE_SIZE;
- await new Promise<void>((resolve) => {
- const img = new Image();
- img.onload = () => {
- if (img.naturalWidth && img.naturalHeight) {
- const ar = img.naturalWidth / img.naturalHeight;
- if (ar >= 1) { height = DEFAULT_IMAGE_SIZE / ar; }
- else { width = DEFAULT_IMAGE_SIZE * ar; }
- }
- resolve();
- };
- img.onerror = () => resolve();
- img.src = image.dataUrl;
- });
- const newElement: ImageElement = {
- id: `image-${timestamp}-${Math.random().toString(36).substring(2, 9)}`,
- type: "image", category: "uploads", x: 50, y: 50,
- width, height, rotation: 0,
- opacity: imageOpacity / 100, zIndex: timestamp, imagePath: image.dataUrl,
- };
- onAddElement(newElement);
- }, [imageOpacity, onAddElement]);
-
- const handleDragOver = useCallback((e: React.DragEvent<HTMLLabelElement>) => {
- e.preventDefault(); e.stopPropagation();
- }, []);
-
- const handleDrop = useCallback((e: React.DragEvent<HTMLLabelElement>) => {
- e.preventDefault(); e.stopPropagation();
- handleImageUpload(e.dataTransfer.files);
- }, [handleImageUpload]);
-
const filteredSvgItems = selectedSvgCategory === "all"
? SVG_CATEGORIES.flatMap(cat => cat.items.map(item => ({ ...item, category: cat.id })))
: SVG_CATEGORIES.find(cat => cat.id === selectedSvgCategory)?.items.map(item => ({ ...item, category: selectedSvgCategory })) || [];
@@ -257,7 +225,7 @@ export function ElementsMenu({
<span>{t("title")}</span>
</div>
- <div className="grid grid-cols-3 bg-[#09090B] squircle-element p-1 text-xs font-medium border border-white/5" role="tablist" aria-label={t("title")}>
+ <div className="grid grid-cols-2 bg-[#09090B] squircle-element p-1 text-xs font-medium border border-white/5" role="tablist" aria-label={t("title")}>
<button className={`flex justify-center items-center gap-1.5 py-1.5 rounded transition ${mode === "elements" ? "bg-white/10 text-white" : "text-white/60 hover:text-white/80"}`} onClick={() => setMode("elements")} role="tab" aria-selected={mode === "elements"} aria-controls="elements-panel">
<Icon icon="iconoir:hexagon" width="14" aria-hidden="true" />
{t("tabs.elements")}
@@ -266,10 +234,6 @@ export function ElementsMenu({
<Icon icon="iconoir:text-size" width="14" aria-hidden="true" />
{t("tabs.text")}
</button>
- <button className={`flex justify-center items-center gap-1.5 py-1.5 rounded transition ${mode === "uploads" ? "bg-white/10 text-white" : "text-white/60 hover:text-white/80"}`} onClick={() => setMode("uploads")} role="tab" aria-selected={mode === "uploads"} aria-controls="uploads-panel">
- <Icon icon="ph:upload-simple-bold" width="14" aria-hidden="true" />
- {t("tabs.uploads")}
- </button>
</div>
{mode === "elements" && (
@@ -340,15 +304,15 @@ export function ElementsMenu({
<div className="space-y-2">
<div className="text-[11px] uppercase tracking-widest text-white/70 font-semibold">{t("sections.images")}</div>
<div className="grid grid-cols-6 gap-1.5">
+ <UploadImageButton onUpload={handleImageUpload} isUploading={isUploading} />
{PINNED_IMAGE_ITEMS.map((item) => (
<button key={item.id} onClick={() => handleAddImage(item)} className="aspect-square bg-white/3 hover:bg-white/8 border border-white/[0.07] hover:border-white/20 squircle-element flex items-center justify-center transition-all active:scale-90 overflow-hidden group">
<ProgressiveImg src={getImagePreviewPath(item)} alt={item.name} className="w-full h-full object-cover group-hover:scale-110" />
</button>
))}
- {Array.from({ length: Math.max(0, 11 - PINNED_IMAGE_ITEMS.length) }).map((_, i) => (
+ {Array.from({ length: Math.max(0, 10 - PINNED_IMAGE_ITEMS.length) }).map((_, i) => (
<div key={`empty-${i}`} className="aspect-square" />
))}
-
<Popover>
<TooltipAction label={t("tooltips.allImages")}>
<PopoverTrigger asChild>
@@ -518,75 +482,42 @@ export function ElementsMenu({
</div>
)}
- {mode === "uploads" && (
- <div className="flex flex-col gap-5 animate-in fade-in duration-150">
- <div className="space-y-2">
- <div className="text-[11px] uppercase tracking-widest text-white/70 font-semibold">{t("uploads.title")}</div>
- <label className={`group flex flex-col items-center justify-center w-full bg-[#09090B] border border-dashed border-white/10 hover:border-white/30 hover:bg-white/3 squircle-element p-8 text-center cursor-pointer transition-all ${isUploading ? "opacity-50 pointer-events-none" : ""}`} onDragOver={handleDragOver} onDrop={handleDrop}>
- {isUploading ? (
- <div className="flex flex-col items-center justify-center w-full">
- <div className="w-12 h-12 rounded-full bg-white/5 border border-white/10 flex items-center justify-center mx-auto mb-4 transition-transform">
- <Icon icon="svg-spinners:180-ring-with-bg" width="24" className="text-white/60" />
- </div>
- <p className="text-sm font-medium text-white/70 mb-1">{t("uploads.uploading")}</p>
- <p className="text-xs text-white/40">{t("uploads.processing")}</p>
- </div>
- ) : (
- <div className="flex flex-col items-center justify-center w-full">
- <div className="w-12 h-12 rounded-full bg-white/5 border border-white/10 flex items-center justify-center mx-auto mb-4 group-hover:scale-105 transition-transform">
- <Icon icon="solar:upload-minimalistic-outline" width="24" className="text-white/40 group-hover:text-white/70 transition-colors" />
- </div>
- <p className="text-sm font-medium text-white/70 mb-1">{t("uploads.title")}</p>
- <p className="text-xs text-white/40 mb-5">{t("uploads.instruction")}</p>
- <div className="inline-flex items-center justify-center gap-2 whitespace-nowrap squircle-element font-medium transition-all border border-white/10 bg-transparent hover:bg-white/10 h-9 px-4 py-2 w-full text-xs text-white/70 group-hover:text-white shadow-xs">
- <span>{t("uploads.selectFile")}</span>
- </div>
- </div>
- )}
- <input type="file" className="hidden" accept="image/png,image/jpeg,image/jpg,image/webp,image/gif" multiple onChange={(e) => handleImageUpload(e.target.files)} disabled={isUploading} />
- </label>
- </div>
-
- <div className="space-y-2">
- <div className="flex justify-between items-center">
- <div className="text-[11px] uppercase tracking-widest text-white/70 font-semibold">
- {t("uploads.gallery", { count: uploadedImages.length })}
- </div>
- {uploadedImages.length > 0 && (
- <button onClick={() => {
- canvasUploadsClear().catch(err => console.error("Error clearing canvas uploads:", err));
- setUploadedImages([]);
- }} className="text-[11px] text-red-400/70 hover:text-red-400 transition-colors">
- {t("uploads.clearAll")}
- </button>
- )}
- </div>
- <div className="grid grid-cols-3 gap-2">
- {uploadedImages.length === 0 ? (
- <div className="col-span-3 py-10 flex flex-col items-center justify-center text-center bg-[#09090B] border border-dashed border-white/10 squircle-element">
- <div className="w-10 h-10 rounded-full bg-white/5 border border-white/10 flex items-center justify-center mb-3">
- <Icon icon="mynaui:image" width="20" className="text-white/40" />
- </div>
- <span className="text-xs font-medium text-white/70 mb-0.5">{t("uploads.emptyTitle")}</span>
- <span className="text-[11px] text-white/40">{t("uploads.emptySubtitle")}</span>
- </div>
- ) : (
- uploadedImages.map((image) => (
- <div key={image.id} className="group relative aspect-square rounded-lg overflow-hidden border border-white/10 bg-white/5 hover:border-white/30 transition-all cursor-pointer" onClick={() => handleAddUploadedImage(image)} title={image.name}>
- <img src={image.dataUrl} alt={image.name} className="w-full h-full object-cover" />
- <div className="absolute inset-0 bg-black/40 opacity-0 group-hover:opacity-100 transition-opacity flex items-center justify-center">
- <Icon icon="ph:plus-circle-bold" width="24" className="text-white" />
- </div>
- <button onClick={(e) => { e.stopPropagation(); handleDeleteUploadedImage(image.id); }} className="absolute top-1 right-1 p-1 rounded bg-black/60 hover:bg-red-500/80 text-white/70 hover:text-white opacity-0 group-hover:opacity-100 transition-all z-10">
- <Icon icon="ph:trash-bold" width="12" />
- </button>
- </div>
- ))
- )}
- </div>
- </div>
- </div>
- )}
</div>
);
+}
+
+
+function UploadImageButton({ onUpload, isUploading }: { onUpload: (files: FileList | null) => void; isUploading: boolean }) {
+ const t = useTranslations("elementsMenu");
+ const inputRef = useRef<HTMLInputElement>(null);
+ return (
+ <>
+ <input
+ ref={inputRef}
+ type="file"
+ accept="image/png,image/jpeg,image/jpg,image/webp,image/gif"
+ multiple
+ className="hidden"
+ onChange={(e) => {
+ onUpload(e.target.files);
+ e.target.value = "";
+ }}
+ aria-label={t("uploads.selectFile")}
+ />
+ <TooltipAction label={t("uploads.selectFile")}>
+ <button
+ onClick={() => inputRef.current?.click()}
+ disabled={isUploading}
+ className="aspect-square bg-white/3 hover:bg-white/8 border border-dashed border-white/30 squircle-element flex items-center justify-center transition-all active:scale-90 group disabled:opacity-50"
+ aria-label={t("uploads.selectFile")}
+ >
+ {isUploading ? (
+ <Icon icon="svg-spinners:180-ring-with-bg" width="16" className="text-white/60" aria-hidden="true" />
+ ) : (
+ <Icon icon="hugeicons:image-upload" width="24" className="text-white-70 group-hover:text-white transition-colors" aria-hidden="true" />
+ )}
+ </button>
+ </TooltipAction>
+ </>
+ );
}
\ No newline at end of file