Skip to content

Commit 2dd44c1

Browse files
authored
Merge pull request #4 from invoke-ai/fix/gallery-grid-progress-placement
fix(gallery): progress placement, formatting
2 parents 3d9b0fd + 71ad72c commit 2dd44c1

1 file changed

Lines changed: 25 additions & 5 deletions

File tree

invokeai/frontend/webv2/src/workbench/widgets/gallery/GalleryImageGrid.tsx

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ import { getGalleryImageDragData, getGalleryImageDragId } from './galleryDnd';
3232
import { useGalleryWidget } from './GalleryWidgetContext';
3333

3434
const GRID_GAP_PX = 4;
35-
const THUMBNAIL_HOVER_CSS = { '&:hover .gallery-thumb-overlay': { opacity: 1 } } as const;
35+
const THUMBNAIL_HOVER_CSS = {
36+
'&:hover .gallery-thumb-overlay': { opacity: 1 },
37+
} as const;
3638
const THUMBNAIL_BUTTON_STYLE = {
3739
background: 'transparent',
3840
border: 0,
@@ -99,7 +101,11 @@ export const GalleryImageGrid = ({ layout }: { layout: 'stacked' | 'wide' }) =>
99101
}, [gallery.images, imageOrderDir, starredFirst]);
100102

101103
const cells = useMemo<GridCell[]>(() => {
102-
const imageCells: GridCell[] = gallery.images.map((image, imageIndex) => ({ image, imageIndex, kind: 'image' }));
104+
const imageCells: GridCell[] = gallery.images.map((image, imageIndex) => ({
105+
image,
106+
imageIndex,
107+
kind: 'image',
108+
}));
103109
const placeholderCells: GridCell[] = gallery.pendingPlaceholders.map((placeholder) => ({
104110
kind: 'placeholder',
105111
placeholder,
@@ -239,7 +245,10 @@ export const GalleryImageGrid = ({ layout }: { layout: 'stacked' | 'wide' }) =>
239245
if (selectedNames.has(image.imageName) && selectedNames.size > 1) {
240246
return gallery.images
241247
.filter((candidate) => selectedNames.has(candidate.imageName))
242-
.map((candidate) => ({ boardId: candidate.boardId, imageName: candidate.imageName }));
248+
.map((candidate) => ({
249+
boardId: candidate.boardId,
250+
imageName: candidate.imageName,
251+
}));
243252
}
244253

245254
return [{ boardId: image.boardId, imageName: image.imageName }];
@@ -340,7 +349,11 @@ export const GalleryImageGrid = ({ layout }: { layout: 'stacked' | 'wide' }) =>
340349
if (commandId === 'gallery.clearSelection') {
341350
dispatch({
342351
type: 'patchWidgetValues',
343-
values: { selectedImage: null, selectedImageName: null, selectedImageNames: [] },
352+
values: {
353+
selectedImage: null,
354+
selectedImageName: null,
355+
selectedImageNames: [],
356+
},
344357
widgetId: 'gallery',
345358
});
346359
return;
@@ -388,7 +401,12 @@ export const GalleryImageGrid = ({ layout }: { layout: 'stacked' | 'wide' }) =>
388401
id,
389402
title,
390403
}),
391-
runtime.hotkeys.register({ commandId: id, defaultKeys: [...defaultKeys], id, title }),
404+
runtime.hotkeys.register({
405+
commandId: id,
406+
defaultKeys: [...defaultKeys],
407+
id,
408+
title,
409+
}),
392410
]);
393411

394412
return () => {
@@ -546,6 +564,8 @@ const GalleryQueuePlaceholderCell = ({
546564
cursor="pointer"
547565
minW="0"
548566
rounded="md"
567+
overflow="hidden"
568+
position="relative"
549569
w="full"
550570
onClick={onClick}
551571
>

0 commit comments

Comments
 (0)