Skip to content
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

Jump to bottom

fix: Two finger panning is slow #7849

Merged
merged 8 commits into from
May 19, 2024
Merged

fix: Two finger panning is slow #7849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a92eecc
Two finger panning speed improvement
zsviczian Apr 4, 2024
93612e7
lint
zsviczian Apr 4, 2024
5d44c51
fix test snapshot
zsviczian Apr 4, 2024
4e3eca4
revert snapshot back to original
zsviczian Apr 4, 2024
dd4e333
Merge branch 'master' into zsviczian-fix-twofinger-panning
dwelle Apr 4, 2024
3f530d2
Merge branch 'master' into zsviczian-fix-twofinger-panning
dwelle May 19, 2024
7661584
test: update snaps
dwelle May 19, 2024
e4c2687
Update packages/excalidraw/components/App.tsx
dwelle May 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions packages/excalidraw/components/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5097,8 +5097,11 @@ class App extends React.Component<AppProps, AppState> {

this.translateCanvas({
zoom: zoomState.zoom,
scrollX: zoomState.scrollX + deltaX / nextZoom,
scrollY: zoomState.scrollY + deltaY / nextZoom,
// 2x multiplier is just a magic number that makes this work correctly
// on touchscreen devices (note: if we get report that panning is slower/faster
// than actual movement, consider swapping with devicePixelRatio)
scrollX: zoomState.scrollX + 2 * (deltaX / nextZoom),
scrollY: zoomState.scrollY + 2 * (deltaY / nextZoom),
Comment on lines +5103 to +5104
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why 2x? Isn't this more related to devicePixelRatio which on most mobile touchscreens would coincide with 2?

dwelle marked this conversation as resolved.
Show resolved Hide resolved
shouldCacheIgnoreZoom: true,
});
});
Expand Down
6 changes: 3 additions & 3 deletions packages/excalidraw/tests/__snapshots__/regressionTests.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10752,7 +10752,7 @@ exports[`regression tests > pinch-to-zoom works > [end of test] appState 1`] = `
"pendingImageElementId": null,
"previousSelectedElementIds": {},
"resizingElement": null,
"scrollX": -2.916666666666668,
"scrollX": -6.2500000000000036,
"scrollY": 0,
"scrolledOutside": false,
"selectedElementIds": {},
Expand Down Expand Up @@ -13688,8 +13688,8 @@ exports[`regression tests > two-finger scroll works > [end of test] appState 1`]
"pendingImageElementId": null,
"previousSelectedElementIds": {},
"resizingElement": null,
"scrollX": 10,
"scrollY": -10,
"scrollX": 20,
"scrollY": -18.535533905932738,
"scrolledOutside": false,
"selectedElementIds": {},
"selectedElementsAreBeingDragged": false,
Expand Down