diff --git a/src/components/shared/AssetGrid.tsx b/src/components/shared/AssetGrid.tsx index c21a349..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 (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, @@ -214,6 +214,8 @@ const AssetGrid = forwardRef(({ assets, isInternal photo={context.photo} width={context.width} height={context.height} + selectable={selectable} + onSelect={(event) => handleSelect(context.index, context.photo, event)} /> ); }; diff --git a/src/components/shared/ResponsiveVirtualizedAssetGrid.tsx b/src/components/shared/ResponsiveVirtualizedAssetGrid.tsx index 4c971f2..ed21a71 100644 --- a/src/components/shared/ResponsiveVirtualizedAssetGrid.tsx +++ b/src/components/shared/ResponsiveVirtualizedAssetGrid.tsx @@ -112,14 +112,6 @@ const ResponsiveVirtualizedAssetGrid = forwardRef) => { - if (selectedIds.length > 0) { - handleSelect(index, asset, event); - } else { - setIndex(index); - } - }, [selectedIds]); - 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: [] }); @@ -200,11 +200,15 @@ const ResponsiveVirtualizedAssetGrid = forwardRef { + e.stopPropagation(); + handleSelect(assetIndex, asset, e); + }} /> )} diff --git a/src/components/shared/VirtualizedAssetGrid.tsx b/src/components/shared/VirtualizedAssetGrid.tsx index add29f4..57837b4 100644 --- a/src/components/shared/VirtualizedAssetGrid.tsx +++ b/src/components/shared/VirtualizedAssetGrid.tsx @@ -76,14 +76,6 @@ const VirtualizedAssetGrid = forwardRef) => { - if (selectedIds.length > 0) { - handleSelect(index, asset, event); - } else { - setIndex(index); - } - }, [selectedIds]); - 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: [] }); @@ -166,11 +166,15 @@ const VirtualizedAssetGrid = forwardRef { + e.stopPropagation(); + handleSelect(assetIndex, asset, e); + }} /> )} diff --git a/src/components/ui/lazy-grid-image.tsx b/src/components/ui/lazy-grid-image.tsx index 015fc33..703bf10 100644 --- a/src/components/ui/lazy-grid-image.tsx +++ b/src/components/ui/lazy-grid-image.tsx @@ -1,6 +1,7 @@ /* eslint-disable @next/next/no-img-element */ import { humanizeDuration } from '@/helpers/string.helper' import { PlayIcon } from '@radix-ui/react-icons' +import { CircleCheck } from 'lucide-react' import React, { useEffect } from 'react' import type { RenderImageProps } from 'react-photo-album' import type { AssetPhoto } from '../shared/AssetGrid' @@ -10,9 +11,11 @@ interface LazyGridImageProps { photo: AssetPhoto; width: number; height: number; + selectable?: boolean; + onSelect?: (event: React.MouseEvent) => void; } -export default function LazyGridImage({ imageProps, photo, width, height }: LazyGridImageProps) { +export default function LazyGridImage({ imageProps, photo, width, height, selectable, onSelect }: LazyGridImageProps) { const [isVisible, setIsVisible] = React.useState(false) const imageRef = React.useRef(null) @@ -45,12 +48,32 @@ export default function LazyGridImage({ imageProps, photo, width, height }: Lazy ) return ( -
+
{imageProps.alt {photo.isVideo &&
{!!photo.duration && {humanizeDuration(photo.duration)}}
} + {selectable && ( +
{ + e.stopPropagation(); + onSelect?.(e); + }} + > +
+ +
+
+ )}
) }