From 6c3d3ea2b35257a8d130dfb2c74086295d8acaff Mon Sep 17 00:00:00 2001 From: yiling Date: Sat, 4 Jul 2026 10:17:04 +0800 Subject: [PATCH 01/12] feat(webui): add compare versions view for version stacks Add a Compare Versions mode to the file detail page (authenticated and public share) that splits the viewer into two 50/50 panes showing two versions side by side. - Breadcrumb file menu gains a Compare Versions entry (version stacks with >=2 versions); the file segment is hidden in compare mode. - URL-driven state (compare/cmpLeft/cmpRight/cmpActive) on both file routes so the view is refresh/share-safe. - Per-side topbar with filename, version, version-switch dropdown, an active-side highlight, and an X exit button. - Shared control bar reflects the active pane; for same-type media it coordinates both panes (play/pause, seek, frame-step, zoom, pan sync), seekbar length matches the active side while the shorter side holds its last frame; only the active side plays audio; resolution/download apply to the active side; fullscreen covers the whole compare view. - Right sidebar (comments/fields) binds to the active side; comment selection seeks the active pane and annotations/comments can be created. - Reuses useFramePlayer + DrawingCanvas without modifying the existing single-file video player. - Unit tests for compare selection/clamp logic. --- AGENTS.md | 1 + packages/webui/components/breadcrumb-nav.tsx | 20 +- .../compare/compare-control-bar.tsx | 296 +++++++++++ .../components/compare/compare-image-pane.tsx | 218 +++++++++ .../compare/compare-pane-topbar.tsx | 139 ++++++ .../components/compare/compare-utils.test.ts | 82 ++++ .../webui/components/compare/compare-utils.ts | 37 ++ .../components/compare/compare-video-pane.tsx | 461 ++++++++++++++++++ .../components/compare/compare-viewer.tsx | 356 ++++++++++++++ packages/webui/components/compare/types.ts | 55 +++ .../webui/components/public-share-manager.tsx | 102 +++- packages/webui/components/top-nav.tsx | 6 + packages/webui/messages/en.json | 3 + packages/webui/messages/zh.json | 3 + packages/webui/paraglide/messages/_index.d.ts | 3 + packages/webui/paraglide/messages/_index.js | 3 + .../paraglide/messages/compare_versions.d.ts | 16 + .../paraglide/messages/compare_versions.js | 29 ++ .../paraglide/messages/exit_compare.d.ts | 16 + .../webui/paraglide/messages/exit_compare.js | 29 ++ .../paraglide/messages/switch_version.d.ts | 16 + .../paraglide/messages/switch_version.js | 29 ++ .../projects/$projectId/files/$fileId.tsx | 144 +++++- .../routes/share/$shareId/files/$fileId.tsx | 26 +- packages/webui/stores/top-nav.ts | 4 + 25 files changed, 2056 insertions(+), 38 deletions(-) create mode 100644 packages/webui/components/compare/compare-control-bar.tsx create mode 100644 packages/webui/components/compare/compare-image-pane.tsx create mode 100644 packages/webui/components/compare/compare-pane-topbar.tsx create mode 100644 packages/webui/components/compare/compare-utils.test.ts create mode 100644 packages/webui/components/compare/compare-utils.ts create mode 100644 packages/webui/components/compare/compare-video-pane.tsx create mode 100644 packages/webui/components/compare/compare-viewer.tsx create mode 100644 packages/webui/components/compare/types.ts create mode 100644 packages/webui/paraglide/messages/compare_versions.d.ts create mode 100644 packages/webui/paraglide/messages/compare_versions.js create mode 100644 packages/webui/paraglide/messages/exit_compare.d.ts create mode 100644 packages/webui/paraglide/messages/exit_compare.js create mode 100644 packages/webui/paraglide/messages/switch_version.d.ts create mode 100644 packages/webui/paraglide/messages/switch_version.js diff --git a/AGENTS.md b/AGENTS.md index a605782c..09532d01 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -90,6 +90,7 @@ Add any additional context, caveats, or follow-up work. - `bun run format` - `bun run typecheck` - `bun run test` + - `bun run test:e2e` - **Backend Testing Mandate**: Every backend feature, service method, workflow, and activity MUST be accompanied by comprehensive tests. Logic-heavy code without corresponding test coverage is considered incomplete. diff --git a/packages/webui/components/breadcrumb-nav.tsx b/packages/webui/components/breadcrumb-nav.tsx index 1acf444a..c34a8076 100644 --- a/packages/webui/components/breadcrumb-nav.tsx +++ b/packages/webui/components/breadcrumb-nav.tsx @@ -23,7 +23,7 @@ import { cn } from '@/ui/lib/utils' import { m } from '@/ui/paraglide/messages.js' import type { AncestorFolder } from '@shumai/dtos' import { Link, useNavigate } from '@tanstack/react-router' -import { Check, ChevronDown, FileIcon, History, LayoutGrid, List } from 'lucide-react' +import { Check, ChevronDown, Columns2, FileIcon, History, LayoutGrid, List } from 'lucide-react' interface BreadcrumbNavProps { teamId: string @@ -62,6 +62,9 @@ interface BreadcrumbNavProps { previewUrl?: string | null creator?: { id: string; name: string | null } | null }> + compareMode?: boolean + canCompareVersions?: boolean + onCompareVersions?: () => void } export function BreadcrumbNav({ @@ -83,6 +86,9 @@ export function BreadcrumbNav({ shareId, downloadInfo, versions, + compareMode = false, + canCompareVersions = false, + onCompareVersions, }: BreadcrumbNavProps) { const navigate = useNavigate() const { canEdit } = usePermissions(projectId) @@ -176,7 +182,7 @@ export function BreadcrumbNav({ )} ))} - {!isRootFolder && ( + {!isRootFolder && !compareMode && (
/ {currentAsset.type === 'folder' ? ( @@ -263,6 +269,16 @@ export function BreadcrumbNav({ )} + {canCompareVersions && onCompareVersions && ( + <> + + onCompareVersions()}> + + {m.compare_versions()} + + + )} + {versions && versions.length > 0 && ( <> diff --git a/packages/webui/components/compare/compare-control-bar.tsx b/packages/webui/components/compare/compare-control-bar.tsx new file mode 100644 index 00000000..3e78e69a --- /dev/null +++ b/packages/webui/components/compare/compare-control-bar.tsx @@ -0,0 +1,296 @@ +import { + DropdownMenu, + DropdownMenuContent, + DropdownMenuItem, + DropdownMenuLabel, + DropdownMenuTrigger, +} from '@/ui/components/ui/dropdown-menu' +import { Slider } from '@/ui/components/ui/slider' +import { cn } from '@/ui/lib/utils' +import ProgressBar from '@/ui/components/viewers/progress-bar' +import { formatTime, formatTimecode } from '@/ui/components/viewers/utils' +import { useUiStore } from '@/ui/stores/ui' +import type { MediaMetadata } from '@shumai/dtos' +import { + Download, + Maximize, + Minimize, + Minus, + Pause, + Play, + Plus, + Repeat, + Settings, + Volume2, + VolumeX, +} from 'lucide-react' +import type { PaneReportedState } from './types' + +const PLAYBACK_RATES = [0.5, 1, 1.5, 2] + +interface CompareControlBarProps { + activeState: PaneReportedState | null + previewUrl?: string + metadata?: MediaMetadata + startTimecode?: string | null + isFullScreen: boolean + onTogglePlay: () => void + onToggleLoop: () => void + onSeek: (frame: number) => void + onVolumeChange: (volume: number) => void + onToggleMute: () => void + onChangePlaybackRate: (rate: number) => void + onChangeResolution: (resolution: string) => void + onZoomIn: () => void + onZoomOut: () => void + onFit: () => void + onDownload: (key?: string) => void + onToggleFullScreen: () => void +} + +export function CompareControlBar({ + activeState, + previewUrl, + metadata, + startTimecode, + isFullScreen, + onTogglePlay, + onToggleLoop, + onSeek, + onVolumeChange, + onToggleMute, + onChangePlaybackRate, + onChangeResolution, + onZoomIn, + onZoomOut, + onFit, + onDownload, + onToggleFullScreen, +}: CompareControlBarProps) { + const { videoTimeDisplayMode, setVideoTimeDisplayMode } = useUiStore() + + const fullscreenButton = ( + + ) + + const zoomControls = ( +
+ + + {Math.round((activeState?.zoom ?? 1) * 100)}% + + + +
+ ) + + // Image (or unsupported) control bar + if (!activeState || activeState.kind !== 'video' || !activeState.video) { + return ( +
+ {activeState?.kind === 'image' && zoomControls} + {activeState?.kind === 'image' && ( + + )} + {fullscreenButton} +
+ ) + } + + const video = activeState.video + const displayTotalFrames = Math.max(0, video.totalFrames - 1) + const displayString = + videoTimeDisplayMode === 'frames' + ? `${video.currentFrame} / ${displayTotalFrames} fr` + : videoTimeDisplayMode === 'standard' + ? `${formatTimecode(video.currentFrame, video.frameRate, 'standard')} / ${formatTime(video.totalFrames / video.frameRate)}` + : `${formatTimecode(video.currentFrame, video.frameRate, videoTimeDisplayMode, startTimecode)} / ${formatTimecode(displayTotalFrames, video.frameRate, videoTimeDisplayMode, startTimecode)}` + + const cycleTimeDisplay = () => { + const modes: Array<'standard' | 'timecode' | 'frames'> = ['standard', 'timecode', 'frames'] + const idx = modes.indexOf(videoTimeDisplayMode as 'standard' | 'timecode' | 'frames') + setVideoTimeDisplayMode(modes[(idx + 1) % modes.length]) + } + + const previewResolutions = video.resolutions.filter((r) => !r.isRaw) + + return ( +
+ +
+ + + + + {/* Volume */} +
+ + onVolumeChange(vals[0] ?? 0)} + className="w-20" + /> +
+ + + +
+ {zoomControls} + + {/* Playback rate */} + + + {video.playbackRate}x + + + {PLAYBACK_RATES.map((rate) => ( + onChangePlaybackRate(rate)} + className={cn( + 'px-2 py-1 text-xs', + video.playbackRate === rate + ? 'bg-primary text-primary-foreground' + : 'text-foreground', + )} + > + {rate}x + + ))} + + + + {/* Resolution */} + {previewResolutions.length > 0 && ( + + + + {video.currentResolution} + + + Quality + {previewResolutions.map((res) => ( + onChangeResolution(res.resolution)} + className={cn( + 'flex w-full items-center justify-between', + video.currentResolution === res.resolution + ? 'font-medium text-primary' + : 'text-foreground', + )} + > + {res.resolution} + + {res.width}x{res.height} + + + ))} + + + )} + + {/* Download */} + + + + + + Download + {video.resolutions.map((res) => ( + onDownload(res.key)} + className="flex w-full items-center justify-between px-3 py-2 text-sm text-foreground" + > + {res.resolution} + {res.isRaw ? 'RAW' : 'MP4'} + + ))} + + + + {fullscreenButton} +
+
+
+ ) +} diff --git a/packages/webui/components/compare/compare-image-pane.tsx b/packages/webui/components/compare/compare-image-pane.tsx new file mode 100644 index 00000000..3dcac681 --- /dev/null +++ b/packages/webui/components/compare/compare-image-pane.tsx @@ -0,0 +1,218 @@ +import { client } from '@/ui/api/client' +import DrawingCanvas from '@/ui/components/drawing-canvas' +import { useScreenSize } from '@/ui/hooks/useScreenSize' +import { getBestTranscode } from '@/ui/lib/media' +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' + +interface CompareImagePaneProps { + file: AssetInfo + shareId?: string + isActive: boolean + annotations: Annotation[] + onStateChange: (state: PaneReportedState) => void + onUserPan?: (dx: number, dy: number) => void + onActivate?: () => void +} + +const MIN_ZOOM = 0.01 +const MAX_ZOOM = 50 + +export const CompareImagePane = forwardRef( + function CompareImagePane( + { file, shareId, isActive, annotations, onStateChange, onUserPan, onActivate }, + ref, + ) { + 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 observerRef = useRef(null) + const zoomRef = useRef(zoom) + zoomRef.current = zoom + const panRef = useRef(pan) + panRef.current = pan + + 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) + } + + // Fit on mount / container resize / file change + useEffect(() => { + if (conW > 0 && conH > 0) { + setZoom(baseScale) + setPan({ + x: (conW - imgW * baseScale) / 2, + y: (conH - imgH * baseScale) / 2, + }) + } + }, [file.id, conW, conH, baseScale, imgW, imgH]) + + const applyZoom = useCallback( + (factor: number) => { + const cx = conW / 2 + const cy = conH / 2 + const cur = zoomRef.current + const newZoom = cur * factor + if (newZoom < MIN_ZOOM || newZoom > MAX_ZOOM) return + const curPan = panRef.current + setPan({ + x: cx - (cx - curPan.x) * (newZoom / cur), + y: cy - (cy - curPan.y) * (newZoom / cur), + }) + setZoom(newZoom) + }, + [conW, conH], + ) + + const fit = useCallback(() => { + setZoom(baseScale) + setPan({ + x: (conW - imgW * baseScale) / 2, + y: (conH - imgH * baseScale) / 2, + }) + }, [baseScale, conW, conH, imgW, imgH]) + + let bestUrl = file.media?.original?.downloadUrl + const bestTranscode = getBestTranscode(file.media?.imageTranscodes, screenWidth) + if (bestTranscode?.url) { + bestUrl = bestTranscode.url + } + + const handleDownload = useCallback(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 + } + }, [file.id, file.media?.original?.key, shareId]) + + useImperativeHandle( + ref, + (): ComparePaneHandle => ({ + getKind: () => 'image', + play: () => {}, + pause: () => {}, + togglePlay: () => {}, + seekToFrame: () => {}, + seekToSecond: () => {}, + stepFrame: () => {}, + setMuted: () => {}, + setVolume: () => {}, + setPlaybackRate: () => {}, + toggleLoop: () => {}, + changeResolution: () => {}, + zoomBy: (factor) => applyZoom(factor), + fit, + panBy: (dx, dy) => setPan((p) => ({ x: p.x + dx, y: p.y + dy })), + download: handleDownload, + }), + [applyZoom, fit, handleDownload], + ) + + // Report state upward + useEffect(() => { + onStateChange({ kind: 'image', zoom }) + }, [zoom, onStateChange]) + + const displayAnnotations = [...annotations, ...(isActive ? draftAnnotations : [])] + + const handlePan = useCallback( + (newOffset: { x: number; y: number }) => { + const prev = panRef.current + const dx = newOffset.x - prev.x + const dy = newOffset.y - prev.y + setPan(newOffset) + if (dx !== 0 || dy !== 0) onUserPan?.(dx, dy) + }, + [onUserPan], + ) + + if (!bestUrl) { + return ( +
+

Preview unavailable

+
+ ) + } + + return ( +
+ +
+ ) + }, +) diff --git a/packages/webui/components/compare/compare-pane-topbar.tsx b/packages/webui/components/compare/compare-pane-topbar.tsx new file mode 100644 index 00000000..e0baa547 --- /dev/null +++ b/packages/webui/components/compare/compare-pane-topbar.tsx @@ -0,0 +1,139 @@ +import { + DropdownMenu, + DropdownMenuContent, + DropdownMenuItem, + DropdownMenuTrigger, +} from '@/ui/components/ui/dropdown-menu' +import { cn } from '@/ui/lib/utils' +import { m } from '@/ui/paraglide/messages.js' +import { Check, ChevronDown, FileIcon, X } from 'lucide-react' +import type { CompareSide } from './types' + +interface VersionItem { + id: string + version: number + name?: string | null + previewUrl?: string | null + creator?: { id: string; name: string | null } | null +} + +interface ComparePaneTopbarProps { + side: CompareSide + fileName: string + version?: number + activeVersionId: string + versions: VersionItem[] + isActive: boolean + onActivate: () => void + onSwitchVersion: (versionId: string) => void + onExit: () => void +} + +export function ComparePaneTopbar({ + side, + fileName, + version, + activeVersionId, + versions, + isActive, + onActivate, + onSwitchVersion, + onExit, +}: ComparePaneTopbarProps) { + const exitButton = ( + + ) + + const label = ( + + ) + + const versionDropdown = ( + + + + + +
+ {versions.map((v) => { + const isCurrent = v.id === activeVersionId + return ( + onSwitchVersion(v.id)} + className="flex cursor-pointer items-center gap-3 rounded-md px-3 py-2" + > +
+ v{v.version} +
+
+ {v.previewUrl ? ( + {v.name + ) : ( + + )} +
+
+ {v.name} + + {v.creator?.name || 'Unknown'} + +
+ {isCurrent && } +
+ ) + })} +
+
+
+ ) + + return ( +
+ {side === 'left' ? ( + <> + {exitButton} + {label} + {versionDropdown} + + ) : ( + <> + {label} + {versionDropdown} +
+ {exitButton} + + )} +
+ ) +} diff --git a/packages/webui/components/compare/compare-utils.test.ts b/packages/webui/components/compare/compare-utils.test.ts new file mode 100644 index 00000000..c5bf6db4 --- /dev/null +++ b/packages/webui/components/compare/compare-utils.test.ts @@ -0,0 +1,82 @@ +import { describe, it, expect } from 'vitest' +import { kindOf, pickDefaultCompareVersions, clampFrame, isSameType } from './compare-utils' + +describe('compare-utils', () => { + describe('kindOf', () => { + it('classifies image media types', () => { + expect(kindOf('image/png')).toBe('image') + expect(kindOf('image/webp')).toBe('image') + }) + + it('classifies video media types', () => { + expect(kindOf('video/mp4')).toBe('video') + expect(kindOf('video/quicktime')).toBe('video') + }) + + it('returns unsupported for missing or unknown types', () => { + expect(kindOf(null)).toBe('unsupported') + expect(kindOf(undefined)).toBe('unsupported') + expect(kindOf('application/pdf')).toBe('unsupported') + }) + }) + + describe('pickDefaultCompareVersions', () => { + it('picks latest and latest-1 regardless of input order', () => { + const versions = [ + { id: 'a', version: 1 }, + { id: 'c', version: 3 }, + { id: 'b', version: 2 }, + ] + const pair = pickDefaultCompareVersions(versions) + expect(pair).not.toBeNull() + expect(pair!.left.id).toBe('c') // v3 (latest) + expect(pair!.right.id).toBe('b') // v2 (latest - 1) + }) + + it('returns null when fewer than two versions', () => { + expect(pickDefaultCompareVersions([{ id: 'a', version: 1 }])).toBeNull() + expect(pickDefaultCompareVersions([])).toBeNull() + expect(pickDefaultCompareVersions(undefined)).toBeNull() + expect(pickDefaultCompareVersions(null)).toBeNull() + }) + + it('does not mutate the input array', () => { + const versions = [ + { id: 'a', version: 1 }, + { id: 'b', version: 2 }, + ] + pickDefaultCompareVersions(versions) + expect(versions.map((v) => v.id)).toEqual(['a', 'b']) + }) + }) + + describe('clampFrame', () => { + it('clamps to the last frame when beyond total (shorter side holds last frame)', () => { + expect(clampFrame(500, 100)).toBe(99) + }) + + it('clamps negative frames to zero', () => { + expect(clampFrame(-5, 100)).toBe(0) + }) + + it('passes through in-range frames', () => { + expect(clampFrame(42, 100)).toBe(42) + }) + + it('handles zero-length safely', () => { + expect(clampFrame(10, 0)).toBe(0) + }) + }) + + describe('isSameType', () => { + it('true only for matching, supported kinds', () => { + expect(isSameType('video', 'video')).toBe(true) + expect(isSameType('image', 'image')).toBe(true) + }) + + it('false for mismatched or unsupported kinds', () => { + expect(isSameType('video', 'image')).toBe(false) + expect(isSameType('unsupported', 'unsupported')).toBe(false) + }) + }) +}) diff --git a/packages/webui/components/compare/compare-utils.ts b/packages/webui/components/compare/compare-utils.ts new file mode 100644 index 00000000..dace8b6a --- /dev/null +++ b/packages/webui/components/compare/compare-utils.ts @@ -0,0 +1,37 @@ +import type { PaneKind } from './types' + +/** Classify an asset's media type into a compare pane kind. */ +export function kindOf(mediaType: string | null | undefined): PaneKind { + if (!mediaType) return 'unsupported' + if (mediaType.startsWith('image/')) return 'image' + if (mediaType.startsWith('video/')) return 'video' + return 'unsupported' +} + +interface VersionLike { + id: string + version: number +} + +/** + * Given a version stack's versions, pick the default compare pair: + * left = latest (highest version number), right = latest - 1. + * Returns null if fewer than two versions exist. + */ +export function pickDefaultCompareVersions( + versions: ReadonlyArray | undefined | null, +): { left: VersionLike; right: VersionLike } | null { + if (!versions || versions.length < 2) return null + const sorted = [...versions].sort((a, b) => b.version - a.version) + return { left: sorted[0], right: sorted[1] } +} + +/** Clamp a frame index into the valid range [0, totalFrames - 1]. */ +export function clampFrame(frame: number, totalFrames: number): number { + return Math.max(0, Math.min(frame, Math.max(0, totalFrames - 1))) +} + +/** True when both panes hold the same (non-unsupported) media kind. */ +export function isSameType(left: PaneKind, right: PaneKind): boolean { + return left === right && left !== 'unsupported' +} diff --git a/packages/webui/components/compare/compare-video-pane.tsx b/packages/webui/components/compare/compare-video-pane.tsx new file mode 100644 index 00000000..b4d418e5 --- /dev/null +++ b/packages/webui/components/compare/compare-video-pane.tsx @@ -0,0 +1,461 @@ +import { client } from '@/ui/api/client' +import DrawingCanvas from '@/ui/components/drawing-canvas' +import { cn } from '@/ui/lib/utils' +import { useAnnotationStore } from '@/ui/stores/annotation-store' +import type { Annotation } from '@/ui/types' +import type { AssetInfo } from '@shumai/dtos' +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 { clampFrame as clampFrameUtil } from './compare-utils' +import type { ComparePaneHandle, DisplayTranscode, PaneReportedState } from './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 + annotations: Annotation[] + onStateChange: (state: PaneReportedState) => void + onActivate?: () => void + onRequestTogglePlay?: () => void + /** Called with the current playhead time in seconds (used only for the active pane). */ + onTimeUpdate?: (second: number) => void + onPlay?: () => void +} + +function computeResolutions(file: AssetInfo): DisplayTranscode[] { + const original: DisplayTranscode | null = file.media?.original?.downloadUrl + ? { + id: 'original', + url: file.media.original.downloadUrl, + key: file.media.original.key ?? '', + width: file.media?.metadata?.originalWidth ?? 0, + height: file.media?.metadata?.originalHeight ?? 0, + size: 0, + isRaw: true, + resolution: 'Original', + } + : null + + const transcodes: DisplayTranscode[] = (file.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 hasOriginalTranscode = transcodes.some((t) => t.isRaw) + if (!hasOriginalTranscode && original) { + return [...transcodes, original] + } + return transcodes +} + +export const CompareVideoPane = forwardRef( + function CompareVideoPane( + { + file, + shareId, + isActive, + muted, + volume, + annotations, + onStateChange, + onActivate, + onRequestTogglePlay, + onTimeUpdate, + onPlay, + }, + ref, + ) { + const playerRef = useRef(null) + const videoContainerRef = useRef(null) + const containerRef = useRef(null) + const videoRef = useRef(null) + const [videoHtmlEl, setVideoHtmlEl] = useState(undefined) + + const { + isDrawing, + currentTool, + currentColor, + addAnnotation, + annotations: draftAnnotations, + } = useAnnotationStore() + + const [containerSize, setContainerSize] = useState({ width: 0, height: 0 }) + const [zoom, setZoom] = useState(1) + const [hasManuallyZoomed, setHasManuallyZoomed] = useState(false) + const [pan, setPan] = useState<{ x: number; y: number } | null>(null) + + const [isPlaying, setIsPlaying] = useState(false) + const [isLooping, setIsLooping] = useState(false) + const [playbackRate, setPlaybackRate] = useState(1) + const [buffered, setBuffered] = useState(0) + const [playerVolume, setPlayerVolume] = useState(volume) + const [playerMuted, setPlayerMuted] = useState(muted) + const [isPlayerReady, setIsPlayerReady] = useState(false) + + const metadata = file.media?.metadata + const frameRate = metadata?.frameRate || 30 + const dbTotalFrames = metadata?.totalFrames || 0 + const containerDuration = metadata?.duration || 0 + const videoDuration = dbTotalFrames / frameRate + const frameDuration = 1 / frameRate + const totalFrames = + containerDuration - videoDuration > 0.5 * frameDuration + ? Math.round(containerDuration * frameRate) + : dbTotalFrames + + const resolutions = computeResolutions(file) + const previewResolutions = resolutions.filter((r) => !r.isRaw) + const initialRes = previewResolutions[0] ?? resolutions[0] + const [currentResolution, setCurrentResolution] = useState(initialRes?.resolution ?? 'Original') + const currentSrcRef = useRef(initialRes?.url) + + const { currentFrame, seekToFrame } = useFramePlayer(videoRef, frameRate, totalFrames) + + const zoomRef = useRef(zoom) + zoomRef.current = zoom + const currentFrameRef = useRef(currentFrame) + currentFrameRef.current = currentFrame + + // Resize observer + 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() + }, []) + + const vidW = metadata?.originalWidth ?? 1920 + const vidH = metadata?.originalHeight ?? 1080 + + // Auto-fit zoom + useEffect(() => { + if (containerSize.width > 0 && containerSize.height > 0 && !hasManuallyZoomed) { + const scale = Math.min(containerSize.width / vidW, containerSize.height / vidH) + setZoom(scale) + } + }, [containerSize.width, containerSize.height, vidW, vidH, hasManuallyZoomed]) + + // Initialize video.js + useEffect(() => { + if (!videoContainerRef.current) return + const videoElement = document.createElement('video-js') + videoElement.classList.add('vjs-big-play-centered', '!h-full', '!w-full') + videoElement.style.opacity = '0' + videoElement.style.pointerEvents = 'none' + videoContainerRef.current.appendChild(videoElement) + + const player = (playerRef.current = videojs(videoElement, { + controls: false, + autoplay: false, + preload: 'auto', + playsinline: true, + sources: [{ src: currentSrcRef.current ?? '', type: 'video/mp4' }], + })) + + const htmlVid = videoElement.querySelector('video') + if (htmlVid) { + setVideoHtmlEl(htmlVid) + videoRef.current = htmlVid + } else { + player.ready(() => { + const techEl = player.tech({ iWillNotUseThisInPlugins: true })?.el() as HTMLVideoElement + if (techEl) { + setVideoHtmlEl(techEl) + videoRef.current = techEl + } + }) + } + + player.on('play', () => { + setIsPlaying(true) + onPlay?.() + }) + player.on('pause', () => setIsPlaying(false)) + player.on('ended', () => setIsPlaying(false)) + player.on('loadedmetadata', () => setIsPlayerReady(true)) + player.on('loadstart', () => setIsPlayerReady(false)) + player.on('timeupdate', () => { + const playerDuration = player.duration() || containerDuration || 0 + const bufferedEnd = player.bufferedEnd() + if (playerDuration > 0) setBuffered((bufferedEnd / playerDuration) * 100) + }) + player.on('volumechange', () => { + setPlayerVolume(player.volume() || 0) + setPlayerMuted(player.muted() || false) + }) + player.on('ratechange', () => setPlaybackRate(player.playbackRate() || 1)) + + return () => { + if (player && !player.isDisposed()) { + player.dispose() + playerRef.current = null + videoRef.current = null + } + } + }, [file.id]) + + // Apply muted / volume (audio routing: only active side unmuted) + useEffect(() => { + const player = playerRef.current + if (!player || !isPlayerReady) return + player.muted(muted) + player.volume(volume) + }, [muted, volume, isPlayerReady]) + + // Report state upward + useEffect(() => { + const state: PaneReportedState = { + kind: 'video', + zoom, + video: { + frameRate, + totalFrames, + currentFrame, + isPlaying, + volume: playerVolume, + isMuted: playerMuted, + playbackRate, + isLooping, + currentResolution, + resolutions, + buffered, + }, + } + onStateChange(state) + }, [ + zoom, + frameRate, + totalFrames, + currentFrame, + isPlaying, + playerVolume, + playerMuted, + playbackRate, + isLooping, + currentResolution, + buffered, + ]) + + // Propagate active playhead time + useEffect(() => { + if (isActive) onTimeUpdate?.(currentFrame / frameRate) + }, [currentFrame, frameRate, isActive, onTimeUpdate]) + + const applyZoom = useCallback((factor: number) => { + const cur = zoomRef.current + const newZoom = cur * factor + if (newZoom < 0.01 || newZoom > 50) return + setZoom(newZoom) + setHasManuallyZoomed(true) + }, []) + + const fit = useCallback(() => { + setHasManuallyZoomed(false) + setPan(null) + }, []) + + const clampFrame = useCallback( + (frame: number) => clampFrameUtil(frame, totalFrames), + [totalFrames], + ) + + const handleDownload = useCallback( + async (key?: string) => { + const dlKey = key ?? file.media?.original?.key + if (!dlKey || !file.id) return + try { + const res = shareId + ? await client.api.shares[':shareId'].files[':fileId']['download-url'].$post({ + param: { shareId, fileId: file.id }, + json: { key: dlKey }, + }) + : await client.api.files['download-url'].$post({ + json: { key: dlKey, 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 + } + }, + [file.id, file.media?.original?.key, shareId], + ) + + const changeResolution = useCallback( + (resolution: string) => { + const player = playerRef.current + if (!player) return + const target = resolutions.find((r) => r.resolution === resolution) + if (!target) return + const wasPlaying = !player.paused() + const currentT = player.currentTime() + setCurrentResolution(resolution) + currentSrcRef.current = target.url + player.src({ type: 'video/mp4', src: target.url }) + player.one('loadedmetadata', () => { + player.currentTime(currentT) + if (wasPlaying) { + const p = player.play() + if (p !== undefined) p.catch(() => {}) + } + }) + }, + [resolutions], + ) + + useImperativeHandle( + ref, + (): ComparePaneHandle => ({ + getKind: () => 'video', + play: () => { + const p = playerRef.current?.play() + if (p !== undefined) p.catch(() => {}) + }, + pause: () => playerRef.current?.pause(), + togglePlay: () => { + const player = playerRef.current + if (!player) return + if (player.paused() || player.ended()) { + const p = player.play() + if (p !== undefined) p.catch(() => {}) + } else { + player.pause() + } + }, + seekToFrame: (frame) => seekToFrame(clampFrame(frame)), + seekToSecond: (second) => { + const frame = Math.floor(second * frameRate + 0.45) + seekToFrame(clampFrame(frame)) + }, + stepFrame: (delta) => seekToFrame(clampFrame(currentFrameRef.current + delta)), + setMuted: (m) => playerRef.current?.muted(m), + setVolume: (v) => { + const player = playerRef.current + if (!player) return + player.volume(v) + if (v > 0 && player.muted()) player.muted(false) + else if (v === 0 && !player.muted()) player.muted(true) + }, + setPlaybackRate: (rate) => playerRef.current?.playbackRate(rate), + toggleLoop: () => { + const player = playerRef.current + if (!player) return + const next = !player.loop() + player.loop(next) + setIsLooping(next) + }, + changeResolution, + zoomBy: applyZoom, + fit, + panBy: (dx, dy) => + setPan((p) => { + const scale = zoomRef.current + const base = p ?? { + x: (containerSize.width - vidW * scale) / 2, + y: (containerSize.height - vidH * scale) / 2, + } + return { x: base.x + dx, y: base.y + dy } + }), + download: (key?: string) => handleDownload(key), + }), + [ + seekToFrame, + clampFrame, + frameRate, + applyZoom, + fit, + changeResolution, + handleDownload, + containerSize.width, + containerSize.height, + vidW, + vidH, + ], + ) + + const displayAnnotations = [...annotations, ...(isActive ? draftAnnotations : [])] + + const scale = zoom + const defaultPanX = (containerSize.width - vidW * scale) / 2 + const defaultPanY = (containerSize.height - vidH * scale) / 2 + const panX = pan?.x ?? defaultPanX + const panY = pan?.y ?? defaultPanY + + const handleAreaClick = useCallback(() => { + if (useAnnotationStore.getState().isDrawing) return + onActivate?.() + onRequestTogglePlay?.() + }, [onActivate, onRequestTogglePlay]) + + if (!file.media?.original?.downloadUrl || !metadata) { + return ( +
+

Media is not available.

+
+ ) + } + + return ( +
+
+ + {videoHtmlEl && containerSize.width > 0 && ( + + )} + + {!isPlaying && !isDrawing && ( +
+
+ +
+
+ )} +
+ ) + }, +) diff --git a/packages/webui/components/compare/compare-viewer.tsx b/packages/webui/components/compare/compare-viewer.tsx new file mode 100644 index 00000000..89747c23 --- /dev/null +++ b/packages/webui/components/compare/compare-viewer.tsx @@ -0,0 +1,356 @@ +import { client } from '@/ui/api/client' +import type { Annotation } from '@/ui/types' +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 { CompareControlBar } from './compare-control-bar' +import { CompareImagePane } from './compare-image-pane' +import { ComparePaneTopbar } from './compare-pane-topbar' +import { CompareVideoPane } from './compare-video-pane' +import { kindOf, isSameType } from './compare-utils' +import type { ComparePaneHandle, CompareSide, PaneKind, PaneReportedState } from './types' + +interface VersionItem { + id: string + version: number + name?: string | null + previewUrl?: string | null + creator?: { id: string; name: string | null } | null +} + +interface CompareViewerProps { + isPublic?: boolean + shareId?: string + versions: VersionItem[] + leftId: string + rightId: string + activeSide: CompareSide + annotations: Annotation[] + /** Bumped nonce requests the active pane seek to `second` (comment navigation). */ + seekRequest?: { second: number; nonce: number } + onActiveSideChange: (side: CompareSide) => void + onSwitchVersion: (side: CompareSide, versionId: string) => void + onExit: () => void + onActiveAssetChange: (asset: AssetInfo | null) => void + onPlay?: () => void + onTimeUpdate?: (second: number) => void +} + +function useCompareAsset(id: string, isPublic: boolean, shareId?: string) { + return useQuery({ + queryKey: isPublic + ? ['public-share-file', shareId, id, localStorage.getItem(`share_pwd_${shareId}`) || ''] + : ['files', id], + queryFn: async () => { + if (isPublic) { + const password = localStorage.getItem(`share_pwd_${shareId}`) || '' + const res = await client.api.shares[':shareId'].files[':fileId'].$get( + { param: { shareId: shareId!, fileId: id } }, + { headers: { 'x-share-password': password } }, + ) + if (!res.ok) throw new Error('Failed to fetch version asset') + return (await res.json()) as unknown as AssetInfo + } + const res = await client.api.files[':fileId'].$get({ param: { fileId: id } }) + if (!res.ok) throw new Error('Failed to fetch version asset') + return (await res.json()) as unknown as AssetInfo + }, + enabled: !!id && (!isPublic || !!shareId), + }) +} + +export function CompareViewer({ + isPublic = false, + shareId, + versions, + leftId, + rightId, + activeSide, + annotations, + seekRequest, + onActiveSideChange, + onSwitchVersion, + onExit, + onActiveAssetChange, + onPlay, + onTimeUpdate, +}: CompareViewerProps) { + const rootRef = useRef(null) + const leftRef = useRef(null) + const rightRef = useRef(null) + + const [leftState, setLeftState] = useState(null) + const [rightState, setRightState] = useState(null) + const [userVolume, setUserVolume] = useState(1) + const [userMuted, setUserMuted] = useState(false) + const [isFullScreen, setIsFullScreen] = useState(false) + + 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 activeAsset = activeSide === 'left' ? leftAsset : rightAsset + const activeState = activeSide === 'left' ? leftState : rightState + + const getActive = useCallback( + () => (activeSide === 'left' ? leftRef.current : rightRef.current), + [activeSide], + ) + const getOther = useCallback( + () => (activeSide === 'left' ? rightRef.current : leftRef.current), + [activeSide], + ) + + // Bind right sidebar to active asset + useEffect(() => { + onActiveAssetChange(activeAsset ?? null) + }, [activeAsset, onActiveAssetChange]) + + // Comment-driven seek on the active pane + useEffect(() => { + if (!seekRequest) return + const active = getActive() + active?.seekToSecond(seekRequest.second) + active?.pause() + if (sameType) { + const other = getOther() + other?.seekToSecond(seekRequest.second) + other?.pause() + } + }, [seekRequest?.nonce]) + + // Fullscreen tracking + useEffect(() => { + const onFs = () => setIsFullScreen(!!document.fullscreenElement) + document.addEventListener('fullscreenchange', onFs) + return () => document.removeEventListener('fullscreenchange', onFs) + }, []) + + const handleStateChangeLeft = useCallback((s: PaneReportedState) => setLeftState(s), []) + const handleStateChangeRight = useCallback((s: PaneReportedState) => setRightState(s), []) + + const applyBoth = useCallback( + (fn: (h: ComparePaneHandle) => void) => { + const active = getActive() + if (active) fn(active) + if (sameType) { + const other = getOther() + if (other) fn(other) + } + }, + [getActive, getOther, sameType], + ) + + // --- Control handlers --- + const handleTogglePlay = useCallback(() => { + const shouldPlay = !activeState?.video?.isPlaying + applyBoth((h) => (shouldPlay ? h.play() : h.pause())) + }, [activeState?.video?.isPlaying, applyBoth]) + + const handleSeek = useCallback( + (frame: number) => applyBoth((h) => h.seekToFrame(frame)), + [applyBoth], + ) + + const handleToggleLoop = useCallback(() => getActive()?.toggleLoop(), [getActive]) + + const handleVolumeChange = useCallback((v: number) => { + setUserVolume(v) + setUserMuted(v === 0) + }, []) + + const handleToggleMute = useCallback(() => setUserMuted((m) => !m), []) + + const handlePlaybackRate = useCallback( + (rate: number) => applyBoth((h) => h.setPlaybackRate(rate)), + [applyBoth], + ) + + const handleChangeResolution = useCallback( + (resolution: string) => getActive()?.changeResolution(resolution), + [getActive], + ) + + const handleZoomIn = useCallback(() => applyBoth((h) => h.zoomBy(1.2)), [applyBoth]) + const handleZoomOut = useCallback(() => applyBoth((h) => h.zoomBy(0.8)), [applyBoth]) + const handleFit = useCallback(() => applyBoth((h) => h.fit()), [applyBoth]) + const handleDownload = useCallback( + (key?: string) => { + getActive()?.download(key) + }, + [getActive], + ) + + const handleToggleFullScreen = useCallback(() => { + if (!rootRef.current) return + if (!document.fullscreenElement) { + rootRef.current.requestFullscreen() + } else { + document.exitFullscreen() + } + }, []) + + const handleUserPanLeft = useCallback( + (dx: number, dy: number) => { + if (sameType) rightRef.current?.panBy(dx, dy) + }, + [sameType], + ) + const handleUserPanRight = useCallback( + (dx: number, dy: number) => { + if (sameType) leftRef.current?.panBy(dx, dy) + }, + [sameType], + ) + + const handleRequestTogglePlay = useCallback(() => handleTogglePlay(), [handleTogglePlay]) + + const versionOf = useCallback( + (id: string) => versions.find((v) => v.id === id)?.version, + [versions], + ) + + const activePreviewUrl = useMemo( + () => activeAsset?.media?.videoPreview?.url, + [activeAsset?.media?.videoPreview?.url], + ) + + const renderPane = (side: CompareSide, asset: AssetInfo, kind: PaneKind) => { + 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 ( +
+

Preview unavailable

+
+ ) + } + + const bothLoaded = !!leftAsset && !!rightAsset + const isLoading = leftLoading || rightLoading + + return ( +
+
+ {/* Left pane */} +
+ {leftAsset && ( + onActiveSideChange('left')} + onSwitchVersion={(vid) => onSwitchVersion('left', vid)} + onExit={onExit} + /> + )} +
+ {leftAsset ? ( + renderPane('left', leftAsset, leftKind) + ) : ( +
+ +
+ )} +
+
+ + {/* Right pane */} +
+ {rightAsset && ( + onActiveSideChange('right')} + onSwitchVersion={(vid) => onSwitchVersion('right', vid)} + onExit={onExit} + /> + )} +
+ {rightAsset ? ( + renderPane('right', rightAsset, rightKind) + ) : ( +
+ +
+ )} +
+
+
+ + {isLoading && !bothLoaded && ( +
+ +
+ )} + + +
+ ) +} diff --git a/packages/webui/components/compare/types.ts b/packages/webui/components/compare/types.ts new file mode 100644 index 00000000..f83373e7 --- /dev/null +++ b/packages/webui/components/compare/types.ts @@ -0,0 +1,55 @@ +import type { VideoTranscode } from '@shumai/dtos' + +export type PaneKind = 'image' | 'video' | 'unsupported' + +export type CompareSide = 'left' | 'right' + +export type DisplayTranscode = VideoTranscode & { resolution: string } + +/** + * Reactive state a pane reports upward so the shared control bar can render. + * `video` is populated only for video panes. + */ +export interface PaneReportedState { + kind: PaneKind + zoom: number + video?: { + frameRate: number + totalFrames: number + currentFrame: number + isPlaying: boolean + volume: number + isMuted: boolean + playbackRate: number + isLooping: boolean + currentResolution: string + resolutions: DisplayTranscode[] + buffered: number + } +} + +/** + * Imperative command surface exposed by each pane via ref. The shared control + * bar dispatches to the active pane (and, when media types match, to both). + */ +export interface ComparePaneHandle { + getKind: () => PaneKind + // Playback (video only; no-ops for images) + play: () => void + pause: () => void + togglePlay: () => void + seekToFrame: (frame: number) => void + seekToSecond: (second: number) => void + stepFrame: (delta: number) => void + setMuted: (muted: boolean) => void + setVolume: (volume: number) => void + setPlaybackRate: (rate: number) => void + toggleLoop: () => void + changeResolution: (resolution: string) => void + // Zoom / pan (image + video) + zoomBy: (factor: number) => void + fit: () => void + panBy: (dx: number, dy: number) => void + // Download active side's original/selected media + download: (key?: string) => void +} diff --git a/packages/webui/components/public-share-manager.tsx b/packages/webui/components/public-share-manager.tsx index 55d6a616..c1c2d542 100644 --- a/packages/webui/components/public-share-manager.tsx +++ b/packages/webui/components/public-share-manager.tsx @@ -16,6 +16,8 @@ import { Lock, AlertCircle, Loader2 } from 'lucide-react' import type { AncestorFolder, AssetInfoPaginatedList, AssetInfo, CommentInfo } from '@shumai/dtos' 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 { Annotation } from '@/ui/types' @@ -26,6 +28,10 @@ interface PublicShareManagerProps { initialFolderId?: string initialFileId?: string startTime?: number + compare?: boolean + compareLeftId?: string + compareRightId?: string + compareActiveSide?: 'left' | 'right' } interface PublicShareInfo { @@ -46,8 +52,13 @@ export function PublicShareManager({ initialFolderId, initialFileId, startTime, + compare, + compareLeftId, + compareRightId, + compareActiveSide = 'left', }: PublicShareManagerProps) { const navigate = useNavigate() + const isCompareMode = !!compare && !!compareLeftId && !!compareRightId const [password, setPassword] = useState(() => { return localStorage.getItem(`share_pwd_${shareId}`) || '' }) @@ -129,6 +140,10 @@ export function PublicShareManager({ const [annotations, setAnnotations] = useState([]) const [currentTime, setCurrentTime] = useState(0) const [selectedCommentId, setSelectedCommentId] = useState(null) + const [compareActiveAsset, setCompareActiveAsset] = useState(null) + const [seekRequest, setSeekRequest] = useState<{ second: number; nonce: number } | undefined>( + undefined, + ) const { data: foldersData, @@ -307,6 +322,13 @@ export function PublicShareManager({ setAnnotations([]) } + if (isCompareMode) { + if (comment.second !== null && comment.second !== undefined) { + setSeekRequest({ second: comment.second, nonce: Date.now() }) + } + return + } + if (comment.second !== null && comment.second !== undefined) { if (videoRef.current) { videoRef.current.currentTime(comment.second) @@ -324,6 +346,24 @@ export function PublicShareManager({ setSelectedCommentId(null) } + const updateCompareSearch = (patch: Record) => { + if (!viewingFileId) return + navigate({ + to: '/share/$shareId/files/$fileId', + params: { shareId, fileId: viewingFileId }, + search: (p: Record) => ({ ...p, ...patch }), + }) + } + + const handleCompareExit = () => { + updateCompareSearch({ + compare: undefined, + cmpLeft: undefined, + cmpRight: undefined, + cmpActive: undefined, + }) + } + const { setProjectState, clearProjectState } = useTopNavStore() useEffect(() => { @@ -364,6 +404,24 @@ export function PublicShareManager({ onFolderClick: handleBreadcrumbClick, isRightSidebarCollapsed, onRightSidebarToggle: () => setIsRightSidebarCollapsed((prev) => !prev), + versions: viewingFileData?.versionStack?.versions, + compareMode: isCompareMode, + canCompareVersions: (viewingFileData?.versionStack?.versions?.length ?? 0) >= 2, + onCompareVersions: () => { + const pair = pickDefaultCompareVersions(viewingFileData?.versionStack?.versions) + if (!pair || !viewingFileId) return + navigate({ + to: '/share/$shareId/files/$fileId', + params: { shareId, fileId: viewingFileId }, + search: (p: Record) => ({ + ...p, + compare: true, + cmpLeft: pair.left.id, + cmpRight: pair.right.id, + cmpActive: 'left' as const, + }), + }) + }, }) } @@ -378,6 +436,9 @@ export function PublicShareManager({ setProjectState, clearProjectState, isRightSidebarCollapsed, + isCompareMode, + navigate, + shareId, ]) let content @@ -456,21 +517,44 @@ export function PublicShareManager({
{viewingFileId ? (
- {isViewingFileLoading && ( + {isViewingFileLoading && !isCompareMode && (
)} - {viewingFileData && ( - updateCompareSearch({ cmpActive: side })} + onSwitchVersion={(side, versionId) => + updateCompareSearch( + side === 'left' ? { cmpLeft: versionId } : { cmpRight: versionId }, + ) + } + onExit={handleCompareExit} + onActiveAssetChange={setCompareActiveAsset} onPlay={handlePlay} onTimeUpdate={setCurrentTime} - annotations={annotations} - startTime={startTime} - shareId={shareId} /> + ) : ( + viewingFileData && ( + + ) )}
) : ( @@ -520,7 +604,7 @@ export function PublicShareManager({ {}} members={[]} readOnly={true} diff --git a/packages/webui/components/top-nav.tsx b/packages/webui/components/top-nav.tsx index 55909a04..ccc7e7d8 100644 --- a/packages/webui/components/top-nav.tsx +++ b/packages/webui/components/top-nav.tsx @@ -24,6 +24,9 @@ export function TopNav() { isPublic, shareId, onFolderClick, + compareMode, + canCompareVersions, + onCompareVersions, } = projectState const isFileView = !!fileId @@ -91,6 +94,9 @@ export function TopNav() { downloadInfo={downloadInfo} versions={versions} onFolderClick={onFolderClick} + compareMode={compareMode} + canCompareVersions={canCompareVersions} + onCompareVersions={onCompareVersions} /> ) } diff --git a/packages/webui/messages/en.json b/packages/webui/messages/en.json index 8d810d4d..4257ba0d 100644 --- a/packages/webui/messages/en.json +++ b/packages/webui/messages/en.json @@ -433,6 +433,9 @@ "versions": "Versions", "manage_versions": "Manage versions...", + "compare_versions": "Compare Versions", + "exit_compare": "Exit compare", + "switch_version": "Switch version", "show_left_sidebar": "Show Left Sidebar", "hide_left_sidebar": "Hide Left Sidebar", "show_right_sidebar": "Show Right Sidebar", diff --git a/packages/webui/messages/zh.json b/packages/webui/messages/zh.json index d78cdce8..69bc8418 100644 --- a/packages/webui/messages/zh.json +++ b/packages/webui/messages/zh.json @@ -433,6 +433,9 @@ "versions": "版本", "manage_versions": "管理版本...", + "compare_versions": "对比版本", + "exit_compare": "退出对比", + "switch_version": "切换版本", "show_left_sidebar": "显示左侧边栏", "hide_left_sidebar": "隐藏左侧边栏", "show_right_sidebar": "显示右侧边栏", diff --git a/packages/webui/paraglide/messages/_index.d.ts b/packages/webui/paraglide/messages/_index.d.ts index b8f093ba..9107c401 100644 --- a/packages/webui/paraglide/messages/_index.d.ts +++ b/packages/webui/paraglide/messages/_index.d.ts @@ -411,6 +411,9 @@ export * from "./auth_feature_teams.js"; export * from "./auth_community_cta.js"; export * from "./versions.js"; export * from "./manage_versions.js"; +export * from "./compare_versions.js"; +export * from "./exit_compare.js"; +export * from "./switch_version.js"; export * from "./show_left_sidebar.js"; export * from "./hide_left_sidebar.js"; export * from "./show_right_sidebar.js"; diff --git a/packages/webui/paraglide/messages/_index.js b/packages/webui/paraglide/messages/_index.js index e0c58356..133b8b12 100644 --- a/packages/webui/paraglide/messages/_index.js +++ b/packages/webui/paraglide/messages/_index.js @@ -413,6 +413,9 @@ export * from './auth_feature_teams.js' export * from './auth_community_cta.js' export * from './versions.js' export * from './manage_versions.js' +export * from './compare_versions.js' +export * from './exit_compare.js' +export * from './switch_version.js' export * from './show_left_sidebar.js' export * from './hide_left_sidebar.js' export * from './show_right_sidebar.js' diff --git a/packages/webui/paraglide/messages/compare_versions.d.ts b/packages/webui/paraglide/messages/compare_versions.d.ts new file mode 100644 index 00000000..76eb52b7 --- /dev/null +++ b/packages/webui/paraglide/messages/compare_versions.d.ts @@ -0,0 +1,16 @@ +/** +* | output | +* | --- | +* | "Compare Versions" | +* +* @param {Compare_VersionsInputs} inputs +* @param {{ locale?: "en" | "zh" }} options +* @returns {LocalizedString} +*/ +export const compare_versions: ((inputs?: Compare_VersionsInputs, options?: { + locale?: "en" | "zh"; +}) => LocalizedString) & import("../runtime.js").MessageMetadata; +export type LocalizedString = import("../runtime.js").LocalizedString; +export type Compare_VersionsInputs = {}; diff --git a/packages/webui/paraglide/messages/compare_versions.js b/packages/webui/paraglide/messages/compare_versions.js new file mode 100644 index 00000000..ef4237d8 --- /dev/null +++ b/packages/webui/paraglide/messages/compare_versions.js @@ -0,0 +1,29 @@ +/* eslint-disable */ +import { getLocale, experimentalStaticLocale } from '../runtime.js'; + +/** @typedef {import('../runtime.js').LocalizedString} LocalizedString */ + +/** @typedef {{}} Compare_VersionsInputs */ + +const en_compare_versions = /** @type {(inputs: Compare_VersionsInputs) => LocalizedString} */ () => { + return /** @type {LocalizedString} */ (`Compare Versions`) +}; + +const zh_compare_versions = /** @type {(inputs: Compare_VersionsInputs) => LocalizedString} */ () => { + return /** @type {LocalizedString} */ (`对比版本`) +}; + +/** +* | output | +* | --- | +* | "Compare Versions" | +* +* @param {Compare_VersionsInputs} inputs +* @param {{ locale?: "en" | "zh" }} options +* @returns {LocalizedString} +*/ +export const compare_versions = /** @type {((inputs?: Compare_VersionsInputs, options?: { locale?: "en" | "zh" }) => LocalizedString) & import('../runtime.js').MessageMetadata} */ ((inputs = {}, options = {}) => { + const locale = experimentalStaticLocale ?? options.locale ?? getLocale() + if (locale === "en") return en_compare_versions(inputs) + return zh_compare_versions(inputs) +}); \ No newline at end of file diff --git a/packages/webui/paraglide/messages/exit_compare.d.ts b/packages/webui/paraglide/messages/exit_compare.d.ts new file mode 100644 index 00000000..bd1660a1 --- /dev/null +++ b/packages/webui/paraglide/messages/exit_compare.d.ts @@ -0,0 +1,16 @@ +/** +* | output | +* | --- | +* | "Exit compare" | +* +* @param {Exit_CompareInputs} inputs +* @param {{ locale?: "en" | "zh" }} options +* @returns {LocalizedString} +*/ +export const exit_compare: ((inputs?: Exit_CompareInputs, options?: { + locale?: "en" | "zh"; +}) => LocalizedString) & import("../runtime.js").MessageMetadata; +export type LocalizedString = import("../runtime.js").LocalizedString; +export type Exit_CompareInputs = {}; diff --git a/packages/webui/paraglide/messages/exit_compare.js b/packages/webui/paraglide/messages/exit_compare.js new file mode 100644 index 00000000..925e654f --- /dev/null +++ b/packages/webui/paraglide/messages/exit_compare.js @@ -0,0 +1,29 @@ +/* eslint-disable */ +import { getLocale, experimentalStaticLocale } from '../runtime.js'; + +/** @typedef {import('../runtime.js').LocalizedString} LocalizedString */ + +/** @typedef {{}} Exit_CompareInputs */ + +const en_exit_compare = /** @type {(inputs: Exit_CompareInputs) => LocalizedString} */ () => { + return /** @type {LocalizedString} */ (`Exit compare`) +}; + +const zh_exit_compare = /** @type {(inputs: Exit_CompareInputs) => LocalizedString} */ () => { + return /** @type {LocalizedString} */ (`退出对比`) +}; + +/** +* | output | +* | --- | +* | "Exit compare" | +* +* @param {Exit_CompareInputs} inputs +* @param {{ locale?: "en" | "zh" }} options +* @returns {LocalizedString} +*/ +export const exit_compare = /** @type {((inputs?: Exit_CompareInputs, options?: { locale?: "en" | "zh" }) => LocalizedString) & import('../runtime.js').MessageMetadata} */ ((inputs = {}, options = {}) => { + const locale = experimentalStaticLocale ?? options.locale ?? getLocale() + if (locale === "en") return en_exit_compare(inputs) + return zh_exit_compare(inputs) +}); \ No newline at end of file diff --git a/packages/webui/paraglide/messages/switch_version.d.ts b/packages/webui/paraglide/messages/switch_version.d.ts new file mode 100644 index 00000000..875e3ab6 --- /dev/null +++ b/packages/webui/paraglide/messages/switch_version.d.ts @@ -0,0 +1,16 @@ +/** +* | output | +* | --- | +* | "Switch version" | +* +* @param {Switch_VersionInputs} inputs +* @param {{ locale?: "en" | "zh" }} options +* @returns {LocalizedString} +*/ +export const switch_version: ((inputs?: Switch_VersionInputs, options?: { + locale?: "en" | "zh"; +}) => LocalizedString) & import("../runtime.js").MessageMetadata; +export type LocalizedString = import("../runtime.js").LocalizedString; +export type Switch_VersionInputs = {}; diff --git a/packages/webui/paraglide/messages/switch_version.js b/packages/webui/paraglide/messages/switch_version.js new file mode 100644 index 00000000..6b1f73d6 --- /dev/null +++ b/packages/webui/paraglide/messages/switch_version.js @@ -0,0 +1,29 @@ +/* eslint-disable */ +import { getLocale, experimentalStaticLocale } from '../runtime.js'; + +/** @typedef {import('../runtime.js').LocalizedString} LocalizedString */ + +/** @typedef {{}} Switch_VersionInputs */ + +const en_switch_version = /** @type {(inputs: Switch_VersionInputs) => LocalizedString} */ () => { + return /** @type {LocalizedString} */ (`Switch version`) +}; + +const zh_switch_version = /** @type {(inputs: Switch_VersionInputs) => LocalizedString} */ () => { + return /** @type {LocalizedString} */ (`切换版本`) +}; + +/** +* | output | +* | --- | +* | "Switch version" | +* +* @param {Switch_VersionInputs} inputs +* @param {{ locale?: "en" | "zh" }} options +* @returns {LocalizedString} +*/ +export const switch_version = /** @type {((inputs?: Switch_VersionInputs, options?: { locale?: "en" | "zh" }) => LocalizedString) & import('../runtime.js').MessageMetadata} */ ((inputs = {}, options = {}) => { + const locale = experimentalStaticLocale ?? options.locale ?? getLocale() + if (locale === "en") return en_switch_version(inputs) + return zh_switch_version(inputs) +}); \ No newline at end of file diff --git a/packages/webui/routes/projects/$projectId/files/$fileId.tsx b/packages/webui/routes/projects/$projectId/files/$fileId.tsx index 7c269d03..3fcecad6 100644 --- a/packages/webui/routes/projects/$projectId/files/$fileId.tsx +++ b/packages/webui/routes/projects/$projectId/files/$fileId.tsx @@ -1,5 +1,7 @@ import { client } from '@/ui/api/client' import { FileViewer } from '@/ui/components/file-viewer' +import { CompareViewer } from '@/ui/components/compare/compare-viewer' +import { pickDefaultCompareVersions } from '@/ui/components/compare/compare-utils' import { FileViewerLeftSidebar } from '@/ui/components/file-viewer-left-sidebar' import { m } from '@/ui/paraglide/messages.js' import { FileViewerRightSidebar } from '@/ui/components/file-viewer-right-sidebar' @@ -25,6 +27,10 @@ function FileViewPage() { const versionAssetId = search.version const startTime = search.start const activeFileId = versionAssetId || fileId + const compareLeftId = search.cmpLeft + const compareRightId = search.cmpRight + const compareActiveSide = search.cmpActive ?? 'left' + const isCompareMode = !!search.compare && !!compareLeftId && !!compareRightId const videoRef = useRef(null) const { teamId, ensureTeamIdForProject } = useTeamContextStore() @@ -32,6 +38,10 @@ function FileViewPage() { const [annotations, setAnnotations] = useState([]) const [currentTime, setCurrentTime] = useState(0) const [selectedCommentId, setSelectedCommentId] = useState(null) + const [compareActiveAsset, setCompareActiveAsset] = useState(null) + const [seekRequest, setSeekRequest] = useState<{ second: number; nonce: number } | undefined>( + undefined, + ) const [carouselState, setCarouselState] = useState<{ show: boolean files: AssetInfo[] @@ -108,7 +118,7 @@ function FileViewPage() { if (!res.ok) throw new Error('Failed to fetch versions') return await res.json() }, - enabled: !!projectId && !!fileId && !!versionAssetId, + enabled: !!projectId && !!fileId && (!!versionAssetId || isCompareMode), }) const { data: projectInfo } = useQuery({ @@ -158,6 +168,24 @@ function FileViewPage() { })), }, versions: versionsDataList, + compareMode: isCompareMode, + canCompareVersions: (versionsDataList?.length ?? 0) >= 2, + onCompareVersions: () => { + const pair = pickDefaultCompareVersions(versionsDataList) + if (!pair) return + navigate({ + to: '/projects/$projectId/files/$fileId', + params: { projectId, fileId }, + search: (p: Record) => ({ + ...p, + version: undefined, + compare: true, + cmpLeft: pair.left.id, + cmpRight: pair.right.id, + cmpActive: 'left' as const, + }), + }) + }, onFolderClick: (id: string) => { navigate({ to: '/projects/$projectId/folders/$folderId', @@ -176,6 +204,7 @@ function FileViewPage() { versionsDataList, activeFileId, fileId, + isCompareMode, setProjectState, clearProjectState, navigate, @@ -270,6 +299,11 @@ function FileViewPage() { setAnnotations([]) }, [fileData?.id]) + useEffect(() => { + setSelectedCommentId(null) + setAnnotations([]) + }, [compareActiveAsset?.id]) + if (isLoading && !fileData) { return } @@ -278,23 +312,45 @@ function FileViewPage() { return
{m.file_not_found()}
} + const sidebarFile = isCompareMode ? compareActiveAsset : (fileData as unknown as AssetInfo) + const sidebarFileId = sidebarFile?.id ?? activeFileId + const handleSaveField = (fieldId: string, value: unknown) => { if (!teamId) return patchMetadata( { - param: { fileId: activeFileId }, + param: { fileId: sidebarFileId }, json: [{ key: fieldId, value }] as InferRequestType['json'], }, { onSuccess: () => { queryClient.invalidateQueries({ - queryKey: ['files', activeFileId], + queryKey: ['files', sidebarFileId], }) }, }, ) } + const updateCompareSearch = (patch: Record) => { + navigate({ + to: '/projects/$projectId/files/$fileId', + params: { projectId, fileId }, + search: (p: Record) => ({ ...p, ...patch }), + }) + } + + const handleCompareExit = () => { + const activeId = compareActiveSide === 'left' ? compareLeftId : compareRightId + updateCompareSearch({ + compare: undefined, + cmpLeft: undefined, + cmpRight: undefined, + cmpActive: undefined, + version: activeId, + }) + } + const handleCommentSelect = (comment: CommentInfo) => { setSelectedCommentId(comment.id || null) const newAnnotations = comment.annotations as Annotation[] @@ -304,6 +360,13 @@ function FileViewPage() { setAnnotations([]) } + if (isCompareMode) { + if (comment.second !== null && comment.second !== undefined) { + setSeekRequest({ second: comment.second, nonce: Date.now() }) + } + return + } + if (comment.second !== null && comment.second !== undefined) { if (videoRef.current) { videoRef.current.currentTime(comment.second) @@ -325,29 +388,50 @@ function FileViewPage() {
- {isFetching && ( + {isFetching && !isCompareMode && (
)} - - {carouselState.show && ( - - )} - + {isCompareMode && compareLeftId && compareRightId ? ( + updateCompareSearch({ cmpActive: side })} + onSwitchVersion={(side, versionId) => + updateCompareSearch( + side === 'left' ? { cmpLeft: versionId } : { cmpRight: versionId }, + ) + } + onExit={handleCompareExit} + onActiveAssetChange={setCompareActiveAsset} + onPlay={handlePlay} + onTimeUpdate={setCurrentTime} + /> + ) : ( + + {carouselState.show && ( + + )} + + )}
{ @@ -359,12 +443,13 @@ function FileViewPage() { { + if (isCompareMode) return if (videoRef.current) { videoRef.current.pause() } @@ -383,6 +468,17 @@ export const Route = createFileRoute('/projects/$projectId/files/$fileId')({ return { version: (search.version as string) || undefined, start: search.start ? Number(search.start) : undefined, - } as { version?: string; start?: number } + compare: search.compare === true || search.compare === 'true' || undefined, + cmpLeft: (search.cmpLeft as string) || undefined, + cmpRight: (search.cmpRight as string) || undefined, + cmpActive: search.cmpActive === 'right' ? 'right' : undefined, + } as { + version?: string + start?: number + compare?: boolean + cmpLeft?: string + cmpRight?: string + cmpActive?: 'left' | 'right' + } }, }) diff --git a/packages/webui/routes/share/$shareId/files/$fileId.tsx b/packages/webui/routes/share/$shareId/files/$fileId.tsx index d3098877..c68503f7 100644 --- a/packages/webui/routes/share/$shareId/files/$fileId.tsx +++ b/packages/webui/routes/share/$shareId/files/$fileId.tsx @@ -3,9 +3,19 @@ import { createFileRoute } from '@tanstack/react-router' function PublicShareFilePage() { const { shareId, fileId } = Route.useParams() - const { start } = Route.useSearch() + const { start, compare, cmpLeft, cmpRight, cmpActive } = Route.useSearch() - return + return ( + + ) } export const Route = createFileRoute('/share/$shareId/files/$fileId')({ @@ -13,6 +23,16 @@ export const Route = createFileRoute('/share/$shareId/files/$fileId')({ validateSearch: (search: Record) => { return { start: search.start ? Number(search.start) : undefined, - } as { start?: number } + compare: search.compare === true || search.compare === 'true' || undefined, + cmpLeft: (search.cmpLeft as string) || undefined, + cmpRight: (search.cmpRight as string) || undefined, + cmpActive: search.cmpActive === 'right' ? 'right' : undefined, + } as { + start?: number + compare?: boolean + cmpLeft?: string + cmpRight?: string + cmpActive?: 'left' | 'right' + } }, }) diff --git a/packages/webui/stores/top-nav.ts b/packages/webui/stores/top-nav.ts index 1e70f27d..e84af066 100644 --- a/packages/webui/stores/top-nav.ts +++ b/packages/webui/stores/top-nav.ts @@ -34,6 +34,10 @@ export interface TopNavProjectState { onFolderClick?: (folderId: string) => void isRightSidebarCollapsed?: boolean onRightSidebarToggle?: () => void + // Compare Versions + compareMode?: boolean + canCompareVersions?: boolean + onCompareVersions?: () => void } interface TopNavStore { From e2d4944060cfb12f861e20e0840ba0bbd9e8e9d5 Mon Sep 17 00:00:00 2001 From: yiling Date: Sat, 4 Jul 2026 10:49:00 +0800 Subject: [PATCH 02/12] refactor(webui): extract shared Video/Image control bars and reuse in compare Extract the video player's inline ControlBar into an exported viewers/video-control-bar.tsx (VideoControlBar + PlayerState + DisplayTranscode) and the image toolbar from file-viewer into an exported viewers/image-control-bar.tsx (ImageControlBar). video-player and file-viewer now consume the shared components with unchanged behavior. compare-control-bar composes the same two shared bars (video vs image active) with fan-out handlers, so the compare control bar can no longer drift from the single-file players (e.g. the time-format dropdown). --- .../compare/compare-control-bar.tsx | 323 ++++------------ .../components/compare/compare-viewer.tsx | 3 +- packages/webui/components/file-viewer.tsx | 59 +-- .../components/viewers/image-control-bar.tsx | 87 +++++ .../components/viewers/video-control-bar.tsx | 361 +++++++++++++++++ .../webui/components/viewers/video-player.tsx | 364 +----------------- 6 files changed, 543 insertions(+), 654 deletions(-) create mode 100644 packages/webui/components/viewers/image-control-bar.tsx create mode 100644 packages/webui/components/viewers/video-control-bar.tsx diff --git a/packages/webui/components/compare/compare-control-bar.tsx b/packages/webui/components/compare/compare-control-bar.tsx index 3e78e69a..c5e2a5f9 100644 --- a/packages/webui/components/compare/compare-control-bar.tsx +++ b/packages/webui/components/compare/compare-control-bar.tsx @@ -1,38 +1,17 @@ +import { ImageControlBar } from '@/ui/components/viewers/image-control-bar' import { - DropdownMenu, - DropdownMenuContent, - DropdownMenuItem, - DropdownMenuLabel, - DropdownMenuTrigger, -} from '@/ui/components/ui/dropdown-menu' -import { Slider } from '@/ui/components/ui/slider' -import { cn } from '@/ui/lib/utils' -import ProgressBar from '@/ui/components/viewers/progress-bar' -import { formatTime, formatTimecode } from '@/ui/components/viewers/utils' -import { useUiStore } from '@/ui/stores/ui' -import type { MediaMetadata } from '@shumai/dtos' -import { - Download, - Maximize, - Minimize, - Minus, - Pause, - Play, - Plus, - Repeat, - Settings, - Volume2, - VolumeX, -} from 'lucide-react' + VideoControlBar, + type DisplayTranscode, + type PlayerState, +} from '@/ui/components/viewers/video-control-bar' +import type { AssetInfo } from '@shumai/dtos' +import { Maximize, Minimize } from 'lucide-react' import type { PaneReportedState } from './types' -const PLAYBACK_RATES = [0.5, 1, 1.5, 2] - interface CompareControlBarProps { activeState: PaneReportedState | null + activeAsset: AssetInfo | null previewUrl?: string - metadata?: MediaMetadata - startTimecode?: string | null isFullScreen: boolean onTogglePlay: () => void onToggleLoop: () => void @@ -50,9 +29,8 @@ interface CompareControlBarProps { export function CompareControlBar({ activeState, + activeAsset, previewUrl, - metadata, - startTimecode, isFullScreen, onTogglePlay, onToggleLoop, @@ -67,230 +45,83 @@ export function CompareControlBar({ onDownload, onToggleFullScreen, }: CompareControlBarProps) { - const { videoTimeDisplayMode, setVideoTimeDisplayMode } = useUiStore() + // Active side is a video: reuse the shared VideoControlBar. + if (activeState?.kind === 'video' && activeState.video && activeAsset) { + const v = activeState.video + const duration = v.totalFrames / v.frameRate + const currentTime = v.currentFrame / v.frameRate + const state: PlayerState = { + isPlaying: v.isPlaying, + progress: duration > 0 ? (currentTime / duration) * 100 : 0, + currentTime, + duration, + volume: v.volume, + isMuted: v.isMuted, + isLooping: v.isLooping, + playbackRate: v.playbackRate, + isFullScreen, + showFrames: false, + currentResolution: v.currentResolution, + } - const fullscreenButton = ( - - ) + // The active-side asset carries the metadata used for timecode display and + // preview scrubbing; ensure the preview url is present for the shared bar. + const data = + previewUrl && !activeAsset.media?.videoPreview + ? { ...activeAsset, media: { ...activeAsset.media, videoPreview: { url: previewUrl } } } + : activeAsset - const zoomControls = ( -
- - - {Math.round((activeState?.zoom ?? 1) * 100)}% - - - -
- ) - - // Image (or unsupported) control bar - if (!activeState || activeState.kind !== 'video' || !activeState.video) { return ( -
- {activeState?.kind === 'image' && zoomControls} - {activeState?.kind === 'image' && ( - - )} - {fullscreenButton} -
+ onChangeResolution(res.resolution)} + handleDownload={(key) => onDownload(key)} + toggleFullScreen={onToggleFullScreen} + onZoomChange={(nz) => (nz >= activeState.zoom ? onZoomIn() : onZoomOut())} + onZoomReset={onFit} + frameRate={v.frameRate} + totalFrames={v.totalFrames} + currentFrame={v.currentFrame} + seekToFrame={onSeek} + /> ) } - const video = activeState.video - const displayTotalFrames = Math.max(0, video.totalFrames - 1) - const displayString = - videoTimeDisplayMode === 'frames' - ? `${video.currentFrame} / ${displayTotalFrames} fr` - : videoTimeDisplayMode === 'standard' - ? `${formatTimecode(video.currentFrame, video.frameRate, 'standard')} / ${formatTime(video.totalFrames / video.frameRate)}` - : `${formatTimecode(video.currentFrame, video.frameRate, videoTimeDisplayMode, startTimecode)} / ${formatTimecode(displayTotalFrames, video.frameRate, videoTimeDisplayMode, startTimecode)}` - - const cycleTimeDisplay = () => { - const modes: Array<'standard' | 'timecode' | 'frames'> = ['standard', 'timecode', 'frames'] - const idx = modes.indexOf(videoTimeDisplayMode as 'standard' | 'timecode' | 'frames') - setVideoTimeDisplayMode(modes[(idx + 1) % modes.length]) + // Active side is an image: reuse the shared ImageControlBar. + if (activeState?.kind === 'image') { + return ( + onDownload()} + canDownload={!!activeAsset?.media?.original?.key} + fullscreen={{ isFullScreen, onToggle: onToggleFullScreen }} + /> + ) } - const previewResolutions = video.resolutions.filter((r) => !r.isRaw) - + // Unsupported / not yet loaded: only expose fullscreen. return ( -
- -
- - - - - {/* Volume */} -
- - onVolumeChange(vals[0] ?? 0)} - className="w-20" - /> -
- - - -
- {zoomControls} - - {/* Playback rate */} - - - {video.playbackRate}x - - - {PLAYBACK_RATES.map((rate) => ( - onChangePlaybackRate(rate)} - className={cn( - 'px-2 py-1 text-xs', - video.playbackRate === rate - ? 'bg-primary text-primary-foreground' - : 'text-foreground', - )} - > - {rate}x - - ))} - - - - {/* Resolution */} - {previewResolutions.length > 0 && ( - - - - {video.currentResolution} - - - Quality - {previewResolutions.map((res) => ( - onChangeResolution(res.resolution)} - className={cn( - 'flex w-full items-center justify-between', - video.currentResolution === res.resolution - ? 'font-medium text-primary' - : 'text-foreground', - )} - > - {res.resolution} - - {res.width}x{res.height} - - - ))} - - - )} - - {/* Download */} - - - - - - Download - {video.resolutions.map((res) => ( - onDownload(res.key)} - className="flex w-full items-center justify-between px-3 py-2 text-sm text-foreground" - > - {res.resolution} - {res.isRaw ? 'RAW' : 'MP4'} - - ))} - - - - {fullscreenButton} -
-
+
+
) } diff --git a/packages/webui/components/compare/compare-viewer.tsx b/packages/webui/components/compare/compare-viewer.tsx index 89747c23..9c8daaff 100644 --- a/packages/webui/components/compare/compare-viewer.tsx +++ b/packages/webui/components/compare/compare-viewer.tsx @@ -334,9 +334,8 @@ export function CompareViewer({
{/* Zoom Toolbar */} -
-
- - - {Math.round(zoom * 100)}% - - -
- - - -
+ handleZoom(1.2)} + onZoomOut={() => handleZoom(0.8)} + onFit={handleFit} + onDownload={handleDownload} + canDownload={!!file.media?.original?.key} + onCopy={handleCopy} + copied={copied} + canCopy={!!bestUrl} + /> )} {isVideo && ( diff --git a/packages/webui/components/viewers/image-control-bar.tsx b/packages/webui/components/viewers/image-control-bar.tsx new file mode 100644 index 00000000..d4d52c68 --- /dev/null +++ b/packages/webui/components/viewers/image-control-bar.tsx @@ -0,0 +1,87 @@ +import { Check, Copy, Download, Maximize, Minimize, Minus, Plus } from 'lucide-react' + +export interface ImageControlBarProps { + zoom: number + onZoomIn: () => void + onZoomOut: () => void + onFit: () => void + onDownload: () => void + canDownload: boolean + onCopy?: () => void + copied?: boolean + canCopy?: boolean + /** When provided, renders a fullscreen toggle (used by compare mode). */ + fullscreen?: { isFullScreen: boolean; onToggle: () => void } +} + +export function ImageControlBar({ + zoom, + onZoomIn, + onZoomOut, + onFit, + onDownload, + canDownload, + onCopy, + copied = false, + canCopy = true, + fullscreen, +}: ImageControlBarProps) { + return ( +
+
+ + + {Math.round(zoom * 100)}% + + +
+ + {onCopy && ( + + )} + + {fullscreen && ( + + )} +
+ ) +} diff --git a/packages/webui/components/viewers/video-control-bar.tsx b/packages/webui/components/viewers/video-control-bar.tsx new file mode 100644 index 00000000..238fcb14 --- /dev/null +++ b/packages/webui/components/viewers/video-control-bar.tsx @@ -0,0 +1,361 @@ +import { cn } from '@/ui/lib/utils' +import { useUiStore } from '@/ui/stores/ui' +import type { AssetInfo, VideoTranscode } from '@shumai/dtos' +import { + Check, + ChevronDown, + Download, + Maximize, + Minimize, + Minus, + Pause, + Play, + Plus, + Repeat, + Settings, + Volume2, + VolumeX, +} from 'lucide-react' +import React from 'react' +import { + DropdownMenu, + DropdownMenuContent, + DropdownMenuItem, + DropdownMenuLabel, + DropdownMenuTrigger, +} from '../ui/dropdown-menu' +import { Slider } from '../ui/slider' +import ProgressBar from './progress-bar' +import { formatTime, formatTimecode } from './utils' + +export interface PlayerState { + isPlaying: boolean + progress: number // 0 to 100 + currentTime: number + duration: number + volume: number + isMuted: boolean + isLooping: boolean + playbackRate: number + isFullScreen: boolean + showFrames: boolean // Toggle between time (02:30) and frames (1234) + currentResolution: string // 'Original' or '720p', '480p' etc. + currentSrc?: string +} + +export type DisplayTranscode = VideoTranscode & { resolution: string } + +export interface ControlBarProps { + state: PlayerState + zoom: number + isControlsVisible: boolean + buffered: number + data: AssetInfo + resolutions: DisplayTranscode[] + togglePlay: () => void + toggleLoop: () => void + toggleMute: () => void + handleVolumeChange: (newVolume: number) => void + changePlaybackRate: (rate: number) => void + changeResolution: (res: DisplayTranscode) => void + handleDownload: (key: string) => void + toggleFullScreen: () => void + onZoomChange: (zoom: number) => void + onZoomReset: () => void + // Frame-accurate props + frameRate: number + totalFrames: number + currentFrame: number + seekToFrame: (frame: number) => Promise | void +} + +export const VideoControlBar: React.FC = ({ + state, + zoom, + isControlsVisible, + buffered, + data, + resolutions, + togglePlay, + toggleLoop, + toggleMute, + handleVolumeChange, + changePlaybackRate, + changeResolution, + handleDownload, + toggleFullScreen, + onZoomChange, + onZoomReset, + frameRate, + totalFrames, + currentFrame, + seekToFrame, +}) => { + const { videoTimeDisplayMode, setVideoTimeDisplayMode } = useUiStore() + + if (!data.media?.metadata) { + return null + } + + const previewResolutions = resolutions.filter((r) => !r.isRaw) + + const startTimecode = data.media?.metadata?.startTimecode + const displayTotalFrames = Math.max(0, totalFrames - 1) + const displayString = + videoTimeDisplayMode === 'frames' + ? `${currentFrame} / ${displayTotalFrames} fr` + : videoTimeDisplayMode === 'standard' + ? `${formatTimecode(currentFrame, frameRate, 'standard')} / ${formatTime(totalFrames / frameRate)}` + : `${formatTimecode(currentFrame, frameRate, videoTimeDisplayMode, startTimecode)} / ${formatTimecode(displayTotalFrames, frameRate, videoTimeDisplayMode, startTimecode)}` + + return ( +
+ {/* Progress Bar */} +
+ +
+ + {/* Lower Controls Row */} +
+ {/* Left Side: Play, Vol, Time */} +
+ + + + +
+ + +
+
+ handleVolumeChange(v[0])} + max={1} + step={0.05} + /> +
+
+
+ +
+ + {displayString} + + + + + + + + Format + + setVideoTimeDisplayMode('standard')} + className="flex items-center justify-between cursor-pointer text-xs" + > + Standard Time + {videoTimeDisplayMode === 'standard' && ( + + )} + + setVideoTimeDisplayMode('frames')} + className="flex items-center justify-between cursor-pointer text-xs" + > + Frames + {videoTimeDisplayMode === 'frames' && ( + + )} + + setVideoTimeDisplayMode('timecode')} + className="flex items-center justify-between cursor-pointer text-xs" + > + Timecode + {videoTimeDisplayMode === 'timecode' && ( + + )} + + + +
+
+ + {/* Right Side: Zoom, Speed, Res, Download, Fullscreen */} +
+ {/* Zoom Controls */} +
+
+ + + {Math.round(zoom * 100)}% + + +
+ +
+ + {/* Playback Rate */} + + + + + + {[0.5, 1, 1.5, 2].map((rate) => ( + changePlaybackRate(rate)} + className={cn( + 'rounded py-1 px-2 text-left text-xs', + state.playbackRate === rate + ? 'bg-primary text-primary-foreground focus:bg-primary focus:text-primary-foreground' + : 'text-foreground', + )} + > + {rate}x + + ))} + + + + {/* Resolution Selector */} + + + + + + + Quality + {previewResolutions.map((res) => ( + changeResolution(res)} + className={cn( + 'flex w-full items-center justify-between', + state.currentResolution === res.resolution + ? 'text-primary font-medium' + : 'text-foreground', + )} + > + {res.resolution} + + {res.width}x{res.height} + + + ))} + + + + {/* Download */} + + + + + + Download + {resolutions.map((res) => ( + handleDownload(res.key ?? '')} + className="flex w-full items-center justify-between px-3 py-2 text-left text-sm text-foreground" + > + {res.resolution} + + {res.isRaw ? data.name?.split('.').pop()?.toUpperCase() || 'RAW' : 'MP4'} + + + ))} + + + + {/* Fullscreen */} + +
+
+
+ ) +} diff --git a/packages/webui/components/viewers/video-player.tsx b/packages/webui/components/viewers/video-player.tsx index 2a01cfab..02ffec3f 100644 --- a/packages/webui/components/viewers/video-player.tsx +++ b/packages/webui/components/viewers/video-player.tsx @@ -1,56 +1,17 @@ -import type { AssetInfo, VideoTranscode } from '@shumai/dtos' +import type { AssetInfo } from '@shumai/dtos' import { client } from '@/ui/api/client' import { cn } from '@/ui/lib/utils' -import { - Check, - ChevronDown, - Download, - Maximize, - Minimize, - Minus, - Pause, - Play, - Plus, - Repeat, - Settings, - Volume2, - VolumeX, -} from 'lucide-react' +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 { - DropdownMenu, - DropdownMenuContent, - DropdownMenuItem, - DropdownMenuLabel, - DropdownMenuTrigger, -} from '../ui/dropdown-menu' -import { Slider } from '../ui/slider' -import ProgressBar from './progress-bar' -import { formatTimecode, formatTime } from './utils' import { useFramePlayer } from './use-frame-player' -import { useUiStore } from '@/ui/stores/ui' +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' -export interface PlayerState { - isPlaying: boolean - progress: number // 0 to 100 - currentTime: number - duration: number - volume: number - isMuted: boolean - isLooping: boolean - playbackRate: number - isFullScreen: boolean - showFrames: boolean // Toggle between time (02:30) and frames (1234) - currentResolution: string // 'Original' or '720p', '480p' etc. - currentSrc?: string -} - interface VideoPlayerProps { data: AssetInfo playerRef?: React.RefObject @@ -63,323 +24,6 @@ interface VideoPlayerProps { children?: React.ReactNode } -type DisplayTranscode = VideoTranscode & { resolution: string } - -interface ControlBarProps { - state: PlayerState - zoom: number - isControlsVisible: boolean - buffered: number - data: AssetInfo - resolutions: DisplayTranscode[] - togglePlay: () => void - toggleLoop: () => void - toggleMute: () => void - handleVolumeChange: (newVolume: number) => void - changePlaybackRate: (rate: number) => void - changeResolution: (res: DisplayTranscode) => void - handleDownload: (key: string) => void - toggleFullScreen: () => void - onZoomChange: (zoom: number) => void - onZoomReset: () => void - // Frame-accurate props - frameRate: number - totalFrames: number - currentFrame: number - seekToFrame: (frame: number) => Promise -} - -const ControlBar: React.FC = ({ - state, - zoom, - isControlsVisible, - buffered, - data, - resolutions, - togglePlay, - toggleLoop, - toggleMute, - handleVolumeChange, - changePlaybackRate, - changeResolution, - handleDownload, - toggleFullScreen, - onZoomChange, - onZoomReset, - frameRate, - totalFrames, - currentFrame, - seekToFrame, -}) => { - if (!data.media?.metadata) { - return null - } - - const previewResolutions = resolutions.filter((r) => !r.isRaw) - - const { videoTimeDisplayMode, setVideoTimeDisplayMode } = useUiStore() - - const startTimecode = data.media?.metadata?.startTimecode - const displayTotalFrames = Math.max(0, totalFrames - 1) - const displayString = - videoTimeDisplayMode === 'frames' - ? `${currentFrame} / ${displayTotalFrames} fr` - : videoTimeDisplayMode === 'standard' - ? `${formatTimecode(currentFrame, frameRate, 'standard')} / ${formatTime(totalFrames / frameRate)}` - : `${formatTimecode(currentFrame, frameRate, videoTimeDisplayMode, startTimecode)} / ${formatTimecode(displayTotalFrames, frameRate, videoTimeDisplayMode, startTimecode)}` - - return ( -
- {/* Progress Bar */} -
- -
- - {/* Lower Controls Row */} -
- {/* Left Side: Play, Vol, Time */} -
- - - - -
- - -
-
- handleVolumeChange(v[0])} - max={1} - step={0.05} - /> -
-
-
- -
- - {displayString} - - - - - - - - Format - - setVideoTimeDisplayMode('standard')} - className="flex items-center justify-between cursor-pointer text-xs" - > - Standard Time - {videoTimeDisplayMode === 'standard' && ( - - )} - - setVideoTimeDisplayMode('frames')} - className="flex items-center justify-between cursor-pointer text-xs" - > - Frames - {videoTimeDisplayMode === 'frames' && ( - - )} - - setVideoTimeDisplayMode('timecode')} - className="flex items-center justify-between cursor-pointer text-xs" - > - Timecode - {videoTimeDisplayMode === 'timecode' && ( - - )} - - - -
-
- - {/* Right Side: Zoom, Speed, Res, Download, Fullscreen */} -
- {/* Zoom Controls */} -
-
- - - {Math.round(zoom * 100)}% - - -
- -
- - {/* Playback Rate */} - - - - - - {[0.5, 1, 1.5, 2].map((rate) => ( - changePlaybackRate(rate)} - className={cn( - 'rounded py-1 px-2 text-left text-xs', - state.playbackRate === rate - ? 'bg-primary text-primary-foreground focus:bg-primary focus:text-primary-foreground' - : 'text-foreground', - )} - > - {rate}x - - ))} - - - - {/* Resolution Selector */} - - - - - - - Quality - {previewResolutions.map((res) => ( - changeResolution(res)} - className={cn( - 'flex w-full items-center justify-between', - state.currentResolution === res.resolution - ? 'text-primary font-medium' - : 'text-foreground', - )} - > - {res.resolution} - - {res.width}x{res.height} - - - ))} - - - - {/* Download */} - - - - - - Download - {resolutions.map((res) => ( - handleDownload(res.key ?? '')} - className="flex w-full items-center justify-between px-3 py-2 text-left text-sm text-foreground" - > - {res.resolution} - - {res.isRaw ? data.name?.split('.').pop()?.toUpperCase() || 'RAW' : 'MP4'} - - - ))} - - - - {/* Fullscreen */} - -
-
-
- ) -} - const VideoPlayer: React.FC = ({ data, playerRef: passedPlayerRef, @@ -958,7 +602,7 @@ const VideoPlayer: React.FC = ({
- Date: Sat, 4 Jul 2026 10:56:55 +0800 Subject: [PATCH 03/12] fix(webui): clicking an inactive compare pane only activates it Previously clicking a non-active video pane both switched the active version and toggled playback. Now a click on an inactive pane only makes it active; play/pause is only toggled when clicking the already-active pane. --- packages/webui/components/compare/compare-video-pane.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/webui/components/compare/compare-video-pane.tsx b/packages/webui/components/compare/compare-video-pane.tsx index b4d418e5..0019f43d 100644 --- a/packages/webui/components/compare/compare-video-pane.tsx +++ b/packages/webui/components/compare/compare-video-pane.tsx @@ -407,9 +407,13 @@ export const CompareVideoPane = forwardRef { if (useAnnotationStore.getState().isDrawing) return - onActivate?.() + // Clicking an inactive pane only activates it; playback is untouched. + if (!isActive) { + onActivate?.() + return + } onRequestTogglePlay?.() - }, [onActivate, onRequestTogglePlay]) + }, [isActive, onActivate, onRequestTogglePlay]) if (!file.media?.original?.downloadUrl || !metadata) { return ( From a4e25db0f765c9946e51ad4a457cf8514c2e5256 Mon Sep 17 00:00:00 2001 From: yiling Date: Sat, 4 Jul 2026 11:16:35 +0800 Subject: [PATCH 04/12] style(webui): emphasize active compare pane topbar The active version's topbar now uses an inverted bar (bg-foreground / text-background) so it reads as black background with white text in the light theme, while the inactive pane keeps the card background with muted text. Filename/version text color now differs between active and inactive panes. --- .../compare/compare-pane-topbar.tsx | 35 +++++++++++++------ .../components/compare/compare-viewer.tsx | 4 +-- 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/packages/webui/components/compare/compare-pane-topbar.tsx b/packages/webui/components/compare/compare-pane-topbar.tsx index e0baa547..e6d7544c 100644 --- a/packages/webui/components/compare/compare-pane-topbar.tsx +++ b/packages/webui/components/compare/compare-pane-topbar.tsx @@ -40,12 +40,15 @@ export function ComparePaneTopbar({ onSwitchVersion, onExit, }: ComparePaneTopbarProps) { + const iconButtonClass = cn( + 'flex-shrink-0 rounded p-1 transition-colors', + isActive + ? 'text-background/70 hover:bg-background/20 hover:text-background' + : 'text-muted-foreground hover:bg-accent hover:text-foreground', + ) + const exitButton = ( - ) @@ -53,11 +56,21 @@ export function ComparePaneTopbar({ const label = (
From aeaff3bc88f986c1a52f8038758d421886ea3b76 Mon Sep 17 00:00:00 2001 From: yiling Date: Sat, 4 Jul 2026 12:28:08 +0800 Subject: [PATCH 07/12] feat(webui): compare fullscreen control bar follows app theme Add a themedChrome prop to VideoControlBar that keeps the normal theme-aware chrome (bg-card / foreground text) while fullscreen instead of the dark video overlay. Compare mode passes it so its fullscreen bar matches the app light/dark theme for both video- and image-active panes (ImageControlBar is already themed). The single-file player is unchanged (themedChrome defaults to false -> dark overlay). The fullscreen toggle icon still reflects the actual fullscreen state. --- .../compare/compare-control-bar.tsx | 1 + .../components/viewers/video-control-bar.tsx | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/packages/webui/components/compare/compare-control-bar.tsx b/packages/webui/components/compare/compare-control-bar.tsx index c5e2a5f9..1f5fb776 100644 --- a/packages/webui/components/compare/compare-control-bar.tsx +++ b/packages/webui/components/compare/compare-control-bar.tsx @@ -76,6 +76,7 @@ export function CompareControlBar({ state={state} zoom={activeState.zoom} isControlsVisible + themedChrome buffered={v.buffered} data={data} resolutions={v.resolutions as DisplayTranscode[]} diff --git a/packages/webui/components/viewers/video-control-bar.tsx b/packages/webui/components/viewers/video-control-bar.tsx index 7ae29892..4d99d337 100644 --- a/packages/webui/components/viewers/video-control-bar.tsx +++ b/packages/webui/components/viewers/video-control-bar.tsx @@ -67,6 +67,12 @@ export interface ControlBarProps { totalFrames: number currentFrame: number seekToFrame: (frame: number) => Promise | void + /** + * When true, keep the normal theme-aware chrome (bg-card / foreground text) + * even while fullscreen, instead of the dark video overlay style. Used by + * compare mode so its fullscreen bar follows the app light/dark theme. + */ + themedChrome?: boolean } export const VideoControlBar: React.FC = ({ @@ -90,6 +96,7 @@ export const VideoControlBar: React.FC = ({ totalFrames, currentFrame, seekToFrame, + themedChrome = false, }) => { const { videoTimeDisplayMode, setVideoTimeDisplayMode } = useUiStore() @@ -97,6 +104,10 @@ export const VideoControlBar: React.FC = ({ return null } + // Whether to render the dark video overlay chrome. Compare mode opts out + // (themedChrome) so its fullscreen bar follows the app light/dark theme. + const overlay = state.isFullScreen && !themedChrome + const previewResolutions = resolutions.filter((r) => !r.isRaw) const startTimecode = data.media?.metadata?.startTimecode @@ -112,7 +123,7 @@ export const VideoControlBar: React.FC = ({
= ({
{/* Left Side: Play, Vol, Time */} @@ -244,7 +255,7 @@ export const VideoControlBar: React.FC = ({
diff --git a/packages/webui/components/viewers/video-player.tsx b/packages/webui/components/viewers/video-player.tsx index 02ffec3f..7ea029f2 100644 --- a/packages/webui/components/viewers/video-player.tsx +++ b/packages/webui/components/viewers/video-player.tsx @@ -40,6 +40,7 @@ const VideoPlayer: React.FC = ({ // 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 [videoHtmlEl, setVideoHtmlEl] = useState(undefined) @@ -488,9 +489,9 @@ const VideoPlayer: React.FC = ({ } const toggleFullScreen = () => { - if (!containerRef.current) return + if (!rootRef.current) return if (!document.fullscreenElement) { - containerRef.current.requestFullscreen() + rootRef.current.requestFullscreen() setState((prev) => ({ ...prev, isFullScreen: true })) } else { document.exitFullscreen() @@ -543,6 +544,7 @@ const VideoPlayer: React.FC = ({ return (
Date: Sat, 4 Jul 2026 13:04:25 +0800 Subject: [PATCH 09/12] fix(webui): auto-hide fullscreen controls on idle regardless of play state The fullscreen control bar only auto-hid while playing, and a separate effect force-showed it whenever paused, so it stayed visible permanently when paused in fullscreen. Now in fullscreen the bar shows on cursor move and hides after the cursor is idle (~2s) whether playing or paused; windowed mode keeps the bar always visible. --- .../webui/components/viewers/video-player.tsx | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/webui/components/viewers/video-player.tsx b/packages/webui/components/viewers/video-player.tsx index 7ea029f2..54b16fe8 100644 --- a/packages/webui/components/viewers/video-player.tsx +++ b/packages/webui/components/viewers/video-player.tsx @@ -348,22 +348,22 @@ const VideoPlayer: React.FC = ({ clearTimeout(controlsTimeoutRef.current) } - // Only set auto-hide timer if we are in fullscreen and playing - // If paused, controls should remain visible so user can see what to do - if (state.isFullScreen && state.isPlaying) { + // In fullscreen, hide the controls after the cursor stays idle, regardless + // of play/pause (YouTube-style). In windowed mode controls stay visible. + if (state.isFullScreen) { controlsTimeoutRef.current = setTimeout(() => { setIsControlsVisible(false) }, 2000) } - }, [state.isFullScreen, state.isPlaying]) + }, [state.isFullScreen]) const handleMouseLeave = useCallback(() => { - // If we leave the player area in fullscreen, hide controls (optional preference, usually good) - if (state.isFullScreen && state.isPlaying) { + // If the cursor leaves the player while fullscreen, hide the controls. + if (state.isFullScreen) { if (controlsTimeoutRef.current) clearTimeout(controlsTimeoutRef.current) setIsControlsVisible(false) } - }, [state.isFullScreen, state.isPlaying]) + }, [state.isFullScreen]) // Clean up timeout on unmount or state change useEffect(() => { @@ -372,13 +372,13 @@ const VideoPlayer: React.FC = ({ } }, []) - // Ensure controls are visible when pausing or entering fullscreen initially + // 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.isPlaying) { + if (!state.isFullScreen) { setIsControlsVisible(true) if (controlsTimeoutRef.current) clearTimeout(controlsTimeoutRef.current) } else { - // If we just started playing (or re-entered playing state), trigger the timer logic handleMouseMove() } }, [state.isPlaying, state.isFullScreen, handleMouseMove]) From c793e0dd788d46fc9a2c7f0e408bdfc7d1fed665 Mon Sep 17 00:00:00 2001 From: yiling Date: Sat, 4 Jul 2026 13:15:52 +0800 Subject: [PATCH 10/12] fix(webui): keep fullscreen controls visible while cursor is over them Track when the cursor is over the control bar (VideoControlBar now forwards mouse enter/leave) and skip the idle-hide timer while it is, so the bar no longer disappears when the cursor rests on it. Also reduce the fullscreen auto-hide delay from 2s to 1.2s. --- .../components/viewers/video-control-bar.tsx | 7 ++++ .../webui/components/viewers/video-player.tsx | 33 ++++++++++++++----- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/packages/webui/components/viewers/video-control-bar.tsx b/packages/webui/components/viewers/video-control-bar.tsx index f1838b1e..28436447 100644 --- a/packages/webui/components/viewers/video-control-bar.tsx +++ b/packages/webui/components/viewers/video-control-bar.tsx @@ -73,6 +73,9 @@ export interface ControlBarProps { * stays in-flow. Colors are always theme-aware regardless of this flag. */ floatOverlayInFullScreen?: boolean + /** Fired when the cursor enters/leaves the bar (used to pin it visible). */ + onMouseEnter?: () => void + onMouseLeave?: () => void } export const VideoControlBar: React.FC = ({ @@ -97,6 +100,8 @@ export const VideoControlBar: React.FC = ({ currentFrame, seekToFrame, floatOverlayInFullScreen = true, + onMouseEnter, + onMouseLeave, }) => { const { videoTimeDisplayMode, setVideoTimeDisplayMode } = useUiStore() @@ -130,6 +135,8 @@ export const VideoControlBar: React.FC = ({ ? 'opacity-100 translate-y-0' : 'opacity-0 translate-y-4 pointer-events-none', )} + onMouseEnter={onMouseEnter} + onMouseLeave={onMouseLeave} > {/* Progress Bar */}
diff --git a/packages/webui/components/viewers/video-player.tsx b/packages/webui/components/viewers/video-player.tsx index 54b16fe8..3d7d69f5 100644 --- a/packages/webui/components/viewers/video-player.tsx +++ b/packages/webui/components/viewers/video-player.tsx @@ -42,6 +42,7 @@ const VideoPlayer: React.FC = ({ 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) @@ -340,23 +341,35 @@ const VideoPlayer: React.FC = ({ } }, [startTime, frameRate, seekToFrame, isPlayerReady]) - const handleMouseMove = useCallback(() => { - // Always show controls on movement - setIsControlsVisible(true) - + const scheduleHide = useCallback(() => { if (controlsTimeoutRef.current) { clearTimeout(controlsTimeoutRef.current) } - - // In fullscreen, hide the controls after the cursor stays idle, regardless - // of play/pause (YouTube-style). In windowed mode controls stay visible. - if (state.isFullScreen) { + // Never hide while the cursor rests over the control bar itself. + if (state.isFullScreen && !isOverControlsRef.current) { controlsTimeoutRef.current = setTimeout(() => { setIsControlsVisible(false) - }, 2000) + }, 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) { @@ -625,6 +638,8 @@ const VideoPlayer: React.FC = ({ totalFrames={totalFrames} currentFrame={currentFrame} seekToFrame={seekToFrame} + onMouseEnter={handleControlsMouseEnter} + onMouseLeave={handleControlsMouseLeave} />
) From 0bbb846beb6f8aed8cc2f465f757f7aaa78ed64b Mon Sep 17 00:00:00 2001 From: yiling Date: Sat, 4 Jul 2026 15:22:38 +0800 Subject: [PATCH 11/12] fix(webui): support version switching on public share (no login redirect) Switching a version in the public share breadcrumb navigated to the authenticated /projects/:id/files/:id route, which triggered the authenticated /api/projects/:id/team call (via resolveTeamIdFromPath) -> 401 -> redirect to login. - breadcrumb handleVersionClick now routes to /share/:shareId/files/:id with a version search param when public. - public share route gains a version param; PublicShareManager fetches the stack asset (for the version list) and the active version child asset (for display/comments/fields), mirroring the authenticated page. - compare exit sets version to the active side for parity. --- packages/webui/components/breadcrumb-nav.tsx | 11 ++++- .../webui/components/public-share-manager.tsx | 47 ++++++++++++++++--- .../routes/share/$shareId/files/$fileId.tsx | 5 +- 3 files changed, 54 insertions(+), 9 deletions(-) diff --git a/packages/webui/components/breadcrumb-nav.tsx b/packages/webui/components/breadcrumb-nav.tsx index c34a8076..d3e3581a 100644 --- a/packages/webui/components/breadcrumb-nav.tsx +++ b/packages/webui/components/breadcrumb-nav.tsx @@ -94,7 +94,16 @@ export function BreadcrumbNav({ const { canEdit } = usePermissions(projectId) const handleVersionClick = (versionId: string) => { - if (!projectId || !fileId) return + if (!fileId) return + if (isPublic && shareId) { + navigate({ + to: '/share/$shareId/files/$fileId', + params: { shareId, fileId }, + search: (prev: Record) => ({ ...prev, version: versionId }), + }) + return + } + if (!projectId) return navigate({ to: '/projects/$projectId/files/$fileId', params: { projectId, fileId }, diff --git a/packages/webui/components/public-share-manager.tsx b/packages/webui/components/public-share-manager.tsx index c1c2d542..cea7ab65 100644 --- a/packages/webui/components/public-share-manager.tsx +++ b/packages/webui/components/public-share-manager.tsx @@ -28,6 +28,7 @@ interface PublicShareManagerProps { initialFolderId?: string initialFileId?: string startTime?: number + versionId?: string compare?: boolean compareLeftId?: string compareRightId?: string @@ -52,6 +53,7 @@ export function PublicShareManager({ initialFolderId, initialFileId, startTime, + versionId, compare, compareLeftId, compareRightId, @@ -98,6 +100,9 @@ export function PublicShareManager({ const currentFolderId = initialFolderId || shareInfo?.rootFolderId const viewingFileId = initialFileId || null + // The stack asset is always fetched by the route file id; when a version is + // selected we additionally display that version child asset. + const activeFileId = versionId || viewingFileId const [ancestorFolders, setAncestorFolders] = useState([]) @@ -229,7 +234,7 @@ export function PublicShareManager({ enabled: !!shareInfo, }) - const { data: viewingFileData, isLoading: isViewingFileLoading } = useQuery({ + const { data: stackFileData, isLoading: isStackFileLoading } = useQuery({ queryKey: ['public-share-file', shareId, viewingFileId, password], queryFn: async () => { const res = await client.api.shares[':shareId'].files[':fileId'].$get( @@ -248,6 +253,30 @@ export function PublicShareManager({ enabled: !!viewingFileId && !!shareInfo, }) + const { data: versionFileData, isLoading: isVersionFileLoading } = useQuery({ + queryKey: ['public-share-file', shareId, versionId, password], + queryFn: async () => { + const res = await client.api.shares[':shareId'].files[':fileId'].$get( + { + param: { shareId, fileId: versionId! }, + }, + { + headers: { + 'x-share-password': password, + }, + }, + ) + if (res.status === 401) throw new Error('Unauthorized') + return (await res.json()) as unknown as AssetInfo + }, + enabled: !!versionId && !!shareInfo, + }) + + // The stack asset provides the version list; the active asset (version child + // or the stack itself) is what we actually display. + const viewingFileData = versionId ? versionFileData : stackFileData + const isViewingFileLoading = isStackFileLoading || (!!versionId && isVersionFileLoading) + useEffect(() => { if (foldersError?.message === 'Unauthorized') { setPassword('') @@ -356,11 +385,13 @@ export function PublicShareManager({ } const handleCompareExit = () => { + const activeId = compareActiveSide === 'left' ? compareLeftId : compareRightId updateCompareSearch({ compare: undefined, cmpLeft: undefined, cmpRight: undefined, cmpActive: undefined, + version: activeId, }) } @@ -381,9 +412,9 @@ export function PublicShareManager({ currentAsset: { name: viewingFileData?.name || currentFolderName, type: viewingFileId ? 'file' : 'folder', - version: viewingFileData?.versionStack - ? (viewingFileData.versionStack.versions.find((v) => v.id === viewingFileData.id) - ?.version ?? viewingFileData.versionStack.versions.length) + version: stackFileData?.versionStack + ? (stackFileData.versionStack.versions.find((v) => v.id === activeFileId)?.version ?? + stackFileData.versionStack.versions.length) : undefined, }, isRootFolder: currentFolderId === shareInfo.rootFolderId && !viewingFileId, @@ -404,11 +435,11 @@ export function PublicShareManager({ onFolderClick: handleBreadcrumbClick, isRightSidebarCollapsed, onRightSidebarToggle: () => setIsRightSidebarCollapsed((prev) => !prev), - versions: viewingFileData?.versionStack?.versions, + versions: stackFileData?.versionStack?.versions, compareMode: isCompareMode, - canCompareVersions: (viewingFileData?.versionStack?.versions?.length ?? 0) >= 2, + canCompareVersions: (stackFileData?.versionStack?.versions?.length ?? 0) >= 2, onCompareVersions: () => { - const pair = pickDefaultCompareVersions(viewingFileData?.versionStack?.versions) + const pair = pickDefaultCompareVersions(stackFileData?.versionStack?.versions) if (!pair || !viewingFileId) return navigate({ to: '/share/$shareId/files/$fileId', @@ -431,6 +462,8 @@ export function PublicShareManager({ currentFolderId, folders, viewingFileData, + stackFileData, + activeFileId, viewingFileId, ancestorFolders, setProjectState, diff --git a/packages/webui/routes/share/$shareId/files/$fileId.tsx b/packages/webui/routes/share/$shareId/files/$fileId.tsx index c68503f7..c21c81e6 100644 --- a/packages/webui/routes/share/$shareId/files/$fileId.tsx +++ b/packages/webui/routes/share/$shareId/files/$fileId.tsx @@ -3,13 +3,14 @@ import { createFileRoute } from '@tanstack/react-router' function PublicShareFilePage() { const { shareId, fileId } = Route.useParams() - const { start, compare, cmpLeft, cmpRight, cmpActive } = Route.useSearch() + const { start, version, compare, cmpLeft, cmpRight, cmpActive } = Route.useSearch() return ( ) => { return { start: search.start ? Number(search.start) : undefined, + version: (search.version as string) || undefined, compare: search.compare === true || search.compare === 'true' || undefined, cmpLeft: (search.cmpLeft as string) || undefined, cmpRight: (search.cmpRight as string) || undefined, cmpActive: search.cmpActive === 'right' ? 'right' : undefined, } as { start?: number + version?: string compare?: boolean cmpLeft?: string cmpRight?: string From ba88cdad78bceff9e6b5e1e7e4fab7f97c7e7c37 Mon Sep 17 00:00:00 2001 From: yiling Date: Sat, 4 Jul 2026 15:29:07 +0800 Subject: [PATCH 12/12] fix(webui): sync compare video pane resolution/source on asset change currentResolution state and currentSrcRef were only initialized on mount, so if file.id changed without a remount the video.js init effect (keyed on file.id) would re-create the player with a stale source. Add an effect that resets them when file.id changes, before the init effect runs, making the pane robust even without a per-asset key on the parent. --- packages/webui/components/compare/compare-video-pane.tsx | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/webui/components/compare/compare-video-pane.tsx b/packages/webui/components/compare/compare-video-pane.tsx index 0019f43d..1a4d9bfd 100644 --- a/packages/webui/components/compare/compare-video-pane.tsx +++ b/packages/webui/components/compare/compare-video-pane.tsx @@ -153,6 +153,15 @@ export const CompareVideoPane = forwardRef { + setCurrentResolution(initialRes?.resolution ?? 'Original') + currentSrcRef.current = initialRes?.url + }, [file.id]) + // Initialize video.js useEffect(() => { if (!videoContainerRef.current) return