Skip to content

Commit b573bb1

Browse files
authored
Merge pull request #363 from Edouard-Tby/fix-edge-context-menu
fix: prevent default browser context menu from appearing on edge righ…
2 parents 404d0cb + ef0ab38 commit b573bb1

File tree

2 files changed

+15
-9
lines changed

2 files changed

+15
-9
lines changed

src/symbols/Arrow.tsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,17 @@ export const Arrow: FC<ArrowProps> = ({
101101
scale={[1, 1, 1]}
102102
onPointerOver={() => onActive(true)}
103103
onPointerOut={() => onActive(false)}
104+
// context menu controls
104105
onPointerDown={event => {
105-
// context menu controls
106106
if (event.nativeEvent.buttons === 2) {
107-
event.nativeEvent.preventDefault();
108107
event.stopPropagation();
109-
onContextMenu();
110108
}
111109
}}
110+
onContextMenu={event => {
111+
event.nativeEvent.preventDefault();
112+
event.stopPropagation();
113+
onContextMenu();
114+
}}
112115
>
113116
<cylinderGeometry
114117
args={[0, size, length, 20, 1, true]}

src/symbols/Line.tsx

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,15 +100,15 @@ const dashedFragmentShader = `
100100
uniform float gapSize;
101101
uniform float lineLength;
102102
varying vec2 vUv;
103-
103+
104104
void main() {
105105
float totalSize = dashSize + gapSize;
106106
float position = mod(vUv.x * lineLength, totalSize);
107-
107+
108108
if (position > dashSize) {
109109
discard;
110110
}
111-
111+
112112
gl_FragColor = vec4(color, opacity);
113113
}
114114
`;
@@ -216,14 +216,17 @@ export const Line: FC<LineProps> = ({
216216
onPointerOver={onPointerOver}
217217
onPointerOut={onPointerOut}
218218
onClick={onClick}
219+
// context menu controls
219220
onPointerDown={event => {
220-
// context menu controls
221221
if (event.nativeEvent.buttons === 2) {
222-
event.nativeEvent.preventDefault();
223222
event.stopPropagation();
224-
onContextMenu();
225223
}
226224
}}
225+
onContextMenu={event => {
226+
event.nativeEvent.preventDefault();
227+
event.stopPropagation();
228+
onContextMenu();
229+
}}
227230
>
228231
<tubeGeometry attach="geometry" ref={tubeRef} />
229232
{dashed ? (

0 commit comments

Comments
 (0)