Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
feat(web): pinch to zoom and swipe between images in the preview dialog (#6448)
Wally4eb6fb77e83a
diff --git a/web/src/components/PreviewImageDialog.tsx b/web/src/components/PreviewImageDialog.tsxindex fe41536a7..55636630e 100644--- a/web/src/components/PreviewImageDialog.tsx+++ b/web/src/components/PreviewImageDialog.tsx@@ -22,6 +22,8 @@ const MIN_ZOOM = 1;const MAX_ZOOM = 4;const ZOOM_STEP = 0.2;const DOUBLE_TAP_ZOOM = 2;+const SWIPE_THRESHOLD = 60;+const SWIPE_DIRECTION_RATIO = 1.5;const clampZoom = (scale: number) => Math.min(MAX_ZOOM, Math.max(MIN_ZOOM, scale));@@ -47,6 +49,25 @@ const clampPanOffset = (offset: PanOffset, scale: number, image: HTMLImageElemenreturn { x: clampPan(offset.x, maxX), y: clampPan(offset.y, maxY) };};+interface PinchGesture {+ startCenterX: number;+ startCenterY: number;+ startDistance: number;+ startMidpointX: number;+ startMidpointY: number;+ startScale: number;+ startPan: PanOffset;+}++interface SwipeGesture {+ pointerId: number;+ startX: number;+ startY: number;+}++const distanceBetween = (first: { x: number; y: number }, second: { x: number; y: number }) =>+ Math.hypot(first.x - second.x, first.y - second.y);+function PreviewImageDialog({ open, onOpenChange, imgUrls = [], items, initialIndex = 0 }: Props) {const t = useTranslate();const sm = useMediaQuery("sm");@@ -54,10 +75,14 @@ function PreviewImageDialog({ open, onOpenChange, imgUrls = [], items, initialInconst [zoomScale, setZoomScale] = useState(MIN_ZOOM);const [showDetails, setShowDetails] = useState(false);const [panOffset, setPanOffset] = useState<PanOffset>(NO_PAN);- const [isPanning, setIsPanning] = useState(false);+ const [swipeOffset, setSwipeOffset] = useState(0);+ const [isInteracting, setIsInteracting] = useState(false);const imageRef = useRef<HTMLImageElement>(null);const surfaceRef = useRef<HTMLDivElement>(null);+ const pointersRef = useRef(new Map<number, { x: number; y: number }>());const panDragRef = useRef<{ pointerId: number; startX: number; startY: number; originX: number; originY: number } | null>(null);+ const pinchRef = useRef<PinchGesture | null>(null);+ const swipeRef = useRef<SwipeGesture | null>(null);const previewItems = useMemo(() => items ?? imgUrls.map((url) => ({ id: url, kind: "image" as const, sourceUrl: url, posterUrl: url, filename: "Image" })),[imgUrls, items],@@ -106,15 +131,21 @@ function PreviewImageDialog({ open, onOpenChange, imgUrls = [], items, initialInimageRef.current.releasePointerCapture(drag.pointerId);}panDragRef.current = null;+ pointersRef.current.clear();+ pinchRef.current = null;+ swipeRef.current = null;setZoomScale(MIN_ZOOM);setPanOffset(NO_PAN);- setIsPanning(false);+ setSwipeOffset(0);+ setIsInteracting(false);}, [currentItem?.id, open]);useEffect(() => {if (zoomScale === MIN_ZOOM) {panDragRef.current = null;- setIsPanning(false);+ if (!pinchRef.current) {+ setIsInteracting(false);+ }}setPanOffset((current) => {if (zoomScale === MIN_ZOOM) {@@ -146,23 +177,88 @@ function PreviewImageDialog({ open, onOpenChange, imgUrls = [], items, initialIn};const handleDoubleClick = () => setZoomScale((scale) => (scale === MIN_ZOOM ? DOUBLE_TAP_ZOOM : MIN_ZOOM));+ const startPan = (pointerId: number, point: { x: number; y: number }) => {+ panDragRef.current = { pointerId, startX: point.x, startY: point.y, originX: panOffset.x, originY: panOffset.y };+ setIsInteracting(true);+ };++ const startPinch = () => {+ const [first, second] = [...pointersRef.current.values()];+ // The untransformed wrapper shares the image's layout center, which the pan offset is measured from.+ const rect = imageRef.current?.parentElement?.getBoundingClientRect();+ const startCenterX = rect ? rect.left + rect.width / 2 : 0;+ const startCenterY = rect ? rect.top + rect.height / 2 : 0;+ pinchRef.current = {+ startCenterX,+ startCenterY,+ startDistance: distanceBetween(first, second),+ startMidpointX: (first.x + second.x) / 2 - startCenterX,+ startMidpointY: (first.y + second.y) / 2 - startCenterY,+ startScale: zoomScale,+ startPan: panOffset,+ };+ panDragRef.current = null;+ swipeRef.current = null;+ setSwipeOffset(0);+ setIsInteracting(true);+ };++ const updatePinch = () => {+ const pinch = pinchRef.current;+ const [first, second] = [...pointersRef.current.values()];+ if (!pinch || !first || !second) {+ return;+ }+ const nextScale = clampZoom(pinch.startScale * (distanceBetween(first, second) / pinch.startDistance));+ if (nextScale === MIN_ZOOM) {+ setZoomScale(MIN_ZOOM);+ setPanOffset(NO_PAN);+ return;+ }+ // Anchor the image point under the moving midpoint as the fingers scale it.+ const ratio = nextScale / pinch.startScale;+ const midpointX = (first.x + second.x) / 2 - pinch.startCenterX;+ const midpointY = (first.y + second.y) / 2 - pinch.startCenterY;+ const next = {+ x: midpointX - (pinch.startMidpointX - pinch.startPan.x) * ratio,+ y: midpointY - (pinch.startMidpointY - pinch.startPan.y) * ratio,+ };+ setPanOffset(clampPanOffset(next, nextScale, imageRef.current, surfaceRef.current));+ setZoomScale(nextScale);+ };+const handlePointerDown = (event: React.PointerEvent<HTMLImageElement>) => {- if (!isZoomed || event.button !== 0) {+ if (event.button !== 0) {return;}event.preventDefault();event.currentTarget.setPointerCapture(event.pointerId);- panDragRef.current = {- pointerId: event.pointerId,- startX: event.clientX,- startY: event.clientY,- originX: panOffset.x,- originY: panOffset.y,- };- setIsPanning(true);+ pointersRef.current.set(event.pointerId, { x: event.clientX, y: event.clientY });+ if (pointersRef.current.size >= 2) {+ startPinch();+ } else if (isZoomed) {+ startPan(event.pointerId, { x: event.clientX, y: event.clientY });+ } else if (hasMultiple) {+ swipeRef.current = { pointerId: event.pointerId, startX: event.clientX, startY: event.clientY };+ }};const handlePointerMove = (event: React.PointerEvent<HTMLImageElement>) => {+ const pointers = pointersRef.current;+ if (!pointers.has(event.pointerId)) {+ return;+ }+ pointers.set(event.pointerId, { x: event.clientX, y: event.clientY });+ if (pointers.size >= 2 && pinchRef.current) {+ updatePinch();+ return;+ }+ const swipe = swipeRef.current;+ if (swipe && swipe.pointerId === event.pointerId) {+ setSwipeOffset(event.clientX - swipe.startX);+ setIsInteracting(true);+ return;+ }const drag = panDragRef.current;if (!drag || drag.pointerId !== event.pointerId) {return;@@ -171,16 +267,53 @@ function PreviewImageDialog({ open, onOpenChange, imgUrls = [], items, initialInsetPanOffset(clampPanOffset(next, zoomScale, imageRef.current, surfaceRef.current));};- const handlePointerEnd = (event: React.PointerEvent<HTMLImageElement>) => {- const drag = panDragRef.current;- if (!drag || drag.pointerId !== event.pointerId) {+ const handlePointerEnd = (event: React.PointerEvent<HTMLImageElement>, cancelled = false) => {+ const pointers = pointersRef.current;+ if (!pointers.has(event.pointerId)) {return;}if (event.currentTarget.hasPointerCapture(event.pointerId)) {event.currentTarget.releasePointerCapture(event.pointerId);}- panDragRef.current = null;- setIsPanning(false);+ pointers.delete(event.pointerId);+ if (pointers.size < 2) {+ pinchRef.current = null;+ }+ if (pointers.size === 1) {+ // Re-anchor the drag on the remaining finger so a pinch lift does not jump.+ const [remainingId, remaining] = [...pointers.entries()][0];+ if (isZoomed) {+ panDragRef.current = {+ pointerId: remainingId,+ startX: remaining.x,+ startY: remaining.y,+ originX: panOffset.x,+ originY: panOffset.y,+ };+ } else {+ panDragRef.current = null;+ setIsInteracting(false);+ }+ return;+ }+ if (pointers.size === 0) {+ const swipe = swipeRef.current;+ if (!cancelled && swipe && swipe.pointerId === event.pointerId) {+ const deltaX = event.clientX - swipe.startX;+ const deltaY = event.clientY - swipe.startY;+ if (Math.abs(deltaX) > SWIPE_THRESHOLD && Math.abs(deltaX) > Math.abs(deltaY) * SWIPE_DIRECTION_RATIO) {+ if (deltaX < 0) {+ handleNext();+ } else {+ handlePrevious();+ }+ }+ }+ swipeRef.current = null;+ setSwipeOffset(0);+ panDragRef.current = null;+ setIsInteracting(false);+ }};if (!itemCount || !currentItem) {@@ -207,7 +340,7 @@ function PreviewImageDialog({ open, onOpenChange, imgUrls = [], items, initialIn<DialogTitle>{currentItem.filename || "Attachment preview"}</DialogTitle><DialogDescription>Attachment preview dialog. Press Escape to close, use left or right arrow keys to switch items, and zoom images with the- controls, mouse wheel, or double tap.+ controls, mouse wheel, double tap, or a pinch gesture.</DialogDescription></VisuallyHidden>@@ -308,11 +441,11 @@ function PreviewImageDialog({ open, onOpenChange, imgUrls = [], items, initialInclassName={cn("max-h-[calc(100dvh-8rem)] max-w-[calc(100vw-1.5rem)] rounded-md object-contain select-none sm:max-h-[calc(100dvh-7rem)] sm:max-w-[calc(100vw-8rem)]",showDetails && "lg:max-w-[calc(100vw-30rem)]",- isZoomed && (isPanning ? "cursor-grabbing" : "cursor-grab"),+ (isZoomed || hasMultiple) && (isInteracting ? "cursor-grabbing" : "cursor-grab"),)}style={{- transform: `translate3d(${panOffset.x}px, ${panOffset.y}px, 0) scale(${zoomScale})`,- transition: isPanning ? "none" : "transform 120ms ease-out",+ transform: `translate3d(${panOffset.x + swipeOffset}px, ${panOffset.y}px, 0) scale(${zoomScale})`,+ transition: isInteracting ? "none" : "transform 120ms ease-out",transformOrigin: "center center",touchAction: "none",}}@@ -320,7 +453,7 @@ function PreviewImageDialog({ open, onOpenChange, imgUrls = [], items, initialInonPointerDown={handlePointerDown}onPointerMove={handlePointerMove}onPointerUp={handlePointerEnd}- onPointerCancel={handlePointerEnd}+ onPointerCancel={(event) => handlePointerEnd(event, true)}draggable={false}loading="eager"decoding="async"diff --git a/web/tests/preview-image-dialog.test.tsx b/web/tests/preview-image-dialog.test.tsxindex e0b7ac52b..b5606e13a 100644--- a/web/tests/preview-image-dialog.test.tsx+++ b/web/tests/preview-image-dialog.test.tsx@@ -81,6 +81,22 @@ const mockPreviewLayout = (image: { width: number; height: number }, surface: {vi.spyOn(HTMLElement.prototype, "clientHeight", "get").mockReturnValue(surface.height);};+// The pinch anchor is measured from the image's layout center, which the untransformed wrapper reports.+const mockImageCenter = (image: HTMLElement, x: number, y: number) => {+ const wrapper = image.parentElement as HTMLElement;+ vi.spyOn(wrapper, "getBoundingClientRect").mockReturnValue({+ x: x - 200,+ y: y - 150,+ left: x - 200,+ top: y - 150,+ right: x + 200,+ bottom: y + 150,+ width: 400,+ height: 300,+ toJSON: () => ({}),+ } as DOMRect);+};+describe("<PreviewImageDialog>", () => {beforeEach(() => {// jsdom ships PointerEvent but not pointer capture: stub the capture methods.@@ -310,6 +326,209 @@ describe("<PreviewImageDialog>", () => {expect(returned).toHaveStyle({ transform: "translate3d(0px, 0px, 0) scale(2)" });});+ it("zooms about the gesture midpoint with a two-finger pinch", () => {+ mockPreviewLayout({ width: 1200, height: 800 }, { width: 600, height: 600 });+ render(+ <PreviewImageDialog+ open+ onOpenChange={vi.fn()}+ items={[{ id: "image-1", kind: "image", sourceUrl: "/image.jpg", posterUrl: "/image.jpg", filename: "image.jpg" }]}+ />,+ );++ const image = screen.getByAltText("Preview image 1 of 1");+ mockImageCenter(image, 300, 300);+ fireEvent.pointerDown(image, { button: 0, pointerId: 1, clientX: 300, clientY: 300 });+ fireEvent.pointerDown(image, { button: 0, pointerId: 2, clientX: 400, clientY: 300 });+ fireEvent.pointerMove(image, { pointerId: 1, clientX: 250, clientY: 300 });+ fireEvent.pointerMove(image, { pointerId: 2, clientX: 450, clientY: 300 });++ expect(image).toHaveStyle({ transform: "translate3d(-50px, 0px, 0) scale(2)" });+ expect(screen.getByText("200%")).toBeInTheDocument();+ });++ it("keeps a pinch around the image center from drifting", () => {+ mockPreviewLayout({ width: 1200, height: 800 }, { width: 600, height: 600 });+ render(+ <PreviewImageDialog+ open+ onOpenChange={vi.fn()}+ items={[{ id: "image-1", kind: "image", sourceUrl: "/image.jpg", posterUrl: "/image.jpg", filename: "image.jpg" }]}+ />,+ );++ const image = screen.getByAltText("Preview image 1 of 1");+ mockImageCenter(image, 300, 300);+ fireEvent.pointerDown(image, { button: 0, pointerId: 1, clientX: 250, clientY: 300 });+ fireEvent.pointerDown(image, { button: 0, pointerId: 2, clientX: 350, clientY: 300 });+ fireEvent.pointerMove(image, { pointerId: 1, clientX: 200, clientY: 300 });+ fireEvent.pointerMove(image, { pointerId: 2, clientX: 400, clientY: 300 });++ expect(image).toHaveStyle({ transform: "translate3d(0px, 0px, 0) scale(2)" });+ });++ it("clamps a pinch at fit zoom and drops the pan", () => {+ mockPreviewLayout({ width: 1200, height: 800 }, { width: 600, height: 600 });+ render(+ <PreviewImageDialog+ open+ onOpenChange={vi.fn()}+ items={[{ id: "image-1", kind: "image", sourceUrl: "/image.jpg", posterUrl: "/image.jpg", filename: "image.jpg" }]}+ />,+ );++ const image = screen.getByAltText("Preview image 1 of 1");+ fireEvent.doubleClick(image);+ fireEvent.pointerDown(image, { button: 0, pointerId: 1, clientX: 100, clientY: 120 });+ fireEvent.pointerMove(image, { pointerId: 1, clientX: 180, clientY: 160 });+ fireEvent.pointerUp(image, { pointerId: 1, clientX: 180, clientY: 160 });+ expect(image).toHaveStyle({ transform: "translate3d(80px, 40px, 0) scale(2)" });++ fireEvent.pointerDown(image, { button: 0, pointerId: 2, clientX: 100, clientY: 100 });+ fireEvent.pointerDown(image, { button: 0, pointerId: 3, clientX: 300, clientY: 300 });+ fireEvent.pointerMove(image, { pointerId: 2, clientX: 190, clientY: 190 });+ fireEvent.pointerMove(image, { pointerId: 3, clientX: 210, clientY: 210 });++ expect(image).toHaveStyle({ transform: "translate3d(0px, 0px, 0) scale(1)" });+ expect(screen.getByText("100%")).toBeInTheDocument();+ });++ it("keeps panning with the finger that stays after a pinch", () => {+ mockPreviewLayout({ width: 1200, height: 800 }, { width: 600, height: 600 });+ render(+ <PreviewImageDialog+ open+ onOpenChange={vi.fn()}+ items={[{ id: "image-1", kind: "image", sourceUrl: "/image.jpg", posterUrl: "/image.jpg", filename: "image.jpg" }]}+ />,+ );++ const image = screen.getByAltText("Preview image 1 of 1");+ mockImageCenter(image, 300, 300);+ fireEvent.pointerDown(image, { button: 0, pointerId: 1, clientX: 300, clientY: 300 });+ fireEvent.pointerDown(image, { button: 0, pointerId: 2, clientX: 400, clientY: 300 });+ fireEvent.pointerMove(image, { pointerId: 1, clientX: 250, clientY: 300 });+ fireEvent.pointerMove(image, { pointerId: 2, clientX: 450, clientY: 300 });+ expect(image).toHaveStyle({ transform: "translate3d(-50px, 0px, 0) scale(2)" });++ fireEvent.pointerUp(image, { pointerId: 2, clientX: 450, clientY: 300 });+ fireEvent.pointerMove(image, { pointerId: 1, clientX: 270, clientY: 300 });++ expect(image).toHaveStyle({ transform: "translate3d(-30px, 0px, 0) scale(2)" });+ });++ it("follows the finger and swipes to the next image in a gallery", () => {+ mockPreviewLayout({ width: 1200, height: 800 }, { width: 600, height: 600 });+ render(+ <PreviewImageDialog+ open+ onOpenChange={vi.fn()}+ items={[+ { id: "image-1", kind: "image", sourceUrl: "/image-1.jpg", posterUrl: "/image-1.jpg", filename: "image-1.jpg" },+ { id: "image-2", kind: "image", sourceUrl: "/image-2.jpg", posterUrl: "/image-2.jpg", filename: "image-2.jpg" },+ ]}+ />,+ );++ const image = screen.getByAltText("Preview image 1 of 2");+ fireEvent.pointerDown(image, { button: 0, pointerId: 1, clientX: 250, clientY: 300 });+ fireEvent.pointerMove(image, { pointerId: 1, clientX: 150, clientY: 300 });+ expect(image).toHaveStyle({ transform: "translate3d(-100px, 0px, 0) scale(1)" });++ fireEvent.pointerUp(image, { pointerId: 1, clientX: 150, clientY: 300 });+ expect(screen.getByAltText("Preview image 2 of 2")).toHaveStyle({ transform: "translate3d(0px, 0px, 0) scale(1)" });+ });++ it("swipes back to the previous image", () => {+ mockPreviewLayout({ width: 1200, height: 800 }, { width: 600, height: 600 });+ render(+ <PreviewImageDialog+ open+ onOpenChange={vi.fn()}+ initialIndex={1}+ items={[+ { id: "image-1", kind: "image", sourceUrl: "/image-1.jpg", posterUrl: "/image-1.jpg", filename: "image-1.jpg" },+ { id: "image-2", kind: "image", sourceUrl: "/image-2.jpg", posterUrl: "/image-2.jpg", filename: "image-2.jpg" },+ ]}+ />,+ );++ const image = screen.getByAltText("Preview image 2 of 2");+ fireEvent.pointerDown(image, { button: 0, pointerId: 1, clientX: 150, clientY: 300 });+ fireEvent.pointerMove(image, { pointerId: 1, clientX: 250, clientY: 300 });+ fireEvent.pointerUp(image, { pointerId: 1, clientX: 250, clientY: 300 });++ expect(screen.getByAltText("Preview image 1 of 2")).toHaveStyle({ transform: "translate3d(0px, 0px, 0) scale(1)" });+ });++ it("ignores short and vertical drags in a gallery", () => {+ mockPreviewLayout({ width: 1200, height: 800 }, { width: 600, height: 600 });+ render(+ <PreviewImageDialog+ open+ onOpenChange={vi.fn()}+ items={[+ { id: "image-1", kind: "image", sourceUrl: "/image-1.jpg", posterUrl: "/image-1.jpg", filename: "image-1.jpg" },+ { id: "image-2", kind: "image", sourceUrl: "/image-2.jpg", posterUrl: "/image-2.jpg", filename: "image-2.jpg" },+ ]}+ />,+ );++ const image = screen.getByAltText("Preview image 1 of 2");+ fireEvent.pointerDown(image, { button: 0, pointerId: 1, clientX: 250, clientY: 300 });+ fireEvent.pointerMove(image, { pointerId: 1, clientX: 220, clientY: 300 });+ fireEvent.pointerUp(image, { pointerId: 1, clientX: 220, clientY: 300 });+ expect(screen.getByAltText("Preview image 1 of 2")).toBeInTheDocument();++ fireEvent.pointerDown(image, { button: 0, pointerId: 2, clientX: 250, clientY: 300 });+ fireEvent.pointerMove(image, { pointerId: 2, clientX: 150, clientY: 400 });+ fireEvent.pointerUp(image, { pointerId: 2, clientX: 150, clientY: 400 });+ expect(screen.getByAltText("Preview image 1 of 2")).toBeInTheDocument();+ });++ it("ignores a cancelled swipe", () => {+ mockPreviewLayout({ width: 1200, height: 800 }, { width: 600, height: 600 });+ render(+ <PreviewImageDialog+ open+ onOpenChange={vi.fn()}+ items={[+ { id: "image-1", kind: "image", sourceUrl: "/image-1.jpg", posterUrl: "/image-1.jpg", filename: "image-1.jpg" },+ { id: "image-2", kind: "image", sourceUrl: "/image-2.jpg", posterUrl: "/image-2.jpg", filename: "image-2.jpg" },+ ]}+ />,+ );++ const image = screen.getByAltText("Preview image 1 of 2");+ fireEvent.pointerDown(image, { button: 0, pointerId: 1, clientX: 250, clientY: 300 });+ fireEvent.pointerMove(image, { pointerId: 1, clientX: 150, clientY: 300 });+ fireEvent.pointerCancel(image, { pointerId: 1, clientX: 150, clientY: 300 });++ expect(screen.getByAltText("Preview image 1 of 2")).toHaveStyle({ transform: "translate3d(0px, 0px, 0) scale(1)" });+ });++ it("pans a zoomed gallery instead of swiping", () => {+ mockPreviewLayout({ width: 1200, height: 800 }, { width: 600, height: 600 });+ render(+ <PreviewImageDialog+ open+ onOpenChange={vi.fn()}+ items={[+ { id: "image-1", kind: "image", sourceUrl: "/image-1.jpg", posterUrl: "/image-1.jpg", filename: "image-1.jpg" },+ { id: "image-2", kind: "image", sourceUrl: "/image-2.jpg", posterUrl: "/image-2.jpg", filename: "image-2.jpg" },+ ]}+ />,+ );++ const image = screen.getByAltText("Preview image 1 of 2");+ fireEvent.doubleClick(image);+ fireEvent.pointerDown(image, { button: 0, pointerId: 1, clientX: 250, clientY: 300 });+ fireEvent.pointerMove(image, { pointerId: 1, clientX: 150, clientY: 300 });+ fireEvent.pointerUp(image, { pointerId: 1, clientX: 150, clientY: 300 });++ expect(screen.getByAltText("Preview image 1 of 2")).toHaveStyle({ transform: "translate3d(-100px, 0px, 0) scale(2)" });+ });+it("zooms image previews with the wheel", () => {render(<PreviewImageDialog