Skip to content

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

feat: integrate 3D viewer controls and environment settings in mockup components

CristianOlivera13d74b5393e21
diff --git a/app/components/ui/editor/Mockup3dMenu.tsx b/app/components/ui/editor/Mockup3dMenu.tsx
index 3b95042..d2bb647 100644
--- a/app/components/ui/editor/Mockup3dMenu.tsx
+++ b/app/components/ui/editor/Mockup3dMenu.tsx
@@ -1,13 +1,24 @@
"use client";
-import { useEffect, useRef, useState, useCallback } from "react";
+import { useRef, useState, useCallback } from "react";
import { useTranslations } from "next-intl";
import { Icon } from "@iconify/react";
+
import { SliderControl } from "../../../../components/ui/SliderControl";
import { HANDLE_R, ImageDeviceId, PAD_H, X_HALF, Y_HALF } from "@/types/mockup.types";
import { Button } from "@/components/ui/button";
import { DetailPageHeader } from "@/components/ui/DetailHeaderMenu";
import { Position3DPresetsEditor } from "@/components/ui/Position3DPresetsEditor";
+import { ENVIRONMENT_OPTIONS, type EnvironmentPreset } from "@/lib/viewer-controls3d";
+
+import {
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+} from "@/components/ui/select";
+import { Toggle } from "@/components/ui/toggle";
function PositionPad({
x,
@@ -36,17 +47,20 @@ function PositionPad({
const pctX = (cx + X_HALF) / (X_HALF * 2);
const hy = ((cy + Y_HALF) / (Y_HALF * 2)) * PAD_H;
- const fromEvent = useCallback((e: React.PointerEvent) => {
- if (!rectCache.current) return;
+ const fromEvent = useCallback(
+ (e: React.PointerEvent) => {
+ if (!rectCache.current) return;
+ const rect = rectCache.current;
+ const currentWidth = rect.width;
- const rect = rectCache.current;
- const currentWidth = rect.width;
- const rx = Math.max(0, Math.min(currentWidth, e.clientX - rect.left));
- const ry = Math.max(0, Math.min(PAD_H, e.clientY - rect.top));
+ const rx = Math.max(0, Math.min(currentWidth, e.clientX - rect.left));
+ const ry = Math.max(0, Math.min(PAD_H, e.clientY - rect.top));
- onChangeX(Math.round((rx / currentWidth) * X_HALF * 2 - X_HALF));
- onChangeY(Math.round((ry / PAD_H) * Y_HALF * 2 - Y_HALF));
- }, [onChangeX, onChangeY]);
+ onChangeX(Math.round((rx / currentWidth) * X_HALF * 2 - X_HALF));
+ onChangeY(Math.round((ry / PAD_H) * Y_HALF * 2 - Y_HALF));
+ },
+ [onChangeX, onChangeY]
+ );
const bgLayerStyle: React.CSSProperties = backgroundUrl
? {
@@ -99,22 +113,13 @@ function PositionPad({
<div className="absolute inset-0 pointer-events-none rounded-[14px] ring-2 ring-cyan-400/30 animate-pulse" />
)}
<div className="absolute inset-0 pointer-events-none opacity-10 bg-[radial-gradient(#a1a1aa_1px,transparent_1px)] bg-size-[14px_14px]" />
- <div
- className="absolute top-0 bottom-0 w-px bg-linear-to-b from-transparent via-white/10 to-transparent -translate-x-1/2"
- style={{ left: "50%" }}
- />
- <div
- className="absolute left-0 right-0 h-px bg-linear-to-r from-transparent via-white/10 to-transparent -translate-y-1/2"
- style={{ top: "50%" }}
- />
- <div
- className="absolute pointer-events-none bg-white/10 transition-opacity -translate-x-1/2"
- style={{ left: `${pctX * 100}%`, top: 0, bottom: 0, width: "1px" }}
- />
- <div
- className="absolute pointer-events-none bg-white/10 transition-opacity -translate-y-1/2"
- style={{ top: hy, left: 0, right: 0, height: "1px" }}
- />
+
+ <div className="absolute top-0 bottom-0 w-px bg-linear-to-b from-transparent via-white/10 to-transparent -translate-x-1/2" style={{ left: "50%" }} />
+ <div className="absolute left-0 right-0 h-px bg-linear-to-r from-transparent via-white/10 to-transparent -translate-y-1/2" style={{ top: "50%" }} />
+
+ <div className="absolute pointer-events-none bg-white/10 transition-opacity -translate-x-1/2" style={{ left: `${pctX * 100}%`, top: 0, bottom: 0, width: "1px" }} />
+ <div className="absolute pointer-events-none bg-white/10 transition-opacity -translate-y-1/2" style={{ top: hy, left: 0, right: 0, height: "1px" }} />
+
<div
className={`absolute bg-white border border-white/40 rounded-full shadow-[0_0_20px_4px_rgba(255,255,255,0.12),0_4px_12px_rgba(0,0,0,0.6)] mix-blend-screen flex items-center justify-center pointer-events-auto transition-transform duration-75`}
style={{
@@ -131,94 +136,6 @@ function PositionPad({
);
}
-function ActiveDevicePreview({ tpl }: { tpl: ActiveDeviceTpl }) {
- const videoRef = useRef<HTMLVideoElement | null>(null);
- const [isHovering, setIsHovering] = useState(false);
- const [videoReady, setVideoReady] = useState(false);
-
- useEffect(() => {
- const video = videoRef.current;
- if (!video) return;
-
- let isMounted = true;
-
- if (isHovering) {
- const playVideo = async () => {
- try {
- await video.play();
- } catch {
- }
- };
- if (isMounted) playVideo();
- } else {
- video.pause();
- video.currentTime = 0;
- }
-
- return () => {
- isMounted = false;
- };
- }, [isHovering]);
-
- return (
- <div
- className="relative w-full h-86 overflow-hidden squircle-element-camera border"
- style={{ borderColor: `${tpl.accentColor}44` }}
- onMouseEnter={() => setIsHovering(true)}
- onMouseLeave={() => setIsHovering(false)}
- >
- <div className="absolute inset-0 bg-[#0d0d10]" />
- <div
- className="absolute inset-0 z-10 pointer-events-none"
- style={{
- background: `linear-gradient(135deg, ${tpl.accentColor}22 0%, transparent 70%)`,
- }}
- />
- {tpl.posterUrl ? (
- <img
- src={tpl.posterUrl}
- alt={tpl.title}
- draggable={false}
- className={`absolute inset-0 h-full w-full object-cover transition-all duration-500 ${isHovering ? "scale-105 opacity-0" : "scale-100 opacity-100"
- }`}
- />
- ) : (
- <div className="absolute inset-0 flex items-center justify-center">
- <Icon icon={tpl.icon} width="48" style={{ color: `${tpl.accentColor}cc` }} />
- </div>
- )}
- {tpl.videoUrl && (
- <video
- ref={videoRef}
- src={tpl.videoUrl}
- poster={tpl.posterUrl}
- muted
- loop
- playsInline
- preload="metadata"
- onLoadedData={() => setVideoReady(true)}
- className={`absolute inset-0 h-full w-full object-cover transition-all duration-500 ${isHovering && videoReady ? "scale-105 opacity-100" : "scale-100 opacity-0"
- }`}
- />
- )}
- <div
- className={`absolute inset-0 z-20 bg-black/20 transition-opacity duration-300 ${isHovering ? "opacity-100" : "opacity-0"
- }`}
- />
- <div className=" flex items-center gap-2 absolute bottom-0 left-0 right-0 px-3 py-2 bg-gradient-to-t from-black/80 to-transparent z-30">
- <Icon icon={tpl.icon} width={14} />
- <span className="text-[11px] font-bold text-white/90 tracking-wide">{tpl.title}</span>
- </div>
- <div
- className="absolute top-2 right-2 size-5 rounded-full flex items-center justify-center z-30"
- style={{ background: tpl.accentColor }}
- >
- <Icon icon="mdi:check-bold" width={11} className="text-white" />
- </div>
- </div>
- );
-}
-
export interface ActiveDeviceTpl {
id: ImageDeviceId;
title: string;
@@ -226,7 +143,6 @@ export interface ActiveDeviceTpl {
icon: string;
modelUrl: string;
posterUrl?: string;
- videoUrl?: string;
}
export interface Mockup3dMenuProps {
@@ -257,6 +173,14 @@ export interface Mockup3dMenuProps {
imagePhonePresetId: string;
setImagePhonePresetId: (id: string) => void;
mediaType: "video" | "image";
+ viewer3DAutoRotate: boolean;
+ setViewer3DAutoRotate: (v: boolean) => void;
+ viewer3DRotationSpeed: number;
+ setViewer3DRotationSpeed: (v: number) => void;
+ viewer3DGlow: number;
+ setViewer3DGlow: (v: number) => void;
+ viewer3DEnvironment: EnvironmentPreset;
+ setViewer3DEnvironment: (v: EnvironmentPreset) => void;
}
export function Mockup3dMenu({
@@ -287,6 +211,14 @@ export function Mockup3dMenu({
imagePhonePresetId,
setImagePhonePresetId,
mediaType,
+ viewer3DAutoRotate,
+ setViewer3DAutoRotate,
+ viewer3DRotationSpeed,
+ setViewer3DRotationSpeed,
+ viewer3DGlow,
+ setViewer3DGlow,
+ viewer3DEnvironment,
+ setViewer3DEnvironment,
}: Mockup3dMenuProps) {
const t = useTranslations("mockupMenu");
@@ -325,7 +257,7 @@ export function Mockup3dMenu({
setImagePhoneOpening,
setImagePhoneShadow,
setImagePhoneShadowColor,
- setImagePhonePresetId
+ setImagePhonePresetId,
]);
return (
@@ -333,10 +265,11 @@ export function Mockup3dMenu({
<div className="flex items-center gap-2 p-3 border-b border-white/6 shrink-0">
<DetailPageHeader label={t("device3DTitle")} icon="mage:box-3d" onBack={onBack} />
</div>
- <div className="flex-1 overflow-y-auto custom-scrollbar px-4 py-4 space-y-5">
- {activeDeviceTpl && <ActiveDevicePreview tpl={activeDeviceTpl} />}
- <div className="flex flex-col gap-4">
+ <div className="flex-1 overflow-y-auto custom-scrollbar px-4 py-4 space-y-6">
+
+ <div className="flex flex-col gap-6">
+
<div className="flex items-center justify-between">
<span className="text-[11px] font-semibold text-white/60 uppercase tracking-wider">
{t("configuration")}
@@ -350,88 +283,157 @@ export function Mockup3dMenu({
{t("reset")}
</button>
</div>
- {mediaType === "video" && (
- <Position3DPresetsEditor
- device={imagePhoneDevice}
- isLaptop={isLaptop}
- selectedPresetId={imagePhonePresetId}
- onSelectPreset={(preset) => {
- setImagePhoneX(preset.x);
- setImagePhoneY(preset.y);
- setImagePhoneScale(preset.scale);
- setImagePhoneRotX(preset.rotateX);
- setImagePhoneRotY(preset.rotateY);
- setImagePhoneRotZ(preset.rotateZ);
- setImagePhonePresetId(preset.id);
- if ("imagePhoneOpening" in preset) {
- setImagePhoneOpening(preset.imagePhoneOpening);
- }
- }}
- rotateX={imagePhoneRotX}
- rotateY={imagePhoneRotY}
- onRotationXYChange={(rX, rY) => {
- setImagePhoneRotX(rX);
- setImagePhoneRotY(rY);
- }}
- rotateZ={imagePhoneRotZ}
- onRotateZChange={setImagePhoneRotZ}
- onCustomReset={handleReset}
+
+ <div className="flex flex-col gap-4">
+ {mediaType === "video" && (
+ <Position3DPresetsEditor
+ device={imagePhoneDevice}
+ isLaptop={isLaptop}
+ selectedPresetId={imagePhonePresetId}
+ onSelectPreset={(preset) => {
+ setImagePhoneX(preset.x);
+ setImagePhoneY(preset.y);
+ setImagePhoneScale(preset.scale);
+ setImagePhoneRotX(preset.rotateX);
+ setImagePhoneRotY(preset.rotateY);
+ setImagePhoneRotZ(preset.rotateZ);
+ setImagePhonePresetId(preset.id);
+ if ("imagePhoneOpening" in preset) {
+ setImagePhoneOpening(preset.imagePhoneOpening);
+ }
+ }}
+ rotateX={imagePhoneRotX}
+ rotateY={imagePhoneRotY}
+ onRotationXYChange={(rX, rY) => {
+ setImagePhoneRotX(rX);
+ setImagePhoneRotY(rY);
+ }}
+ rotateZ={imagePhoneRotZ}
+ onRotateZChange={setImagePhoneRotZ}
+ onCustomReset={handleReset}
+ />
+ )}
+
+ <SliderControl
+ icon="solar:scale-linear"
+ label={t("scale")}
+ value={Math.round(imagePhoneScale * 100)}
+ min={30}
+ max={300}
+ step={1}
+ onChange={(v) => setImagePhoneScale(v / 100)}
+ suffix="%"
/>
- )}
-
- <SliderControl
- icon="solar:scale-linear"
- label={t("scale")}
- value={Math.round(imagePhoneScale * 100)}
- min={30}
- max={300}
- step={1}
- onChange={(v) => {
- setImagePhoneScale(v / 100);
- }}
- suffix="%"
- />
- {isLaptop && (
+
+ <div className="flex flex-col gap-2">
+ <span className="text-[11px] font-semibold text-white/60 uppercase tracking-wider">
+ {t("position")}
+ </span>
+ <PositionPad
+ x={imagePhoneX}
+ y={imagePhoneY}
+ onChangeX={setImagePhoneX}
+ onChangeY={setImagePhoneY}
+ backgroundUrl={backgroundUrl}
+ backgroundColorCss={backgroundColorCss}
+ />
+ </div>
+ </div>
+
+ <div className="flex flex-col gap-4 pt-4 border-t border-white/6">
+ {isLaptop && (
+ <SliderControl
+ icon="material-symbols:laptop-chromebook-outline"
+ label={t("laptopOpening")}
+ value={Math.round(imagePhoneOpening * 100)}
+ min={0}
+ max={100}
+ step={1}
+ onChange={(v) => setImagePhoneOpening(v / 100)}
+ suffix="%"
+ />
+ )}
+
<SliderControl
- icon="material-symbols:laptop-chromebook-outline"
- label={t("laptopOpening")}
- value={Math.round(imagePhoneOpening * 100)}
+ icon="mdi:blur"
+ label={t("shadow")}
+ value={Math.round(imagePhoneShadow * 100)}
min={0}
max={100}
step={1}
- onChange={(v) => {
- setImagePhoneOpening(v / 100);
- }}
+ onChange={(v) => setImagePhoneShadow(v / 100)}
suffix="%"
/>
- )}
- <SliderControl
- icon="mdi:blur"
- label={t("shadow")}
- value={Math.round(imagePhoneShadow * 100)}
- min={0}
- max={100}
- step={1}
- onChange={(v) => {
- setImagePhoneShadow(v / 100);
- }}
- suffix="%"
- />
-
- <div className="flex flex-col gap-2">
- <span className="text-[11px] font-semibold text-white/60 uppercase tracking-wider">{t("position")}</span>
- <PositionPad
- x={imagePhoneX}
- y={imagePhoneY}
- onChangeX={setImagePhoneX}
- onChangeY={setImagePhoneY}
- backgroundUrl={backgroundUrl}
- backgroundColorCss={backgroundColorCss}
+ </div>
+
+ <div className="flex flex-col gap-4 pt-4 border-t border-white/6">
+ <span className="text-[11px] font-semibold text-white/60 uppercase tracking-wider">
+ {t("viewer3d")}
+ </span>
+
+ <div className="flex flex-col gap-2">
+ <span className="text-[11px] font-medium text-white/50 flex items-center gap-2">
+ {t("environment")}
+ </span>
+ <Select
+ value={viewer3DEnvironment}
+ onValueChange={(val) => setViewer3DEnvironment(val as EnvironmentPreset)}
+ >
+ <SelectTrigger className="w-full bg-white/3 border-white/[0.07] text-white/80 h-9" textSize="xs">
+ <SelectValue placeholder={t("environment")} />
+ </SelectTrigger>
+ <SelectContent>
+ {ENVIRONMENT_OPTIONS.map((opt) => (
+ <SelectItem key={opt} value={opt} textSize="xs">
+ {t(`environments.${opt}`)}
+ </SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
+ </div>
+
+ <SliderControl
+ icon="mdi:white-balance-sunny"
+ label={t("glow")}
+ value={Math.round(viewer3DGlow * 100)}
+ min={0}
+ max={500}
+ step={10}
+ onChange={(v) => setViewer3DGlow(v / 100)}
+ suffix="%"
/>
+
+ <div
+ className={`flex items-center justify-between px-3 py-2 squircle-element border transition-all ${viewer3DAutoRotate
+ ? "bg-blue-500/10 border-blue-500/40 text-blue-300"
+ : "bg-white/3 border-white/[0.07] text-white/60 hover:border-white/20"
+ }`}
+ >
+ <span className="flex items-center gap-2 text-[12px] font-medium">
+ <Icon icon="mdi:orbit-variant" width="14" />
+ {t("autoRotate")}
+ </span>
+ <Toggle
+ checked={viewer3DAutoRotate}
+ onChange={setViewer3DAutoRotate}
+ />
+ </div>
+
+ {viewer3DAutoRotate && (
+ <SliderControl
+ icon="mdi:speedometer"
+ label={t("rotationSpeed")}
+ value={viewer3DRotationSpeed}
+ min={0.1}
+ max={10}
+ step={0.1}
+ onChange={setViewer3DRotationSpeed}
+ />
+ )}
</div>
</div>
- <Button onClick={onRemove} variant="outline" className="w-full text-xs mt-2">
+ <Button onClick={onRemove} variant="outline" className="w-full text-xs mt-4">
<Icon icon="ph:trash-bold" width="13" aria-hidden="true" />
{t("removeFrame")}
</Button>
diff --git a/app/components/ui/editor/MockupMenu.tsx b/app/components/ui/editor/MockupMenu.tsx
index e213ad2..f3ecd9b 100644
--- a/app/components/ui/editor/MockupMenu.tsx
+++ b/app/components/ui/editor/MockupMenu.tsx
@@ -64,13 +64,24 @@ export function MockupMenu({
const [gridLoaded, setGridLoaded] = useState(false);
const {
- imagePhoneActive, setImagePhoneActive, imagePhoneX, setImagePhoneX, imagePhoneY, setImagePhoneY,
- imagePhoneScale, setImagePhoneScale, imagePhoneRotX, imagePhoneRotY, setImagePhoneRotX, setImagePhoneRotY,
- imagePhoneRotZ, setImagePhoneRotZ, imagePhoneDevice, setImagePhoneDevice, imagePhoneOpening, setImagePhoneOpening,
- imagePhoneShadow, setImagePhoneShadow, imagePhoneShadowColor, imagePhonePresetId, setImagePhonePresetId, setImagePhoneShadowColor
+ imagePhoneActive, setImagePhoneActive,
+ imagePhoneX, setImagePhoneX,
+ imagePhoneY, setImagePhoneY,
+ imagePhoneScale, setImagePhoneScale,
+ imagePhoneRotX, imagePhoneRotY, setImagePhoneRotX, setImagePhoneRotY,
+ imagePhoneRotZ, setImagePhoneRotZ,
+ imagePhoneDevice, setImagePhoneDevice,
+ imagePhoneOpening, setImagePhoneOpening,
+ imagePhoneShadow, setImagePhoneShadow,
+ imagePhoneShadowColor,
+ imagePhonePresetId, setImagePhonePresetId,
+ setImagePhoneShadowColor,
+ viewer3DAutoRotate, setViewer3DAutoRotate,
+ viewer3DRotationSpeed, setViewer3DRotationSpeed,
+ viewer3DGlow, setViewer3DGlow,
+ viewer3DEnvironment, setViewer3DEnvironment,
} = useMockup3dContext();
-
const filteredMockups = useMemo(() => {
return selectedCategory === "all"
? MOCKUPS
@@ -281,10 +292,18 @@ export function MockupMenu({
setImagePhoneRotZ={setImagePhoneRotZ}
imagePhonePresetId={imagePhonePresetId}
setImagePhonePresetId={setImagePhonePresetId}
+ viewer3DAutoRotate={viewer3DAutoRotate}
+ setViewer3DAutoRotate={setViewer3DAutoRotate}
+ viewer3DRotationSpeed={viewer3DRotationSpeed}
+ setViewer3DRotationSpeed={setViewer3DRotationSpeed}
+ viewer3DGlow={viewer3DGlow}
+ setViewer3DGlow={setViewer3DGlow}
+ viewer3DEnvironment={viewer3DEnvironment}
+ setViewer3DEnvironment={setViewer3DEnvironment}
/>
);
}
-
+
return (
<div className="p-4 flex flex-col gap-6">
<div className="flex items-center gap-2 text-white font-medium">
diff --git a/app/components/ui/editor/VideoCanvas.tsx b/app/components/ui/editor/VideoCanvas.tsx
index 894f72f..ea249f3 100644
--- a/app/components/ui/editor/VideoCanvas.tsx
+++ b/app/components/ui/editor/VideoCanvas.tsx
@@ -19,11 +19,8 @@ import { CanvasElementsLayer, ElementResizeStart } from "./CanvasElementsLayer";
import { EditorHoverTooltip } from "./EditorHoverTooltip";
import { LayersPanel } from "./LayersPanel";
import { useMockup3dContext } from "@/app/contexts/Mockup3dContext";
-import { PHONE_H, PHONE_W, DEVICE_3D_DIMENSIONS, DEVICE_VIEWER_DEFAULTS, PHONE_DEVICE_URLS } from "@/lib/phone3d.utils";
-import { Viewer3DControls } from "@/lib/viewer-controls3d";
-import { ControlsPopup } from "@/components/ui/ControlsPopup";
+import { PHONE_H, PHONE_W, DEVICE_3D_DIMENSIONS, PHONE_DEVICE_URLS } from "@/lib/phone3d.utils";
import { CanvasContextMenu } from "@/components/ui/CanvasContextMenu";
-import { Viewer3DControlsBridge } from "@/components/ui/Viewer3DControlsBridge";
import { GetMediaMaskStyles } from "@/lib/media-mask.utils";
import { MediaContent } from "@/components/ui/MediaContent";
import { RotationGuideLine } from "@/components/ui/RotationGuideLine";
@@ -114,15 +111,13 @@ function VideoCanvasInner({
// Motion 3D phone overlay state (reads from shared MotionContext)
const {
- imagePhoneActive, imagePhoneX, imagePhoneY,
- imagePhoneScale, setImagePhoneScale,
- setImagePhoneX, setImagePhoneY,
+ imagePhoneActive, imagePhoneX, imagePhoneY, imagePhoneScale,
+ setImagePhoneScale, setImagePhoneX, setImagePhoneY,
imagePhoneRotX, setImagePhoneRotX, imagePhoneRotY, setImagePhoneRotY,
- imagePhoneRotZ,
- imagePhoneDevice,
- imagePhoneOpening,
+ imagePhoneRotZ, imagePhoneDevice, imagePhoneOpening,
imagePhoneShadow, imagePhoneShadowColor,
- imagePhoneRefWidth, setImagePhoneRefWidth
+ imagePhoneRefWidth, setImagePhoneRefWidth,
+ viewer3DAutoRotate, viewer3DRotationSpeed, viewer3DGlow, viewer3DEnvironment,
} = useMockup3dContext();
// 3D phone overlay is active in both video and image mode
@@ -483,15 +478,6 @@ function VideoCanvasInner({
return () => observer.disconnect();
}, [aspectRatio, customAspectRatio]);
- const deviceDefaults = DEVICE_VIEWER_DEFAULTS[imagePhoneDevice] ?? { environment: "studio", glow: 1.0 };
-
- const [viewer3D, setViewer3D] = useState<Viewer3DControls>({
- autoRotate: false,
- rotationSpeed: 3.5,
- glow: deviceDefaults.glow,
- environment: deviceDefaults.environment,
- });
-
const prevAspectKeyRef = useRef<string | null>(null);
const pendingAspectRescaleRef = useRef(false);
@@ -2226,12 +2212,6 @@ function VideoCanvasInner({
{/* ── 3D phone overlay (video & image mode) ── */}
{imagePhoneActive && (
<div className="absolute inset-0 pointer-events-none" style={{ zIndex: 155, overflow: "visible" }}>
- <Viewer3DControlsBridge
- environment={deviceDefaults.environment}
- glow={deviceDefaults.glow}
- onChange={setViewer3D}
- />
- <ControlsPopup />
<div
className="absolute animate-in fade-in zoom-in-95 duration-300"
style={{
@@ -2318,10 +2298,10 @@ function VideoCanvasInner({
zoom={1}
shadowIntensity={imagePhoneShadow}
shadowColor={imagePhoneShadowColor}
- autoRotate={viewer3D.autoRotate}
- rotationSpeed={viewer3D.rotationSpeed}
- glow={viewer3D.glow}
- environment={viewer3D.environment}
+ autoRotate={viewer3DAutoRotate}
+ rotationSpeed={viewer3DRotationSpeed}
+ glow={viewer3DGlow}
+ environment={viewer3DEnvironment}
isSelected={isVideoSelected}
isHovered={isVideoHovered}
onSelectChange={(value) => setIsVideoSelected(value)}
diff --git a/app/contexts/Mockup3dContext.tsx b/app/contexts/Mockup3dContext.tsx
index f547ecb..7753fb5 100644
--- a/app/contexts/Mockup3dContext.tsx
+++ b/app/contexts/Mockup3dContext.tsx
@@ -1,6 +1,8 @@
"use client";
-import { createContext, useContext, useState, type ReactNode } from "react";
+import { createContext, useContext, useState, useEffect, useRef, type ReactNode } from "react";
+import { DEVICE_VIEWER_DEFAULTS } from "@/lib/phone3d.utils";
+import type { EnvironmentPreset } from "@/lib/viewer-controls3d";
interface Mockup3dState {
selectedTemplateId: string | null;
@@ -51,6 +53,14 @@ interface Mockup3dState {
setImagePhoneShadowColor: (v: string) => void;
imagePhoneRefWidth: number;
setImagePhoneRefWidth: (v: number) => void;
+ viewer3DAutoRotate: boolean;
+ setViewer3DAutoRotate: (v: boolean) => void;
+ viewer3DRotationSpeed: number;
+ setViewer3DRotationSpeed: (v: number) => void;
+ viewer3DGlow: number;
+ setViewer3DGlow: (v: number) => void;
+ viewer3DEnvironment: EnvironmentPreset;
+ setViewer3DEnvironment: (v: EnvironmentPreset) => void;
}
const Mockup3dContext = createContext<Mockup3dState | null>(null);
@@ -74,6 +84,21 @@ export function Mockup3dProvider({ children }: { children: ReactNode }) {
const [imagePhoneShadow, setImagePhoneShadow] = useState(0.6);
const [imagePhoneShadowColor, setImagePhoneShadowColor] = useState("#000000");
const [imagePhoneRefWidth, setImagePhoneRefWidth] = useState(0);
+ const [viewer3DAutoRotate, setViewer3DAutoRotate] = useState(false);
+ const [viewer3DRotationSpeed, setViewer3DRotationSpeed] = useState(3.5);
+ const [viewer3DGlow, setViewer3DGlow] = useState(1.0);
+ const [viewer3DEnvironment, setViewer3DEnvironment] = useState<EnvironmentPreset>("studio");
+
+ // Al cambiar de dispositivo, reponer glow/environment a los defaults de ese dispositivo
+ // (esto reemplaza el useEffect que antes vivía en ViewerControls3D vía Leva)
+ const prevViewerDeviceRef = useRef(imagePhoneDevice);
+ useEffect(() => {
+ if (prevViewerDeviceRef.current === imagePhoneDevice) return;
+ prevViewerDeviceRef.current = imagePhoneDevice;
+ const defaults = DEVICE_VIEWER_DEFAULTS[imagePhoneDevice] ?? { environment: "studio" as EnvironmentPreset, glow: 1.0 };
+ setViewer3DGlow(defaults.glow);
+ setViewer3DEnvironment(defaults.environment);
+ }, [imagePhoneDevice]);
return (
<Mockup3dContext.Provider value={{
@@ -94,6 +119,10 @@ export function Mockup3dProvider({ children }: { children: ReactNode }) {
imagePhoneShadow, setImagePhoneShadow,
imagePhoneShadowColor, setImagePhoneShadowColor,
imagePhoneRefWidth, setImagePhoneRefWidth,
+ viewer3DAutoRotate, setViewer3DAutoRotate,
+ viewer3DRotationSpeed, setViewer3DRotationSpeed,
+ viewer3DGlow, setViewer3DGlow,
+ viewer3DEnvironment, setViewer3DEnvironment,
}}>
{children}
</Mockup3dContext.Provider>
diff --git a/components/ui/ControlsPopup.tsx b/components/ui/ControlsPopup.tsx
deleted file mode 100644
index a7f3f4a..0000000
--- a/components/ui/ControlsPopup.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-"use client";
-
-import { useEffect, useState } from "react";
-import { createPortal } from "react-dom";
-import { Leva } from "leva";
-
-export function ControlsPopup() {
- const [mounted, setMounted] = useState(false);
-
- useEffect(() => {
- const timeoutId = setTimeout(() => {
- setMounted(true);
- }, 0);
- return () => clearTimeout(timeoutId);
- }, []);
-
- if (!mounted) return null;
-
- return createPortal(
- <div
- style={{
- position: "fixed",
- bottom: "220px",
- right: "275px",
- width: "320px",
- zIndex: 10,
- }}
- onPointerDown={(e) => e.stopPropagation()}
- >
- <Leva titleBar={{ filter: false }} fill flat />
- </div>,
- document.body
- );
-}
\ No newline at end of file
diff --git a/components/ui/Viewer3DControlsBridge.tsx b/components/ui/Viewer3DControlsBridge.tsx
deleted file mode 100644
index 8b1c7cd..0000000
--- a/components/ui/Viewer3DControlsBridge.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { EnvironmentPreset, Viewer3DControls, ViewerControls3D } from "@/lib/viewer-controls3d";
-import { useEffect } from "react";
-
-export function Viewer3DControlsBridge({
- environment,
- glow,
- onChange,
-}: {
- environment: EnvironmentPreset;
- glow: number;
- onChange: (controls: Viewer3DControls) => void;
-}) {
- const controls = ViewerControls3D({ defaultEnvironment: environment, defaultGlow: glow });
-
- useEffect(() => {
- onChange(controls);
- // eslint-disable-next-line react-hooks/exhaustive-deps
- }, [controls.autoRotate, controls.rotationSpeed, controls.glow, controls.environment]);
-
- return null;
-}
\ No newline at end of file
diff --git a/components/ui/select.tsx b/components/ui/select.tsx
index dce1d0c..91ce063 100644
--- a/components/ui/select.tsx
+++ b/components/ui/select.tsx
@@ -6,38 +6,40 @@ import { Select as SelectPrimitive } from "radix-ui"
import { cn } from "@/lib/utils"
-function Select({
- ...props
-}: React.ComponentProps<typeof SelectPrimitive.Root>) {
+function Select({ ...props }: React.ComponentProps<typeof SelectPrimitive.Root>) {
return <SelectPrimitive.Root data-slot="select" {...props} />
}
-function SelectGroup({
- ...props
-}: React.ComponentProps<typeof SelectPrimitive.Group>) {
+function SelectGroup({ ...props }: React.ComponentProps<typeof SelectPrimitive.Group>) {
return <SelectPrimitive.Group data-slot="select-group" {...props} />
}
-function SelectValue({
- ...props
-}: React.ComponentProps<typeof SelectPrimitive.Value>) {
+function SelectValue({ ...props }: React.ComponentProps<typeof SelectPrimitive.Value>) {
return <SelectPrimitive.Value data-slot="select-value" {...props} />
}
function SelectTrigger({
className,
size = "default",
+ textSize = "sm",
children,
...props
}: React.ComponentProps<typeof SelectPrimitive.Trigger> & {
size?: "sm" | "default"
+ textSize?: "xs" | "sm" | "base" | "lg"
}) {
return (
<SelectPrimitive.Trigger
data-slot="select-trigger"
data-size={size}
className={cn(
- "border-input data-[placeholder]:text-muted-foreground [&_svg:not([class*='text-'])]:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 dark:hover:bg-input/50 flex w-fit items-center justify-between gap-2 rounded-md border bg-transparent px-3 py-2 text-sm whitespace-nowrap shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 data-[size=default]:h-9 data-[size=sm]:h-8 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-2 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+ "border-input data-[placeholder]:text-muted-foreground [&_svg:not([class*='text-'])]:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 dark:hover:bg-input/50 flex w-fit items-center justify-between gap-2 rounded-md border bg-transparent px-3 py-2 whitespace-nowrap shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 data-[size=default]:h-9 data-[size=sm]:h-8 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-2 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+ {
+ "text-xs": textSize === "xs",
+ "text-sm": textSize === "sm",
+ "text-base": textSize === "base",
+ "text-lg": textSize === "lg",
+ },
className
)}
{...props}
@@ -69,7 +71,7 @@ function SelectContent({
)}
position={position}
align={align}
- {...props}
+ {...props}
>
<SelectScrollUpButton />
<SelectPrimitive.Viewport
@@ -87,10 +89,7 @@ function SelectContent({
)
}
-function SelectLabel({
- className,
- ...props
-}: React.ComponentProps<typeof SelectPrimitive.Label>) {
+function SelectLabel({ className, ...props }: React.ComponentProps<typeof SelectPrimitive.Label>) {
return (
<SelectPrimitive.Label
data-slot="select-label"
@@ -103,13 +102,22 @@ function SelectLabel({
function SelectItem({
className,
children,
+ textSize = "sm",
...props
-}: React.ComponentProps<typeof SelectPrimitive.Item>) {
+}: React.ComponentProps<typeof SelectPrimitive.Item> & {
+ textSize?: "xs" | "sm" | "base" | "lg"
+}) {
return (
<SelectPrimitive.Item
data-slot="select-item"
className={cn(
- "focus:bg-accent focus:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground relative flex w-full cursor-default items-center gap-2 rounded-sm py-1.5 pr-8 pl-2 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2",
+ "focus:bg-accent focus:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground relative flex w-full cursor-default items-center gap-2 rounded-sm py-1.5 pr-8 pl-2 outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2",
+ {
+ "text-xs": textSize === "xs",
+ "text-sm": textSize === "sm",
+ "text-base": textSize === "base",
+ "text-lg": textSize === "lg",
+ },
className
)}
{...props}
@@ -127,10 +135,7 @@ function SelectItem({
)
}
-function SelectSeparator({
- className,
- ...props
-}: React.ComponentProps<typeof SelectPrimitive.Separator>) {
+function SelectSeparator({ className, ...props }: React.ComponentProps<typeof SelectPrimitive.Separator>) {
return (
<SelectPrimitive.Separator
data-slot="select-separator"
@@ -147,10 +152,7 @@ function SelectScrollUpButton({
return (
<SelectPrimitive.ScrollUpButton
data-slot="select-scroll-up-button"
- className={cn(
- "flex cursor-default items-center justify-center py-1",
- className
- )}
+ className={cn("flex cursor-default items-center justify-center py-1", className)}
{...props}
>
<ChevronUpIcon className="size-4" />
@@ -165,10 +167,7 @@ function SelectScrollDownButton({
return (
<SelectPrimitive.ScrollDownButton
data-slot="select-scroll-down-button"
- className={cn(
- "flex cursor-default items-center justify-center py-1",
- className
- )}
+ className={cn("flex cursor-default items-center justify-center py-1", className)}
{...props}
>
<ChevronDownIcon className="size-4" />
@@ -187,4 +186,4 @@ export {
SelectSeparator,
SelectTrigger,
SelectValue,
-}
+}
\ No newline at end of file
diff --git a/lib/viewer-controls3d.ts b/lib/viewer-controls3d.ts
index 185e1e1..57555e1 100644
--- a/lib/viewer-controls3d.ts
+++ b/lib/viewer-controls3d.ts
@@ -21,9 +21,9 @@ export const HDRI_FILES: Record<EnvironmentPreset, string> = {
warehouse: "/hdri/empty_warehouse_01_1k.hdr",
};
-const ENVIRONMENT_OPTIONS = [
- 'sunset', 'dawn', 'night', 'warehouse', 'forest',
- 'apartment', 'studio', 'city', 'park', 'lobby',
+export const ENVIRONMENT_OPTIONS = [
+ "sunset", "dawn", "night", "warehouse", "forest",
+ "apartment", "studio", "city", "park", "lobby",
] as const;
export interface Viewer3DControls {
@@ -34,19 +34,14 @@ export interface Viewer3DControls {
}
export function ViewerControls3D({ defaultEnvironment = "studio", defaultGlow = 1.0 }: ViewerControlsOptions = {}): Viewer3DControls {
- const [controls, set] = useControls("Configuration 3D", () => ({
- autoRotate: false,
- rotationSpeed: { value: 3.5, min: 0.1, max: 10, step: 0.1 },
- glow: { value: defaultGlow, min: 0.0, max: 5.0, step: 0.1 },
- environment: {
- options: ENVIRONMENT_OPTIONS,
- value: defaultEnvironment
- }
- }));
-
- useEffect(() => {
- set({ environment: defaultEnvironment, glow: defaultGlow });
- }, [defaultEnvironment, defaultGlow, set]);
-
- return controls as Viewer3DControls;
+ const [controls, set] = useControls("Configuration 3D", () => ({
+ autoRotate: false,
+ rotationSpeed: { value: 3.5, min: 0.1, max: 10, step: 0.1 },
+ glow: { value: defaultGlow, min: 0.0, max: 5.0, step: 0.1 },
+ environment: { options: ENVIRONMENT_OPTIONS, value: defaultEnvironment }
+ }));
+ useEffect(() => {
+ set({ environment: defaultEnvironment, glow: defaultGlow });
+ }, [defaultEnvironment, defaultGlow, set]);
+ return controls as Viewer3DControls;
}
\ No newline at end of file