Skip to content

fix: ignore secondary scrollbar mouse buttons#381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nrps9909 wants to merge 1 commit into
base:master
Choose a base branch
from
+31 −7
Open

fix: ignore secondary scrollbar mouse buttons #381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 8 additions & 7 deletions src/ScrollBar.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -134,20 +134,17 @@ const ScrollBar = React.forwardRef<ScrollBarRef, ScrollBarProps>((props, ref) =>
nextTop = pagePosition - rect.top - spinSize / 2;
}

onScroll(
getScrollOffsetByThumbTop(nextTop, enableScrollRange, enableOffsetRange),
horizontal,
);
onScroll(getScrollOffsetByThumbTop(nextTop, enableScrollRange, enableOffsetRange), horizontal);
};

const onContainerMouseDown: React.MouseEventHandler = (e) => {
e.stopPropagation();
e.preventDefault();

if (e.button !== 0 || isThumbTarget(e.target)) {
return;
}

e.stopPropagation();
e.preventDefault();

scrollToTrackPosition(e);
};

Expand All@@ -156,6 +153,10 @@ const ScrollBar = React.forwardRef<ScrollBarRef, ScrollBarProps>((props, ref) =>
stateRef.current = { top, dragging, pageY: pageXY, startTop };

const onThumbMouseDown = useEvent((e: React.MouseEvent | React.TouchEvent | TouchEvent) => {
if ('button' in e && e.button !== 0) {
return;
}

setDragging(true);
setPageXY(getPageXY(e, horizontal));
setStartTop(stateRef.current.top);
Expand Down
23 changes: 23 additions & 0 deletions tests/scroll.test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -393,6 +393,29 @@ describe('List.Scroll', () => {
expect(container.querySelector('ul').scrollTop).toEqual(950);
});

it('ignores right mouse button', () => {
const { container } = genList({
itemHeight: 20,
height: 100,
data: genData(100),
});
const holder = getHolder(container);
const scrollbar = container.querySelector('.rc-virtual-list-scrollbar-vertical');
const thumb = container.querySelector('.rc-virtual-list-scrollbar-thumb');

const trackEvent = createEvent.mouseDown(scrollbar, { button: 2 });
fireEvent(scrollbar, trackEvent);

expect(trackEvent.defaultPrevented).toBeFalsy();
expect(holder.scrollTop).toEqual(0);

const thumbEvent = createEvent.mouseDown(thumb, { button: 2 });
fireEvent(thumb, thumbEvent);

expect(thumbEvent.defaultPrevented).toBeFalsy();
expect(holder.style.pointerEvents).toEqual('');
});

it('should show scrollbar when element has showScrollBar prop set to true', () => {
jest.useFakeTimers();
const listRef = React.createRef();
Expand Down