alighasami/vue-flow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(core): allow pan on drag for other mouse btns if left is disabled

Browse Source 
Signed-off-by: braks <78412429+bcakmakoglu@users.noreply.github.com>
This commit is contained in:
braks
2024-11-01 14:52:10 +01:00
committed by Braks
parent 72e0e2e97e
commit ecd21ceebb
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/core/src/container/Viewport/Viewport.vue
View File

@@ -66,7 +66,11 @@ const selectionKeyPressed = useKeyPress(selectionKeyCode)
const zoomKeyPressed = useKeyPress(zoomActivationKeyCode) const zoomKeyPressed = useKeyPress(zoomActivationKeyCode)
const shouldPanOnDrag = toRef(() => !selectionKeyPressed.value && (panKeyPressed.value || panOnDrag.value)) const shouldPanOnDrag = toRef(
() =>
(!selectionKeyPressed.value || (selectionKeyPressed.value && selectionKeyCode.value === true)) &&
(panKeyPressed.value || panOnDrag.value),
)
const shouldPanOnScroll = toRef(() => panKeyPressed.value || panOnScroll.value) const shouldPanOnScroll = toRef(() => panKeyPressed.value || panOnScroll.value)
@@ -226,9 +230,16 @@ onMounted(() => {
return false return false
} }
const leftMouseBtnPanAllowed =
eventButton !== 0 || (selectionKeyCode.value === true && Array.isArray(panOnDrag.value) && !panOnDrag.value.includes(0))
// We only allow right clicks if pan on drag is set to right-click // We only allow right clicks if pan on drag is set to right-click
const buttonAllowed = const buttonAllowed =
(Array.isArray(shouldPanOnDrag.value) && shouldPanOnDrag.value.includes(eventButton)) || !eventButton || eventButton <= 1 leftMouseBtnPanAllowed &&
((Array.isArray(panOnDrag.value) && panOnDrag.value.includes(eventButton)) ||
(selectionKeyCode.value === true && Array.isArray(panOnDrag.value) && !panOnDrag.value.includes(0)) ||
!eventButton ||
eventButton <= 1)
// default filter for d3-zoom // default filter for d3-zoom
return (!event.ctrlKey || event.type === 'wheel') && buttonAllowed return (!event.ctrlKey || event.type === 'wheel') && buttonAllowed