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

Message list not vertically scrolling while mouse over horizontal scrollable code blocks (#7497) is fixed [Duplicate for vertical scroll hotfix] #9026

Merged
merged 5 commits into from
May 18, 2022
Merged

Message list not vertically scrolling while mouse over horizontal scrollable code blocks (#7497) is fixed [Duplicate for vertical scroll hotfix] #9026

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
33e08d7
refactored
orkunkarakus May 16, 2022
7146981
Merge remote-tracking branch 'upstream/main' into fix/7497-LongLinesI…
orkunkarakus May 16, 2022
0f9972a
detailed comment added
orkunkarakus May 17, 2022
36d72b7
detailed comment added
orkunkarakus May 17, 2022
ced4039
refactored comment
orkunkarakus May 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/components/HTMLEngineProvider/HTMLRenderers/PreRenderer/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@ class PreRenderer extends React.Component {
const node = this.ref.getScrollableNode();
const horizontalOverflow = node.scrollWidth > node.offsetWidth;

if ((event.currentTarget === node) && horizontalOverflow) {
/* if the user scrolls horizontally while scrolling with two fingers on the touchpads,
the fingers may go up a little during that scroll, and the page will start to scroll
vertically due to this going up. With this sensitive we eliminate this bug. */
Copy link
Member

@parasharrajat parasharrajat May 17, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Suggested change
/* if the user scrolls horizontally while scrolling with two fingers on the touchpads,
the fingers may go up a little during that scroll, and the page will start to scroll
vertically due to this going up. With this sensitive we eliminate this bug. */
/* Scrolling horizontally with two fingers on the touchpads,
the fingers may go up a little during that scroll, and the page will start to scroll vertically. We eliminate this bug by checking the large delta. */

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@parasharrajat Refactored. PR is ready

const isVerticalScrolling = Math.abs(event.deltaY) > 3; // This is for touchpads sensitive
if ((event.currentTarget === node) && horizontalOverflow && !isVerticalScrolling) {
Comment on lines +35 to +36
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
const isVerticalScrolling = Math.abs(event.deltaY) > 3; // This is for touchpads sensitive
if ((event.currentTarget === node) && horizontalOverflow && !isVerticalScrolling) {
if ((event.currentTarget === node) && horizontalOverflow && event.deltaX !== 0) {

What if only do this? What benefit do we get from checking scroll sensitivity?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@parasharrajat Because even if the user scrolls horizontally while scrolling with two fingers on the touchpads, the fingers may go up a little during that scroll, and the page will start to scroll vertically due to this going up. With this sensitive i eliminated this bug.

Copy link
Member

Choose a reason for hiding this comment

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

Ok, let me test this behavior.

Copy link
Contributor Author

@orkunkarakus orkunkarakus May 16, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

@parasharrajat and if we only do this event.deltaX !== 0 the scroll will not be smooth. Tested on touchpad.

Copy link
Member

Choose a reason for hiding this comment

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

Ok, I tested it. Looking fine to me. Add a comment instead This is for touchpads sensitive like you did https://github.com/Expensify/App/pull/9026/files#r873936354

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@parasharrajat More detailed comment added. PR is ready 👍

node.scrollLeft += event.deltaX;
event.preventDefault();
event.stopPropagation();
Expand Down