diff --git a/src/components/shared/AssetGrid.tsx b/src/components/shared/AssetGrid.tsx index 4dbd27b..74b33a6 100644 --- a/src/components/shared/AssetGrid.tsx +++ b/src/components/shared/AssetGrid.tsx @@ -120,14 +120,6 @@ const AssetGrid = forwardRef(({ assets, isInternal }), [assets, selectedIds, updateContext]); - const handleClick = (index: number, asset: AssetPhoto, event: React.MouseEvent) => { - if (selectable && (event.metaKey || event.ctrlKey || selectedIds.length > 0)) { - handleSelect(index, asset, event); - } else { - setIndex(index); - } - } - const handleSelect = (_idx: number, asset: AssetPhoto, event: React.MouseEvent) => { event.stopPropagation(); @@ -157,6 +149,14 @@ const AssetGrid = forwardRef(({ assets, isInternal } }; + const handleClick = (index: number, asset: AssetPhoto, event: React.MouseEvent) => { + if (selectable && (event.metaKey || event.ctrlKey || selectedIds.length > 0)) { + handleSelect(index, asset, event); + } else { + setIndex(index); + } + } + const slides = useMemo(() => { return assets.filter((asset) => !deletedIds.has(asset.id)).map((asset) => ({ ...asset, diff --git a/src/components/shared/ResponsiveVirtualizedAssetGrid.tsx b/src/components/shared/ResponsiveVirtualizedAssetGrid.tsx index 81d3699..ed21a71 100644 --- a/src/components/shared/ResponsiveVirtualizedAssetGrid.tsx +++ b/src/components/shared/ResponsiveVirtualizedAssetGrid.tsx @@ -112,14 +112,6 @@ const ResponsiveVirtualizedAssetGrid = forwardRef) => { - if (selectable && (event.metaKey || event.ctrlKey || selectedIds.length > 0)) { - handleSelect(index, asset, event); - } else { - setIndex(index); - } - }, [selectedIds, selectable, handleSelect]); - const handleSelect = useCallback((_idx: number, asset: IAsset, event: React.MouseEvent) => { event.stopPropagation(); const isPresent = selectedIds.includes(asset.id); @@ -146,6 +138,14 @@ const ResponsiveVirtualizedAssetGrid = forwardRef) => { + if (selectable && (event.metaKey || event.ctrlKey || selectedIds.length > 0)) { + handleSelect(index, asset, event); + } else { + setIndex(index); + } + }, [selectedIds, selectable, handleSelect]); + const handleEsc = useCallback((event: KeyboardEvent) => { if (event.key === "Escape") { updateContext({ selectedIds: [] }); diff --git a/src/components/shared/VirtualizedAssetGrid.tsx b/src/components/shared/VirtualizedAssetGrid.tsx index a5367e1..57837b4 100644 --- a/src/components/shared/VirtualizedAssetGrid.tsx +++ b/src/components/shared/VirtualizedAssetGrid.tsx @@ -76,14 +76,6 @@ const VirtualizedAssetGrid = forwardRef) => { - if (selectable && (event.metaKey || event.ctrlKey || selectedIds.length > 0)) { - handleSelect(index, asset, event); - } else { - setIndex(index); - } - }, [selectedIds, selectable, handleSelect]); - const handleSelect = useCallback((_idx: number, asset: IAsset, event: React.MouseEvent) => { event.stopPropagation(); const isPresent = selectedIds.includes(asset.id); @@ -110,6 +102,14 @@ const VirtualizedAssetGrid = forwardRef) => { + if (selectable && (event.metaKey || event.ctrlKey || selectedIds.length > 0)) { + handleSelect(index, asset, event); + } else { + setIndex(index); + } + }, [selectedIds, selectable, handleSelect]); + const handleEsc = useCallback((event: KeyboardEvent) => { if (event.key === "Escape") { updateContext({ selectedIds: [] });