@enact/limestone 1.9.3 → 1.9.4

package/.github/workflows/ci-branch.yml

@@ -3,8 +3,8 @@ name: CI
 on:
   push:
     branches:
-      - develop
-      - master
+      - release/1.9.x.develop
+      - release/1.9.x
   pull_request:
     types: [opened, synchronize, reopened]
   workflow_dispatch:

package/.github/workflows/ci-reusable.yml

@@ -35,7 +35,7 @@ jobs:
 
       - name: Clone and setup Enact CLI
         run: |
-          git clone --branch=7.2.1 --depth 1 https://github.com/enactjs/cli ../cli
+          git clone --branch=release/7.2.x.develop --depth 1 https://github.com/enactjs/cli ../cli
           pushd ../cli
           npm install
           npm link

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 The following is a curated list of changes in the Enact limestone module, newest changes on the top.
 
+## [1.9.4] - 2026-06-18
+
+### Fixed
+
+- `limestone/VirtualList` focus jump and scroll freeze when scrolled by long press
+
 ## [1.9.3] - 2026-04-20
 
 ### Fixed

package/VirtualList/tests/useEvent-specs.js

@@ -27,6 +27,14 @@ var keyDownUp = function keyDownUp(keyCode) {
     });
   };
 };
+var keyDownRepeat = function keyDownRepeat(keyCode) {
+  return function (elm) {
+    return _react.fireEvent.keyDown(elm, {
+      keyCode: keyCode,
+      repeat: true
+    });
+  };
+};
 var pressLeftKey = keyDownUp(37);
 var pressRightKey = keyDownUp(39);
 var pressUpKey = keyDownUp(38);
@@ -148,6 +156,37 @@ describe('VirtualList useEvent', function () {
     expect(spy).toHaveBeenCalled();
     global.Element.prototype.scrollTo = scrollToFn;
   });
