From 33e08d747246d4ee10115c8152e9ad3b07e875f1 Mon Sep 17 00:00:00 2001 From: Orkun Karakus Date: Mon, 16 May 2022 18:56:21 +0300 Subject: [PATCH 1/4] refactored --- .../HTMLEngineProvider/HTMLRenderers/PreRenderer/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/PreRenderer/index.js b/src/components/HTMLEngineProvider/HTMLRenderers/PreRenderer/index.js index ee3981fc1541..c3be9a55cc5e 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/PreRenderer/index.js +++ b/src/components/HTMLEngineProvider/HTMLRenderers/PreRenderer/index.js @@ -30,8 +30,8 @@ class PreRenderer extends React.Component { scrollNode(event) { const node = this.ref.getScrollableNode(); const horizontalOverflow = node.scrollWidth > node.offsetWidth; - - if ((event.currentTarget === node) && horizontalOverflow) { + const isVerticalScrolling = Math.abs(event.deltaY) > 3; // This is for touchpads sensitive + if ((event.currentTarget === node) && horizontalOverflow && !isVerticalScrolling) { node.scrollLeft += event.deltaX; event.preventDefault(); event.stopPropagation(); From 0f9972ab826a7584a773e60d5742fe1b73c26f00 Mon Sep 17 00:00:00 2001 From: Orkun Karakus Date: Tue, 17 May 2022 15:36:09 +0300 Subject: [PATCH 2/4] detailed comment added --- .../HTMLEngineProvider/HTMLRenderers/PreRenderer/index.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/PreRenderer/index.js b/src/components/HTMLEngineProvider/HTMLRenderers/PreRenderer/index.js index c3be9a55cc5e..7d4f29670956 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/PreRenderer/index.js +++ b/src/components/HTMLEngineProvider/HTMLRenderers/PreRenderer/index.js @@ -30,6 +30,10 @@ class PreRenderer extends React.Component { scrollNode(event) { const node = this.ref.getScrollableNode(); const horizontalOverflow = node.scrollWidth > node.offsetWidth; + + /* 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. */ const isVerticalScrolling = Math.abs(event.deltaY) > 3; // This is for touchpads sensitive if ((event.currentTarget === node) && horizontalOverflow && !isVerticalScrolling) { node.scrollLeft += event.deltaX; From 36d72b7db2a4580a6979592e5d004868c99b40a7 Mon Sep 17 00:00:00 2001 From: Orkun Karakus Date: Tue, 17 May 2022 19:47:30 +0300 Subject: [PATCH 3/4] detailed comment added --- .../HTMLEngineProvider/HTMLRenderers/PreRenderer/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/PreRenderer/index.js b/src/components/HTMLEngineProvider/HTMLRenderers/PreRenderer/index.js index 7d4f29670956..9e7a63fd9091 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/PreRenderer/index.js +++ b/src/components/HTMLEngineProvider/HTMLRenderers/PreRenderer/index.js @@ -31,9 +31,9 @@ class PreRenderer extends React.Component { const node = this.ref.getScrollableNode(); const horizontalOverflow = node.scrollWidth > node.offsetWidth; - /* 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. */ const isVerticalScrolling = Math.abs(event.deltaY) > 3; // This is for touchpads sensitive if ((event.currentTarget === node) && horizontalOverflow && !isVerticalScrolling) { node.scrollLeft += event.deltaX; From ced4039c37414616b57c878b226ab3a050b42d36 Mon Sep 17 00:00:00 2001 From: Orkun Karakus Date: Wed, 18 May 2022 08:35:18 +0300 Subject: [PATCH 4/4] refactored comment --- .../HTMLEngineProvider/HTMLRenderers/PreRenderer/index.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/PreRenderer/index.js b/src/components/HTMLEngineProvider/HTMLRenderers/PreRenderer/index.js index 9e7a63fd9091..6b911a720aff 100644 --- a/src/components/HTMLEngineProvider/HTMLRenderers/PreRenderer/index.js +++ b/src/components/HTMLEngineProvider/HTMLRenderers/PreRenderer/index.js @@ -31,9 +31,7 @@ class PreRenderer extends React.Component { const node = this.ref.getScrollableNode(); const horizontalOverflow = node.scrollWidth > node.offsetWidth; - /* 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. */ + // Account for vertical scrolling variation when horizontally scrolling via touchpad by checking a large delta. const isVerticalScrolling = Math.abs(event.deltaY) > 3; // This is for touchpads sensitive if ((event.currentTarget === node) && horizontalOverflow && !isVerticalScrolling) { node.scrollLeft += event.deltaX;