Skip to content

fix(ui): fix no progress images when gallery is empty #3268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 25, 2023
Merged

fix(ui): fix no progress images when gallery is empty #3268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions invokeai/frontend/web/src/features/gallery/components/CurrentImageButtons.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,11 +151,17 @@ const CurrentImageButtons = (props: CurrentImageButtonsProps) => {
};

const handleCopyImage = async () => {
if (!selectedImage) return;
if (!selectedImage?.url) {
return;
}

const blob = await fetch(getUrl(selectedImage.url)).then((res) =>
res.blob()
);
const url = getUrl(selectedImage.url);

if (!url) {
return;
}

const blob = await fetch(url).then((res) => res.blob());
const data = [new ClipboardItem({ [blob.type]: blob })];

await navigator.clipboard.write(data);
Expand All @@ -175,6 +181,10 @@ const CurrentImageButtons = (props: CurrentImageButtonsProps) => {
: window.location.toString() + selectedImage.url
: '';

if (!url) {
return;
}

navigator.clipboard.writeText(url).then(() => {
toast({
title: t('toast.imageLinkCopied'),
Expand Down Expand Up @@ -477,7 +487,7 @@ const CurrentImageButtons = (props: CurrentImageButtonsProps) => {
{t('parameters.copyImageToLink')}
</IAIButton>

<Link download={true} href={getUrl(selectedImage!.url)}>
<Link download={true} href={getUrl(selectedImage?.url)}>
<IAIButton leftIcon={<FaDownload />} size="sm" w="100%">
{t('parameters.downloadImage')}
</IAIButton>
Expand Down
9 changes: 5 additions & 4 deletions invokeai/frontend/web/src/features/gallery/components/CurrentImageDisplay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Flex, Icon } from '@chakra-ui/react';
import { createSelector } from '@reduxjs/toolkit';
import { useAppSelector } from 'app/storeHooks';
import { systemSelector } from 'features/system/store/systemSelectors';
import { isEqual } from 'lodash';

import { MdPhoto } from 'react-icons/md';
Expand All @@ -12,12 +13,12 @@ import CurrentImageButtons from './CurrentImageButtons';
import CurrentImagePreview from './CurrentImagePreview';

export const currentImageDisplaySelector = createSelector(
[gallerySelector, selectedImageSelector],
(gallery, selectedImage) => {
const { currentImage, intermediateImage } = gallery;
[systemSelector, selectedImageSelector],
(system, selectedImage) => {
const { progressImage } = system;

return {
hasAnImageToDisplay: selectedImage || intermediateImage,
hasAnImageToDisplay: selectedImage || progressImage,
};
},
{
Expand Down