Backup_Repos/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2026-03-25 14:41:18 +01:00
Code Issues Projects Releases Wiki Activity

Merge fa4bfa2c7a into fd480c5a3e

Browse source
This commit is contained in:
(Moai Emoji) 2026-03-23 23:10:53 -05:00 committed by GitHub
commit 3a3ff1d1fc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 27 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -206,8 +206,25 @@ export const LightboxComponent: React.FC<IProps> = ({
setLightboxSettings({ slideshowDelay: v });
}
const scaleUp =
lightboxSettings?.scaleUp ??
config?.interface.imageLightbox.scaleUp ??
false;
const resetZoomOnNav =
lightboxSettings?.resetZoomOnNav ??
config?.interface.imageLightbox.resetZoomOnNav ??
false;
const scrollMode =
lightboxSettings?.scrollMode ??
config?.interface.imageLightbox.scrollMode ??
GQL.ImageLightboxScrollMode.Zoom;
const displayMode =
lightboxSettings?.displayMode ?? GQL.ImageLightboxDisplayMode.FitXy;
lightboxSettings?.displayMode ??
config?.interface.imageLightbox.displayMode ??
GQL.ImageLightboxDisplayMode.FitXy;
const oldDisplayMode = useRef(displayMode);
function setDisplayMode(v: GQL.ImageLightboxDisplayMode) {
@ -250,13 +267,13 @@ export const LightboxComponent: React.FC<IProps> = ({
// reset zoom status
// setResetZoom((r) => !r);
// setZoomed(false);
if (lightboxSettings?.resetZoomOnNav) {
if (resetZoomOnNav) {
setZoom(1);
}
setResetPosition((r) => !r);
oldIndex.current = index;
}, [index, images.length, lightboxSettings?.resetZoomOnNav]);
}, [index, images.length, resetZoomOnNav]);
const getNavOffset = useCallback(() => {
if (images.length < 2) return;
@ -288,13 +305,13 @@ export const LightboxComponent: React.FC<IProps> = ({
// reset zoom status
// setResetZoom((r) => !r);
// setZoomed(false);
if (lightboxSettings?.resetZoomOnNav) {
if (resetZoomOnNav) {
setZoom(1);
}
setResetPosition((r) => !r);
}
oldDisplayMode.current = displayMode;
}, [displayMode, lightboxSettings?.resetZoomOnNav]);
}, [displayMode, resetZoomOnNav]);
const selectIndex = (e: React.MouseEvent, i: number) => {
setIndex(i);
@ -635,7 +652,7 @@ export const LightboxComponent: React.FC<IProps> = ({
label={intl.formatMessage({
id: "dialogs.lightbox.scale_up.label",
})}
checked={lightboxSettings?.scaleUp ?? false}
checked={scaleUp}
disabled={displayMode === GQL.ImageLightboxDisplayMode.Original}
onChange={(v) => setScaleUp(v.currentTarget.checked)}
/>
@ -655,7 +672,7 @@ export const LightboxComponent: React.FC<IProps> = ({
label={intl.formatMessage({
id: "dialogs.lightbox.reset_zoom_on_nav",
})}
checked={lightboxSettings?.resetZoomOnNav ?? false}
checked={resetZoomOnNav}
onChange={(v) => setResetZoomOnNav(v.currentTarget.checked)}
/>
</Col>
@ -674,10 +691,7 @@ export const LightboxComponent: React.FC<IProps> = ({
onChange={(e) =>
setScrollMode(e.target.value as GQL.ImageLightboxScrollMode)
}
value={
lightboxSettings?.scrollMode ??
GQL.ImageLightboxScrollMode.Zoom
}
value={scrollMode}
className="btn-secondary mx-1 mb-1"
>
<option
@ -885,11 +899,8 @@ export const LightboxComponent: React.FC<IProps> = ({
width={image.visual_files?.[0]?.width ?? 0}
height={image.visual_files?.[0]?.height ?? 0}
displayMode={displayMode}
scaleUp={lightboxSettings?.scaleUp ?? false}
scrollMode={
lightboxSettings?.scrollMode ??
GQL.ImageLightboxScrollMode.Zoom
}
scaleUp={scaleUp}
scrollMode={scrollMode}
resetPosition={resetPosition}
zoom={i === currentIndex ? zoom : 1}
scrollAttemptsBeforeChange={scrollAttemptsBeforeChange}