fix(share,file-browser): improve public share opening and multi-selection interactions (#522)

* fix(share,file-browser): improve public share opening and multi-selection interactions

* docs(changelog): merge release notes into single entry with Frame.io behavior change details

* fix(file-browser,share): prevent duplicate double-click navigation and fix stale range anchor
This commit is contained in:
Yiling-J
2026-11-07 11:18:47 +08:00
committed by GitHub
parent 2d2ea51668
commit 0359733637
17 changed files with 1054 additions and 116 deletions
+2
View File
@@ -12,6 +12,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
### Changed
- **file-browser**: ⚠️ **Behavior Change**: Align asset selection and click behavior with Frame.io: single-clicking file or folder cards on public share links always opens or enters the asset even when already selected, clicking an already-selected card in workspace file lists preserves multi-selection, checkboxes independently toggle individual items without clearing other selections, and Shift-click range selection is supported on public share links
## [0.6.4] - 2026-11-05
### Added
@@ -73,7 +73,7 @@ interface FileBrowserProps {
totalFilesSize?: number
selectedItem: AssetInfo | null
selectedIds: Set<string>
onItemSelect: (item: AssetInfo, event: React.MouseEvent) => void
onItemSelect: (item: AssetInfo, event: React.MouseEvent, meta?: { isCheckbox?: boolean }) => void
onItemDoubleClick: (item: AssetInfo) => void
onSaveField: (fileId: string, fieldId: string, value: unknown) => void
displayStyle: 'card' | 'list'
@@ -175,9 +175,9 @@ export function FileBrowser({
}, [selectedIds.size])
const handleItemSelectWrapper = useCallback(
(item: AssetInfo, event: React.MouseEvent) => {
(item: AssetInfo, event: React.MouseEvent, meta?: { isCheckbox?: boolean }) => {
setInternalSelectedItem(item)
onItemSelect(item, event)
onItemSelect(item, event, meta)
},
[onItemSelect],
)
@@ -778,6 +778,7 @@ export function FileBrowser({
isRecents,
selectedCount: selectedIds.size,
isShareView,
isPublic,
allowDownload,
fields: displayedFields,
canEdit,
@@ -802,4 +802,119 @@ describe('FileCard', () => {
const copyOption = screen.getByText(/^Copy$|^复制$/i)
expect(copyOption).toBeTruthy()
})
it('triggers onDoubleClick on single card body click in public share view even when checked', () => {
const onSelect = vi.fn()
const onDoubleClick = vi.fn()
renderComponent({
item: fileItem,
isPublic: true,
isChecked: true,
onSelect,
onDoubleClick,
})
const card = screen.getByTestId('file-card')
fireEvent.click(card)
expect(onDoubleClick).toHaveBeenCalledWith(fileItem)
expect(onSelect).not.toHaveBeenCalled()
})
it('does not trigger onDoubleClick multiple times on double-click in public share view', () => {
const onSelect = vi.fn()
const onDoubleClick = vi.fn()
renderComponent({
item: fileItem,
isPublic: true,
onSelect,
onDoubleClick,
})
const card = screen.getByTestId('file-card')
// Click 1 (detail = 1)
fireEvent.click(card, { detail: 1 })
// Click 2 (detail = 2)
fireEvent.click(card, { detail: 2 })
// Double click event
fireEvent.doubleClick(card)
expect(onDoubleClick).toHaveBeenCalledTimes(1)
expect(onDoubleClick).toHaveBeenCalledWith(fileItem)
})
it('triggers onSelect instead of onDoubleClick on public share card when clicking with modifier keys', () => {
const onSelect = vi.fn()
const onDoubleClick = vi.fn()
renderComponent({
item: fileItem,
isPublic: true,
onSelect,
onDoubleClick,
})
const card = screen.getByTestId('file-card')
fireEvent.click(card, { shiftKey: true })
expect(onDoubleClick).not.toHaveBeenCalled()
expect(onSelect).toHaveBeenCalledWith(fileItem, expect.anything())
})
it('preserves multi-selection in internal workspace when clicking an already selected card body', () => {
const onSelect = vi.fn()
const onDoubleClick = vi.fn()
renderComponent({
item: fileItem,
isPublic: false,
isChecked: true,
selectedCount: 3,
onSelect,
onDoubleClick,
})
const card = screen.getByTestId('file-card')
fireEvent.click(card)
expect(onSelect).not.toHaveBeenCalled()
expect(onDoubleClick).not.toHaveBeenCalled()
})
it('calls onSelect when clicking an unselected card body in internal workspace', () => {
const onSelect = vi.fn()
renderComponent({
item: fileItem,
isPublic: false,
isChecked: false,
selectedCount: 3,
onSelect,
})
const card = screen.getByTestId('file-card')
fireEvent.click(card)
expect(onSelect).toHaveBeenCalledWith(fileItem, expect.anything())
})
it('calls onSelect with { isCheckbox: true } when checkbox is clicked directly', () => {
const onSelect = vi.fn()
const onDoubleClick = vi.fn()
renderComponent({
item: fileItem,
isPublic: true,
onSelect,
onDoubleClick,
})
const checkbox = screen.getByRole('checkbox')
fireEvent.click(checkbox)
expect(onDoubleClick).not.toHaveBeenCalled()
expect(onSelect).toHaveBeenCalledWith(fileItem, expect.anything(), { isCheckbox: true })
})
})
@@ -26,6 +26,7 @@ import { ProgressCircle } from '@/ui/components/ui/progress-circle'
import { formatRemainingTimeSeconds, formatTimeAgo, getTrashDaysLeft } from '@/ui/lib/time'
import { formatSize } from '@/ui/lib/format'
import { selectFileNameWithoutExtension } from '@/ui/lib/rename-utils'
import { handleCardClick } from '@/ui/lib/selection-utils'
import { cn } from '@/ui/lib/utils'
import { useUploadStore } from '@/ui/stores/upload'
import { useDraggable, useDroppable } from '@dnd-kit/react'
@@ -57,7 +58,7 @@ interface FileCardProps {
isSelected?: boolean
isChecked?: boolean
isEditing?: boolean
onSelect?: (item: AssetInfo, event: React.MouseEvent) => void
onSelect?: (item: AssetInfo, event: React.MouseEvent, meta?: { isCheckbox?: boolean }) => void
onDoubleClick?: (item: AssetInfo) => void
onContextMenu?: (e: React.MouseEvent, item: AssetInfo) => void
// Deprecated manual drag handlers replaced by dnd-kit
@@ -85,6 +86,7 @@ interface FileCardProps {
selectedCount?: number
fields?: MetadataFieldInfo[]
isShareView?: boolean
isPublic?: boolean
canEdit?: boolean
archiveStorageEnabled?: boolean
/** When false, hides the download action. Defaults to true. */
@@ -121,6 +123,7 @@ export function FileCard({
selectedCount,
fields = [],
isShareView,
isPublic = false,
canEdit = true,
archiveStorageEnabled = false,
allowDownload = true,
@@ -253,7 +256,16 @@ export function FileCard({
}, [displayItem.name])
const handleClick = (e: React.MouseEvent) => {
onSelect(displayItem, e)
handleCardClick({
item: displayItem,
event: e,
isPublic,
selectedCount,
isSelected,
isChecked,
onSelect,
onDoubleClick,
})
}
const handleRename = () => {
@@ -382,7 +394,7 @@ export function FileCard({
ref={setNodeRef}
style={{ opacity }}
onClick={handleClick}
onDoubleClick={() => onDoubleClick(displayItem)}
onDoubleClick={isPublic ? undefined : () => onDoubleClick(displayItem)}
onContextMenu={(e) => onContextMenu(e, displayItem)}
onMouseDown={(e) => {
if (e.shiftKey) {
@@ -397,15 +409,15 @@ export function FileCard({
)}
>
{!hideCheckbox && (
<div className="absolute left-2 top-2 z-10 flex items-center gap-1.5">
<div className="absolute left-2 top-2 z-20 flex items-center gap-1.5">
<Checkbox
checked={isChecked}
onCheckedChange={() => {}}
onClick={(e) => {
e.stopPropagation()
onSelect(displayItem, e)
onSelect(displayItem, e, { isCheckbox: true })
}}
className="h-4 w-4 bg-white/20 dark:bg-white/20 border-2 data-[state=checked]:bg-primary data-[state=checked]:border-primary border-foreground/15"
className="h-4 w-4 bg-white/20 dark:bg-white/20 border-2 hover:border-primary transition-colors cursor-pointer data-[state=checked]:bg-primary data-[state=checked]:border-primary border-foreground/15"
/>
</div>
)}
@@ -250,4 +250,81 @@ describe('FileListItem', () => {
expect(statusBadge.textContent).toMatch(/Alice.*(is uploading|正在上传)/i)
expect(screen.getByTestId('file-list-item-remote-uploading-circle')).toBeTruthy()
})
it('triggers onDoubleClick on single row click in public share view even when checked', () => {
const onSelect = vi.fn()
const onDoubleClick = vi.fn()
renderComponent({
item: mockItem,
isPublic: true,
isChecked: true,
onSelect,
onDoubleClick,
})
const row = screen.getByTestId('file-card')
fireEvent.click(row)
expect(onDoubleClick).toHaveBeenCalledWith(mockItem)
expect(onSelect).not.toHaveBeenCalled()
})
it('does not trigger onDoubleClick multiple times on double-click in public share view', () => {
const onSelect = vi.fn()
const onDoubleClick = vi.fn()
renderComponent({
item: mockItem,
isPublic: true,
onSelect,
onDoubleClick,
})
const row = screen.getByTestId('file-card')
fireEvent.click(row, { detail: 1 })
fireEvent.click(row, { detail: 2 })
fireEvent.doubleClick(row)
expect(onDoubleClick).toHaveBeenCalledTimes(1)
expect(onDoubleClick).toHaveBeenCalledWith(mockItem)
})
it('preserves multi-selection in internal workspace when clicking already selected list row', () => {
const onSelect = vi.fn()
const onDoubleClick = vi.fn()
renderComponent({
item: mockItem,
isPublic: false,
isChecked: true,
selectedCount: 3,
onSelect,
onDoubleClick,
})
const row = screen.getByTestId('file-card')
fireEvent.click(row)
expect(onSelect).not.toHaveBeenCalled()
expect(onDoubleClick).not.toHaveBeenCalled()
})
it('calls onSelect with { isCheckbox: true } when list item checkbox is clicked', () => {
const onSelect = vi.fn()
const onDoubleClick = vi.fn()
renderComponent({
item: mockItem,
isPublic: true,
onSelect,
onDoubleClick,
})
const checkbox = screen.getByRole('checkbox')
fireEvent.click(checkbox)
expect(onDoubleClick).not.toHaveBeenCalled()
expect(onSelect).toHaveBeenCalledWith(mockItem, expect.anything(), { isCheckbox: true })
})
})
@@ -17,6 +17,7 @@ import { Checkbox } from '@/ui/components/ui/checkbox'
import { EditableText } from '@/ui/components/ui/editable-text'
import { useUploadStore } from '@/ui/stores/upload'
import { ProgressCircle } from '@/ui/components/ui/progress-circle'
import { handleCardClick } from '@/ui/lib/selection-utils'
import { type FieldInfo as MetadataFieldInfo } from '@shumai/dtos'
@@ -26,7 +27,7 @@ interface FileListItemProps {
isSelected: boolean
isChecked: boolean
isEditing: boolean
onSelect: (item: AssetInfo, event: React.MouseEvent) => void
onSelect: (item: AssetInfo, event: React.MouseEvent, meta?: { isCheckbox?: boolean }) => void
onDoubleClick: (item: AssetInfo) => void
onContextMenu: (e: React.MouseEvent, item: AssetInfo) => void
onDragStart: (item: AssetInfo) => void
@@ -40,6 +41,8 @@ interface FileListItemProps {
columnSizing?: Record<string, number>
canEdit?: boolean
isRecents?: boolean
isPublic?: boolean
selectedCount?: number
}
export function FileListItem({
@@ -64,6 +67,8 @@ export function FileListItem({
columnSizing,
canEdit = true,
isRecents,
isPublic = false,
selectedCount,
}: FileListItemProps) {
const [name, setName] = useState(item.name)
const inputRef = useRef<HTMLInputElement>(null)
@@ -190,7 +195,16 @@ export function FileListItem({
}
const handleClick = (e: React.MouseEvent) => {
onSelect(displayItem, e)
handleCardClick({
item: displayItem,
event: e,
isPublic,
selectedCount,
isSelected,
isChecked,
onSelect,
onDoubleClick,
})
}
const handleRename = () => {
if (name !== displayItem.name) {
@@ -214,7 +228,7 @@ export function FileListItem({
ref={setDraggableRef}
style={{ opacity }}
onClick={handleClick}
onDoubleClick={() => onDoubleClick(displayItem)}
onDoubleClick={isPublic ? undefined : () => onDoubleClick(displayItem)}
onContextMenu={(e) => onContextMenu(e, displayItem)}
onMouseDown={(e) => {
if (e.shiftKey) {
@@ -240,9 +254,9 @@ export function FileListItem({
onCheckedChange={() => {}}
onClick={(e) => {
e.stopPropagation()
onSelect(displayItem, e)
onSelect(displayItem, e, { isCheckbox: true })
}}
className="h-4 w-4 shrink-0 data-[state=checked]:bg-primary data-[state=checked]:border-primary"
className="h-4 w-4 shrink-0 hover:border-primary transition-colors cursor-pointer data-[state=checked]:bg-primary data-[state=checked]:border-primary"
/>
<div className="w-8 h-8 shrink-0 flex items-center justify-center bg-muted rounded overflow-hidden">
{isUploading ? (
@@ -1,5 +1,5 @@
// @vitest-environment happy-dom
import { cleanup, render, screen } from '@testing-library/react'
import { cleanup, fireEvent, render, screen } from '@testing-library/react'
import React from 'react'
import { afterEach, describe, expect, it, vi } from 'vitest'
import type { AssetInfo } from '@shumai/dtos'
@@ -111,4 +111,80 @@ describe('FolderCard', () => {
renderComponent({ item: folderItem, hideActions: true })
expect(screen.queryByRole('button')).toBeNull()
})
it('triggers onSelect with { isCheckbox: true } when folder checkbox is clicked', () => {
const onSelect = vi.fn()
const onDoubleClick = vi.fn()
renderComponent({
item: folderItem,
onSelect,
onDoubleClick,
})
const checkbox = screen.getByRole('checkbox')
fireEvent.click(checkbox)
expect(onDoubleClick).not.toHaveBeenCalled()
expect(onSelect).toHaveBeenCalledWith(folderItem, expect.anything(), { isCheckbox: true })
})
it('triggers onDoubleClick on single card body click in public share view even when checked', () => {
const onSelect = vi.fn()
const onDoubleClick = vi.fn()
renderComponent({
item: folderItem,
isPublic: true,
isChecked: true,
onSelect,
onDoubleClick,
})
const card = screen.getByTestId('file-card')
fireEvent.click(card)
expect(onDoubleClick).toHaveBeenCalledWith(folderItem)
expect(onSelect).not.toHaveBeenCalled()
})
it('does not trigger onDoubleClick multiple times on double-click in public share view', () => {
const onSelect = vi.fn()
const onDoubleClick = vi.fn()
renderComponent({
item: folderItem,
isPublic: true,
onSelect,
onDoubleClick,
})
const card = screen.getByTestId('file-card')
fireEvent.click(card, { detail: 1 })
fireEvent.click(card, { detail: 2 })
fireEvent.doubleClick(card)
expect(onDoubleClick).toHaveBeenCalledTimes(1)
expect(onDoubleClick).toHaveBeenCalledWith(folderItem)
})
it('preserves multi-selection in internal workspace when clicking already selected folder card body', () => {
const onSelect = vi.fn()
const onDoubleClick = vi.fn()
renderComponent({
item: folderItem,
isPublic: false,
isChecked: true,
selectedCount: 2,
onSelect,
onDoubleClick,
})
const card = screen.getByTestId('file-card')
fireEvent.click(card)
expect(onSelect).not.toHaveBeenCalled()
expect(onDoubleClick).not.toHaveBeenCalled()
})
})
@@ -28,13 +28,14 @@ import React, { useEffect, useMemo, useRef, useState } from 'react'
import type { DragState } from '../dnd-types'
import { FilePreview } from './file-preview'
import { getAllFilesFromEntries } from '@/ui/lib/dnd-utils'
import { handleCardClick } from '@/ui/lib/selection-utils'
interface FolderCardProps {
item: AssetInfo
isSelected?: boolean
isChecked?: boolean
isEditing?: boolean
onSelect?: (item: AssetInfo, event: React.MouseEvent) => void
onSelect?: (item: AssetInfo, event: React.MouseEvent, meta?: { isCheckbox?: boolean }) => void
onDoubleClick?: (item: AssetInfo) => void
onContextMenu?: (e: React.MouseEvent, item: AssetInfo) => void
// Deprecated manual drag props replaced by dnd-kit
@@ -61,6 +62,7 @@ interface FolderCardProps {
canEdit?: boolean
archiveStorageEnabled?: boolean
isShareView?: boolean
isPublic?: boolean
isExternalDragging?: boolean
externalOverFolderId?: string | null
setExternalOverFolderId?: (id: string | null) => void
@@ -152,6 +154,7 @@ export function FolderCard({
canEdit = true,
archiveStorageEnabled = false,
isShareView,
isPublic = false,
isExternalDragging,
externalOverFolderId,
setExternalOverFolderId,
@@ -223,7 +226,16 @@ export function FolderCard({
}, [item.name])
const handleClick = (e: React.MouseEvent) => {
onSelect(item, e)
handleCardClick({
item,
event: e,
isPublic,
selectedCount,
isSelected,
isChecked,
onSelect,
onDoubleClick,
})
}
const handleRename = () => {
@@ -274,7 +286,7 @@ export function FolderCard({
ref={setNodeRef}
style={{ opacity }}
onClick={handleClick}
onDoubleClick={() => onDoubleClick(item)}
onDoubleClick={isPublic ? undefined : () => onDoubleClick(item)}
onContextMenu={(e) => onContextMenu(e, item)}
onMouseDown={(e) => {
if (e.shiftKey) {
@@ -367,8 +379,11 @@ export function FolderCard({
<div className="absolute top-1 left-1 z-30 transition-all duration-200">
<Checkbox
checked={isChecked}
onClick={(e) => e.stopPropagation()} // Let parent handler deal with it
className="w-5 h-5 border-1 border-foreground/20 bg-background/50 data-[state=checked]:bg-primary data-[state=checked]:border-primary"
onClick={(e) => {
e.stopPropagation()
onSelect(item, e, { isCheckbox: true })
}}
className="w-5 h-5 border-1 border-foreground/20 bg-background/50 hover:border-primary transition-colors cursor-pointer data-[state=checked]:bg-primary data-[state=checked]:border-primary"
/>
</div>
)}
@@ -168,7 +168,7 @@ interface FileBrowserListViewProps {
selectedItem: AssetInfo | null
selectedIds: Set<string>
displayedFields: FieldInfo[]
onItemSelect: (item: AssetInfo, event: React.MouseEvent) => void
onItemSelect: (item: AssetInfo, event: React.MouseEvent, meta?: { isCheckbox?: boolean }) => void
onItemDoubleClick: (item: AssetInfo) => void
renderItem: (item: AssetInfo, columnSizing?: Record<string, number>) => React.ReactNode
foldersExpanded: boolean
@@ -70,7 +70,7 @@ export interface MobileFileBrowserProps {
totalFilesSize?: number
selectedItem: AssetInfo | null
selectedIds: Set<string>
onItemSelect: (item: AssetInfo, event: React.MouseEvent) => void
onItemSelect: (item: AssetInfo, event: React.MouseEvent, meta?: { isCheckbox?: boolean }) => void
onItemDoubleClick: (item: AssetInfo) => void
onSaveField?: (fileId: string, fieldId: string, value: unknown) => void
onClearSelection: () => void
@@ -534,6 +534,7 @@ export function MobileFileBrowser({
isRecentlyDeleted={isRecentlyDeleted}
isRecents={isRecents}
selectedCount={selectedIds.size}
isPublic={isPublic}
canEdit={canEdit}
archiveStorageEnabled={archiveStorageEnabled}
isShareView={isShareView}
@@ -599,6 +600,7 @@ export function MobileFileBrowser({
isRecentlyDeleted={isRecentlyDeleted}
isRecents={isRecents}
selectedCount={selectedIds.size}
isPublic={isPublic}
canEdit={canEdit}
archiveStorageEnabled={archiveStorageEnabled}
isShareView={isShareView}
@@ -24,7 +24,7 @@ import { useInfiniteQuery, useQuery, useQueryClient } from '@tanstack/react-quer
import { useNavigate } from '@tanstack/react-router'
import { useEffect, useMemo, useRef, useState } from 'react'
import { cn } from '../lib/utils'
import { getSelectedRangeIds } from '../lib/selection-utils'
import { computeNextItemSelection } from '../lib/selection-utils'
import { useIsMobile } from '@/ui/hooks/use-mobile'
import { ChatbotSidebar } from './chatbot-sidebar'
import { SnapToPointer } from './dnd-modifiers'
@@ -358,56 +358,22 @@ export default function FileSystemManager({
}
}
const handleItemSelect = (item: AssetInfo, event: React.MouseEvent) => {
const isCtrlOrCmd = event.metaKey || event.ctrlKey
const isShift = event.shiftKey
if (isShift && lastSelectedId) {
// Find the last selected item
const allItems = [...folders, ...files]
const lastSelectedItem = allItems.find((i) => i.id === lastSelectedId)
if (lastSelectedItem) {
const newSelectedIds = getSelectedRangeIds(
lastSelectedItem,
item,
lastSelectedId,
folders,
files,
selectedIds,
)
if (newSelectedIds) {
setSelectedIds(newSelectedIds)
setSelectedItem(item)
return
}
}
}
if (isCtrlOrCmd) {
const newSelectedIds = new Set(selectedIds)
if (newSelectedIds.has(item.id)) {
newSelectedIds.delete(item.id)
setSelectedIds(newSelectedIds)
if (selectedItem?.id === item.id) {
const allItems = [...folders, ...files]
const remaining = allItems.find((i) => newSelectedIds.has(i.id))
setSelectedItem(remaining || null)
setLastSelectedId(remaining ? remaining.id : null)
}
} else {
newSelectedIds.add(item.id)
setSelectedIds(newSelectedIds)
setLastSelectedId(item.id)
setSelectedItem(item)
}
return
}
setSelectedIds(new Set([item.id]))
setLastSelectedId(item.id)
setSelectedItem(item)
const handleItemSelect = (
item: AssetInfo,
event: React.MouseEvent,
meta?: { isCheckbox?: boolean },
) => {
const nextState = computeNextItemSelection({
item,
event,
meta,
folders,
files,
state: { selectedIds, selectedItem, lastSelectedId },
})
setSelectedIds(nextState.selectedIds)
setSelectedItem(nextState.selectedItem)
setLastSelectedId(nextState.lastSelectedId)
}
const handleSaveField = (fileId: string, fieldId: string, value: unknown) => {
@@ -0,0 +1,346 @@
// @vitest-environment happy-dom
import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react'
import React from 'react'
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import { PublicShareManager } from './public-share-manager'
import { client } from '@/ui/api/client'
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
const mockNavigate = vi.fn()
vi.mock('@tanstack/react-router', () => ({
useNavigate: () => mockNavigate,
useRouterState: ({
select,
}: { select?: (state: { location: { pathname: string } }) => unknown } = {}) => {
const state = { location: { pathname: '/share/share-1' } }
return select ? select(state) : state
},
Link: ({ children, ...props }: React.AnchorHTMLAttributes<HTMLAnchorElement>) => (
<a {...props}>{children}</a>
),
}))
vi.mock('@tanstack/react-virtual', () => ({
useVirtualizer: (options: { count: number }) => ({
getVirtualItems: () =>
Array.from({ length: options.count }, (_, i) => ({
index: i,
start: i * 50,
size: 50,
key: i,
})),
getTotalSize: () => options.count * 50,
}),
}))
vi.mock('@dnd-kit/react', () => ({
useDraggable: () => ({
ref: vi.fn(),
isDragging: false,
}),
useDroppable: () => ({
ref: vi.fn(),
isOver: false,
}),
}))
vi.mock('@/ui/hooks/use-permissions', () => ({
usePermissions: () => ({
canEdit: false,
canAdmin: false,
canView: true,
}),
}))
vi.mock('@/ui/api/client', () => ({
client: {
api: {
shares: {
':shareId': {
info: {
$get: vi.fn(),
},
folders: {
':folderId': {
children: {
$get: vi.fn(),
},
search: {
$post: vi.fn(),
},
},
},
teams: {
':teamId': {
upload: {
tasks: {
$post: vi.fn().mockResolvedValue({ ok: true, json: async () => ({}) }),
':taskId': {
$patch: vi.fn().mockResolvedValue({ ok: true, json: async () => ({}) }),
},
},
},
},
},
files: {
':fileId': {
$get: vi.fn(),
},
},
fields: {
$get: vi.fn(),
},
},
},
projects: {
':projectId': {
reparent: {
$post: vi.fn().mockResolvedValue({ ok: true, json: async () => ({}) }),
},
shares: {
$get: vi.fn().mockResolvedValue({ ok: true, json: async () => ({ data: [] }) }),
$post: vi.fn().mockResolvedValue({ ok: true, json: async () => ({ id: 'share-1' }) }),
},
copy: {
$post: vi.fn().mockResolvedValue({ ok: true, json: async () => ({}) }),
},
},
},
teams: {
':teamId': {
upload: {
tasks: {
$post: vi.fn().mockResolvedValue({ ok: true, json: async () => ({}) }),
':taskId': {
$patch: vi.fn().mockResolvedValue({ ok: true, json: async () => ({}) }),
},
},
},
},
},
files: {
$delete: vi.fn().mockResolvedValue({ ok: true, json: async () => ({}) }),
'download-links': {
$post: vi.fn().mockResolvedValue({ ok: true, json: async () => ({ files: [] }) }),
},
restore: {
$post: vi.fn().mockResolvedValue({ ok: true, json: async () => ({}) }),
},
':fileId': {
$get: vi.fn().mockResolvedValue({ ok: true, json: async () => ({}) }),
$put: vi.fn().mockResolvedValue({ ok: true, json: async () => ({}) }),
},
},
folders: {
$post: vi.fn().mockResolvedValue({ ok: true, json: async () => ({ id: 'new-f' }) }),
$delete: vi.fn().mockResolvedValue({ ok: true, json: async () => ({}) }),
restore: {
$post: vi.fn().mockResolvedValue({ ok: true, json: async () => ({}) }),
},
':folderId': {
$put: vi.fn().mockResolvedValue({ ok: true, json: async () => ({}) }),
},
},
},
},
}))
describe('PublicShareManager selection and card click behavior', () => {
let queryClient: QueryClient
const mockFiles = [
{ id: 'f1', name: 'File 1.mov', type: 'file', status: 'processed' },
{ id: 'f2', name: 'File 2.mov', type: 'file', status: 'processed' },
{ id: 'f3', name: 'File 3.mov', type: 'file', status: 'processed' },
{ id: 'f4', name: 'File 4.mov', type: 'file', status: 'processed' },
]
beforeEach(() => {
mockNavigate.mockClear()
queryClient = new QueryClient({
defaultOptions: { queries: { retry: false } },
})
const shareClient = client.api.shares[':shareId']
type InfoResponse = Awaited<ReturnType<typeof shareClient.info.$get>>
type FileResponse = Awaited<ReturnType<(typeof shareClient.files)[':fileId']['$get']>>
type ChildrenResponse = Awaited<
ReturnType<(typeof shareClient.folders)[':folderId']['children']['$get']>
>
type FieldsResponse = Awaited<ReturnType<typeof shareClient.fields.$get>>
vi.mocked(shareClient.info.$get).mockResolvedValue({
ok: true,
status: 200,
json: async () => ({
id: 'share-1',
name: 'Test Share',
rootFolderId: 'root-folder-1',
projectId: 'project-1',
allowDownload: true,
isDisabled: false,
isExpired: false,
hasPassword: false,
expireAt: null,
}),
} as unknown as InfoResponse)
vi.mocked(shareClient.files[':fileId'].$get).mockResolvedValue({
ok: true,
status: 200,
json: async () => ({
id: 'root-folder-1',
name: 'Root',
type: 'folder',
}),
} as unknown as FileResponse)
vi.mocked(shareClient.folders[':folderId'].children.$get).mockImplementation(
async ({ query }: { query?: { assetType?: string } }) => {
if (query?.assetType === 'folder') {
return {
ok: true,
status: 200,
json: async () => ({ data: [], pageInfo: { total: 0 } }),
} as unknown as ChildrenResponse
}
return {
ok: true,
status: 200,
json: async () => ({ data: mockFiles, pageInfo: { total: 4 } }),
} as unknown as ChildrenResponse
},
)
vi.mocked(shareClient.fields.$get).mockResolvedValue({
ok: true,
status: 200,
json: async () => [],
} as unknown as FieldsResponse)
})
afterEach(() => {
cleanup()
})
it('navigates immediately on single clicking card body even if already selected', async () => {
render(
<QueryClientProvider client={queryClient}>
<PublicShareManager shareId="share-1" />
</QueryClientProvider>,
)
await waitFor(() => {
expect(screen.getByText('File 1.mov')).toBeTruthy()
})
const checkboxes = screen.getAllByRole('checkbox')
// Select first card via checkbox
fireEvent.click(checkboxes[0])
expect(checkboxes[0].getAttribute('data-state')).toBe('checked')
// Single click on card body must navigate
const cards = screen.getAllByTestId('file-card')
fireEvent.click(cards[0])
expect(mockNavigate).toHaveBeenCalledWith({
to: '/share/$shareId/files/$fileId',
params: {
shareId: 'share-1',
fileId: 'f1',
},
})
})
it('independently toggles checkbox without deselecting other selected assets', async () => {
render(
<QueryClientProvider client={queryClient}>
<PublicShareManager shareId="share-1" />
</QueryClientProvider>,
)
await waitFor(() => {
expect(screen.getByText('File 1.mov')).toBeTruthy()
})
const checkboxes = screen.getAllByRole('checkbox')
// Select items 0, 1, 2
fireEvent.click(checkboxes[0])
fireEvent.click(checkboxes[1])
fireEvent.click(checkboxes[2])
expect(checkboxes[0].getAttribute('data-state')).toBe('checked')
expect(checkboxes[1].getAttribute('data-state')).toBe('checked')
expect(checkboxes[2].getAttribute('data-state')).toBe('checked')
// Now click checkbox on item 1 (which is currently selected)
fireEvent.click(checkboxes[1])
// Item 1 should be unchecked, items 0 and 2 should remain checked
expect(checkboxes[1].getAttribute('data-state')).toBe('unchecked')
expect(checkboxes[0].getAttribute('data-state')).toBe('checked')
expect(checkboxes[2].getAttribute('data-state')).toBe('checked')
})
it('supports shift-click range selection between cards or checkboxes', async () => {
render(
<QueryClientProvider client={queryClient}>
<PublicShareManager shareId="share-1" />
</QueryClientProvider>,
)
await waitFor(() => {
expect(screen.getByText('File 1.mov')).toBeTruthy()
})
const checkboxes = screen.getAllByRole('checkbox')
// Click first item checkbox to establish lastSelectedId
fireEvent.click(checkboxes[0])
expect(checkboxes[0].getAttribute('data-state')).toBe('checked')
// Shift-click the 3rd item checkbox (index 2)
fireEvent.click(checkboxes[2], { shiftKey: true })
// Items 0, 1, and 2 must now all be checked
expect(checkboxes[0].getAttribute('data-state')).toBe('checked')
expect(checkboxes[1].getAttribute('data-state')).toBe('checked')
expect(checkboxes[2].getAttribute('data-state')).toBe('checked')
expect(checkboxes[3].getAttribute('data-state')).toBe('unchecked')
})
it('updates range anchor when the anchor item is deselected so it is not re-selected on next shift-click', async () => {
render(
<QueryClientProvider client={queryClient}>
<PublicShareManager shareId="share-1" />
</QueryClientProvider>,
)
await waitFor(() => {
expect(screen.getByText('File 1.mov')).toBeTruthy()
})
const checkboxes = screen.getAllByRole('checkbox')
// 1. Click item 0 to establish anchor at item 0
fireEvent.click(checkboxes[0])
expect(checkboxes[0].getAttribute('data-state')).toBe('checked')
// 2. Shift-click item 2 -> selects 0, 1, 2
fireEvent.click(checkboxes[2], { shiftKey: true })
expect(checkboxes[0].getAttribute('data-state')).toBe('checked')
expect(checkboxes[1].getAttribute('data-state')).toBe('checked')
expect(checkboxes[2].getAttribute('data-state')).toBe('checked')
// 3. Deselect item 0 via its checkbox
fireEvent.click(checkboxes[0])
expect(checkboxes[0].getAttribute('data-state')).toBe('unchecked')
// 4. Shift-click item 3 -> should NOT re-select item 0
fireEvent.click(checkboxes[3], { shiftKey: true })
expect(checkboxes[0].getAttribute('data-state')).toBe('unchecked')
expect(checkboxes[3].getAttribute('data-state')).toBe('checked')
})
})
@@ -21,6 +21,7 @@ import { FieldInfo } from '@shumai/dtos'
import { FileViewer } from './file-viewer'
import { CompareViewer } from './compare/compare-viewer'
import { pickDefaultCompareVersions } from './compare/compare-utils'
import { computeNextItemSelection } from '@/ui/lib/selection-utils'
import type { MediaController } from './viewers/types'
import type { Annotation } from '@/ui/types'
@@ -145,6 +146,7 @@ export function PublicShareManager({
const [selectedItem, setSelectedItem] = useState<AssetInfo | null>(null)
const [selectedIds, setSelectedIds] = useState<Set<string>>(new Set())
const [lastSelectedId, setLastSelectedId] = useState<string | null>(null)
const [rightSidebarWidth, setRightSidebarWidth] = useState(360)
const [isRightSidebarCollapsed, setIsRightSidebarCollapsed] = useState(() => !initialFileId)
const mediaControllerRef = useRef<MediaController | null>(null)
@@ -335,6 +337,8 @@ export function PublicShareManager({
})
}
setSelectedIds(new Set())
setSelectedItem(null)
setLastSelectedId(null)
}
const handleBreadcrumbClick = (folderId: string) => {
@@ -354,6 +358,25 @@ export function PublicShareManager({
}
setSelectedIds(new Set())
setSelectedItem(null)
setLastSelectedId(null)
}
const handleItemSelect = (
item: AssetInfo,
e: React.MouseEvent,
meta?: { isCheckbox?: boolean },
) => {
const nextState = computeNextItemSelection({
item,
event: e,
meta,
folders,
files,
state: { selectedIds, selectedItem, lastSelectedId },
})
setSelectedIds(nextState.selectedIds)
setSelectedItem(nextState.selectedItem)
setLastSelectedId(nextState.lastSelectedId)
}
const handleCommentSelect = (comment: CommentInfo) => {
@@ -686,30 +709,12 @@ export function PublicShareManager({
totalFilesSize={totalFilesSize}
selectedItem={selectedItem}
selectedIds={selectedIds}
onItemSelect={(item, e) => {
if (e.metaKey || e.ctrlKey) {
const next = new Set(selectedIds)
if (next.has(item.id!)) {
next.delete(item.id!)
setSelectedIds(next)
if (selectedItem?.id === item.id) {
const remaining = [...folders, ...files].find((i) => next.has(i.id!))
setSelectedItem(remaining || null)
}
} else {
next.add(item.id!)
setSelectedIds(next)
setSelectedItem(item)
}
} else {
setSelectedIds(new Set([item.id!]))
setSelectedItem(item)
}
}}
onItemSelect={handleItemSelect}
onItemDoubleClick={handleItemDoubleClick}
onClearSelection={() => {
setSelectedIds(new Set())
setSelectedItem(null)
setLastSelectedId(null)
}}
fetchNextFoldersPage={fetchNextFoldersPage}
hasNextFoldersPage={hasNextPageFolders}
@@ -732,32 +737,14 @@ export function PublicShareManager({
files={files}
selectedItem={selectedItem}
selectedIds={selectedIds}
onItemSelect={(item, e) => {
if (e.metaKey || e.ctrlKey) {
const next = new Set(selectedIds)
if (next.has(item.id!)) {
next.delete(item.id!)
setSelectedIds(next)
if (selectedItem?.id === item.id) {
const remaining = [...folders, ...files].find((i) => next.has(i.id!))
setSelectedItem(remaining || null)
}
} else {
next.add(item.id!)
setSelectedIds(next)
setSelectedItem(item)
}
} else {
setSelectedIds(new Set([item.id!]))
setSelectedItem(item)
}
}}
onItemSelect={handleItemSelect}
onItemDoubleClick={handleItemDoubleClick}
onSaveField={() => {}}
displayStyle={(shareInfo.viewMode as 'card' | 'list') ?? 'card'}
onClearSelection={() => {
setSelectedIds(new Set())
setSelectedItem(null)
setLastSelectedId(null)
}}
fetchNextFoldersPage={fetchNextFoldersPage}
hasNextFoldersPage={hasNextPageFolders}
@@ -170,4 +170,22 @@ describe('SpriteScrubber', () => {
expect(scrubber.className).toContain('cursor-pointer')
expect(scrubber.className).not.toContain('cursor-crosshair')
})
it('renders loading spinner overlay with pointer-events-none when hovering before sprite loads', () => {
const { getByTestId, container } = render(
<SpriteScrubber
spriteUrl="https://example.com/sprite.webp"
thumbnailUrl="https://example.com/thumb.webp"
videoWidth={1920}
videoHeight={1080}
/>,
)
const scrubber = getByTestId('sprite-scrubber')
fireEvent.mouseEnter(scrubber)
const spinnerOverlay = container.querySelector('.animate-spin')?.parentElement
expect(spinnerOverlay).toBeTruthy()
expect(spinnerOverlay?.className).toContain('pointer-events-none')
})
})
@@ -180,7 +180,7 @@ export const SpriteScrubber: React.FC<SpriteScrubberProps> = ({
/>
{isHovering && !spriteLoaded && (
<div className="absolute inset-0 flex items-center justify-center bg-black/50 z-10">
<div className="absolute inset-0 flex items-center justify-center bg-black/50 z-10 pointer-events-none">
<div className="w-6 h-6 border-2 border-white/30 border-t-white rounded-full animate-spin" />
</div>
)}
+177 -2
View File
@@ -1,5 +1,10 @@
import { describe, expect, it } from 'vitest'
import { getSelectedRangeIds } from './selection-utils'
import { describe, expect, it, vi } from 'vitest'
import {
computeNextItemSelection,
getSelectedRangeIds,
handleCardClick,
type ItemSelectionState,
} from './selection-utils'
import type { AssetInfo } from '@shumai/dtos'
describe('getSelectedRangeIds', () => {
@@ -89,3 +94,173 @@ describe('getSelectedRangeIds', () => {
expect(result?.has('folder2')).toBe(true)
})
})
describe('computeNextItemSelection', () => {
const files = [
{ id: 'f1', name: 'File 1', type: 'file' },
{ id: 'f2', name: 'File 2', type: 'file' },
{ id: 'f3', name: 'File 3', type: 'file' },
{ id: 'f4', name: 'File 4', type: 'file' },
] as unknown as AssetInfo[]
it('selects single item on plain click', () => {
const initialState: ItemSelectionState = {
selectedIds: new Set(),
selectedItem: null,
lastSelectedId: null,
}
const state = computeNextItemSelection({
item: files[0],
event: { metaKey: false, ctrlKey: false, shiftKey: false } as unknown as React.MouseEvent,
folders: [],
files,
state: initialState,
})
expect(state.selectedIds).toEqual(new Set(['f1']))
expect(state.selectedItem).toEqual(files[0])
expect(state.lastSelectedId).toBe('f1')
})
it('independently toggles checkbox without deselecting other items', () => {
const initialState: ItemSelectionState = {
selectedIds: new Set(['f1', 'f2', 'f3']),
selectedItem: files[2],
lastSelectedId: 'f1',
}
// Toggle f2 off via checkbox
const state = computeNextItemSelection({
item: files[1],
event: { metaKey: false, ctrlKey: false, shiftKey: false } as unknown as React.MouseEvent,
meta: { isCheckbox: true },
folders: [],
files,
state: initialState,
})
expect(state.selectedIds).toEqual(new Set(['f1', 'f3']))
expect(state.lastSelectedId).toBe('f1')
})
it('resets range anchor when the range anchor is deselected (Finding 2 bug)', () => {
// Repro steps:
// 1. Click f1 (anchor = f1)
const state1 = computeNextItemSelection({
item: files[0],
event: { metaKey: false, ctrlKey: false, shiftKey: false } as unknown as React.MouseEvent,
folders: [],
files,
state: { selectedIds: new Set(), selectedItem: null, lastSelectedId: null },
})
expect(state1.lastSelectedId).toBe('f1')
// 2. Shift-click f3 -> selects f1, f2, f3; selectedItem = f3; lastSelectedId remains f1
const state2 = computeNextItemSelection({
item: files[2],
event: { metaKey: false, ctrlKey: false, shiftKey: true } as unknown as React.MouseEvent,
folders: [],
files,
state: state1,
})
expect(state2.selectedIds).toEqual(new Set(['f1', 'f2', 'f3']))
expect(state2.selectedItem).toEqual(files[2])
expect(state2.lastSelectedId).toBe('f1')
// 3. Ctrl-click f1 to deselect f1
// The anchor f1 is now deselected! In the buggy version, lastSelectedId remained f1 because selectedItem was f3.
const state3 = computeNextItemSelection({
item: files[0],
event: { metaKey: true, ctrlKey: false, shiftKey: false } as unknown as React.MouseEvent,
folders: [],
files,
state: state2,
})
expect(state3.selectedIds).toEqual(new Set(['f2', 'f3']))
// Anchor MUST NOT be the deselected f1! It must update to a remaining selected item or null
expect(state3.lastSelectedId).not.toBe('f1')
expect(state3.selectedIds.has(state3.lastSelectedId!)).toBe(true)
// 4. Subsequent Shift-click on f4 must NOT re-select f1
const state4 = computeNextItemSelection({
item: files[3],
event: { metaKey: false, ctrlKey: false, shiftKey: true } as unknown as React.MouseEvent,
folders: [],
files,
state: state3,
})
expect(state4.selectedIds.has('f1')).toBe(false)
expect(state4.selectedIds.has('f4')).toBe(true)
})
})
describe('handleCardClick', () => {
const mockItem = { id: 'item-1', name: 'File 1' } as unknown as AssetInfo
it('in public mode, ignores click with detail > 1 (Finding 1 double-click fix)', () => {
const onSelect = vi.fn()
const onDoubleClick = vi.fn()
// Rapid double-click event (detail = 2)
handleCardClick({
item: mockItem,
event: {
detail: 2,
metaKey: false,
ctrlKey: false,
shiftKey: false,
} as unknown as React.MouseEvent,
isPublic: true,
onSelect,
onDoubleClick,
})
expect(onDoubleClick).not.toHaveBeenCalled()
expect(onSelect).not.toHaveBeenCalled()
})
it('in public mode, single click (detail = 1) calls onDoubleClick', () => {
const onSelect = vi.fn()
const onDoubleClick = vi.fn()
handleCardClick({
item: mockItem,
event: {
detail: 1,
metaKey: false,
ctrlKey: false,
shiftKey: false,
} as unknown as React.MouseEvent,
isPublic: true,
onSelect,
onDoubleClick,
})
expect(onDoubleClick).toHaveBeenCalledWith(mockItem)
expect(onSelect).not.toHaveBeenCalled()
})
it('in internal mode, preserves multi-selection when clicking already selected card', () => {
const onSelect = vi.fn()
const onDoubleClick = vi.fn()
handleCardClick({
item: mockItem,
event: {
detail: 1,
metaKey: false,
ctrlKey: false,
shiftKey: false,
} as unknown as React.MouseEvent,
isPublic: false,
selectedCount: 3,
isChecked: true,
onSelect,
onDoubleClick,
})
expect(onSelect).not.toHaveBeenCalled()
expect(onDoubleClick).not.toHaveBeenCalled()
})
})
+132
View File
@@ -1,4 +1,136 @@
import type { AssetInfo } from '@shumai/dtos'
import type React from 'react'
export interface ItemSelectionState {
selectedIds: Set<string>
selectedItem: AssetInfo | null
lastSelectedId: string | null
}
export interface ComputeItemSelectionOptions {
item: AssetInfo
event: React.MouseEvent
meta?: { isCheckbox?: boolean }
folders: AssetInfo[]
files: AssetInfo[]
state: ItemSelectionState
}
export function computeNextItemSelection({
item,
event,
meta,
folders,
files,
state,
}: ComputeItemSelectionOptions): ItemSelectionState {
const isCtrlOrCmd = event.metaKey || event.ctrlKey
const isShift = event.shiftKey
if (isShift && state.lastSelectedId) {
const allItems = [...folders, ...files]
const lastSelectedItem = allItems.find((i) => i.id === state.lastSelectedId)
if (lastSelectedItem) {
const newSelectedIds = getSelectedRangeIds(
lastSelectedItem,
item,
state.lastSelectedId,
folders,
files,
state.selectedIds,
)
if (newSelectedIds) {
return {
selectedIds: newSelectedIds,
selectedItem: item,
lastSelectedId: state.lastSelectedId,
}
}
}
}
if (isCtrlOrCmd || meta?.isCheckbox) {
const next = new Set(state.selectedIds)
if (next.has(item.id!)) {
next.delete(item.id!)
const allItems = [...folders, ...files]
const remaining = allItems.find((i) => next.has(i.id!)) || null
return {
selectedIds: next,
selectedItem: state.selectedItem?.id === item.id ? remaining : state.selectedItem,
lastSelectedId:
state.lastSelectedId === item.id
? remaining
? remaining.id!
: null
: state.lastSelectedId,
}
}
next.add(item.id!)
return {
selectedIds: next,
selectedItem: item,
lastSelectedId: item.id!,
}
}
return {
selectedIds: new Set([item.id!]),
selectedItem: item,
lastSelectedId: item.id!,
}
}
export interface HandleCardClickOptions {
item: AssetInfo
event: React.MouseEvent
isPublic?: boolean
selectedCount?: number
isSelected?: boolean
isChecked?: boolean
onSelect: (item: AssetInfo, event: React.MouseEvent) => void
onDoubleClick: (item: AssetInfo) => void
}
export function handleCardClick({
item,
event,
isPublic = false,
selectedCount = 0,
isSelected = false,
isChecked = false,
onSelect,
onDoubleClick,
}: HandleCardClickOptions): void {
if (isPublic) {
// Ignore subsequent clicks of a rapid double-click in public mode to prevent duplicate navigations
if (event.detail > 1) {
return
}
if (event.metaKey || event.ctrlKey || event.shiftKey) {
onSelect(item, event)
} else {
onDoubleClick(item)
}
return
}
if (
selectedCount > 1 &&
(isChecked || isSelected) &&
!event.metaKey &&
!event.ctrlKey &&
!event.shiftKey
) {
// Frame.io behavior: clicking an already selected card when multiple items are selected preserves the selection
return
}
onSelect(item, event)
}
export function getSelectedRangeIds(
lastSelectedItem: AssetInfo,