Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/Preview/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ const Preview: React.FC<PreviewProps> = props => {
maxScale,
onTransform,
);
const { isMoving, onMouseDown, onWheel } = useMouseEvent(
const { isMoving, onMouseDown } = useMouseEvent(
imgRef,
movable,
open,
Expand Down Expand Up @@ -284,7 +284,6 @@ const Preview: React.FC<PreviewProps> = props => {
}}
fallback={fallback}
src={src}
onWheel={onWheel}
onMouseDown={onMouseDown}
onDoubleClick={onDoubleClick}
onTouchStart={onTouchStart}
Expand Down
22 changes: 17 additions & 5 deletions src/hooks/useMouseEvent.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { warning } from '@rc-component/util';
import { useEvent, warning } from '@rc-component/util';
import type React from 'react';
import { useEffect, useRef, useState } from 'react';
import getFixScaleEleTransPosition from '../getFixScaleEleTransPosition';
Expand Down Expand Up @@ -83,8 +83,9 @@ export default function useMouseEvent(
}
};

const onWheel = (event: React.WheelEvent<HTMLImageElement>) => {
if (!open || !wheel || event.deltaY == 0) return;
const onWheel = useEvent((event: WheelEvent) => {
if (!open || !wheel || event.target !== imgRef.current || event.deltaY == 0) return;
event.preventDefault();
// Scale ratio depends on the deltaY size
const scaleRatio = Math.abs(event.deltaY / 100);
// Limit the maximum scale ratio
Expand All @@ -95,7 +96,19 @@ export default function useMouseEvent(
ratio = BASE_SCALE_RATIO / ratio;
}
dispatchZoomChange(ratio, 'wheel', event.clientX, event.clientY);
};
});

// React delegates wheel events through a passive listener, so use a native listener
// to prevent the browser's trackpad zoom gesture.
useEffect(() => {
if (open && wheel) {
window.addEventListener('wheel', onWheel, { passive: false });
}

return () => {
window.removeEventListener('wheel', onWheel);
};
}, [open, wheel, onWheel]);

useEffect(() => {
if (movable) {
Expand Down Expand Up @@ -134,6 +147,5 @@ export default function useMouseEvent(
onMouseDown,
onMouseMove,
onMouseUp,
onWheel,
};
}
33 changes: 33 additions & 0 deletions tests/preview.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,39 @@ describe('Preview', () => {
});
});

it('should prevent browser zoom when zooming with a trackpad', () => {
const { container } = render(
<Image
src="https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png"
preview={{ open: true }}
/>,
);

fireEvent.click(container.querySelector('.rc-image')!);
act(() => {
jest.runAllTimers();
});

const previewImage = document.querySelector('.rc-image-preview-img');
let defaultPrevented = false;
window.addEventListener(
'wheel',
event => {
defaultPrevented = event.defaultPrevented;
},
{ once: true },
);
fireEvent.wheel(previewImage!, { ctrlKey: true, deltaY: -50 });
act(() => {
jest.runAllTimers();
});

expect(defaultPrevented).toBe(true);
expect(previewImage).toHaveStyle({
transform: 'translate3d(0px, 0px, 0) scale3d(1.25, 1.25, 1) rotate(0deg)',
});
});

it('should not zoom with wheel when wheel is false', () => {
const { container } = render(
<Image
Expand Down
Loading