diff --git a/packages/spotlight/CHANGELOG.md b/packages/spotlight/CHANGELOG.md index 3d94920e8a..ae3b2e2b3b 100644 --- a/packages/spotlight/CHANGELOG.md +++ b/packages/spotlight/CHANGELOG.md @@ -7,6 +7,7 @@ The following is a curated list of changes in the Enact spotlight module, newest ### Fixed - `spotlight` to trigger `onLeaveContainerFail` when `leaveFor` prevents navigation +- `spotlight` to correctly maintain pointer mode on webOS ## [3.3.0-alpha.12] - 2020-06-15 diff --git a/packages/spotlight/src/pointer.js b/packages/spotlight/src/pointer.js index 362d7b2862..329a2bb0f0 100644 --- a/packages/spotlight/src/pointer.js +++ b/packages/spotlight/src/pointer.js @@ -144,6 +144,8 @@ const notifyPointerMove = (current, target, x, y) => { * @private */ const notifyKeyDown = (keyCode, callback) => { + const palmSystem = window.PalmSystem; + // for hide/show pointer events, handle them and return true if (is('pointerHide', keyCode)) { hidePointerJob.start(callback); @@ -151,7 +153,11 @@ const notifyKeyDown = (keyCode, callback) => { } else if (is('pointerShow', keyCode)) { setPointerMode(true); return true; - } else if (!is('nonModal', keyCode) && !is('cancel', keyCode)) { + } else if ( + !is('nonModal', keyCode) && + !is('cancel', keyCode) && + !(is('enter', keyCode) && palmSystem && palmSystem.cursor && palmSystem.cursor.visibility) + ) { setPointerMode(false); }