From d957ab2339ba8d1ceec2f10a25de087d329ca7bc Mon Sep 17 00:00:00 2001 From: Yiling-J Date: Tue, 20 Oct 2026 17:39:40 +0800 Subject: [PATCH] fix(webui): fix loading skeleton layout mismatches and keep left carousel visible (#485) * fix(webui): fix loading skeleton layout mismatches and keep left carousel visible * fix(webui): update mobile file list skeleton to match card layout * fix(webui): blur video poster before playback with instant cut on play * docs: consolidate webui changelog entries into single line --- CHANGELOG.md | 1 + .../file-viewer-left-sidebar.test.tsx | 34 +++ .../components/file-viewer-left-sidebar.tsx | 79 ++++--- .../components/loading-skeletons.test.tsx | 38 ++++ .../webui/components/loading-skeletons.tsx | 197 +++++++++--------- packages/webui/components/top-nav.test.tsx | 84 ++++++++ packages/webui/components/top-nav.tsx | 28 ++- .../viewers/video/compare-video-pane.test.tsx | 9 + .../viewers/video/compare-video-pane.tsx | 7 +- .../viewers/video/video-viewer.test.tsx | 11 +- .../components/viewers/video/video-viewer.tsx | 7 +- .../$projectId/files/$fileId.lazy.tsx | 56 ++--- .../projects/$projectId/files/$fileId.tsx | 2 + 13 files changed, 386 insertions(+), 167 deletions(-) create mode 100644 packages/webui/components/loading-skeletons.test.tsx create mode 100644 packages/webui/components/top-nav.test.tsx diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a29aee3..5d215fe6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). ### Fixed * **transcode**: Fix an issue where PDF, 3D model, and image background transcode workflows could fail with missing temporary file errors if a worker restarted or recovered midway through processing +* **webui**: Improve file list and detail loading with matching skeleton layouts, a persistent sidebar carousel to eliminate layout shift, and smoothed video poster previews ### Changed diff --git a/packages/webui/components/file-viewer-left-sidebar.test.tsx b/packages/webui/components/file-viewer-left-sidebar.test.tsx index 4778ceb2..494ce758 100644 --- a/packages/webui/components/file-viewer-left-sidebar.test.tsx +++ b/packages/webui/components/file-viewer-left-sidebar.test.tsx @@ -227,4 +227,38 @@ describe('FileViewerLeftSidebar', () => { expect(agentBadge?.getAttribute('title')).toBe('DrawBot') expect(agentBadge?.textContent).toBe('AI') }) + + it('renders thumbnail skeletons when isLoading is true and initialFiles is empty', () => { + const { container } = render( + , + ) + + const skeletons = container.querySelectorAll('[data-testid="carousel-skeleton-item"]') + expect(skeletons.length).toBe(6) + }) + + it('renders files instead of skeletons when isLoading is false', () => { + const { container } = render( + , + ) + + const skeletons = container.querySelectorAll('[data-testid="carousel-skeleton-item"]') + expect(skeletons.length).toBe(0) + const links = container.querySelectorAll('[data-testid="carousel-link"]') + expect(links.length).toBe(3) + }) }) diff --git a/packages/webui/components/file-viewer-left-sidebar.tsx b/packages/webui/components/file-viewer-left-sidebar.tsx index ccab19af..1e33ef6d 100644 --- a/packages/webui/components/file-viewer-left-sidebar.tsx +++ b/packages/webui/components/file-viewer-left-sidebar.tsx @@ -6,6 +6,7 @@ import { File, Loader2, AudioLines } from 'lucide-react' import type { FC } from 'react' import { useEffect, useRef, useState } from 'react' import { useInView } from 'react-intersection-observer' +import { Skeleton } from '@/ui/components/ui/skeleton' interface FileViewerLeftSidebarProps { projectId: string @@ -13,6 +14,7 @@ interface FileViewerLeftSidebarProps { parentFolderId: string initialFiles: AssetInfo[] initialNextCursor: string | undefined + isLoading?: boolean } export const CarouselFilePreview = ({ item }: { item: AssetInfo }) => { @@ -44,6 +46,7 @@ export const FileViewerLeftSidebar: FC = ({ parentFolderId, initialFiles, initialNextCursor, + isLoading = false, }) => { const { ref, inView } = useInView({ threshold: 0, @@ -122,43 +125,51 @@ export const FileViewerLeftSidebar: FC = ({ return (
- {files.map((file) => { - if (!file) return null - const isActive = file.id === currentAssetId - return ( -
- - - {file.agent && ( - ( + + )) + : files.map((file) => { + if (!file) return null + const isActive = file.id === currentAssetId + return ( +
+ - AI - - )} - -
- ) - })} + + {file.agent && ( + + AI + + )} + +
+ ) + })} {/* Infinite Scroll Trigger */} - {hasMore && ( + {!isLoading && hasMore && (
{ + afterEach(() => { + cleanup() + }) + + it('renders MobileFileBrowserContentSkeleton with card layout', () => { + render() + const skeleton = screen.getByTestId('mobile-file-browser-loading-skeleton') + expect(skeleton).toBeDefined() + + // Assert cards with aspect-square are rendered + const aspectSquareElements = skeleton.querySelectorAll('.aspect-square') + expect(aspectSquareElements.length).toBe(3) + }) + + it('renders ProjectFolderSkeleton containing desktop and mobile layouts', () => { + const { container } = render() + expect(screen.getByTestId('mobile-file-browser-loading-skeleton')).toBeDefined() + expect(container.querySelector('[data-testid="file-browser-loading-skeleton"]')).toBeDefined() + }) + + it('renders FileDetailSkeleton without top nav duplicate', () => { + const { container } = render() + // Left sidebar carousel skeleton should exist on desktop + const carouselCards = container.querySelectorAll('.w-24 .rounded-lg') + expect(carouselCards.length).toBe(6) + }) +}) diff --git a/packages/webui/components/loading-skeletons.tsx b/packages/webui/components/loading-skeletons.tsx index 0e80a7f9..aeba3a03 100644 --- a/packages/webui/components/loading-skeletons.tsx +++ b/packages/webui/components/loading-skeletons.tsx @@ -2,46 +2,38 @@ import { Skeleton } from '@/ui/components/ui/skeleton' export function ProjectFolderSkeleton() { return ( -
- {/* Top navigation/breadcrumbs placeholder */} -
+
+ {/* Sidebar (Folder tree placeholder) */} +
+ - / -
-
- - +
+
+ + +
+
+ + +
+
+ + +
-
- {/* Sidebar (Folder tree placeholder) */} -
-
- - -
-
-
- - -
-
- - -
-
- - -
-
+ {/* Main content area */} +
+ {/* Mobile: matches MobileFileBrowserContentSkeleton */} +
+
- {/* File Browser area */} -
- {/* File browser toolbar */} + {/* Desktop: file browser toolbar + card grid */} +
@@ -53,27 +45,7 @@ export function ProjectFolderSkeleton() {
- - {/* Cards Grid */} -
-
- -
-
- {Array.from({ length: 10 }).map((_, i) => ( -
- -
- -
- - -
-
-
- ))} -
-
+
@@ -82,54 +54,69 @@ export function ProjectFolderSkeleton() { export function FileDetailSkeleton() { return ( -
- {/* Top navigation */} -
-
- - / - - / - +
+ {/* Mobile-only view: matches MobileFileDetail */} +
+ {/* Mobile File Header placeholder */} +
+
+ + +
+
+ + +
-
- + {/* Media area placeholder */} +
+ +
+ {/* Bottom sheet placeholder */} +
+
+
+ + +
+
+
+ + +
-
- {/* Left Pane (Version stack) */} -
- -
- {Array.from({ length: 4 }).map((_, i) => ( -
- -
- - -
-
- ))} -
+ {/* Desktop view: Left Carousel (96px) + Center Full-Bleed Viewer + Right Sidebar (360px) */} +
+ {/* Left Carousel Skeleton (96px / w-24) */} +
+ {Array.from({ length: 6 }).map((_, i) => ( + + ))}
- {/* Center Pane (Viewer area) */} -
-
- + {/* Center Viewer Area */} +
+
+
-
-
- - + {/* Bottom video control bar placeholder */} +
+
+ + +
+ +
+ +
-
- {/* Right Pane (Metadata and Comments) */} -
+ {/* Right Sidebar Skeleton (360px) */} +
{/* Metadata Section */}
@@ -214,18 +201,30 @@ export function FileBrowserContentSkeleton({ export function MobileFileBrowserContentSkeleton() { return (
- {Array.from({ length: 6 }).map((_, i) => ( -
- -
- - +
+ + +
+
+ {Array.from({ length: 3 }).map((_, i) => ( +
+ +
+ +
+ + +
+
-
- ))} + ))} +
) } diff --git a/packages/webui/components/top-nav.test.tsx b/packages/webui/components/top-nav.test.tsx new file mode 100644 index 00000000..190fca04 --- /dev/null +++ b/packages/webui/components/top-nav.test.tsx @@ -0,0 +1,84 @@ +// @vitest-environment happy-dom +import React from 'react' +import { cleanup, render, screen } from '@testing-library/react' +import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' +import { QueryClient, QueryClientProvider } from '@tanstack/react-query' +import { TopNav } from './top-nav' +import { useTopNavStore } from '@/ui/stores/top-nav' + +let mockPathname = '/projects/proj-1' +let mockIsMobile = false + +vi.mock('@tanstack/react-router', () => ({ + Link: ({ children, to, ...props }: { children: React.ReactNode; to: string }) => ( + + {children} + + ), + useNavigate: () => vi.fn(), + useRouterState: ({ select }: { select: (s: { location: { pathname: string } }) => string }) => + select({ location: { pathname: mockPathname } }), +})) + +vi.mock('@/ui/hooks/use-mobile', () => ({ + useIsMobile: () => mockIsMobile, +})) + +describe('TopNav component', () => { + const queryClient = new QueryClient({ + defaultOptions: { + queries: { + retry: false, + }, + }, + }) + + beforeEach(() => { + useTopNavStore.getState().clearProjectState() + mockPathname = '/projects/proj-1' + mockIsMobile = false + }) + + afterEach(() => { + cleanup() + vi.clearAllMocks() + }) + + it('renders TopNavBreadcrumbSkeleton on project routes when projectState is not loaded', () => { + mockPathname = '/projects/proj-1' + const { container } = render( + + + , + ) + + expect(screen.getByTestId('top-nav-breadcrumb-skeleton')).toBeDefined() + // Ensure center ShumaiLogo is NOT rendered + expect(container.querySelector('.text-orange-600')).toBeNull() + }) + + it('renders TeamHeader with logo on non-project routes when projectState is not loaded', () => { + mockPathname = '/teams/team-1' + const { container } = render( + + + , + ) + + expect(screen.queryByTestId('top-nav-breadcrumb-skeleton')).toBeNull() + // TeamHeader contains ShumaiLogo with text-orange-600 + expect(container.querySelector('.text-orange-600')).not.toBeNull() + }) + + it('returns null on mobile when navigating file routes', () => { + mockPathname = '/projects/proj-1/files/file-1' + mockIsMobile = true + const { container } = render( + + + , + ) + + expect(container.firstChild).toBeNull() + }) +}) diff --git a/packages/webui/components/top-nav.tsx b/packages/webui/components/top-nav.tsx index bfe414cc..5bb0ad1e 100644 --- a/packages/webui/components/top-nav.tsx +++ b/packages/webui/components/top-nav.tsx @@ -5,6 +5,28 @@ import { useUiStore } from '@/ui/stores/ui' import { useChatbotStore } from '@/ui/stores/chatbot' import { useUserMetadataStore } from '@/ui/stores/user-metadata' import { useIsMobile } from '@/ui/hooks/use-mobile' +import { Skeleton } from '@/ui/components/ui/skeleton' +import { useRouterState } from '@tanstack/react-router' + +export function TopNavBreadcrumbSkeleton() { + return ( +
+
+ + + / + +
+
+ + +
+
+ ) +} export function TopNav() { const { projectState } = useTopNavStore() @@ -12,12 +34,16 @@ export function TopNav() { const { isChatbotOpen, setIsChatbotOpen } = useChatbotStore() const hideAgent = useUserMetadataStore((s) => Boolean(s.metadata['appearance.hideAgent'])) const isMobile = useIsMobile() + const pathname = useRouterState({ select: (s) => s.location.pathname }) - if (isMobile && projectState?.fileId) { + if (isMobile && (projectState?.fileId || pathname.includes('/files/'))) { return null } if (!projectState) { + if (pathname.startsWith('/projects/')) { + return + } return } diff --git a/packages/webui/components/viewers/video/compare-video-pane.test.tsx b/packages/webui/components/viewers/video/compare-video-pane.test.tsx index a96d8b8c..fbf36047 100644 --- a/packages/webui/components/viewers/video/compare-video-pane.test.tsx +++ b/packages/webui/components/viewers/video/compare-video-pane.test.tsx @@ -346,6 +346,15 @@ describe('CompareVideoPane', () => { '[data-testid="compare-video-area"] video', ) as HTMLVideoElement expect(video.getAttribute('poster')).toBe('https://cdn.example.com/compare-poster.jpg') + expect(video.className).toContain('blur-md') + expect(video.className).toContain('scale-105') + + act(() => { + video.dispatchEvent(new Event('play')) + }) + + expect(video.className).not.toContain('blur-md') + expect(video.className).not.toContain('scale-105') }) it('shows loading spinner initially, transitions on loadeddata, and blocks play while loading', () => { diff --git a/packages/webui/components/viewers/video/compare-video-pane.tsx b/packages/webui/components/viewers/video/compare-video-pane.tsx index 63a86dbb..4ae70f8c 100644 --- a/packages/webui/components/viewers/video/compare-video-pane.tsx +++ b/packages/webui/components/viewers/video/compare-video-pane.tsx @@ -718,7 +718,7 @@ export const CompareVideoPane = forwardRef