Skip to content

Commit 1e3acb1

Browse files
committed
fix(core): if selection key code is true prevent pan on drag on left mouse btn (#1670)
* fix(core): if selection key code is true prevent pan on drag on left mouse btn Signed-off-by: braks <[email protected]> * chore(changeset): add Signed-off-by: braks <[email protected]> * fix(tests): correct viewport drag tests Signed-off-by: braks <[email protected]> --------- Signed-off-by: braks <[email protected]>
1 parent 00cff79 commit 1e3acb1

File tree

3 files changed

+16
-8
lines changed

3 files changed

+16
-8
lines changed

.changeset/hungry-pans-unite.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@vue-flow/core": patch
3+
---
4+
5+
if selection key code is true prevent pan on drag on left mouse btn

packages/core/src/container/Viewport/Viewport.vue

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,11 @@ onMounted(() => {
221221
return false
222222
}
223223
224+
// if selection key code is true and panOnDrag tries to use left mouse button we prevent it
225+
if (selectionKeyCode.value === true && Array.isArray(panOnDrag.value) && panOnDrag.value.includes(0) && eventButton === 0) {
226+
return false
227+
}
228+
224229
// if the pane is only movable using allowed clicks
225230
if (
226231
Array.isArray(shouldPanOnDrag.value) &&
@@ -230,16 +235,12 @@ onMounted(() => {
230235
return false
231236
}
232237
233-
const leftMouseBtnPanAllowed =
234-
eventButton !== 0 || (selectionKeyCode.value === true && Array.isArray(panOnDrag.value) && !panOnDrag.value.includes(0))
235-
236238
// We only allow right clicks if pan on drag is set to right-click
237239
const buttonAllowed =
238-
leftMouseBtnPanAllowed &&
239-
((Array.isArray(panOnDrag.value) && panOnDrag.value.includes(eventButton)) ||
240-
(selectionKeyCode.value === true && Array.isArray(panOnDrag.value) && !panOnDrag.value.includes(0)) ||
241-
!eventButton ||
242-
eventButton <= 1)
240+
(Array.isArray(shouldPanOnDrag.value) && shouldPanOnDrag.value.includes(eventButton)) ||
241+
(selectionKeyCode.value === true && Array.isArray(shouldPanOnDrag.value) && !shouldPanOnDrag.value.includes(0)) ||
242+
!eventButton ||
243+
eventButton <= 1
243244
244245
// default filter for d3-zoom
245246
return (!event.ctrlKey || event.type === 'wheel') && buttonAllowed

tests/cypress/component/2-vue-flow/viewport.ts renamed to tests/cypress/component/2-vue-flow/viewport.cy.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ describe('Viewport drag / zoom', () => {
88
beforeEach(() => {
99
cy.vueFlow({
1010
nodes,
11+
fitViewOnInit: false,
1112
})
1213
})
1314

@@ -27,6 +28,7 @@ describe('Viewport drag / zoom', () => {
2728
await cy.tryAssertion(() => {
2829
cy.transformationPane()
2930
.should('exist')
31+
.should('not.have.css', 'transform', 'matrix(1, 0, 0, 1, 0, 0)')
3032
.should(
3133
'have.css',
3234
'transform',

0 commit comments

Comments
 (0)