variablelab/theatre
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix the bug where small wheel events would leak to cause unwanted scroll

Browse source
This commit is contained in:
Aria Minaei 2022-05-10 15:27:43 +02:00
parent ab8361d24a
commit e12d495f29
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/HorizontallyScrollableArea.tsx
View file

@ -152,23 +152,6 @@ function useHandlePanAndZoom(
if (!node) return
const receiveWheelEvent = (event: WheelEvent) => {
if (Math.abs(event.deltaY) < Math.abs(event.deltaX)) {
// receiveVerticalWheelEvent(event)
event.preventDefault()
event.stopPropagation()
const scaledSpaceToUnitSpace = val(layoutP.scaledSpace.toUnitSpace)
const deltaPos = scaledSpaceToUnitSpace(event.deltaX * 1)
const oldRange = val(layoutP.clippedSpace.range)
const newRange = mapValues(oldRange, (p) => p + deltaPos)
const setRange = val(layoutP.clippedSpace.setRange)
setRange(newRange)
return
}
// pinch
if (event.ctrlKey) {
event.preventDefault()
@ -200,8 +183,9 @@ function useHandlePanAndZoom(
val(layoutP.clippedSpace.setRange)(
normalizeRange(newRange, [0, maxEnd]),
)
return
}
// paning
// panning
else if (event.shiftKey) {
event.preventDefault()
event.stopPropagation()
@ -220,6 +204,22 @@ function useHandlePanAndZoom(
)
val(layoutP.clippedSpace.setRange)(newRange)
return
} else {
receiveVerticalWheelEvent(event)
event.preventDefault()
event.stopPropagation()
const scaledSpaceToUnitSpace = val(layoutP.scaledSpace.toUnitSpace)
const deltaPos = scaledSpaceToUnitSpace(event.deltaX * 1)
const oldRange = val(layoutP.clippedSpace.range)
const newRange = mapValues(oldRange, (p) => p + deltaPos)
const setRange = val(layoutP.clippedSpace.setRange)
setRange(newRange)
return
}
}