diff --git a/packages/webui/components/file-viewer.test.tsx b/packages/webui/components/file-viewer.test.tsx index 587cdadb..2095f32c 100644 --- a/packages/webui/components/file-viewer.test.tsx +++ b/packages/webui/components/file-viewer.test.tsx @@ -5,15 +5,25 @@ import { afterEach, describe, expect, it, vi } from 'vitest' import { FileViewer } from './file-viewer' import type { AssetInfo } from '@shumai/dtos' +const MockViewer = React.forwardRef( + ({ file, children }, ref) => { + React.useImperativeHandle(ref, () => ({})) + return ( +
+
{file.name}
+ {children} +
+ ) + }, +) + // Mock registry so getViewerForFile returns a simple test viewer vi.mock('./viewers/registry', () => ({ getViewerForFile: () => ({ id: 'test-viewer', name: 'Test Viewer', match: () => true, - viewer: React.forwardRef(({ file }) => ( -
{file.name}
- )), + viewer: MockViewer, }), })) diff --git a/packages/webui/components/file-viewer.tsx b/packages/webui/components/file-viewer.tsx index 2db7422d..ac4bf3c6 100644 --- a/packages/webui/components/file-viewer.tsx +++ b/packages/webui/components/file-viewer.tsx @@ -22,22 +22,19 @@ export function FileViewer({ const ViewerComponent = viewerDef.viewer return ( -
+ {children} -
- -
-
+ ) } diff --git a/packages/webui/components/viewers/default/default-viewer.tsx b/packages/webui/components/viewers/default/default-viewer.tsx index a5c026bd..f55ca920 100644 --- a/packages/webui/components/viewers/default/default-viewer.tsx +++ b/packages/webui/components/viewers/default/default-viewer.tsx @@ -4,7 +4,7 @@ import React, { useImperativeHandle } from 'react' import { FileViewerProps, MediaController } from '../types' export const DefaultViewer = React.forwardRef( - ({ file, shareId, allowDownload = true }, ref) => { + ({ file, shareId, children, allowDownload = true }, ref) => { // Implement no-op media controller useImperativeHandle(ref, () => ({ play: () => {}, @@ -39,8 +39,11 @@ export const DefaultViewer = React.forwardRef( return (
-
-

Preview unavailable

+
+ {children} +
+

Preview unavailable

+
{allowDownload && ( diff --git a/packages/webui/components/viewers/image/image-viewer.tsx b/packages/webui/components/viewers/image/image-viewer.tsx index 1c445116..e5634b87 100644 --- a/packages/webui/components/viewers/image/image-viewer.tsx +++ b/packages/webui/components/viewers/image/image-viewer.tsx @@ -10,7 +10,7 @@ import { centeredPan, fitScale, isZoomed, zoomAtPoint } from '../pan-zoom' import { usePanZoomGestures } from '../use-pan-zoom' export const ImageViewer = React.forwardRef( - ({ file, annotations, shareId, allowDownload }, ref) => { + ({ file, annotations, shareId, children, allowDownload }, ref) => { // Implement no-op media controller since images are static useImperativeHandle(ref, () => ({ play: () => {}, @@ -35,6 +35,11 @@ export const ImageViewer = React.forwardRef( const containerRef = useRef(null) + useEffect(() => { + setHasManuallyZoomed(false) + setCopied(false) + }, [file.id]) + useEffect(() => { const node = containerRef.current if (!node) return @@ -173,31 +178,34 @@ export const ImageViewer = React.forwardRef( return (
-
- {bestUrl ? ( - - ) : ( -
-

Preview unavailable

-
- )} +
+ {children} +
+ {bestUrl ? ( + + ) : ( +
+

Preview unavailable

+
+ )} +
( ( - { file, annotations, shareId, onPlay, onPause, onTimeUpdate, startTime, allowDownload }, + { + file, + annotations, + shareId, + children, + onPlay, + onPause, + onTimeUpdate, + startTime, + allowDownload, + }, ref, ) => { const { @@ -127,6 +137,10 @@ export const PdfViewer = React.forwardRef( const [pan, setPan] = useState({ x: 0, y: 0 }) const [hasManuallyZoomed, setHasManuallyZoomed] = useState(false) + useEffect(() => { + setHasManuallyZoomed(false) + }, [file.id]) + const containerRef = useRef(null) useEffect(() => { @@ -382,53 +396,56 @@ export const PdfViewer = React.forwardRef( return (
-
- {loading ? ( -
-
-
- ) : error ? ( -
- {error} -
- ) : ( - + {children} +
+ {loading ? ( +
+
+
+ ) : error ? ( +
+ {error} +
+ ) : ( + + )} + {/* Invisible selectable text overlay, transformed to match the Konva + stage. It sits ON TOP of the page canvas so the native selection + highlight is visible; pointer events are enabled only when not + drawing, so drags reach the stage below in draw mode. */} +
{ + // The container is user-select:none, so Chromium no longer + // clears the selection when clicking empty space (only text + // spans move the caret). Restore the expected behavior: a + // press on the container/br (not a text span) deselects. + if (e.target instanceof HTMLElement && e.target.tagName !== 'SPAN') { + window.getSelection()?.removeAllRanges() + } + }} + style={{ + transform: `translate(${pan.x}px, ${pan.y}px) scale(${zoom})`, + transformOrigin: '0 0', + pointerEvents: isDrawing ? 'none' : 'auto', + }} /> - )} - {/* Invisible selectable text overlay, transformed to match the Konva - stage. It sits ON TOP of the page canvas so the native selection - highlight is visible; pointer events are enabled only when not - drawing, so drags reach the stage below in draw mode. */} -
{ - // The container is user-select:none, so Chromium no longer - // clears the selection when clicking empty space (only text - // spans move the caret). Restore the expected behavior: a - // press on the container/br (not a text span) deselects. - if (e.target instanceof HTMLElement && e.target.tagName !== 'SPAN') { - window.getSelection()?.removeAllRanges() - } - }} - style={{ - transform: `translate(${pan.x}px, ${pan.y}px) scale(${zoom})`, - transformOrigin: '0 0', - pointerEvents: isDrawing ? 'none' : 'auto', - }} - /> +
( ( - { file: data, onPlay, onPause, onTimeUpdate, annotations, startTime, shareId, allowDownload }, + { + file: data, + onPlay, + onPause, + onTimeUpdate, + annotations, + startTime, + shareId, + children, + allowDownload, + }, ref, ) => { const localPlayerRef = useRef(null) @@ -117,6 +127,10 @@ const VideoViewer = React.forwardRef( const [hasManuallyZoomed, setHasManuallyZoomed] = useState(false) const [containerSize, setContainerSize] = useState({ width: 0, height: 0 }) + useEffect(() => { + setHasManuallyZoomed(false) + }, [data.id]) + const vidW = data.media?.metadata?.originalWidth || 1920 const vidH = data.media?.metadata?.originalHeight || 1080 const baseScale = fitScale(containerSize.width, containerSize.height, vidW, vidH) @@ -622,64 +636,69 @@ const VideoViewer = React.forwardRef( onMouseMove={handleMouseMove} onMouseLeave={handleMouseLeave} > - {/* Video Area */} -
- {/* Hidden VideoJS container */} -
+
+ {/* Render Carousel/Sidebar here if not fullscreen */} + {!state.isFullScreen && children} - {isAudio ? ( -
- -
- ) : ( - /* Drawing Canvas (Visible) */ - videoHtmlEl && - containerSize.width > 0 && ( - - ) - )} + {/* Video Area */} +
+ {/* Hidden VideoJS container */} +
- {/* Big Play Button Overlay (when paused) */} - {!state.isPlaying && !isDrawing && ( -
-
- + {isAudio ? ( +
+
-
- )} + ) : ( + /* Drawing Canvas (Visible) */ + videoHtmlEl && + containerSize.width > 0 && ( + + ) + )} + + {/* Big Play Button Overlay (when paused) */} + {!state.isPlaying && !isDrawing && ( +
+
+ +
+
+ )} +