Skip to content

Web UI: Gallery improvements #1198

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
Oct 21, 2022
Merged

Web UI: Gallery improvements #1198

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
690 changes: 690 additions & 0 deletions frontend/dist/assets/index.2d646c45.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion frontend/dist/assets/index.58175ea1.css
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions frontend/dist/assets/index.7749e179.css
View file
Open in desktop

Large diffs are not rendered by default.

690 changes: 0 additions & 690 deletions frontend/dist/assets/index.b06af007.js
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions frontend/dist/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>InvokeAI - A Stable Diffusion Toolkit</title>
<link rel="shortcut icon" type="icon" href="/assets/favicon.0d253ced.ico" />
<script type="module" crossorigin src="/assets/index.b06af007.js"></script>
<link rel="stylesheet" href="/assets/index.58175ea1.css">
<script type="module" crossorigin src="/assets/index.2d646c45.js"></script>
<link rel="stylesheet" href="/assets/index.7749e179.css">
</head>

<body>
Expand Down
2 changes: 1 addition & 1 deletion frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"@chakra-ui/react": "^2.3.1",
"@emotion/react": "^11.10.4",
"@emotion/styled": "^11.10.4",
"@radix-ui/react-context-menu": "^2.0.1",
"@reduxjs/toolkit": "^1.8.5",
"@types/uuid": "^8.3.4",
"dateformat": "^5.0.3",
Expand All @@ -25,7 +26,6 @@
"react-dropzone": "^14.2.2",
"react-hotkeys-hook": "^3.4.7",
"react-icons": "^4.4.0",
"react-masonry-css": "^1.0.16",
"react-redux": "^8.0.2",
"redux-persist": "^6.0.0",
"socket.io": "^4.5.2",
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/socketio/emitters.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const makeSocketIOEmitters = (

const options = { ...getState().options };

if (tabMap[options.activeTab] === 'txt2img') {
if (tabMap[options.activeTab] !== 'img2img') {
options.shouldUseInitImage = false;
}

Expand Down
11 changes: 8 additions & 3 deletions frontend/src/common/components/WorkInProgress/PostProcessingWIP.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,17 @@ export const PostProcessingWIP = () => {
<p>
Invoke AI offers a wide variety of post processing features. Image
Upscaling and Face Restoration are already available in the WebUI. You
can access them from the Advanced Options menu of the Text To Image tab.
A dedicated UI will be released soon.
can access them from the Advanced Options menu of the Text To Image and
Image To Image tabs. You can also process images directly, using the
image action buttons above the main image display.
</p>
<p>
A dedicated UI will be released soon to facilitate more advanced post
processing workflows.
</p>
<p>
The Invoke AI Command Line Interface offers various other features
including Embiggen, High Resolution Fixing and more.
including Embiggen.
</p>
</div>
);
Expand Down
8 changes: 8 additions & 0 deletions frontend/src/features/gallery/DeleteImageModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
FormControl,
FormLabel,
Flex,
useToast,
} from '@chakra-ui/react';
import { createSelector } from '@reduxjs/toolkit';
import {
Expand Down Expand Up @@ -57,6 +58,7 @@ const DeleteImageModal = forwardRef(
const dispatch = useAppDispatch();
const shouldConfirmOnDelete = useAppSelector(systemSelector);
const cancelRef = useRef<HTMLButtonElement>(null);
const toast = useToast();

const handleClickDelete = (e: SyntheticEvent) => {
e.stopPropagation();
Expand All @@ -65,6 +67,12 @@ const DeleteImageModal = forwardRef(

const handleDelete = () => {
dispatch(deleteImage(image));
toast({
title: 'Image Deleted',
status: 'success',
duration: 2500,
isClosable: true,
});
onClose();
};

Expand Down
42 changes: 42 additions & 0 deletions frontend/src/features/gallery/HoverableImage.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
max-height: 100%;
}

.hoverable-image-delete-button {
position: absolute;
top: 0.25rem;
right: 0.25rem;
}

.hoverable-image-content {
display: flex;
position: absolute;
Expand Down Expand Up @@ -57,3 +63,39 @@
}
}
}

.hoverable-image-context-menu {
z-index: 999;
padding: 0.4rem;
border-radius: 0.25rem;
background-color: var(--context-menu-bg-color);
box-shadow: var(--context-menu-box-shadow);

[role='menuitem'] {
font-size: 0.8rem;
line-height: 1rem;
border-radius: 3px;
display: flex;
align-items: center;
height: 1.75rem;
padding: 0 0.5rem;
position: relative;
user-select: none;
cursor: pointer;
outline: none;

&[data-disabled] {
color: grey;
pointer-events: none;
cursor: not-allowed;
}

&[data-warning] {
color: var(--status-bad-color);
}

&[data-highlighted] {
background-color: var(--context-menu-bg-color-hover);
}
}
}
Loading