@vaadin/component-base 24.9.14 → 24.9.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/component-base",
-  "version": "24.9.14",
+  "version": "24.9.16",
   "publishConfig": {
     "access": "public"
   },
@@ -38,10 +38,10 @@
     "lit": "^3.0.0"
   },
   "devDependencies": {
-    "@vaadin/chai-plugins": "~24.9.14",
-    "@vaadin/test-runner-commands": "~24.9.14",
+    "@vaadin/chai-plugins": "~24.9.16",
+    "@vaadin/test-runner-commands": "~24.9.16",
     "@vaadin/testing-helpers": "^1.1.0",
     "sinon": "^18.0.0"
   },
-  "gitHead": "50398d652287304f9092a52aeb066bd12d2f86ca"
+  "gitHead": "518ee03db7a60c23ce70008af8793f19e9c0fcd2"
 }

package/src/define.js

@@ -13,7 +13,7 @@ function dashToCamelCase(dash) {
 
 const experimentalMap = {};
 
-export function defineCustomElement(CustomElement, version = '24.9.14') {
+export function defineCustomElement(CustomElement, version = '24.9.16') {
   Object.defineProperty(CustomElement, 'version', {
     get() {
       return version;

package/src/virtualizer-iron-list-adapter.js

@@ -484,11 +484,19 @@ export class IronListAdapter {
 
   /** @private */
   __getFocusedElement(visibleElements = this.__getVisibleElements()) {
-    return visibleElements.find(
-      (element) =>
-        element.contains(this.elementsContainer.getRootNode().activeElement) ||
-        element.contains(this.scrollTarget.getRootNode().activeElement),
-    );
+    // `document.activeElement` retargets to the outermost shadow host when
+    // focus lives in a nested shadow tree. Descend through nested shadow
+    // roots' `activeElement`s to reach the real focused node, then walk up
+    // the flattened tree (via `assignedSlot`/`parentNode`/`host`) until a
+    // visible row is reached.
+    let node = document.activeElement;
+    while (node?.shadowRoot?.activeElement) {
+      node = node.shadowRoot.activeElement;
+    }
+    while (node && !visibleElements.includes(node)) {
+      node = node.assignedSlot || node.parentNode || node.host;
+    }
+    return node;
   }
 
   /** @private */