diff --git a/packages/studio/src/App.tsx b/packages/studio/src/App.tsx index b65c6f706b..c5dc4cc35f 100644 --- a/packages/studio/src/App.tsx +++ b/packages/studio/src/App.tsx @@ -255,6 +255,36 @@ export function StudioApp() { ], ); + const handlePreviewBlockDrop = useCallback( + (blockName: string, position: { left: number; top: number }) => { + if (!projectId) return; + void addBlockToProject({ + projectId, + blockName, + activeCompPath, + visualPosition: position, + timelineElements, + readProjectFile: fileManager.readProjectFile, + writeProjectFile: fileManager.writeProjectFile, + recordEdit: editHistory.recordEdit, + refreshFileTree: fileManager.refreshFileTree, + reloadPreview, + showToast, + }); + }, + [ + projectId, + activeCompPath, + timelineElements, + fileManager.readProjectFile, + fileManager.writeProjectFile, + fileManager.refreshFileTree, + editHistory.recordEdit, + reloadPreview, + showToast, + ], + ); + const clearDomSelectionRef = useRef<() => void>(() => {}); const domEditSelectionBridgeRef = useRef(null); const handleDomEditElementDeleteRef = useRef<(s: DomEditSelection) => Promise>( @@ -541,6 +571,7 @@ export function StudioApp() { handleTimelineElementDelete={timelineEditing.handleTimelineElementDelete} handleTimelineAssetDrop={timelineEditing.handleTimelineAssetDrop} handleTimelineBlockDrop={handleTimelineBlockDrop} + handlePreviewBlockDrop={handlePreviewBlockDrop} handleTimelineFileDrop={timelineEditing.handleTimelineFileDrop} handleTimelineElementMove={timelineEditing.handleTimelineElementMove} handleTimelineElementResize={timelineEditing.handleTimelineElementResize} diff --git a/packages/studio/src/components/StudioPreviewArea.tsx b/packages/studio/src/components/StudioPreviewArea.tsx index 00201a0fa5..862bb86512 100644 --- a/packages/studio/src/components/StudioPreviewArea.tsx +++ b/packages/studio/src/components/StudioPreviewArea.tsx @@ -29,6 +29,10 @@ export interface StudioPreviewAreaProps { blockName: string, placement: Pick, ) => Promise | void; + handlePreviewBlockDrop?: ( + blockName: string, + position: { left: number; top: number }, + ) => Promise | void; handleTimelineFileDrop: ( files: File[], placement?: Pick, @@ -53,6 +57,7 @@ export function StudioPreviewArea({ handleTimelineElementDelete, handleTimelineAssetDrop, handleTimelineBlockDrop, + handlePreviewBlockDrop, handleTimelineFileDrop, handleTimelineElementMove, handleTimelineElementResize, @@ -104,6 +109,7 @@ export function StudioPreviewArea({ onDeleteElement={handleTimelineElementDelete} onAssetDrop={handleTimelineAssetDrop} onBlockDrop={handleTimelineBlockDrop} + onPreviewBlockDrop={handlePreviewBlockDrop} onFileDrop={handleTimelineFileDrop} onMoveElement={handleTimelineElementMove} onResizeElement={handleTimelineElementResize} diff --git a/packages/studio/src/components/nle/NLELayout.tsx b/packages/studio/src/components/nle/NLELayout.tsx index efee6163f1..2a2fe70b91 100644 --- a/packages/studio/src/components/nle/NLELayout.tsx +++ b/packages/studio/src/components/nle/NLELayout.tsx @@ -54,6 +54,10 @@ interface NLELayoutProps { blockName: string, placement: Pick, ) => Promise | void; + onPreviewBlockDrop?: ( + blockName: string, + position: { left: number; top: number }, + ) => Promise | void; /** Persist timeline move actions back into source HTML */ onMoveElement?: ( element: TimelineElement, @@ -107,6 +111,7 @@ export const NLELayout = memo(function NLELayout({ onDeleteElement, onAssetDrop, onBlockDrop, + onPreviewBlockDrop, onMoveElement, onResizeElement, onBlockedEditAttempt, @@ -353,6 +358,7 @@ export const NLELayout = memo(function NLELayout({ portrait={portrait} directUrl={directUrl} suppressLoadingOverlay={hasLoadedOnceRef.current} + onBlockDrop={onPreviewBlockDrop} /> {!isFullscreen && previewOverlay} diff --git a/packages/studio/src/components/nle/NLEPreview.tsx b/packages/studio/src/components/nle/NLEPreview.tsx index 7e829d3982..ec3ea2aa27 100644 --- a/packages/studio/src/components/nle/NLEPreview.tsx +++ b/packages/studio/src/components/nle/NLEPreview.tsx @@ -12,6 +12,7 @@ import { type PreviewZoomState, } from "./previewZoom"; import { readStudioUiPreferences, writeStudioUiPreferences } from "../../utils/studioUiPreferences"; +import { usePreviewBlockDrop } from "./usePreviewBlockDrop"; interface NLEPreviewProps { projectId: string; @@ -21,6 +22,7 @@ interface NLEPreviewProps { portrait?: boolean; directUrl?: string; suppressLoadingOverlay?: boolean; + onBlockDrop?: (blockName: string, position: { left: number; top: number }) => void; } export function getPreviewPlayerKey({ @@ -90,6 +92,7 @@ export const NLEPreview = memo(function NLEPreview({ portrait, directUrl, suppressLoadingOverlay, + onBlockDrop, }: NLEPreviewProps) { const activeKey = getPreviewPlayerKey({ projectId, directUrl }); const viewportRef = useRef(null); @@ -364,6 +367,13 @@ export const NLEPreview = memo(function NLEPreview({ }; }, [applyPan]); + const { + isDragOver: previewDragOver, + handleDragOver: handlePreviewDragOver, + handleDragLeave: handlePreviewDragLeave, + handleDrop: handlePreviewDrop, + } = usePreviewBlockDrop({ portrait, stageRef, onBlockDrop }); + const initial = zoomRef.current; return ( @@ -373,6 +383,9 @@ export const NLEPreview = memo(function NLEPreview({ className="relative flex-1 flex items-center justify-center p-2 overflow-hidden min-h-0 outline-none focus:ring-1 focus:ring-studio-accent/40 bg-neutral-700" tabIndex={0} aria-label="Composition preview" + onDragOver={handlePreviewDragOver} + onDragLeave={handlePreviewDragLeave} + onDrop={handlePreviewDrop} >
+ {previewDragOver && ( +
+ )}
; + onBlockDrop?: (blockName: string, position: { left: number; top: number }) => void; +} + +interface BlockDropPayload { + name: string; + dimensions?: { width: number; height: number }; +} + +function parseBlockPayload(raw: string): BlockDropPayload | null { + try { + const parsed = JSON.parse(raw) as { + name?: string; + dimensions?: { width: number; height: number }; + }; + return parsed.name ? (parsed as BlockDropPayload) : null; + } catch { + return null; + } +} + +function resolveCompositionPosition( + clientX: number, + clientY: number, + stageRect: DOMRect, + portrait: boolean | undefined, +): { left: number; top: number } | null { + if (stageRect.width === 0 || stageRect.height === 0) return null; + + const normalizedX = (clientX - stageRect.left) / stageRect.width; + const normalizedY = (clientY - stageRect.top) / stageRect.height; + + const compWidth = portrait ? 1080 : 1920; + const compHeight = portrait ? 1920 : 1080; + + return { + left: Math.max(0, Math.min(normalizedX * compWidth, compWidth)), + top: Math.max(0, Math.min(normalizedY * compHeight, compHeight)), + }; +} + +function centerBlockAtPosition( + pos: { left: number; top: number }, + block: BlockDropPayload, +): { left: number; top: number } { + const blockW = block.dimensions?.width ?? 0; + const blockH = block.dimensions?.height ?? 0; + return { + left: Math.max(0, pos.left - blockW / 2), + top: Math.max(0, pos.top - blockH / 2), + }; +} + +export function usePreviewBlockDrop({ + portrait, + stageRef, + onBlockDrop, +}: UsePreviewBlockDropOptions) { + const [isDragOver, setIsDragOver] = useState(false); + + const handleDragOver = useCallback( + (e: React.DragEvent) => { + if (!onBlockDrop) return; + if (!e.dataTransfer.types.includes(TIMELINE_BLOCK_MIME)) return; + e.preventDefault(); + e.dataTransfer.dropEffect = "copy"; + setIsDragOver(true); + }, + [onBlockDrop], + ); + + const handleDragLeave = useCallback(() => { + setIsDragOver(false); + }, []); + + // fallow-ignore-next-line complexity + const handleDrop = useCallback( + (e: React.DragEvent) => { + setIsDragOver(false); + if (!onBlockDrop) return; + + const payload = e.dataTransfer.getData(TIMELINE_BLOCK_MIME); + if (!payload) return; + e.preventDefault(); + + const block = parseBlockPayload(payload); + const stage = stageRef.current; + if (!block || !stage) return; + + const pos = resolveCompositionPosition( + e.clientX, + e.clientY, + stage.getBoundingClientRect(), + portrait, + ); + if (!pos) return; + + onBlockDrop(block.name, centerBlockAtPosition(pos, block)); + }, + [onBlockDrop, stageRef, portrait], + ); + + return { isDragOver, handleDragOver, handleDragLeave, handleDrop }; +} diff --git a/packages/studio/src/utils/blockInstaller.ts b/packages/studio/src/utils/blockInstaller.ts index fb62ce46b0..802c0d589d 100644 --- a/packages/studio/src/utils/blockInstaller.ts +++ b/packages/studio/src/utils/blockInstaller.ts @@ -14,6 +14,7 @@ interface AddBlockOptions { blockName: string; activeCompPath: string | null; placement?: { start: number; track: number }; + visualPosition?: { left: number; top: number }; timelineElements: TimelineElement[]; readProjectFile: (path: string) => Promise; writeProjectFile: (path: string, content: string) => Promise; @@ -44,6 +45,7 @@ export async function addBlockToProject( blockName, activeCompPath, placement, + visualPosition, timelineElements, readProjectFile, writeProjectFile, @@ -133,6 +135,9 @@ export async function addBlockToProject( ? (block as { dimensions: { height: number } }).dimensions.height : hostDims.height; + const left = visualPosition ? Math.round(visualPosition.left) : 0; + const top = visualPosition ? Math.round(visualPosition.top) : 0; + const subCompHtml = `
` + + `style="position: absolute; left: ${left}px; top: ${top}px; width: ${width}px; height: ${height}px; z-index: ${zIndex}">` + `
`; const patchedContent = insertTimelineAssetIntoSource(originalContent, subCompHtml);