diff --git a/packages/webui/components/chat/message-card.tsx b/packages/webui/components/chat/message-card.tsx
index 0cfea015..cedf8168 100644
--- a/packages/webui/components/chat/message-card.tsx
+++ b/packages/webui/components/chat/message-card.tsx
@@ -17,7 +17,7 @@ import Markdown from 'react-markdown'
import { Avatar, AvatarFallback, AvatarImage } from '../ui/avatar'
import { DrawAnnotation } from '../ui/icons'
import { Skeleton } from '../ui/skeleton'
-import { formatTimecode } from '../viewers/utils'
+import { formatTimecode } from '../viewers/video/utils'
import { m } from '@/ui/paraglide/messages.js'
import { useUiStore } from '@/ui/stores/ui'
diff --git a/packages/webui/components/chat/message-input.tsx b/packages/webui/components/chat/message-input.tsx
index 4fb853fb..e69805ea 100644
--- a/packages/webui/components/chat/message-input.tsx
+++ b/packages/webui/components/chat/message-input.tsx
@@ -27,7 +27,7 @@ import { Button } from '../ui/button'
import { DrawAnnotation } from '../ui/icons'
import { Popover, PopoverContent, PopoverTrigger } from '../ui/popover'
import { ProgressCircle } from '../ui/progress-circle'
-import { formatTimecode } from '../viewers/utils'
+import { formatTimecode } from '../viewers/video/utils'
import { useUiStore } from '@/ui/stores/ui'
type UploadingFile = {
diff --git a/packages/webui/components/compare/compare-control-bar.tsx b/packages/webui/components/compare/compare-control-bar.tsx
index 6edc2925..cc45d656 100644
--- a/packages/webui/components/compare/compare-control-bar.tsx
+++ b/packages/webui/components/compare/compare-control-bar.tsx
@@ -1,9 +1,9 @@
-import { ImageControlBar } from '@/ui/components/viewers/image-control-bar'
+import { ImageControlBar } from '@/ui/components/viewers/image/image-control-bar'
import {
VideoControlBar,
type DisplayTranscode,
type PlayerState,
-} from '@/ui/components/viewers/video-control-bar'
+} from '@/ui/components/viewers/video/video-control-bar'
import type { AssetInfo } from '@shumai/dtos'
import { Maximize, Minimize } from 'lucide-react'
import type { PaneReportedState } from './types'
@@ -85,10 +85,10 @@ export function CompareControlBar({
toggleMute={onToggleMute}
handleVolumeChange={onVolumeChange}
changePlaybackRate={onChangePlaybackRate}
- changeResolution={(res) => onChangeResolution(res.resolution)}
- handleDownload={(key) => onDownload(key)}
+ changeResolution={(res: DisplayTranscode) => onChangeResolution(res.resolution)}
+ handleDownload={(key?: string) => onDownload(key)}
toggleFullScreen={onToggleFullScreen}
- onZoomChange={(nz) => (nz >= activeState.zoom ? onZoomIn() : onZoomOut())}
+ onZoomChange={(nz: number) => (nz >= activeState.zoom ? onZoomIn() : onZoomOut())}
onZoomReset={onFit}
frameRate={v.frameRate}
totalFrames={v.totalFrames}
diff --git a/packages/webui/components/compare/compare-viewer.tsx b/packages/webui/components/compare/compare-viewer.tsx
index 95fe0aac..8331234d 100644
--- a/packages/webui/components/compare/compare-viewer.tsx
+++ b/packages/webui/components/compare/compare-viewer.tsx
@@ -4,12 +4,10 @@ import type { AssetInfo } from '@shumai/dtos'
import { useQuery } from '@tanstack/react-query'
import { Loader2 } from 'lucide-react'
import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { getViewerForFile } from '@/ui/components/viewers/registry'
import { CompareControlBar } from './compare-control-bar'
-import { CompareImagePane } from './compare-image-pane'
import { ComparePaneTopbar } from './compare-pane-topbar'
-import { isSameType, kindOf } from './compare-utils'
-import { CompareVideoPane } from './compare-video-pane'
-import type { ComparePaneHandle, CompareSide, PaneKind, PaneReportedState } from './types'
+import type { ComparePaneHandle, CompareSide, PaneReportedState } from './types'
interface VersionItem {
id: string
@@ -89,9 +87,9 @@ export function CompareViewer({
const { data: leftAsset, isLoading: leftLoading } = useCompareAsset(leftId, isPublic, shareId)
const { data: rightAsset, isLoading: rightLoading } = useCompareAsset(rightId, isPublic, shareId)
- const leftKind = kindOf(leftAsset?.mediaType)
- const rightKind = kindOf(rightAsset?.mediaType)
- const sameType = isSameType(leftKind, rightKind)
+ const leftDef = getViewerForFile(leftAsset)
+ const rightDef = getViewerForFile(rightAsset)
+ const sameType = !!leftAsset && !!rightAsset && leftDef.id === rightDef.id
const activeAsset = activeSide === 'left' ? leftAsset : rightAsset
const activeState = activeSide === 'left' ? leftState : rightState
@@ -219,51 +217,41 @@ export function CompareViewer({
[activeAsset?.media?.videoPreview?.url],
)
- const renderPane = (side: CompareSide, asset: AssetInfo, kind: PaneKind) => {
+ const renderPane = (side: CompareSide, asset: AssetInfo) => {
+ const def = getViewerForFile(asset)
+ const ComparePane = def?.comparePane
+
+ if (!ComparePane) {
+ return (
+
+ )
+ }
+
const isActive = activeSide === side
const paneRef = side === 'left' ? leftRef : rightRef
const onStateChange = side === 'left' ? handleStateChangeLeft : handleStateChangeRight
const onUserPan = side === 'left' ? handleUserPanLeft : handleUserPanRight
const paneAnnotations = isActive ? annotations : []
- if (kind === 'video') {
- return (
- onActiveSideChange(side)}
- onRequestTogglePlay={handleRequestTogglePlay}
- onTimeUpdate={onTimeUpdate}
- onPlay={onPlay}
- />
- )
- }
- if (kind === 'image') {
- return (
- onActiveSideChange(side)}
- />
- )
- }
return (
-
+ onActiveSideChange(side)}
+ muted={isActive ? userMuted : true}
+ volume={userVolume}
+ onPlay={onPlay}
+ onTimeUpdate={onTimeUpdate}
+ onRequestTogglePlay={handleRequestTogglePlay}
+ />
)
}
@@ -290,7 +278,7 @@ export function CompareViewer({
)}
{leftAsset ? (
- renderPane('left', leftAsset, leftKind)
+ renderPane('left', leftAsset)
) : (
@@ -316,7 +304,7 @@ export function CompareViewer({
)}
{rightAsset ? (
- renderPane('right', rightAsset, rightKind)
+ renderPane('right', rightAsset)
) : (
diff --git a/packages/webui/components/file-browser/file-preview.tsx b/packages/webui/components/file-browser/file-preview.tsx
index bbc2c574..c7875cc3 100644
--- a/packages/webui/components/file-browser/file-preview.tsx
+++ b/packages/webui/components/file-browser/file-preview.tsx
@@ -1,6 +1,6 @@
import { File, Folder } from 'lucide-react'
import { SpriteScrubber } from '../sprite-scrubber'
-import { formatTime } from '../viewers/utils'
+import { formatTime } from '../viewers/video/utils'
type FilePreviewItem = {
type?: string | null
diff --git a/packages/webui/components/file-viewer-right-sidebar.tsx b/packages/webui/components/file-viewer-right-sidebar.tsx
index 2c982264..70bd8b0a 100644
--- a/packages/webui/components/file-viewer-right-sidebar.tsx
+++ b/packages/webui/components/file-viewer-right-sidebar.tsx
@@ -15,6 +15,7 @@ import { ChatInput } from './chat/message-input'
import FieldRenderer from './field-renderer'
import { GuestIdentityPopup } from './guest-identity-popup'
import { ScrollArea } from './ui/scroll-area'
+import { getViewerForFile } from '@/ui/components/viewers/registry'
interface FileViewerRightSidebarProps {
teamId: string
@@ -88,7 +89,8 @@ export function FileViewerRightSidebar({
enabled: !!projectId && !readOnly,
})
- const isAiEnabled = file?.mediaType?.startsWith('image/') || file?.mediaType?.startsWith('video/')
+ const viewerDef = getViewerForFile(file)
+ const isAiEnabled = !!viewerDef?.commentsConfig?.hasAiBots
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const enabledBots = isAiEnabled ? (bots as any[]) || [] : []
@@ -355,12 +357,12 @@ export function FileViewerRightSidebar({
onViewAttachment={setViewingAttachment}
hasReplies={!!comment.replies?.length}
frameRate={
- file?.mediaType?.startsWith('video/')
+ viewerDef?.commentsConfig?.hasTimestamp
? file?.media?.metadata?.frameRate || 30
: undefined
}
startTimecode={
- file?.mediaType?.startsWith('video/')
+ viewerDef?.commentsConfig?.hasTimestamp
? file?.media?.metadata?.startTimecode
: undefined
}
@@ -381,12 +383,12 @@ export function FileViewerRightSidebar({
hasReplies={false}
isLastReply={index === (comment.replies?.length ?? 0) - 1}
frameRate={
- file?.mediaType?.startsWith('video/')
+ viewerDef?.commentsConfig?.hasTimestamp
? file?.media?.metadata?.frameRate || 30
: undefined
}
startTimecode={
- file?.mediaType?.startsWith('video/')
+ viewerDef?.commentsConfig?.hasTimestamp
? file?.media?.metadata?.startTimecode
: undefined
}
@@ -417,14 +419,14 @@ export function FileViewerRightSidebar({
bots={enabledBots}
hideAnnotationControl={hideAnnotationControl}
disableMentions={isPublic}
- currentTime={file?.mediaType?.startsWith('video/') ? currentTime : undefined}
+ currentTime={viewerDef?.commentsConfig?.hasTimestamp ? currentTime : undefined}
frameRate={
- file?.mediaType?.startsWith('video/')
+ viewerDef?.commentsConfig?.hasTimestamp
? file?.media?.metadata?.frameRate || 30
: undefined
}
startTimecode={
- file?.mediaType?.startsWith('video/')
+ viewerDef?.commentsConfig?.hasTimestamp
? file?.media?.metadata?.startTimecode
: undefined
}
diff --git a/packages/webui/components/file-viewer.tsx b/packages/webui/components/file-viewer.tsx
index 04ec10c6..df026049 100644
--- a/packages/webui/components/file-viewer.tsx
+++ b/packages/webui/components/file-viewer.tsx
@@ -1,33 +1,14 @@
-import { useScreenSize } from '@/ui/hooks/useScreenSize'
-import { client } from '@/ui/api/client'
-import { getBestTranscode } from '@/ui/lib/media'
-import type { AssetInfo } from '@shumai/dtos'
-import { Download } from 'lucide-react'
-import type { ReactNode, RefObject } from 'react'
-import { useCallback, useEffect, useRef, useState } from 'react'
-import type Player from 'video.js/dist/types/player'
-import DrawingCanvas from './drawing-canvas'
-import VideoPlayer from './viewers/video-player'
-import { ImageControlBar } from './viewers/image-control-bar'
+import { getViewerForFile } from './viewers/registry'
+import type { FileViewerProps, MediaController } from './viewers/types'
+import React, { RefObject } from 'react'
-import { useAnnotationStore } from '@/ui/stores/annotation-store'
-import type { Annotation } from '@/ui/types'
-
-type FileViewerProps = {
- file: AssetInfo
- videoRef?: RefObject
- onPlay?: () => void
- onPause?: () => void
- onTimeUpdate?: (time: number) => void
- annotations?: Annotation[]
- startTime?: number
- shareId?: string
- children?: ReactNode
+interface OuterFileViewerProps extends FileViewerProps {
+ mediaControllerRef?: RefObject
}
export function FileViewer({
file,
- videoRef,
+ mediaControllerRef,
onPlay,
onPause,
onTimeUpdate,
@@ -35,271 +16,22 @@ export function FileViewer({
startTime,
shareId,
children,
-}: FileViewerProps) {
- const { width: screenWidth } = useScreenSize()
- const isImage = file.mediaType?.startsWith('image/')
- const isVideo = file.mediaType?.startsWith('video/')
-
- // Annotation Store
- const {
- isDrawing,
- currentTool,
- currentColor,
- addAnnotation,
- annotations: draftAnnotations,
- reset: resetAnnotations,
- } = useAnnotationStore()
-
- // Reset annotations when file changes
- useEffect(() => {
- resetAnnotations()
- }, [file.id, resetAnnotations])
-
- // State for Image Viewer
- const [containerSize, setContainerSize] = useState({ width: 0, height: 0 })
- const [zoom, setZoom] = useState(1)
- const [pan, setPan] = useState({ x: 0, y: 0 })
- const [copied, setCopied] = useState(false)
-
- const observerRef = useRef(null)
-
- const containerRef = useCallback((node: HTMLDivElement | null) => {
- if (observerRef.current) {
- observerRef.current.disconnect()
- observerRef.current = null
- }
-
- if (node !== null) {
- const observer = new ResizeObserver((entries) => {
- const entry = entries[0]
- if (entry) {
- setContainerSize({
- width: entry.contentRect.width,
- height: entry.contentRect.height,
- })
- }
- })
- observer.observe(node)
- observerRef.current = observer
- }
- }, [])
-
- const imgW = file.media?.metadata?.originalWidth ?? 1920
- const imgH = file.media?.metadata?.originalHeight ?? 1080
- const conW = containerSize.width
- const conH = containerSize.height
-
- let baseScale = 1
-
- if (conW > 0 && conH > 0) {
- baseScale = Math.min(conW / imgW, conH / imgH)
- }
-
- // Reset/Fit logic
- useEffect(() => {
- if (conW > 0 && conH > 0 && isImage) {
- setZoom(baseScale)
- // Center
- const x = (conW - imgW * baseScale) / 2
- const y = (conH - imgH * baseScale) / 2
- setPan({ x, y })
- }
- }, [file.id, conW, conH, isImage, baseScale, imgW, imgH])
-
- const handleZoom = (factor: number) => {
- const cx = conW / 2
- const cy = conH / 2
-
- // Limit min/max zoom if needed?
- const newZoom = zoom * factor
- if (newZoom < 0.01 || newZoom > 50) return
-
- const newPanX = cx - (cx - pan.x) * (newZoom / zoom)
- const newPanY = cy - (cy - pan.y) * (newZoom / zoom)
-
- setZoom(newZoom)
- setPan({ x: newPanX, y: newPanY })
- }
-
- const handleFit = () => {
- setZoom(baseScale)
- const x = (conW - imgW * baseScale) / 2
- const y = (conH - imgH * baseScale) / 2
- setPan({ x, y })
- }
-
- let bestUrl = file.media?.original?.downloadUrl
-
- if (isImage) {
- const bestTranscode = getBestTranscode(file.media?.imageTranscodes, screenWidth)
- if (bestTranscode?.url) {
- bestUrl = bestTranscode.url
- }
- }
-
- const handleDownload = async () => {
- const key = file.media?.original?.key
- if (!key || !file.id) return
- try {
- const res = shareId
- ? await client.api.shares[':shareId'].files[':fileId']['download-url'].$post({
- param: { shareId, fileId: file.id },
- json: { key },
- })
- : await client.api.files['download-url'].$post({
- json: { key, assetId: file.id },
- })
- if (!res.ok) return
- const { url } = await res.json()
- const link = document.createElement('a')
- link.href = url
- link.download = ''
- document.body.appendChild(link)
- link.click()
- document.body.removeChild(link)
- } catch {
- // silently fail
- }
- }
-
- const handleCopy = async () => {
- const webpUrl = bestUrl
- if (!webpUrl) return
- try {
- // To support Safari and iOS, we must invoke navigator.clipboard.write
- // synchronously inside the click handler. We can pass a promise to ClipboardItem
- // which resolves to the Blob asynchronously.
- const copyPromise = (async () => {
- const response = await fetch(webpUrl)
- const blob = await response.blob()
-
- const img = new Image()
- img.crossOrigin = 'anonymous'
- const objectUrl = URL.createObjectURL(blob)
- img.src = objectUrl
-
- try {
- await new Promise((resolve, reject) => {
- img.onload = resolve
- img.onerror = (e) => reject(new Error('Failed to load image: ' + String(e)))
- })
-
- const canvas = document.createElement('canvas')
- canvas.width = img.width
- canvas.height = img.height
- const ctx = canvas.getContext('2d')
- if (!ctx) throw new Error('Could not get canvas context')
- ctx.drawImage(img, 0, 0)
-
- const pngBlob = await new Promise((resolve) => {
- canvas.toBlob(resolve, 'image/png')
- })
-
- if (!pngBlob) throw new Error('Failed to convert image to PNG')
- return pngBlob
- } finally {
- URL.revokeObjectURL(objectUrl)
- }
- })()
-
- await navigator.clipboard.write([
- new ClipboardItem({
- 'image/png': copyPromise,
- }),
- ])
- setCopied(true)
- setTimeout(() => setCopied(false), 2000)
- } catch (err) {
- console.error('Failed to copy image to clipboard:', err)
- }
- }
-
- const isUnsupported = !bestUrl || (!isImage && !isVideo)
-
- if (isUnsupported) {
- return (
-
- )
- }
-
- // Combine saved annotations and draft annotations
- const displayAnnotations = [...(annotations || []), ...draftAnnotations]
+}: OuterFileViewerProps) {
+ const viewerDef = getViewerForFile(file)
+ const ViewerComponent = viewerDef.viewer
return (
-
- {isImage && (
- <>
-
- {/* Zoom Toolbar */}
-
handleZoom(1.2)}
- onZoomOut={() => handleZoom(0.8)}
- onFit={handleFit}
- onDownload={handleDownload}
- canDownload={!!file.media?.original?.key}
- onCopy={handleCopy}
- copied={copied}
- canCopy={!!bestUrl}
- />
- >
- )}
- {isVideo && (
-
- {children}
-
- )}
-
+
+ {children}
+
)
}
diff --git a/packages/webui/components/public-share-manager.tsx b/packages/webui/components/public-share-manager.tsx
index cea7ab65..9c5692a5 100644
--- a/packages/webui/components/public-share-manager.tsx
+++ b/packages/webui/components/public-share-manager.tsx
@@ -18,7 +18,7 @@ import { FieldInfo } from '@shumai/dtos'
import { FileViewer } from './file-viewer'
import { CompareViewer } from './compare/compare-viewer'
import { pickDefaultCompareVersions } from './compare/compare-utils'
-import type Player from 'video.js/dist/types/player'
+import type { MediaController } from './viewers/types'
import type { Annotation } from '@/ui/types'
import { useNavigate } from '@tanstack/react-router'
@@ -141,7 +141,7 @@ export function PublicShareManager({
const [selectedIds, setSelectedIds] = useState>(new Set())
const [rightSidebarWidth, setRightSidebarWidth] = useState(360)
const [isRightSidebarCollapsed, setIsRightSidebarCollapsed] = useState(() => !initialFileId)
- const videoRef = useRef(null)
+ const mediaControllerRef = useRef(null)
const [annotations, setAnnotations] = useState([])
const [currentTime, setCurrentTime] = useState(0)
const [selectedCommentId, setSelectedCommentId] = useState(null)
@@ -359,14 +359,10 @@ export function PublicShareManager({
}
if (comment.second !== null && comment.second !== undefined) {
- if (videoRef.current) {
- videoRef.current.currentTime(comment.second)
- videoRef.current.pause()
- }
+ mediaControllerRef.current?.seekTo(comment.second)
+ mediaControllerRef.current?.pause()
} else if (newAnnotations && newAnnotations.length > 0) {
- if (videoRef.current) {
- videoRef.current.pause()
- }
+ mediaControllerRef.current?.pause()
}
}
@@ -580,7 +576,7 @@ export function PublicShareManager({
viewingFileData && (
{
- if (videoRef.current) {
- videoRef.current.pause()
- }
+ mediaControllerRef.current?.pause()
}}
selectedCommentId={selectedCommentId}
/>
diff --git a/packages/webui/components/viewers/default/default-viewer.tsx b/packages/webui/components/viewers/default/default-viewer.tsx
new file mode 100644
index 00000000..deec3433
--- /dev/null
+++ b/packages/webui/components/viewers/default/default-viewer.tsx
@@ -0,0 +1,64 @@
+import { client } from '@/ui/api/client'
+import { Download } from 'lucide-react'
+import React, { useImperativeHandle } from 'react'
+import { FileViewerProps, MediaController } from '../types'
+
+export const DefaultViewer = React.forwardRef(
+ ({ file, shareId, children }, ref) => {
+ // Implement no-op media controller
+ useImperativeHandle(ref, () => ({
+ play: () => {},
+ pause: () => {},
+ seekTo: () => {},
+ }))
+
+ const handleDownload = async () => {
+ const key = file.media?.original?.key
+ if (!key || !file.id) return
+ try {
+ const res = shareId
+ ? await client.api.shares[':shareId'].files[':fileId']['download-url'].$post({
+ param: { shareId, fileId: file.id },
+ json: { key },
+ })
+ : await client.api.files['download-url'].$post({
+ json: { key, assetId: file.id },
+ })
+ if (!res.ok) return
+ const { url } = await res.json()
+ const link = document.createElement('a')
+ link.href = url
+ link.download = ''
+ document.body.appendChild(link)
+ link.click()
+ document.body.removeChild(link)
+ } catch {
+ // silently fail
+ }
+ }
+
+ return (
+
+ )
+ },
+)
+
+export default DefaultViewer
diff --git a/packages/webui/components/viewers/default/index.tsx b/packages/webui/components/viewers/default/index.tsx
new file mode 100644
index 00000000..a5dd4d1c
--- /dev/null
+++ b/packages/webui/components/viewers/default/index.tsx
@@ -0,0 +1,14 @@
+import { FileTypeDefinition } from '../types'
+import DefaultViewer from './default-viewer'
+
+export const defaultTypeDefinition: FileTypeDefinition = {
+ id: 'default',
+ name: 'Default',
+ match: () => true,
+ viewer: DefaultViewer,
+ commentsConfig: {
+ hasTimestamp: false,
+ hasAnnotations: false,
+ hasAiBots: false,
+ },
+}
diff --git a/packages/webui/components/compare/compare-image-pane.tsx b/packages/webui/components/viewers/image/compare-image-pane.tsx
similarity index 98%
rename from packages/webui/components/compare/compare-image-pane.tsx
rename to packages/webui/components/viewers/image/compare-image-pane.tsx
index 3dcac681..ea1ea03d 100644
--- a/packages/webui/components/compare/compare-image-pane.tsx
+++ b/packages/webui/components/viewers/image/compare-image-pane.tsx
@@ -6,7 +6,7 @@ import { useAnnotationStore } from '@/ui/stores/annotation-store'
import type { Annotation } from '@/ui/types'
import type { AssetInfo } from '@shumai/dtos'
import { forwardRef, useCallback, useEffect, useImperativeHandle, useRef, useState } from 'react'
-import type { ComparePaneHandle, PaneReportedState } from './types'
+import type { ComparePaneHandle, PaneReportedState } from '../../compare/types'
interface CompareImagePaneProps {
file: AssetInfo
diff --git a/packages/webui/components/viewers/image-control-bar.tsx b/packages/webui/components/viewers/image/image-control-bar.tsx
similarity index 100%
rename from packages/webui/components/viewers/image-control-bar.tsx
rename to packages/webui/components/viewers/image/image-control-bar.tsx
diff --git a/packages/webui/components/viewers/image/image-viewer.tsx b/packages/webui/components/viewers/image/image-viewer.tsx
new file mode 100644
index 00000000..b7b3d923
--- /dev/null
+++ b/packages/webui/components/viewers/image/image-viewer.tsx
@@ -0,0 +1,223 @@
+import { useScreenSize } from '@/ui/hooks/useScreenSize'
+import { client } from '@/ui/api/client'
+import { getBestTranscode } from '@/ui/lib/media'
+import React, { useCallback, useEffect, useRef, useState, useImperativeHandle } from 'react'
+import DrawingCanvas from '@/ui/components/drawing-canvas'
+import { ImageControlBar } from './image-control-bar'
+import { useAnnotationStore } from '@/ui/stores/annotation-store'
+import { FileViewerProps, MediaController } from '../types'
+
+export const ImageViewer = React.forwardRef(
+ ({ file, annotations, shareId, children }, ref) => {
+ // Implement no-op media controller since images are static
+ useImperativeHandle(ref, () => ({
+ play: () => {},
+ pause: () => {},
+ seekTo: () => {},
+ }))
+
+ const { width: screenWidth } = useScreenSize()
+ const {
+ isDrawing,
+ currentTool,
+ currentColor,
+ addAnnotation,
+ annotations: draftAnnotations,
+ } = useAnnotationStore()
+
+ const [containerSize, setContainerSize] = useState({ width: 0, height: 0 })
+ const [zoom, setZoom] = useState(1)
+ const [pan, setPan] = useState({ x: 0, y: 0 })
+ const [copied, setCopied] = useState(false)
+
+ const observerRef = useRef(null)
+
+ const containerRef = useCallback((node: HTMLDivElement | null) => {
+ if (observerRef.current) {
+ observerRef.current.disconnect()
+ observerRef.current = null
+ }
+
+ if (node !== null) {
+ const observer = new ResizeObserver((entries) => {
+ const entry = entries[0]
+ if (entry) {
+ setContainerSize({
+ width: entry.contentRect.width,
+ height: entry.contentRect.height,
+ })
+ }
+ })
+ observer.observe(node)
+ observerRef.current = observer
+ }
+ }, [])
+
+ const imgW = file.media?.metadata?.originalWidth ?? 1920
+ const imgH = file.media?.metadata?.originalHeight ?? 1080
+ const conW = containerSize.width
+ const conH = containerSize.height
+
+ let baseScale = 1
+
+ if (conW > 0 && conH > 0) {
+ baseScale = Math.min(conW / imgW, conH / imgH)
+ }
+
+ // Reset/Fit logic
+ useEffect(() => {
+ if (conW > 0 && conH > 0) {
+ setZoom(baseScale)
+ // Center
+ const x = (conW - imgW * baseScale) / 2
+ const y = (conH - imgH * baseScale) / 2
+ setPan({ x, y })
+ }
+ }, [file.id, conW, conH, baseScale, imgW, imgH])
+
+ const handleZoom = (factor: number) => {
+ const cx = conW / 2
+ const cy = conH / 2
+
+ const newZoom = zoom * factor
+ if (newZoom < 0.01 || newZoom > 50) return
+
+ const newPanX = cx - (cx - pan.x) * (newZoom / zoom)
+ const newPanY = cy - (cy - pan.y) * (newZoom / zoom)
+
+ setZoom(newZoom)
+ setPan({ x: newPanX, y: newPanY })
+ }
+
+ const handleFit = () => {
+ setZoom(baseScale)
+ const x = (conW - imgW * baseScale) / 2
+ const y = (conH - imgH * baseScale) / 2
+ setPan({ x, y })
+ }
+
+ let bestUrl = file.media?.original?.downloadUrl
+
+ const bestTranscode = getBestTranscode(file.media?.imageTranscodes, screenWidth)
+ if (bestTranscode?.url) {
+ bestUrl = bestTranscode.url
+ }
+
+ const handleDownload = async () => {
+ const key = file.media?.original?.key
+ if (!key || !file.id) return
+ try {
+ const res = shareId
+ ? await client.api.shares[':shareId'].files[':fileId']['download-url'].$post({
+ param: { shareId, fileId: file.id },
+ json: { key },
+ })
+ : await client.api.files['download-url'].$post({
+ json: { key, assetId: file.id },
+ })
+ if (!res.ok) return
+ const { url } = await res.json()
+ const link = document.createElement('a')
+ link.href = url
+ link.download = ''
+ document.body.appendChild(link)
+ link.click()
+ document.body.removeChild(link)
+ } catch {
+ // silently fail
+ }
+ }
+
+ const handleCopy = async () => {
+ const webpUrl = bestUrl
+ if (!webpUrl) return
+ try {
+ const copyPromise = (async () => {
+ const response = await fetch(webpUrl)
+ const blob = await response.blob()
+
+ const img = new Image()
+ img.crossOrigin = 'anonymous'
+ const objectUrl = URL.createObjectURL(blob)
+ img.src = objectUrl
+
+ try {
+ await new Promise((resolve, reject) => {
+ img.onload = resolve
+ img.onerror = (e) => reject(new Error('Failed to load image: ' + String(e)))
+ })
+
+ const canvas = document.createElement('canvas')
+ canvas.width = img.width
+ canvas.height = img.height
+ const ctx = canvas.getContext('2d')
+ if (!ctx) throw new Error('Could not get canvas context')
+ ctx.drawImage(img, 0, 0)
+
+ const pngBlob = await new Promise((resolve) => {
+ canvas.toBlob(resolve, 'image/png')
+ })
+
+ if (!pngBlob) throw new Error('Failed to convert image to PNG')
+ return pngBlob
+ } finally {
+ URL.revokeObjectURL(objectUrl)
+ }
+ })()
+
+ await navigator.clipboard.write([
+ new ClipboardItem({
+ 'image/png': copyPromise,
+ }),
+ ])
+ setCopied(true)
+ setTimeout(() => setCopied(false), 2000)
+ } catch (err) {
+ console.error('Failed to copy image to clipboard:', err)
+ }
+ }
+
+ const displayAnnotations = [...(annotations || []), ...draftAnnotations]
+
+ return (
+
+
+
handleZoom(1.2)}
+ onZoomOut={() => handleZoom(0.8)}
+ onFit={handleFit}
+ onDownload={handleDownload}
+ canDownload={!!file.media?.original?.key}
+ onCopy={handleCopy}
+ copied={copied}
+ canCopy={!!bestUrl}
+ />
+
+ )
+ },
+)
+
+export default ImageViewer
diff --git a/packages/webui/components/viewers/image/index.tsx b/packages/webui/components/viewers/image/index.tsx
new file mode 100644
index 00000000..c06fdc3d
--- /dev/null
+++ b/packages/webui/components/viewers/image/index.tsx
@@ -0,0 +1,16 @@
+import { FileTypeDefinition } from '../types'
+import ImageViewer from './image-viewer'
+import { CompareImagePane } from './compare-image-pane'
+
+export const imageTypeDefinition: FileTypeDefinition = {
+ id: 'image',
+ name: 'Image',
+ match: (file) => !!file.mediaType?.startsWith('image/'),
+ viewer: ImageViewer,
+ comparePane: CompareImagePane,
+ commentsConfig: {
+ hasTimestamp: false,
+ hasAnnotations: true,
+ hasAiBots: true,
+ },
+}
diff --git a/packages/webui/components/viewers/registry.ts b/packages/webui/components/viewers/registry.ts
new file mode 100644
index 00000000..5302d2c7
--- /dev/null
+++ b/packages/webui/components/viewers/registry.ts
@@ -0,0 +1,17 @@
+import type { AssetInfo } from '@shumai/dtos'
+import { FileTypeDefinition } from './types'
+import { videoTypeDefinition } from './video'
+import { imageTypeDefinition } from './image'
+import { defaultTypeDefinition } from './default'
+
+const registry: FileTypeDefinition[] = [videoTypeDefinition, imageTypeDefinition]
+
+export function getViewerForFile(file: AssetInfo | null | undefined): FileTypeDefinition {
+ if (!file) return defaultTypeDefinition
+ const match = registry.find((viewer) => viewer.match(file))
+ return match || defaultTypeDefinition
+}
+
+export function getAllViewers(): FileTypeDefinition[] {
+ return registry
+}
diff --git a/packages/webui/components/viewers/types.ts b/packages/webui/components/viewers/types.ts
new file mode 100644
index 00000000..1137a0d2
--- /dev/null
+++ b/packages/webui/components/viewers/types.ts
@@ -0,0 +1,53 @@
+import type { AssetInfo } from '@shumai/dtos'
+import type { Annotation } from '@/ui/types'
+import type { ComparePaneHandle, PaneReportedState } from '@/ui/components/compare/types'
+import type React from 'react'
+
+export interface MediaController {
+ play: () => void
+ pause: () => void
+ seekTo: (second: number) => void
+ getCurrentTime?: () => number
+ getDuration?: () => number
+}
+
+export interface FileViewerProps {
+ file: AssetInfo
+ annotations?: Annotation[]
+ onPlay?: () => void
+ onPause?: () => void
+ onTimeUpdate?: (time: number) => void
+ startTime?: number
+ shareId?: string
+ children?: React.ReactNode
+}
+
+export interface ComparePaneProps {
+ file: AssetInfo
+ isActive: boolean
+ annotations: Annotation[]
+ onStateChange: (state: PaneReportedState) => void
+ onActivate: () => void
+ onUserPan?: (dx: number, dy: number) => void
+ shareId?: string
+ muted?: boolean
+ volume?: number
+ onPlay?: () => void
+ onTimeUpdate?: (second: number) => void
+ onRequestTogglePlay?: () => void
+}
+
+export interface FileTypeDefinition {
+ id: string
+ name: string
+ match: (file: AssetInfo) => boolean
+ viewer: React.ForwardRefExoticComponent>
+ comparePane?: React.ForwardRefExoticComponent<
+ ComparePaneProps & React.RefAttributes
+ >
+ commentsConfig?: {
+ hasTimestamp?: boolean
+ hasAnnotations?: boolean
+ hasAiBots?: boolean
+ }
+}
diff --git a/packages/webui/components/viewers/video-player.tsx b/packages/webui/components/viewers/video-player.tsx
deleted file mode 100644
index 66ca7c11..00000000
--- a/packages/webui/components/viewers/video-player.tsx
+++ /dev/null
@@ -1,644 +0,0 @@
-import type { AssetInfo } from '@shumai/dtos'
-import { client } from '@/ui/api/client'
-import { cn } from '@/ui/lib/utils'
-import { Play } from 'lucide-react'
-import React, { useCallback, useEffect, useRef, useState } from 'react'
-import videojs from 'video.js'
-import type Player from 'video.js/dist/types/player'
-import { useFramePlayer } from './use-frame-player'
-import { resolveTotalFrames } from './utils'
-import { VideoControlBar, type PlayerState, type DisplayTranscode } from './video-control-bar'
-
-import type { Annotation } from '@/ui/types'
-import DrawingCanvas from '../drawing-canvas'
-import { useAnnotationStore } from '@/ui/stores/annotation-store'
-
-interface VideoPlayerProps {
- data: AssetInfo
- playerRef?: React.RefObject
- onPlay?: () => void
- onPause?: () => void
- onTimeUpdate?: (time: number) => void
- annotations?: Annotation[]
- startTime?: number
- shareId?: string
- children?: React.ReactNode
-}
-
-const VideoPlayer: React.FC = ({
- data,
- playerRef: passedPlayerRef,
- onPlay,
- onPause,
- onTimeUpdate,
- annotations,
- startTime,
- shareId,
- children,
-}) => {
- const localPlayerRef = useRef(null)
- const playerRef = passedPlayerRef || localPlayerRef
- // We use a container ref to manually append the video element
- const videoContainerRef = useRef(null)
- const containerRef = useRef(null)
- const rootRef = useRef(null)
- const controlsTimeoutRef = useRef | null>(null)
- const isOverControlsRef = useRef(false)
-
- const [videoHtmlEl, setVideoHtmlEl] = useState(undefined)
- const videoRef = useRef(null)
- const [zoom, setZoom] = useState(1)
- const [hasManuallyZoomed, setHasManuallyZoomed] = useState(false)
- const [containerSize, setContainerSize] = useState({ width: 0, height: 0 })
-
- const handleZoomChange = (newZoom: number) => {
- setZoom(newZoom)
- setHasManuallyZoomed(true)
- }
-
- const handleZoomReset = () => {
- setHasManuallyZoomed(false)
- }
-
- // Store
- const {
- isDrawing,
- currentTool,
- currentColor,
- addAnnotation,
- annotations: draftAnnotations,
- } = useAnnotationStore()
-
- // Combine annotations
- const displayAnnotations = [...(annotations || []), ...draftAnnotations]
-
- // Resize Observer for container
- useEffect(() => {
- if (!containerRef.current) return
- const observer = new ResizeObserver((entries) => {
- const entry = entries[0]
- if (entry) {
- setContainerSize({
- width: entry.contentRect.width,
- height: entry.contentRect.height,
- })
- }
- })
- observer.observe(containerRef.current)
- return () => observer.disconnect()
- }, [])
-
- // Fit to screen initial / responsive resize
- useEffect(() => {
- if (containerSize.width > 0 && containerSize.height > 0) {
- const vidW = data.media?.metadata?.originalWidth ?? 1920
- const vidH = data.media?.metadata?.originalHeight ?? 1080
- const scale = Math.min(containerSize.width / vidW, containerSize.height / vidH)
- if (!hasManuallyZoomed) {
- setZoom(scale)
- }
- }
- }, [containerSize.width, containerSize.height, data.media?.metadata, hasManuallyZoomed])
-
- // Cleanup ref when player is disposed
- useEffect(() => {
- return () => {
- videoRef.current = null
- }
- }, [])
-
- if (!data.media?.original?.downloadUrl || !data.media.metadata) {
- return (
-
-
Media is not available.
-
- )
- }
-
- // Initial resolution setup
- const originalRes: DisplayTranscode = {
- id: 'original',
- url: data.media.original.downloadUrl,
- key: data.media.original.key ?? '',
- width: data.media.metadata.originalWidth ?? 0,
- height: data.media.metadata.originalHeight ?? 0,
- size: 0,
- isRaw: true,
- resolution: 'Original',
- }
-
- const resolutions: DisplayTranscode[] = (data.media.videoTranscodes ?? []).map((t) => {
- const longSide = Math.max(t.width, t.height)
- let resolution = `${t.height}p`
- if (longSide >= 3840) resolution = '2160p'
- else if (longSide >= 1920) resolution = '1080p'
- else if (longSide >= 1280) resolution = '720p'
- else if (longSide >= 960) resolution = '540p'
- else if (longSide >= 640) resolution = '360p'
- else if (longSide >= 320) resolution = '180p'
-
- return {
- ...t,
- resolution: t.isRaw ? 'Original' : resolution,
- }
- })
-
- const previewResolutions = resolutions.filter((r) => !r.isRaw)
-
- // Logic to select best resolution based on screen size
- const getInitialResolution = (): DisplayTranscode => {
- if (previewResolutions.length === 0) return originalRes
-
- if (typeof window === 'undefined') return previewResolutions[0]
-
- // Use device pixel ratio for high DPI screens
- const screenWidth = window.innerWidth * (window.devicePixelRatio || 1)
-
- // 1. Sort by width ascending
- const sortedResolutions = [...previewResolutions].sort((a, b) => {
- const wA = a.width ?? 0
- const wB = b.width ?? 0
- return wA - wB
- })
-
- // 2. Find first one >= screenWidth
- const bestFit = sortedResolutions.find((r) => (r.width ?? 0) >= screenWidth)
-
- // 3. If found, return it. If not (all are smaller), return the last one (largest).
- return bestFit || sortedResolutions[sortedResolutions.length - 1]
- }
-
- const initialRes = getInitialResolution()
-
- // State
- const [state, setState] = useState({
- isPlaying: false,
- progress: 0,
- currentTime: 0,
- duration: data.media.metadata.duration || 0,
- volume: 1,
- isMuted: false,
- isLooping: false,
- playbackRate: 1,
- isFullScreen: false,
- showFrames: false,
- currentResolution: initialRes.resolution,
- currentSrc: initialRes.url,
- })
-
- const [buffered, setBuffered] = useState(0)
- const [isControlsVisible, setIsControlsVisible] = useState(true)
- const [isPlayerReady, setIsPlayerReady] = useState(false)
- const lastProcessedStartTimeRef = useRef(null)
-
- // Frame-accurate hook and derived state
- const metadata = data.media.metadata
- const frameRate = metadata.frameRate || 30
- const dbTotalFrames = metadata.totalFrames || 0
- const containerDuration = metadata.duration || 0
-
- const totalFrames = resolveTotalFrames({ dbTotalFrames, containerDuration, frameRate })
- const { currentFrame, seekToFrame } = useFramePlayer(videoRef, frameRate, totalFrames)
-
- const currentTime = currentFrame / frameRate
- const duration = totalFrames / frameRate
- const progress = duration > 0 ? (currentTime / duration) * 100 : 0
-
- const controlBarState: PlayerState = {
- ...state,
- currentTime,
- duration,
- progress,
- }
-
- // Trigger time update event reactively
- useEffect(() => {
- if (onTimeUpdate) {
- onTimeUpdate(currentFrame / frameRate)
- }
- }, [currentFrame, frameRate, onTimeUpdate])
-
- // Initialize Video.js
- useEffect(() => {
- if (!videoContainerRef.current) return
-
- // 1. Create the video element manually
- // This avoids conflicts with React Strict Mode where the DOM might not match React's virtual DOM expectations after Video.js modifies it.
- const videoElement = document.createElement('video-js')
- videoElement.classList.add('vjs-big-play-centered', '!h-full', '!w-full')
-
- // Hide it, but keep it in DOM
- videoElement.style.opacity = '0'
- videoElement.style.pointerEvents = 'none'
-
- // Append to our container
- videoContainerRef.current.appendChild(videoElement)
-
- // 2. Initialize the player
- const player = (playerRef.current = videojs(videoElement, {
- controls: false,
- autoplay: false,
- preload: 'auto',
- playsinline: true,
- sources: [
- {
- src: state.currentSrc,
- type: 'video/mp4',
- },
- ],
- }))
-
- // Extract video element for Konva
- const htmlVid = videoElement.querySelector('video')
- if (htmlVid) {
- setVideoHtmlEl(htmlVid)
- videoRef.current = htmlVid
- } else {
- // Fallback: try player.tech().el()
- // Wait for ready?
- player.ready(() => {
- const techEl = player.tech({ iWillNotUseThisInPlugins: true })?.el() as HTMLVideoElement
- if (techEl) {
- setVideoHtmlEl(techEl)
- videoRef.current = techEl
- }
- })
- }
-
- player.on('play', () => {
- setState((p) => ({ ...p, isPlaying: true }))
- onPlay?.()
- })
- player.on('pause', () => {
- setState((p) => ({ ...p, isPlaying: false }))
- onPause?.()
- })
- player.on('ended', () => setState((p) => ({ ...p, isPlaying: false })))
- player.on('loadedmetadata', () => {
- setIsPlayerReady(true)
- })
- player.on('loadstart', () => {
- setIsPlayerReady(false)
- })
-
- player.on('timeupdate', () => {
- const playerDuration = player.duration() || data.media?.metadata?.duration || 0
-
- const bufferedEnd = player.bufferedEnd()
- if (playerDuration > 0) {
- setBuffered((bufferedEnd / playerDuration) * 100)
- }
- })
-
- player.on('volumechange', () => {
- const vol = player.volume()
- const muted = player.muted()
- setState((prev) => ({
- ...prev,
- volume: vol || 0,
- isMuted: muted || false,
- }))
- })
-
- player.on('ratechange', () => {
- setState((prev) => ({
- ...prev,
- playbackRate: player.playbackRate() || 1,
- }))
- })
-
- player.on('error', () => {
- console.error('VideoJS Error:', player.error())
- })
-
- // Set initial state
- player.volume(state.volume)
-
- // 4. Cleanup
- return () => {
- if (player && !player.isDisposed()) {
- player.dispose()
- playerRef.current = null
- videoRef.current = null
- }
- }
- }, [data])
-
- // Handle changes to startTime (e.g., clicking different chunks in search results)
- useEffect(() => {
- if (!isPlayerReady) return
-
- if (startTime !== undefined && startTime !== null && startTime > 0) {
- if (startTime !== lastProcessedStartTimeRef.current) {
- lastProcessedStartTimeRef.current = startTime
- const targetFrame = Math.floor(startTime * frameRate + 0.45)
- seekToFrame(targetFrame)
- }
- }
- }, [startTime, frameRate, seekToFrame, isPlayerReady])
-
- const scheduleHide = useCallback(() => {
- if (controlsTimeoutRef.current) {
- clearTimeout(controlsTimeoutRef.current)
- }
- // Never hide while the cursor rests over the control bar itself.
- if (state.isFullScreen && !isOverControlsRef.current) {
- controlsTimeoutRef.current = setTimeout(() => {
- setIsControlsVisible(false)
- }, 1200)
- }
- }, [state.isFullScreen])
-
- const handleMouseMove = useCallback(() => {
- // Always show controls on movement, then (re)start the idle hide timer.
- setIsControlsVisible(true)
- scheduleHide()
- }, [scheduleHide])
-
- const handleControlsMouseEnter = useCallback(() => {
- isOverControlsRef.current = true
- if (controlsTimeoutRef.current) clearTimeout(controlsTimeoutRef.current)
- setIsControlsVisible(true)
- }, [])
-
- const handleControlsMouseLeave = useCallback(() => {
- isOverControlsRef.current = false
- scheduleHide()
- }, [scheduleHide])
-
- const handleMouseLeave = useCallback(() => {
- // If the cursor leaves the player while fullscreen, hide the controls.
- if (state.isFullScreen) {
- if (controlsTimeoutRef.current) clearTimeout(controlsTimeoutRef.current)
- setIsControlsVisible(false)
- }
- }, [state.isFullScreen])
-
- // Clean up timeout on unmount or state change
- useEffect(() => {
- return () => {
- if (controlsTimeoutRef.current) clearTimeout(controlsTimeoutRef.current)
- }
- }, [])
-
- // Windowed mode: controls are always visible. Fullscreen: show now and let
- // the idle timer hide them (re-runs on play/pause so pausing re-reveals them).
- useEffect(() => {
- if (!state.isFullScreen) {
- setIsControlsVisible(true)
- if (controlsTimeoutRef.current) clearTimeout(controlsTimeoutRef.current)
- } else {
- handleMouseMove()
- }
- }, [state.isPlaying, state.isFullScreen, handleMouseMove])
-
- // -- Event Handlers --
-
- const togglePlay = useCallback(() => {
- // Disable click-to-play if drawing
- if (useAnnotationStore.getState().isDrawing) return
-
- const player = playerRef.current
- if (!player) return
-
- if (player.paused() || player.ended()) {
- const playPromise = player.play()
- if (playPromise !== undefined) {
- playPromise.catch((error) => {
- // Ignore AbortError which happens when pausing rapidly after playing
- if (error.name === 'AbortError') return
- console.error('Play failed:', error)
- })
- }
- } else {
- player.pause()
- }
- }, [])
-
- const toggleLoop = () => {
- const player = playerRef.current
- if (!player) return
- const newLoop = !state.isLooping
- player.loop(newLoop)
- setState((prev) => ({ ...prev, isLooping: newLoop }))
- }
-
- const handleVolumeChange = (newVolume: number) => {
- // Optimistic update to prevent slider jumping and ensure immediate UI feedback
- setState((prev) => ({
- ...prev,
- volume: newVolume,
- isMuted: newVolume === 0, // If dragging to 0, consider it muted
- }))
-
- const player = playerRef.current
- if (!player) return
-
- // Set volume first so if we unmute, it is at the correct level
- player.volume(newVolume)
-
- // Manage mute state based on volume
- if (newVolume > 0 && player.muted()) {
- player.muted(false)
- } else if (newVolume === 0 && !player.muted()) {
- player.muted(true)
- }
- }
-
- const toggleMute = () => {
- const player = playerRef.current
- if (!player) return
-
- const isMuted = player.muted()
- if (isMuted) {
- player.muted(false)
- // If volume was 0 (e.g. user dragged to 0), restore to default 0.5 so they hear something
- if (player.volume() === 0) {
- player.volume(0.5)
- }
- } else {
- player.muted(true)
- }
- }
-
- const changePlaybackRate = (rate: number) => {
- const player = playerRef.current
- if (!player) return
- player.playbackRate(rate)
- }
-
- const changeResolution = (res: DisplayTranscode) => {
- const player = playerRef.current
- if (!player) return
-
- const wasPlaying = !player.paused()
- const currentT = player.currentTime()
-
- setState((prev) => ({
- ...prev,
- currentResolution: res.resolution,
- currentSrc: res.url,
- }))
-
- player.src({ type: 'video/mp4', src: res.url })
-
- player.one('loadedmetadata', () => {
- player.currentTime(currentT)
- if (wasPlaying) {
- const playPromise = player.play()
- if (playPromise !== undefined) {
- playPromise.catch((error) => {
- if (error.name === 'AbortError') return
- console.error('Play after seek failed:', error)
- })
- }
- }
- player.playbackRate(state.playbackRate)
- })
- }
-
- const toggleFullScreen = () => {
- if (!rootRef.current) return
- if (!document.fullscreenElement) {
- rootRef.current.requestFullscreen()
- setState((prev) => ({ ...prev, isFullScreen: true }))
- } else {
- document.exitFullscreen()
- setState((prev) => ({ ...prev, isFullScreen: false }))
- }
- }
-
- const handleDownload = async (key: string) => {
- try {
- const res = shareId
- ? await client.api.shares[':shareId'].files[':fileId']['download-url'].$post({
- param: { shareId, fileId: data.id! },
- json: { key },
- })
- : await client.api.files['download-url'].$post({
- json: { key, assetId: data.id! },
- })
- if (!res.ok) return
- const { url } = await res.json()
- const link = document.createElement('a')
- link.href = url
- link.download = ''
- document.body.appendChild(link)
- link.click()
- document.body.removeChild(link)
- } catch {
- // silently fail
- }
- }
-
- // Listen for fullscreen change events (ESC key)
- useEffect(() => {
- const onFsChange = () => {
- setState((prev) => ({
- ...prev,
- isFullScreen: !!document.fullscreenElement,
- }))
- }
- document.addEventListener('fullscreenchange', onFsChange)
- return () => document.removeEventListener('fullscreenchange', onFsChange)
- }, [])
-
- // Calculate center pan
- const vidW = data.media?.metadata?.originalWidth ?? 1920
- const vidH = data.media?.metadata?.originalHeight ?? 1080
-
- const scale = zoom
- const panX = (containerSize.width - vidW * scale) / 2
- const panY = (containerSize.height - vidH * scale) / 2
-
- return (
-
-
- {/* Render Carousel/Sidebar here if not fullscreen */}
- {!state.isFullScreen && children}
-
- {/* Video Area */}
-
- {/* Hidden VideoJS container */}
-
-
- {/* Drawing Canvas (Visible) */}
- {videoHtmlEl && containerSize.width > 0 && (
-
- )}
-
- {/* Big Play Button Overlay (when paused) */}
- {!state.isPlaying && !isDrawing && (
-
- )}
-
-
-
-
-
- )
-}
-
-export default VideoPlayer
diff --git a/packages/webui/components/compare/compare-video-pane.tsx b/packages/webui/components/viewers/video/compare-video-pane.tsx
similarity index 98%
rename from packages/webui/components/compare/compare-video-pane.tsx
rename to packages/webui/components/viewers/video/compare-video-pane.tsx
index eb9a1e7b..b63f4852 100644
--- a/packages/webui/components/compare/compare-video-pane.tsx
+++ b/packages/webui/components/viewers/video/compare-video-pane.tsx
@@ -8,21 +8,21 @@ import { Play } from 'lucide-react'
import { forwardRef, useCallback, useEffect, useImperativeHandle, useRef, useState } from 'react'
import videojs from 'video.js'
import type Player from 'video.js/dist/types/player'
-import { useFramePlayer } from '@/ui/components/viewers/use-frame-player'
-import { resolveTotalFrames } from '@/ui/components/viewers/utils'
-import { clampFrame as clampFrameUtil } from './compare-utils'
-import type { ComparePaneHandle, DisplayTranscode, PaneReportedState } from './types'
+import { useFramePlayer } from './use-frame-player'
+import { resolveTotalFrames } from './utils'
+import { clampFrame as clampFrameUtil } from '../../compare/compare-utils'
+import type { ComparePaneHandle, DisplayTranscode, PaneReportedState } from '../../compare/types'
interface CompareVideoPaneProps {
file: AssetInfo
shareId?: string
isActive: boolean
/** Whether this pane's audio should be muted (only the active side plays audio). */
- muted: boolean
- volume: number
+ muted?: boolean
+ volume?: number
annotations: Annotation[]
onStateChange: (state: PaneReportedState) => void
- onActivate?: () => void
+ onActivate: () => void
onRequestTogglePlay?: () => void
/** Called with the current playhead time in seconds (used only for the active pane). */
onTimeUpdate?: (second: number) => void
@@ -68,8 +68,8 @@ export const CompareVideoPane = forwardRef !!file.mediaType?.startsWith('video/'),
+ viewer: VideoViewer,
+ comparePane: CompareVideoPane,
+ commentsConfig: {
+ hasTimestamp: true,
+ hasAnnotations: true,
+ hasAiBots: true,
+ },
+}
diff --git a/packages/webui/components/viewers/progress-bar.tsx b/packages/webui/components/viewers/video/progress-bar.tsx
similarity index 100%
rename from packages/webui/components/viewers/progress-bar.tsx
rename to packages/webui/components/viewers/video/progress-bar.tsx
diff --git a/packages/webui/components/viewers/use-frame-player.test.ts b/packages/webui/components/viewers/video/use-frame-player.test.ts
similarity index 100%
rename from packages/webui/components/viewers/use-frame-player.test.ts
rename to packages/webui/components/viewers/video/use-frame-player.test.ts
diff --git a/packages/webui/components/viewers/use-frame-player.ts b/packages/webui/components/viewers/video/use-frame-player.ts
similarity index 100%
rename from packages/webui/components/viewers/use-frame-player.ts
rename to packages/webui/components/viewers/video/use-frame-player.ts
diff --git a/packages/webui/components/viewers/utils.test.ts b/packages/webui/components/viewers/video/utils.test.ts
similarity index 100%
rename from packages/webui/components/viewers/utils.test.ts
rename to packages/webui/components/viewers/video/utils.test.ts
diff --git a/packages/webui/components/viewers/utils.ts b/packages/webui/components/viewers/video/utils.ts
similarity index 100%
rename from packages/webui/components/viewers/utils.ts
rename to packages/webui/components/viewers/video/utils.ts
diff --git a/packages/webui/components/viewers/video-control-bar.tsx b/packages/webui/components/viewers/video/video-control-bar.tsx
similarity index 98%
rename from packages/webui/components/viewers/video-control-bar.tsx
rename to packages/webui/components/viewers/video/video-control-bar.tsx
index 28436447..ff05f3ea 100644
--- a/packages/webui/components/viewers/video-control-bar.tsx
+++ b/packages/webui/components/viewers/video/video-control-bar.tsx
@@ -23,8 +23,8 @@ import {
DropdownMenuItem,
DropdownMenuLabel,
DropdownMenuTrigger,
-} from '../ui/dropdown-menu'
-import { Slider } from '../ui/slider'
+} from '../../ui/dropdown-menu'
+import { Slider } from '../../ui/slider'
import ProgressBar from './progress-bar'
import { formatTime, formatTimecode } from './utils'
@@ -196,7 +196,7 @@ export const VideoControlBar: React.FC = ({
handleVolumeChange(v[0])}
+ onValueChange={(v: number[]) => handleVolumeChange(v[0])}
max={1}
step={0.05}
/>
diff --git a/packages/webui/components/viewers/video/video-viewer.tsx b/packages/webui/components/viewers/video/video-viewer.tsx
new file mode 100644
index 00000000..d3e1dc52
--- /dev/null
+++ b/packages/webui/components/viewers/video/video-viewer.tsx
@@ -0,0 +1,649 @@
+import { client } from '@/ui/api/client'
+import { cn } from '@/ui/lib/utils'
+import { Play } from 'lucide-react'
+import React, { useCallback, useEffect, useRef, useState, useImperativeHandle } from 'react'
+import videojs from 'video.js'
+import type Player from 'video.js/dist/types/player'
+import { useFramePlayer } from './use-frame-player'
+import { resolveTotalFrames } from './utils'
+import { VideoControlBar, type PlayerState, type DisplayTranscode } from './video-control-bar'
+import DrawingCanvas from '@/ui/components/drawing-canvas'
+import { useAnnotationStore } from '@/ui/stores/annotation-store'
+import { FileViewerProps, MediaController } from '../types'
+
+const VideoViewer = React.forwardRef(
+ (
+ { file: data, onPlay, onPause, onTimeUpdate, annotations, startTime, shareId, children },
+ ref,
+ ) => {
+ const localPlayerRef = useRef(null)
+ const playerRef = localPlayerRef
+ // We use a container ref to manually append the video element
+ const videoContainerRef = useRef(null)
+ const containerRef = useRef(null)
+ const rootRef = useRef(null)
+ const controlsTimeoutRef = useRef | null>(null)
+
+ useImperativeHandle(ref, () => ({
+ play: () => {
+ if (localPlayerRef.current) {
+ localPlayerRef.current.play()
+ }
+ },
+ pause: () => {
+ if (localPlayerRef.current) {
+ localPlayerRef.current.pause()
+ }
+ },
+ seekTo: (second: number) => {
+ if (localPlayerRef.current) {
+ localPlayerRef.current.currentTime(second)
+ }
+ },
+ getCurrentTime: () => {
+ return (localPlayerRef.current ? localPlayerRef.current.currentTime() : 0) ?? 0
+ },
+ getDuration: () => {
+ return (localPlayerRef.current ? localPlayerRef.current.duration() : 0) ?? 0
+ },
+ }))
+ const isOverControlsRef = useRef(false)
+
+ const [videoHtmlEl, setVideoHtmlEl] = useState(undefined)
+ const videoRef = useRef(null)
+ const [zoom, setZoom] = useState(1)
+ const [hasManuallyZoomed, setHasManuallyZoomed] = useState(false)
+ const [containerSize, setContainerSize] = useState({ width: 0, height: 0 })
+
+ const handleZoomChange = (newZoom: number) => {
+ setZoom(newZoom)
+ setHasManuallyZoomed(true)
+ }
+
+ const handleZoomReset = () => {
+ setHasManuallyZoomed(false)
+ }
+
+ // Store
+ const {
+ isDrawing,
+ currentTool,
+ currentColor,
+ addAnnotation,
+ annotations: draftAnnotations,
+ } = useAnnotationStore()
+
+ // Combine annotations
+ const displayAnnotations = [...(annotations || []), ...draftAnnotations]
+
+ // Resize Observer for container
+ useEffect(() => {
+ if (!containerRef.current) return
+ const observer = new ResizeObserver((entries) => {
+ const entry = entries[0]
+ if (entry) {
+ setContainerSize({
+ width: entry.contentRect.width,
+ height: entry.contentRect.height,
+ })
+ }
+ })
+ observer.observe(containerRef.current)
+ return () => observer.disconnect()
+ }, [])
+
+ // Fit to screen initial / responsive resize
+ useEffect(() => {
+ if (containerSize.width > 0 && containerSize.height > 0) {
+ const vidW = data.media?.metadata?.originalWidth ?? 1920
+ const vidH = data.media?.metadata?.originalHeight ?? 1080
+ const scale = Math.min(containerSize.width / vidW, containerSize.height / vidH)
+ if (!hasManuallyZoomed) {
+ setZoom(scale)
+ }
+ }
+ }, [containerSize.width, containerSize.height, data.media?.metadata, hasManuallyZoomed])
+
+ // Cleanup ref when player is disposed
+ useEffect(() => {
+ return () => {
+ videoRef.current = null
+ }
+ }, [])
+
+ if (!data.media?.original?.downloadUrl || !data.media.metadata) {
+ return (
+
+
Media is not available.
+
+ )
+ }
+
+ // Initial resolution setup
+ const originalRes: DisplayTranscode = {
+ id: 'original',
+ url: data.media.original.downloadUrl,
+ key: data.media.original.key ?? '',
+ width: data.media.metadata.originalWidth ?? 0,
+ height: data.media.metadata.originalHeight ?? 0,
+ size: 0,
+ isRaw: true,
+ resolution: 'Original',
+ }
+
+ const resolutions: DisplayTranscode[] = (data.media.videoTranscodes ?? []).map((t) => {
+ const longSide = Math.max(t.width, t.height)
+ let resolution = `${t.height}p`
+ if (longSide >= 3840) resolution = '2160p'
+ else if (longSide >= 1920) resolution = '1080p'
+ else if (longSide >= 1280) resolution = '720p'
+ else if (longSide >= 960) resolution = '540p'
+ else if (longSide >= 640) resolution = '360p'
+ else if (longSide >= 320) resolution = '180p'
+
+ return {
+ ...t,
+ resolution: t.isRaw ? 'Original' : resolution,
+ }
+ })
+
+ const previewResolutions = resolutions.filter((r) => !r.isRaw)
+
+ // Logic to select best resolution based on screen size
+ const getInitialResolution = (): DisplayTranscode => {
+ if (previewResolutions.length === 0) return originalRes
+
+ if (typeof window === 'undefined') return previewResolutions[0]
+
+ // Use device pixel ratio for high DPI screens
+ const screenWidth = window.innerWidth * (window.devicePixelRatio || 1)
+
+ // 1. Sort by width ascending
+ const sortedResolutions = [...previewResolutions].sort((a, b) => {
+ const wA = a.width ?? 0
+ const wB = b.width ?? 0
+ return wA - wB
+ })
+
+ // 2. Find first one >= screenWidth
+ const bestFit = sortedResolutions.find((r) => (r.width ?? 0) >= screenWidth)
+
+ // 3. If found, return it. If not (all are smaller), return the last one (largest).
+ return bestFit || sortedResolutions[sortedResolutions.length - 1]
+ }
+
+ const initialRes = getInitialResolution()
+
+ // State
+ const [state, setState] = useState({
+ isPlaying: false,
+ progress: 0,
+ currentTime: 0,
+ duration: data.media.metadata.duration || 0,
+ volume: 1,
+ isMuted: false,
+ isLooping: false,
+ playbackRate: 1,
+ isFullScreen: false,
+ showFrames: false,
+ currentResolution: initialRes.resolution,
+ currentSrc: initialRes.url,
+ })
+
+ const [buffered, setBuffered] = useState(0)
+ const [isControlsVisible, setIsControlsVisible] = useState(true)
+ const [isPlayerReady, setIsPlayerReady] = useState(false)
+ const lastProcessedStartTimeRef = useRef(null)
+
+ // Frame-accurate hook and derived state
+ const metadata = data.media.metadata
+ const frameRate = metadata.frameRate || 30
+ const dbTotalFrames = metadata.totalFrames || 0
+ const containerDuration = metadata.duration || 0
+
+ const totalFrames = resolveTotalFrames({ dbTotalFrames, containerDuration, frameRate })
+ const { currentFrame, seekToFrame } = useFramePlayer(videoRef, frameRate, totalFrames)
+
+ const currentTime = currentFrame / frameRate
+ const duration = totalFrames / frameRate
+ const progress = duration > 0 ? (currentTime / duration) * 100 : 0
+
+ const controlBarState: PlayerState = {
+ ...state,
+ currentTime,
+ duration,
+ progress,
+ }
+
+ // Trigger time update event reactively
+ useEffect(() => {
+ if (onTimeUpdate) {
+ onTimeUpdate(currentFrame / frameRate)
+ }
+ }, [currentFrame, frameRate, onTimeUpdate])
+
+ // Initialize Video.js
+ useEffect(() => {
+ if (!videoContainerRef.current) return
+
+ // 1. Create the video element manually
+ // This avoids conflicts with React Strict Mode where the DOM might not match React's virtual DOM expectations after Video.js modifies it.
+ const videoElement = document.createElement('video-js')
+ videoElement.classList.add('vjs-big-play-centered', '!h-full', '!w-full')
+
+ // Hide it, but keep it in DOM
+ videoElement.style.opacity = '0'
+ videoElement.style.pointerEvents = 'none'
+
+ // Append to our container
+ videoContainerRef.current.appendChild(videoElement)
+
+ // 2. Initialize the player
+ const player = (playerRef.current = videojs(videoElement, {
+ controls: false,
+ autoplay: false,
+ preload: 'auto',
+ playsinline: true,
+ sources: [
+ {
+ src: state.currentSrc,
+ type: 'video/mp4',
+ },
+ ],
+ }))
+
+ // Extract video element for Konva
+ const htmlVid = videoElement.querySelector('video')
+ if (htmlVid) {
+ setVideoHtmlEl(htmlVid)
+ videoRef.current = htmlVid
+ } else {
+ // Fallback: try player.tech().el()
+ // Wait for ready?
+ player.ready(() => {
+ const techEl = player.tech({ iWillNotUseThisInPlugins: true })?.el() as HTMLVideoElement
+ if (techEl) {
+ setVideoHtmlEl(techEl)
+ videoRef.current = techEl
+ }
+ })
+ }
+
+ player.on('play', () => {
+ setState((p) => ({ ...p, isPlaying: true }))
+ onPlay?.()
+ })
+ player.on('pause', () => {
+ setState((p) => ({ ...p, isPlaying: false }))
+ onPause?.()
+ })
+ player.on('ended', () => setState((p) => ({ ...p, isPlaying: false })))
+ player.on('loadedmetadata', () => {
+ setIsPlayerReady(true)
+ })
+ player.on('loadstart', () => {
+ setIsPlayerReady(false)
+ })
+
+ player.on('timeupdate', () => {
+ const playerDuration = player.duration() || data.media?.metadata?.duration || 0
+
+ const bufferedEnd = player.bufferedEnd()
+ if (playerDuration > 0) {
+ setBuffered((bufferedEnd / playerDuration) * 100)
+ }
+ })
+
+ player.on('volumechange', () => {
+ const vol = player.volume()
+ const muted = player.muted()
+ setState((prev) => ({
+ ...prev,
+ volume: vol || 0,
+ isMuted: muted || false,
+ }))
+ })
+
+ player.on('ratechange', () => {
+ setState((prev) => ({
+ ...prev,
+ playbackRate: player.playbackRate() || 1,
+ }))
+ })
+
+ player.on('error', () => {
+ console.error('VideoJS Error:', player.error())
+ })
+
+ // Set initial state
+ player.volume(state.volume)
+
+ // 4. Cleanup
+ return () => {
+ if (player && !player.isDisposed()) {
+ player.dispose()
+ playerRef.current = null
+ videoRef.current = null
+ }
+ }
+ }, [data])
+
+ // Handle changes to startTime (e.g., clicking different chunks in search results)
+ useEffect(() => {
+ if (!isPlayerReady) return
+
+ if (startTime !== undefined && startTime !== null && startTime > 0) {
+ if (startTime !== lastProcessedStartTimeRef.current) {
+ lastProcessedStartTimeRef.current = startTime
+ const targetFrame = Math.floor(startTime * frameRate + 0.45)
+ seekToFrame(targetFrame)
+ }
+ }
+ }, [startTime, frameRate, seekToFrame, isPlayerReady])
+
+ const scheduleHide = useCallback(() => {
+ if (controlsTimeoutRef.current) {
+ clearTimeout(controlsTimeoutRef.current)
+ }
+ // Never hide while the cursor rests over the control bar itself.
+ if (state.isFullScreen && !isOverControlsRef.current) {
+ controlsTimeoutRef.current = setTimeout(() => {
+ setIsControlsVisible(false)
+ }, 1200)
+ }
+ }, [state.isFullScreen])
+
+ const handleMouseMove = useCallback(() => {
+ // Always show controls on movement, then (re)start the idle hide timer.
+ setIsControlsVisible(true)
+ scheduleHide()
+ }, [scheduleHide])
+
+ const handleControlsMouseEnter = useCallback(() => {
+ isOverControlsRef.current = true
+ if (controlsTimeoutRef.current) clearTimeout(controlsTimeoutRef.current)
+ setIsControlsVisible(true)
+ }, [])
+
+ const handleControlsMouseLeave = useCallback(() => {
+ isOverControlsRef.current = false
+ scheduleHide()
+ }, [scheduleHide])
+
+ const handleMouseLeave = useCallback(() => {
+ // If the cursor leaves the player while fullscreen, hide the controls.
+ if (state.isFullScreen) {
+ if (controlsTimeoutRef.current) clearTimeout(controlsTimeoutRef.current)
+ setIsControlsVisible(false)
+ }
+ }, [state.isFullScreen])
+
+ // Clean up timeout on unmount or state change
+ useEffect(() => {
+ return () => {
+ if (controlsTimeoutRef.current) clearTimeout(controlsTimeoutRef.current)
+ }
+ }, [])
+
+ // Windowed mode: controls are always visible. Fullscreen: show now and let
+ // the idle timer hide them (re-runs on play/pause so pausing re-reveals them).
+ useEffect(() => {
+ if (!state.isFullScreen) {
+ setIsControlsVisible(true)
+ if (controlsTimeoutRef.current) clearTimeout(controlsTimeoutRef.current)
+ } else {
+ handleMouseMove()
+ }
+ }, [state.isPlaying, state.isFullScreen, handleMouseMove])
+
+ // -- Event Handlers --
+
+ const togglePlay = useCallback(() => {
+ // Disable click-to-play if drawing
+ if (useAnnotationStore.getState().isDrawing) return
+
+ const player = playerRef.current
+ if (!player) return
+
+ if (player.paused() || player.ended()) {
+ const playPromise = player.play()
+ if (playPromise !== undefined) {
+ playPromise.catch((error) => {
+ // Ignore AbortError which happens when pausing rapidly after playing
+ if (error.name === 'AbortError') return
+ console.error('Play failed:', error)
+ })
+ }
+ } else {
+ player.pause()
+ }
+ }, [])
+
+ const toggleLoop = () => {
+ const player = playerRef.current
+ if (!player) return
+ const newLoop = !state.isLooping
+ player.loop(newLoop)
+ setState((prev) => ({ ...prev, isLooping: newLoop }))
+ }
+
+ const handleVolumeChange = (newVolume: number) => {
+ // Optimistic update to prevent slider jumping and ensure immediate UI feedback
+ setState((prev) => ({
+ ...prev,
+ volume: newVolume,
+ isMuted: newVolume === 0, // If dragging to 0, consider it muted
+ }))
+
+ const player = playerRef.current
+ if (!player) return
+
+ // Set volume first so if we unmute, it is at the correct level
+ player.volume(newVolume)
+
+ // Manage mute state based on volume
+ if (newVolume > 0 && player.muted()) {
+ player.muted(false)
+ } else if (newVolume === 0 && !player.muted()) {
+ player.muted(true)
+ }
+ }
+
+ const toggleMute = () => {
+ const player = playerRef.current
+ if (!player) return
+
+ const isMuted = player.muted()
+ if (isMuted) {
+ player.muted(false)
+ // If volume was 0 (e.g. user dragged to 0), restore to default 0.5 so they hear something
+ if (player.volume() === 0) {
+ player.volume(0.5)
+ }
+ } else {
+ player.muted(true)
+ }
+ }
+
+ const changePlaybackRate = (rate: number) => {
+ const player = playerRef.current
+ if (!player) return
+ player.playbackRate(rate)
+ }
+
+ const changeResolution = (res: DisplayTranscode) => {
+ const player = playerRef.current
+ if (!player) return
+
+ const wasPlaying = !player.paused()
+ const currentT = player.currentTime()
+
+ setState((prev) => ({
+ ...prev,
+ currentResolution: res.resolution,
+ currentSrc: res.url,
+ }))
+
+ player.src({ type: 'video/mp4', src: res.url })
+
+ player.one('loadedmetadata', () => {
+ player.currentTime(currentT)
+ if (wasPlaying) {
+ const playPromise = player.play()
+ if (playPromise !== undefined) {
+ playPromise.catch((error) => {
+ if (error.name === 'AbortError') return
+ console.error('Play after seek failed:', error)
+ })
+ }
+ }
+ player.playbackRate(state.playbackRate)
+ })
+ }
+
+ const toggleFullScreen = () => {
+ if (!rootRef.current) return
+ if (!document.fullscreenElement) {
+ rootRef.current.requestFullscreen()
+ setState((prev) => ({ ...prev, isFullScreen: true }))
+ } else {
+ document.exitFullscreen()
+ setState((prev) => ({ ...prev, isFullScreen: false }))
+ }
+ }
+
+ const handleDownload = async (key: string) => {
+ try {
+ const res = shareId
+ ? await client.api.shares[':shareId'].files[':fileId']['download-url'].$post({
+ param: { shareId, fileId: data.id! },
+ json: { key },
+ })
+ : await client.api.files['download-url'].$post({
+ json: { key, assetId: data.id! },
+ })
+ if (!res.ok) return
+ const { url } = await res.json()
+ const link = document.createElement('a')
+ link.href = url
+ link.download = ''
+ document.body.appendChild(link)
+ link.click()
+ document.body.removeChild(link)
+ } catch {
+ // silently fail
+ }
+ }
+
+ // Listen for fullscreen change events (ESC key)
+ useEffect(() => {
+ const onFsChange = () => {
+ setState((prev) => ({
+ ...prev,
+ isFullScreen: !!document.fullscreenElement,
+ }))
+ }
+ document.addEventListener('fullscreenchange', onFsChange)
+ return () => document.removeEventListener('fullscreenchange', onFsChange)
+ }, [])
+
+ // Calculate center pan
+ const vidW = data.media?.metadata?.originalWidth ?? 1920
+ const vidH = data.media?.metadata?.originalHeight ?? 1080
+
+ const scale = zoom
+ const panX = (containerSize.width - vidW * scale) / 2
+ const panY = (containerSize.height - vidH * scale) / 2
+
+ return (
+
+
+ {/* Render Carousel/Sidebar here if not fullscreen */}
+ {!state.isFullScreen && children}
+
+ {/* Video Area */}
+
+ {/* Hidden VideoJS container */}
+
+
+ {/* Drawing Canvas (Visible) */}
+ {videoHtmlEl && containerSize.width > 0 && (
+
+ )}
+
+ {/* Big Play Button Overlay (when paused) */}
+ {!state.isPlaying && !isDrawing && (
+
+ )}
+
+
+
+
+
+ )
+ },
+)
+
+export default VideoViewer
diff --git a/packages/webui/e2e/harness/main.tsx b/packages/webui/e2e/harness/main.tsx
index 4eebd19d..9e09de7e 100644
--- a/packages/webui/e2e/harness/main.tsx
+++ b/packages/webui/e2e/harness/main.tsx
@@ -1,8 +1,8 @@
import { type ReactElement, useCallback, useRef, useState } from 'react'
import ReactDOM from 'react-dom/client'
-import type Player from 'video.js/dist/types/player'
-import VideoPlayer from '@/ui/components/viewers/video-player'
-import { calculateFrameCenterTime } from '@/ui/components/viewers/utils'
+import type { MediaController } from '@/ui/components/viewers/types'
+import VideoPlayer from '@/ui/components/viewers/video/video-viewer'
+import { calculateFrameCenterTime } from '@/ui/components/viewers/video/utils'
import { useUiStore } from '@/ui/stores/ui'
import {
SAMPLE_FRAME_RATE,
@@ -70,7 +70,7 @@ interface HarnessComment {
}
function Harness(): ReactElement {
- const playerRef = useRef(null)
+ const playerRef = useRef(null)
// Latest player time (seconds) as reported by the real onTimeUpdate prop.
const currentTimeRef = useRef(0)
const seekInputRef = useRef(null)
@@ -92,7 +92,7 @@ function Harness(): ReactElement {
if (!player) return
const frame = Number.parseInt(seekInputRef.current?.value ?? '', 10)
if (Number.isNaN(frame)) return
- player.currentTime(calculateFrameCenterTime(frame, SAMPLE_FRAME_RATE))
+ player.seekTo(calculateFrameCenterTime(frame, SAMPLE_FRAME_RATE))
player.pause()
}, [])
@@ -114,7 +114,7 @@ function Harness(): ReactElement {
const handleCommentClick = useCallback((second: number) => {
const player = playerRef.current
if (!player) return
- player.currentTime(second)
+ player.seekTo(second)
player.pause()
}, [])
@@ -132,8 +132,8 @@ function Harness(): ReactElement {
diff --git a/packages/webui/routes/projects/$projectId/files/$fileId.tsx b/packages/webui/routes/projects/$projectId/files/$fileId.tsx
index 3fcecad6..3bceb6a0 100644
--- a/packages/webui/routes/projects/$projectId/files/$fileId.tsx
+++ b/packages/webui/routes/projects/$projectId/files/$fileId.tsx
@@ -19,7 +19,7 @@ import { keepPreviousData, useQuery, useQueryClient } from '@tanstack/react-quer
import { createFileRoute, useNavigate } from '@tanstack/react-router'
import { Loader2 } from 'lucide-react'
import { useEffect, useRef, useState } from 'react'
-import type Player from 'video.js/dist/types/player'
+import type { MediaController } from '@/ui/components/viewers/types'
function FileViewPage() {
const { projectId, fileId } = Route.useParams()
@@ -32,7 +32,7 @@ function FileViewPage() {
const compareActiveSide = search.cmpActive ?? 'left'
const isCompareMode = !!search.compare && !!compareLeftId && !!compareRightId
- const videoRef = useRef(null)
+ const mediaControllerRef = useRef(null)
const { teamId, ensureTeamIdForProject } = useTeamContextStore()
const [rightSidebarWidth, setRightSidebarWidth] = useState(360)
const [annotations, setAnnotations] = useState([])
@@ -368,14 +368,10 @@ function FileViewPage() {
}
if (comment.second !== null && comment.second !== undefined) {
- if (videoRef.current) {
- videoRef.current.currentTime(comment.second)
- videoRef.current.pause()
- }
+ mediaControllerRef.current?.seekTo(comment.second)
+ mediaControllerRef.current?.pause()
} else if (newAnnotations && newAnnotations.length > 0) {
- if (videoRef.current) {
- videoRef.current.pause()
- }
+ mediaControllerRef.current?.pause()
}
}
@@ -415,7 +411,7 @@ function FileViewPage() {
) : (
{
if (isCompareMode) return
- if (videoRef.current) {
- videoRef.current.pause()
- }
+ mediaControllerRef.current?.pause()
}}
selectedCommentId={selectedCommentId}
/>