Backup_Repos/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-06 16:34:02 +01:00
Code Issues Projects Releases Wiki Activity

Show correct image in lightbox (#5659)

Browse source
This commit is contained in:
WithoutPants 2025-02-18 16:32:13 +11:00 committed by GitHub
parent 638398808b
commit 50a900e83c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ui/v2.5/src/components/Images/ImageList.tsx
View file

@ -182,7 +182,7 @@ const ImageListImages: React.FC<IImageListImages> = ({
const handleImageOpen = useCallback( const handleImageOpen = useCallback(
(index) => { (index) => {
setSlideshowRunning(true); setSlideshowRunning(true);
showLightbox(index, true); showLightbox({ initialIndex: index, slideshowEnabled: true });
}, },
[showLightbox, setSlideshowRunning] [showLightbox, setSlideshowRunning]
); );

2
ui/v2.5/src/components/Tagger/scenes/SceneTagger.tsx
View file

@ -153,7 +153,7 @@ export const Tagger: React.FC<ITaggerProps> = ({ scenes, queue }) => {
}); });
function showLightboxImage(imagePath: string) { function showLightboxImage(imagePath: string) {
setSpriteImage(imagePath); setSpriteImage(imagePath);
showLightbox(); showLightbox({ images: lightboxImage });
} }
const filteredScenes = useMemo( const filteredScenes = useMemo(

9
ui/v2.5/src/hooks/Lightbox/LightboxLink.tsx
View file

@ -6,16 +6,17 @@ import { Button } from "react-bootstrap";
export const LightboxLink: React.FC< export const LightboxLink: React.FC<
PropsWithChildren<{ images?: ILightboxImage[] | undefined; index?: number }> PropsWithChildren<{ images?: ILightboxImage[] | undefined; index?: number }>
> = ({ images, index, children }) => { > = ({ images, index, children }) => {
const showLightbox = useLightbox({ const showLightbox = useLightbox();
images,
});
if (!images || images.length === 0) { if (!images || images.length === 0) {
return <>{children}</>; return <>{children}</>;
} }
return ( return (
<Button variant="link" onClick={() => showLightbox(index)}> <Button
variant="link"
onClick={() => showLightbox({ images, initialIndex: index })}
>
{children} {children}
</Button> </Button>
); );

13
ui/v2.5/src/hooks/Lightbox/hooks.ts
View file

@ -4,7 +4,7 @@ import { IState, useLightboxContext } from "./context";
import { IChapter } from "./types"; import { IChapter } from "./types";
export const useLightbox = ( export const useLightbox = (
state: Partial<Omit<IState, "isVisible">>, state: Partial<Omit<IState, "isVisible">> = {},
chapters: IChapter[] = [] chapters: IChapter[] = []
) => { ) => {
const { setLightboxState } = useLightboxContext(); const { setLightboxState } = useLightboxContext();
@ -33,14 +33,13 @@ export const useLightbox = (
]); ]);
const show = useCallback( const show = useCallback(
(index?: number, slideshowEnabled = false) => { (props: Partial<IState>) => {
setLightboxState({ setLightboxState({
initialIndex: index, ...props,
isVisible: true, isVisible: true,
slideshowEnabled, page: props.page ?? state.page,
page: state.page, pages: props.pages ?? state.pages,
pages: state.pages, pageSize: props.pageSize ?? state.pageSize,
pageSize: state.pageSize,
chapters: chapters, chapters: chapters,
}); });
}, },