@lumx/react 4.9.0-next.16 → 4.9.0-next.17

package/index.js

@@ -2498,7 +2498,8 @@ function isOptionDisabled(option) {
 /** Returns true when the cell is NOT the first gridcell in its row (i.e., it's an action cell). */
 function isActionCell(cell) {
   const row = cell.closest('[role="row"]');
-  return row?.querySelector('[role="gridcell"]') !== cell;
+  if (!row) return false;
+  return row.querySelector('[role="gridcell"]') !== cell;
 }
 
 /** Predicate matching an option element that carries `aria-selected="true"`. */
@@ -3371,16 +3372,17 @@ function setupCombobox(callbacks, options, onTriggerAttach) {
       switch (event.key) {
         case 'Enter':
           if (handle.isOpen && nav?.hasActiveItem && nav.activeItem) {
-            if (!isOptionDisabled(nav.activeItem)) {
-              // Click the active item. For option cells, the delegated click handler
-              // on the listbox will call handle.select() and handle closing.
-              // For action cells and link options, the native click fires too.
-              nav.activeItem.click();
+            // Capture activeItem before click — the click handler may close
+            // the popover and clear the focus navigation state.
+            const {
+              activeItem
+            } = nav;
+            // "Click" on active option
+            if (!isOptionDisabled(activeItem)) {
+              activeItem.click();
             }
-            // Close for single-select. For option cells the delegated handler
-            // already closed, but setIsOpen(false) is idempotent. For action cells
-            // and disabled options, the delegated handler did NOT close, so this is needed.
-            if (!handle.isMultiSelect) {
+            // Only close when not in multi select and not in action cell
+            if (!handle.isMultiSelect && !isActionCell(activeItem)) {
               handle.setIsOpen(false);
             }
           } else if (!handle.isMultiSelect) {