From 524e824a4a753eee44b741bdd8850e21e2f810e1 Mon Sep 17 00:00:00 2001 From: Jiye Kim Date: Fri, 26 Apr 2024 17:22:17 +0900 Subject: [PATCH 1/2] WRQ-9559: Fix scrolling by holding pageup/down key Enact-DCO-1.0-Signed-off-by: Jiye Kim (jiye.kim@lge.com) --- useScroll/useEvent.js | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/useScroll/useEvent.js b/useScroll/useEvent.js index ce46d7975d..ba518ce3e7 100644 --- a/useScroll/useEvent.js +++ b/useScroll/useEvent.js @@ -262,7 +262,6 @@ const useEventKey = (props, instances, context) => { const {keyCode, repeat} = ev; forward('onKeyDown', ev, props); - ev.preventDefault(); spottable.current.animateOnFocus = true; @@ -308,21 +307,25 @@ const pointerTracker = (ev) => { const pageKeyHandler = (ev) => { const {keyCode} = ev; - if (Spotlight.getPointerMode() && !Spotlight.getCurrent() && (isPageUp(keyCode) || isPageDown(keyCode))) { - const - {x, y} = lastPointer, - elem = document.elementFromPoint(x, y); - - if (elem) { - for (const [key, value] of scrollers) { - if (utilDOM.containsDangerously(value, elem)) { - /* To handle page keys in nested scrollable components, - * break the loop only when `scrollByPageOnPointerMode` returns `true`. - * This approach assumes that an inner scrollable component is - * mounted earlier than an outer scrollable component. - */ - if (key.scrollByPageOnPointerMode(ev)) { - break; + if (isPageUp(keyCode) || isPageDown(keyCode)) { + ev.preventDefault(); + + if (Spotlight.getPointerMode() && !Spotlight.getCurrent()) { + const + {x, y} = lastPointer, + elem = document.elementFromPoint(x, y); + + if (elem) { + for (const [key, value] of scrollers) { + if (utilDOM.containsDangerously(value, elem)) { + /* To handle page keys in nested scrollable components, + * break the loop only when `scrollByPageOnPointerMode` returns `true`. + * This approach assumes that an inner scrollable component is + * mounted earlier than an outer scrollable component. + */ + if (key.scrollByPageOnPointerMode(ev)) { + break; + } } } } From a038026ca3ea928cce7fd2a2925475be703ef831 Mon Sep 17 00:00:00 2001 From: Jiye Kim Date: Fri, 26 Apr 2024 18:11:36 +0900 Subject: [PATCH 2/2] change node version for travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 34c99bfb64..3899c30bd2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ dist: focal language: node_js node_js: - lts/* - - node + - 21 sudo: false before_install: - sudo apt-get update