Backup_Repos/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2026-05-09 05:05:29 +02:00
Code Issues Projects Releases Wiki Activity

Fix merge conflict with #6354

Browse source
This commit is contained in:
sezzim 2025-12-07 20:53:00 -08:00
parent 21411a6321
commit c8be7df4e0
1 changed files with 10 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
ui/v2.5/src/hooks/Lightbox/Lightbox.tsx
View file

@ -229,7 +229,6 @@ export const LightboxComponent: React.FC<IProps> = ({
const [index, setIndex] = useState<number | null>(null);
const [movingLeft, setMovingLeft] = useState(false);
const oldIndex = useRef<number | null>(null);
const [transition, setTransition] = useState<string | null>(null);
const [isSwitchingPage, setIsSwitchingPage] = useState(true);
const [isFullscreen, setFullscreen] = useState(false);
const [showOptions, setShowOptions] = useState(false);
@ -312,6 +311,11 @@ export const LightboxComponent: React.FC<IProps> = ({
);
const disableAnimation = config?.interface.imageLightbox.disableAnimation;
const defaultTransition = disableAnimation ? CLASSNAME_INSTANT : null;
const [transition, setTransition] = useState<string | null>(
defaultTransition
);
function setSlideshowDelay(v: number) {
setLightboxSettings({ slideshowDelay: v });
@ -360,7 +364,10 @@ export const LightboxComponent: React.FC<IProps> = ({
}
}, [isSwitchingPage, images, index]);
const restoreTransition = useDebounce(() => setTransition(null), 400);
const restoreTransition = useDebounce(
() => setTransition(defaultTransition),
400
);
const overrideTransition = useCallback(
(t: string) => {
@ -470,10 +477,6 @@ export const LightboxComponent: React.FC<IProps> = ({
(isUserAction = true) => {
if (isSwitchingPage || index === -1) return;
if (disableAnimation) {
setInstant();
}
setShowChapters(false);
setMovingLeft(true);
@ -491,25 +494,13 @@ export const LightboxComponent: React.FC<IProps> = ({
resetIntervalCallback.current();
}
},
[
images,
pageCallback,
isSwitchingPage,
resetIntervalCallback,
index,
disableAnimation,
setInstant,
]
[images, pageCallback, isSwitchingPage, resetIntervalCallback, index]
);
const handleRight = useCallback(
(isUserAction = true) => {
if (isSwitchingPage) return;
if (disableAnimation) {
setInstant();
}
setMovingLeft(false);
setShowChapters(false);
@ -534,8 +525,6 @@ export const LightboxComponent: React.FC<IProps> = ({
isSwitchingPage,
resetIntervalCallback,
index,
disableAnimation,
setInstant,
]
);