Skip to content

High performance self-hosted photo and video management solution.

feat: zoom image improvements for reactive prop handlings (#25286)

Min Idzelisca0d4b283aaf
diff --git a/web/src/lib/actions/zoom-image.ts b/web/src/lib/actions/zoom-image.ts
index e67d3e1928..36cce538d1 100644
--- a/web/src/lib/actions/zoom-image.ts
+++ b/web/src/lib/actions/zoom-image.ts
@@ -1,48 +1,42 @@
import { photoZoomState } from '$lib/stores/zoom-image.store';
-import { useZoomImageWheel } from '@zoom-image/svelte';
+import { createZoomImageWheel } from '@zoom-image/core';
import { get } from 'svelte/store';
export const zoomImageAction = (node: HTMLElement, options?: { disabled?: boolean }) => {
- const { createZoomImage, zoomImageState, setZoomImageState } = useZoomImageWheel();
-
- createZoomImage(node, {
+ const state = get(photoZoomState);
+ const zoomInstance = createZoomImageWheel(node, {
maxZoom: 10,
+ initialState: state,
});
- const state = get(photoZoomState);
- if (state) {
- setZoomImageState(state);
- }
+ const unsubscribes = [
+ photoZoomState.subscribe((state) => zoomInstance.setState(state)),
+ zoomInstance.subscribe(({ state }) => {
+ photoZoomState.set(state);
+ }),
+ ];
- // Store original event handlers so we can prevent them when disabled
- const wheelHandler = (event: WheelEvent) => {
+ const stopIfDisabled = (event: Event) => {
if (options?.disabled) {
event.stopImmediatePropagation();
}
};
- const pointerDownHandler = (event: PointerEvent) => {
- if (options?.disabled) {
- event.stopImmediatePropagation();
- }
- };
-
- // Add handlers at capture phase with higher priority
- node.addEventListener('wheel', wheelHandler, { capture: true });
- node.addEventListener('pointerdown', pointerDownHandler, { capture: true });
-
- const unsubscribes = [photoZoomState.subscribe(setZoomImageState), zoomImageState.subscribe(photoZoomState.set)];
+ node.addEventListener('wheel', stopIfDisabled, { capture: true });
+ node.addEventListener('pointerdown', stopIfDisabled, { capture: true });
+ node.style.overflow = 'visible';
return {
update(newOptions?: { disabled?: boolean }) {
options = newOptions;
},
destroy() {
- node.removeEventListener('wheel', wheelHandler, { capture: true });
- node.removeEventListener('pointerdown', pointerDownHandler, { capture: true });
for (const unsubscribe of unsubscribes) {
unsubscribe();
}
+ node.removeEventListener('wheel', stopIfDisabled, { capture: true });
+ node.removeEventListener('pointerdown', stopIfDisabled, { capture: true });
+ zoomInstance.cleanup();
},
};
};
diff --git a/web/src/lib/stores/zoom-image.store.ts b/web/src/lib/stores/zoom-image.store.ts
index 2c6ee18972..63c20b2c21 100644
--- a/web/src/lib/stores/zoom-image.store.ts
+++ b/web/src/lib/stores/zoom-image.store.ts
@@ -1,4 +1,25 @@
import type { ZoomImageWheelState } from '@zoom-image/core';
-import { writable } from 'svelte/store';
+import { derived, writable } from 'svelte/store';
-export const photoZoomState = writable<ZoomImageWheelState>();
+export const photoZoomState = writable<ZoomImageWheelState>({
+ currentRotation: 0,
+ currentZoom: 1,
+ enable: true,
+ currentPositionX: 0,
+ currentPositionY: 0,
+});
+
+export const photoZoomTransform = derived(
+ photoZoomState,
+ ($state) => `translate(${$state.currentPositionX}px,${$state.currentPositionY}px) scale(${$state.currentZoom})`,
+);
+
+export const resetZoomState = () => {
+ photoZoomState.set({
+ currentRotation: 0,
+ currentZoom: 1,
+ enable: true,
+ currentPositionX: 0,
+ currentPositionY: 0,
+ });
+};