WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

refactor: Replace MouseEvent buttons with button #712

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
bkepka-box wants to merge 2 commits into
base: master
Choose a base branch
from
Open

refactor: Replace MouseEvent buttons with button #712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15fb804
refactor: Replace MouseEvent buttons with button
bkepka-box Apr 29, 2024
0b4e14b
fix(tests): fix related tests
bkepka-box Apr 29, 2024
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
8 changes: 4 additions & 4 deletions src/components/PointerCapture/PointerCapture.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ function PointerCapture(props: Props, ref: React.Ref<PointerCaptureRef>): JSX.El
event.preventDefault();
event.stopPropagation();
};
const handleMouseDown = ({ buttons, clientX, clientY }: React.MouseEvent): void => {
if (buttons !== MOUSE_PRIMARY) {
const handleMouseDown = ({ button, clientX, clientY }: React.MouseEvent): void => {
if (button !== MOUSE_PRIMARY) {
return;
}

Expand All @@ -66,8 +66,8 @@ function PointerCapture(props: Props, ref: React.Ref<PointerCaptureRef>): JSX.El
};

React.useEffect(() => {
const handleMouseMove = ({ buttons, clientX, clientY }: MouseEvent): void => {
if (buttons !== MOUSE_PRIMARY || status === Status.init) {
const handleMouseMove = ({ button, clientX, clientY }: MouseEvent): void => {
if (button !== MOUSE_PRIMARY || status === Status.init) {
return;
}

Expand Down
8 changes: 4 additions & 4 deletions src/components/PointerCapture/__tests__/PointerCapture-test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ describe('PointerCapture', () => {
describe('eventing', () => {
const mockMouseEvent = {
...mockEvent,
buttons: 1,
button: 0,
};

const mockTouchEvent = {
Expand All @@ -85,7 +85,7 @@ describe('PointerCapture', () => {
test('should not invoke onDrawStart if mousedown event is not the primary button', () => {
const onDrawStart = jest.fn();
const wrapper = getWrapper({ onDrawStart });
const event = { ...mockEvent, buttons: 2 };
const event = { ...mockEvent, button: 1 };

wrapper.find('div').simulate('mousedown', event);

Expand Down Expand Up @@ -136,7 +136,7 @@ describe('PointerCapture', () => {
document.dispatchEvent(
new MouseEvent('mousemove', {
...mockMouseEvent,
buttons: 2,
button: 1,
clientX: 10,
clientY: 10,
}),
Expand All @@ -151,7 +151,7 @@ describe('PointerCapture', () => {
document.dispatchEvent(
new MouseEvent('mousemove', {
...mockMouseEvent,
buttons: 1,
button: 0,
clientX: 10,
clientY: 10,
}),
Expand Down
2 changes: 1 addition & 1 deletion src/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ export const ANNOTATOR_EVENT = {
setVisibility: 'annotationsetvisibility',
};

export const MOUSE_PRIMARY = 1;
export const MOUSE_PRIMARY = 0;
2 changes: 1 addition & 1 deletion src/drawing/DrawingTarget.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const DrawingTarget = (props: Props, ref: React.Ref<DrawingTargetRef>): J
onSelect(annotationId);
};
const handleMouseDown = (event: React.MouseEvent<DrawingTargetRef>): void => {
if (event.buttons !== MOUSE_PRIMARY) {
if (event.button !== MOUSE_PRIMARY) {
return;
}
const activeElement = document.activeElement as HTMLElement;
Expand Down
4 changes: 2 additions & 2 deletions src/drawing/__tests__/DrawingTarget-test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ describe('DrawingTarget', () => {
describe('handleMouseDown()', () => {
// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
const getEvent = () => ({
buttons: 1,
button: 0,
currentTarget: {
focus: jest.fn(),
},
Expand All @@ -68,7 +68,7 @@ describe('DrawingTarget', () => {
const anchor = wrapper.find('a');
const event = {
...getEvent(),
buttons: 2,
button: 1,
};

anchor.simulate('mousedown', event);
Expand Down
4 changes: 2 additions & 2 deletions src/highlight/HighlightCreatorManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ export default class HighlightCreatorManager implements Manager {
this.referenceEl.removeEventListener('mouseup', this.handleMouseUp);
}

handleMouseDown = ({ buttons }: MouseEvent): void => {
if (buttons !== MOUSE_PRIMARY) {
handleMouseDown = ({ button }: MouseEvent): void => {
if (button !== MOUSE_PRIMARY) {
return;
}

Expand Down
2 changes: 1 addition & 1 deletion src/highlight/HighlightTarget.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const HighlightTarget = (props: Props, ref: React.Ref<HighlightTargetRef>): JSX.
};

const handleMouseDown = (event: React.MouseEvent<HighlightTargetRef>): void => {
if (event.buttons !== MOUSE_PRIMARY) {
if (event.button !== MOUSE_PRIMARY) {
return;
}
const activeElement = document.activeElement as HTMLElement;
Expand Down
4 changes: 2 additions & 2 deletions src/highlight/__tests__/HighlightCreatorManager-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ describe('HighlightCreatorManager', () => {
((setIsSelectingAction as unknown) as jest.Mock).mockReturnValue({ type: 'set_is_selecting' });
((setSelectionAction as unknown) as jest.Mock).mockReturnValue({ type: 'set_selection' });

wrapper.handleMouseDown(new MouseEvent('mousedown', { buttons: 1 }));
wrapper.handleMouseDown(new MouseEvent('mousedown', { button: 0 }));

expect(clearTimeout).toHaveBeenCalledWith(1);
expect(setIsSelectingAction).toHaveBeenCalledWith(true);
Expand All @@ -100,7 +100,7 @@ describe('HighlightCreatorManager', () => {
test('should do nothing if is not primary button', () => {
const wrapper = getWrapper();

wrapper.handleMouseDown(new MouseEvent('mousedown', { buttons: 2 }));
wrapper.handleMouseDown(new MouseEvent('mousedown', { button: 1 }));

expect(defaults.store.dispatch).not.toHaveBeenCalled();
});
Expand Down
4 changes: 2 additions & 2 deletions src/highlight/__tests__/HighlightTarget-test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ describe('HighlightTarget', () => {

describe('handleMouseDown()', () => {
const mockEvent = {
buttons: 1,
button: 0,
currentTarget: {
focus: jest.fn(),
},
Expand All @@ -66,7 +66,7 @@ describe('HighlightTarget', () => {
const anchor = wrapper.find('a');
const event = {
...mockEvent,
buttons: 2,
button: 1,
};

anchor.simulate('mousedown', event);
Expand Down
2 changes: 1 addition & 1 deletion src/region/RegionAnnotation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const RegionAnnotation = (props: Props, ref: React.Ref<RegionAnnotationRe
onSelect(annotationId);
};
const handleMouseDown = (event: React.MouseEvent<RegionAnnotationRef>): void => {
if (event.buttons !== MOUSE_PRIMARY) {
if (event.button !== MOUSE_PRIMARY) {
return;
}

Expand Down
2 changes: 1 addition & 1 deletion src/region/__tests__/RegionAnnotation-test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ describe('RegionAnnotation', () => {

test('should focus the button on mousedown', () => {
const button = { focus: jest.fn() };
const event = { buttons: 1, currentTarget: button, ...mockEvent };
const event = { button: 0, currentTarget: button, ...mockEvent };
const wrapper = getWrapper();

wrapper.simulate('mousedown', event);
Expand Down
10 changes: 5 additions & 5 deletions src/region/__tests__/RegionCreator-test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ describe('RegionCreator', () => {
describe('mouse events', () => {
const simulateDrawStart = (wrapper: ReactWrapper, clientX = 10, clientY = 10): void =>
act(() => {
wrapper.simulate('mousedown', { buttons: 1, clientX, clientY });
wrapper.simulate('mousedown', { button: 0, clientX, clientY });
});
const simulateDrawMove = (clientX = 10, clientY = 10): void =>
act(() => {
document.dispatchEvent(new MouseEvent('mousemove', { buttons: 1, clientX, clientY }));
document.dispatchEvent(new MouseEvent('mousemove', { button: 0, clientX, clientY }));
});
const simulateDrawStop = (): void =>
act(() => {
Expand Down Expand Up @@ -132,9 +132,9 @@ describe('RegionCreator', () => {
const wrapper = getWrapper();

act(() => {
wrapper.simulate('mousedown', { buttons: 2, clientX: 50, clientY: 50 });
document.dispatchEvent(new MouseEvent('mousemove', { buttons: 2, clientX: 100, clientY: 100 }));
document.dispatchEvent(new MouseEvent('mouseup', { buttons: 2, clientX: 100, clientY: 100 }));
wrapper.simulate('mousedown', { button: 1, clientX: 50, clientY: 50 });
document.dispatchEvent(new MouseEvent('mousemove', { button: 1, clientX: 100, clientY: 100 }));
document.dispatchEvent(new MouseEvent('mouseup', { button: 1, clientX: 100, clientY: 100 }));
});
jest.advanceTimersByTime(1000);
wrapper.update();
Expand Down