Merge pull request #273 from immich-power-tools/fix-gallery-selection

fix: restore gallery grid selection UI
This commit is contained in:
Varun Raj Manoharan authored and GitHub committed 2026-04-23 15:02:28 +05:30
commit 8c8b68e52b
4 files changed
+61 -28

No files matched your search

+10 -8
View File
@@ -120,14 +120,6 @@ const AssetGrid = forwardRef<AssetGridRef, AssetGridProps>(({ 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<AssetGridRef, AssetGridProps>(({ 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<AssetGridRef, AssetGridProps>(({ assets, isInternal
photo={context.photo}
width={context.width}
height={context.height}
selectable={selectable}
onSelect={(event) => handleSelect(context.index, context.photo, event)}
/>
);
};
@@ -112,14 +112,6 @@ const ResponsiveVirtualizedAssetGrid = forwardRef<ResponsiveVirtualizedAssetGrid
}));
}, [assets]);
const handleClick = useCallback((index: number, asset: IAsset, event: React.MouseEvent<HTMLElement>) => {
if (selectedIds.length > 0) {
handleSelect(index, asset, event);
} else {
setIndex(index);
}
}, [selectedIds]);
const handleSelect = useCallback((_idx: number, asset: IAsset, event: React.MouseEvent<HTMLElement>) => {
event.stopPropagation();
const isPresent = selectedIds.includes(asset.id);
@@ -146,6 +138,14 @@ const ResponsiveVirtualizedAssetGrid = forwardRef<ResponsiveVirtualizedAssetGrid
}
}, [selectedIds, assets, lastSelectedIndex, updateContext, onSelectionChange]);
const handleClick = useCallback((index: number, asset: IAsset, event: React.MouseEvent<HTMLElement>) => {
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<ResponsiveVirtualizedAssetGrid
)}
{selectable && (
<div
className={`absolute top-2 left-2 w-4 h-4 rounded-full border-2 ${
className={`absolute top-2 left-2 w-4 h-4 rounded-full border-2 cursor-pointer z-10 ${
isSelected
? 'bg-blue-500 border-blue-500'
: 'bg-white/80 border-gray-300'
}`}
onClick={(e) => {
e.stopPropagation();
handleSelect(assetIndex, asset, e);
}}
/>
)}
</div>
+13 -9
View File
@@ -76,14 +76,6 @@ const VirtualizedAssetGrid = forwardRef<VirtualizedAssetGridRef, VirtualizedAsse
}));
}, [assets]);
const handleClick = useCallback((index: number, asset: IAsset, event: React.MouseEvent<HTMLElement>) => {
if (selectedIds.length > 0) {
handleSelect(index, asset, event);
} else {
setIndex(index);
}
}, [selectedIds]);
const handleSelect = useCallback((_idx: number, asset: IAsset, event: React.MouseEvent<HTMLElement>) => {
event.stopPropagation();
const isPresent = selectedIds.includes(asset.id);
@@ -110,6 +102,14 @@ const VirtualizedAssetGrid = forwardRef<VirtualizedAssetGridRef, VirtualizedAsse
}
}, [selectedIds, assets, lastSelectedIndex, updateContext, onSelectionChange]);
const handleClick = useCallback((index: number, asset: IAsset, event: React.MouseEvent<HTMLElement>) => {
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<VirtualizedAssetGridRef, VirtualizedAsse
)}
{selectable && (
<div
className={`absolute top-2 left-2 w-4 h-4 rounded-full border-2 ${
className={`absolute top-2 left-2 w-4 h-4 rounded-full border-2 cursor-pointer z-10 ${
isSelected
? 'bg-blue-500 border-blue-500'
: 'bg-white/80 border-gray-300'
}`}
onClick={(e) => {
e.stopPropagation();
handleSelect(assetIndex, asset, e);
}}
/>
)}
</div>
+25 -2
View File
@@ -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<HTMLDivElement>(null)
@@ -45,12 +48,32 @@ export default function LazyGridImage({ imageProps, photo, width, height }: Lazy
)
return (
<div style={{ position: 'relative', width, height }}>
<div
style={{
position: 'relative',
width,
height,
}}
className={`group ${photo.isSelected ? 'ring-4 ring-blue-500 ring-inset' : ''}`}
>
<img {...imageProps} alt={imageProps.alt || ""} title="" style={{ ...imageProps.style, width, height, objectFit: 'cover' }} />
{photo.isVideo && <div className="absolute bottom-2 right-2 bg-black/50 p-1 rounded-full flex items-center gap-1">
<PlayIcon className="w-3 h-3 text-white" />
{!!photo.duration && <span className="text-xs text-white">{humanizeDuration(photo.duration)}</span>}
</div>}
{selectable && (
<div
className={`absolute top-2 left-2 z-10 cursor-pointer transition-opacity ${photo.isSelected ? 'opacity-100' : 'opacity-0 group-hover:opacity-100'}`}
onClick={(e) => {
e.stopPropagation();
onSelect?.(e);
}}
>
<div className={`rounded-full p-0.5 ${photo.isSelected ? 'bg-blue-500 text-white' : 'bg-black/20 text-white/50'}`}>
<CircleCheck className="w-5 h-5" />
</div>
</div>
)}
</div>
)
}