+  test('should handle repeat keydown on first VirtualList entry without error', function () {
+    (0, _react.render)(/*#__PURE__*/(0, _jsxRuntime.jsx)(_VirtualList["default"], {
+      clientSize: clientSize,
+      dataSize: dataSize,
+      itemRenderer: renderItem,
+      itemSize: itemSize
+    }));
+    var list = _react.screen.getByRole('list');
+    var item0 = list.children.item(0).children.item(0);
+    focus(item0);
+    expect(currentFocusIndex).toBe(0);
+    keyDownRepeat(40)(item0);
+    expect(currentFocusIndex).toBe(0);
+  });
+  test('should handle repeat keydown when data-index jumps unexpectedly without error', function () {
+    (0, _react.render)(/*#__PURE__*/(0, _jsxRuntime.jsx)(_VirtualList["default"], {
+      clientSize: clientSize,
+      dataSize: dataSize,
+      itemRenderer: renderItem,
+      itemSize: itemSize
+    }));
+    var list = _react.screen.getByRole('list');
+    var item0 = list.children.item(0).children.item(0);
+    var item1 = list.children.item(1).children.item(0);
+    focus(item0);
+    pressDownKey(item0);
+    expect(currentFocusIndex).toBe(1);
+    item1.dataset.index = '20';
+    keyDownRepeat(40)(item1);
+    expect(currentFocusIndex).toBe(1);
+  });
   test('should scroll by page-down key', function () {
     var spy = jest.fn(function () {});
     var scrollToFn = global.Element.prototype.scrollTo;

package/VirtualList/useEvent.js

@@ -28,13 +28,14 @@ var isDown = (0, _keymap.is)('down'),
     // should return -1 if index is not a number or a negative value
     return number >= 0 ? number : -1;
   };
-var prevKeyDownIndex = -1;
 var useEventKey = exports.useEventKey = function useEventKey(props, instances, context) {
   // Mutable value
 
   var mutableRef = (0, _react.useRef)({
     fn: null
   });
+  var prevKeyDownIndexRef = (0, _react.useRef)(-1);
+  var hasProcessedKeyDownRef = (0, _react.useRef)(false);
 
   // Functions
 
@@ -121,6 +122,7 @@ var useEventKey = exports.useEventKey = function useEventKey(props, instances, c
     var handle5WayKeyUp = context.handle5WayKeyUp,
       handleDirectionKeyDown = context.handleDirectionKeyDown,
       handlePageUpDownKeyDown = context.handlePageUpDownKeyDown,
+      resetAccelerator = context.resetAccelerator,
       spotlightAcceleratorProcessKey = context.spotlightAcceleratorProcessKey;
     function handleKeyDown(ev) {
       var keyCode = ev.keyCode,
@@ -163,15 +165,50 @@ var useEventKey = exports.useEventKey = function useEventKey(props, instances, c
               isRightMovement = _getNextIndex.isRightMovement,
               isWrapped = _getNextIndex.isWrapped,
               nextIndex = _getNextIndex.nextIndex;
+            var _scrollContentHandle$2 = scrollContentHandle.current,
+              dimensionToExtent = _scrollContentHandle$2.dimensionToExtent,
+              isPrimaryDirectionVertical = _scrollContentHandle$2.isPrimaryDirectionVertical;
+
+            // VirtualList recycles DOM nodes during scroll. If a node gets reused for a different index
+            // while browser focus stays on it, target.dataset.index reflects the new (wrong) index.
+            // Detect this by checking if the index jumped unnaturally during key repeat.
+            var isForwardKey = isPrimaryDirectionVertical ? isDownKey : isRightMovement;
+            var isBackwardKey = isPrimaryDirectionVertical ? isUpKey : isLeftMovement;
+            var isOutdatedIndex = repeat && prevKeyDownIndexRef.current !== -1 && (isForwardKey && (prevKeyDownIndexRef.current > index || index > prevKeyDownIndexRef.current + dimensionToExtent) || isBackwardKey && (prevKeyDownIndexRef.current < index || index < prevKeyDownIndexRef.current - dimensionToExtent));
+
+            // Block the first repeat event when entering VirtualList from outside with acceleration.
+            // prevKeyDownIndexRef is -1 only on first entry; a repeat here means key was held before entering.
+            var isFirstEntryRepeat = repeat && !hasProcessedKeyDownRef.current;
+            if (isFirstEntryRepeat) {
+              ev.preventDefault();
+              ev.stopPropagation();
+              resetAccelerator();
+              return;
+            }
+            if (isOutdatedIndex) {
+              ev.preventDefault();
+              ev.stopPropagation();
+              resetAccelerator();
+              var correctedNextIndex = isForwardKey ? prevKeyDownIndexRef.current + dimensionToExtent : prevKeyDownIndexRef.current - dimensionToExtent;
+              if (correctedNextIndex >= 0 && correctedNextIndex < props.dataSize) {
+                var currentItemNode = instances.itemRefs.current[prevKeyDownIndexRef.current % scrollContentHandle.current.state.numOfItems];
+                var correctedTarget = currentItemNode && parseInt(currentItemNode.dataset.index) === prevKeyDownIndexRef.current ? currentItemNode : target;
+                handleDirectionKeyDown(ev, 'acceleratedKeyDown', {
+                  isWrapped: false,
+                  keyCode: keyCode,
+                  nextIndex: correctedNextIndex,
+                  repeat: repeat,
+                  target: correctedTarget
+                });
+                prevKeyDownIndexRef.current = correctedNextIndex;
+              }
+              // At list boundary: keep prevKeyDownIndexRef.current unchanged so next event stays recoverable
+              return;
+            }
             if (nextIndex >= 0) {
               // if the candidate is another item
               ev.preventDefault();
               ev.stopPropagation();
-              if (repeat && prevKeyDownIndex !== -1 && (isDownKey && prevKeyDownIndex > index || isUpKey && prevKeyDownIndex < index)) {
-                // Ignore keyEvent from item with wrong data-index (Workaround for data-index bug)
-                // Sometimes keyDown event occurs before the data-index updated, it causes reverse focus change
-                return;
-              }
               if (props.scrollContainerHandle && props.scrollContainerHandle.current) {
                 props.scrollContainerHandle.current.lastInputType = 'arrowKey';
               }
@@ -188,9 +225,6 @@ var useEventKey = exports.useEventKey = function useEventKey(props, instances, c
                 focusableScrollbar = props.focusableScrollbar,
                 isHorizontalScrollbarVisible = props.isHorizontalScrollbarVisible,
                 isVerticalScrollbarVisible = props.isVerticalScrollbarVisible;
-              var _scrollContentHandle$2 = scrollContentHandle.current,
-                dimensionToExtent = _scrollContentHandle$2.dimensionToExtent,
-                isPrimaryDirectionVertical = _scrollContentHandle$2.isPrimaryDirectionVertical;
               var column = index % dimensionToExtent;
               var row = (index - column) % dataSize / dimensionToExtent;
               var directions = {};
@@ -236,7 +270,8 @@ var useEventKey = exports.useEventKey = function useEventKey(props, instances, c
               }
             }
           }
-          prevKeyDownIndex = index;
+          prevKeyDownIndexRef.current = index;
+          hasProcessedKeyDownRef.current = true;
           if (isLeaving) {
             handleDirectionKeyDown(ev, 'keyLeave');
           }

package/VirtualList/useThemeVirtualList.js

@@ -99,6 +99,9 @@ var useSpottable = function useSpottable(props, instances) {
       handle5WayKeyUp: function handle5WayKeyUp() {
         SpotlightAccelerator.reset();
       },
+      resetAccelerator: function resetAccelerator() {
+        SpotlightAccelerator.reset();
+      },
       spotlightAcceleratorProcessKey: function spotlightAcceleratorProcessKey(ev) {
         return SpotlightAccelerator.processKey(ev, nop);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enact/limestone",
-  "version": "1.9.3",
+  "version": "1.9.4",
   "description": "Large-screen/TV support library for Enact, containing a variety of UI components.",
   "repository": {
     "type": "git",
@@ -47,12 +47,12 @@
     "@enovaui/core-tokens": "^0.14.0",
     "@enovaui/webos-tokens": "^0.14.0",
     "classnames": "^2.5.1",
-    "ilib": "^14.21.3",
+    "ilib": "^14.22.0",
     "invariant": "^2.2.4",
     "prop-types": "^15.8.1",
     "ramda": "^0.32.0",
-    "react": "^19.2.5",
-    "react-dom": "^19.2.5",
+    "react": "^19.2.7",
+    "react-dom": "^19.2.7",
     "warning": "^4.0.3"
   },
   "peerDependencies": {