@nebula.js/stardust 4.0.0-alpha.6 → 4.0.0-alpha.7

package/core/esm/dev.js

@@ -1,14 +1,14 @@
 /*
-* @nebula.js/stardust v4.0.0-alpha.6
+* @nebula.js/stardust v4.0.0-alpha.7
 * Copyright (c) 2023 QlikTech International AB
 * Released under the MIT license.
 */
 
 import * as React from 'react';
-import React__default, { useState as useState$1, useEffect as useEffect$1, forwardRef, useMemo as useMemo$1, useImperativeHandle as useImperativeHandle$1, useReducer, useCallback, useLayoutEffect as useLayoutEffect$1, PureComponent, useRef, createElement, useContext } from 'react';
+import React__default, { useState as useState$1, useEffect as useEffect$1, forwardRef, useMemo as useMemo$1, useImperativeHandle as useImperativeHandle$1, useReducer, useCallback, useLayoutEffect as useLayoutEffect$1, PureComponent, useRef, useContext, createElement } from 'react';
 import ReactDOM from 'react-dom';
 import { CacheProvider, ThemeContext as ThemeContext$2 } from '@emotion/react';
-import { Checkbox, Radio, Typography, FormControlLabel, Box, Grid, Tooltip, Paper, IconButton, Popover, MenuList, MenuItem, ListItemIcon, Divider, InputAdornment, OutlinedInput, Badge, List, ListItem, Button, Icon, CircularProgress } from '@mui/material';
+import { Checkbox, Radio, Typography, FormControlLabel, Box, Grid, Tooltip, Paper, IconButton, styled as styled$4, Popover, MenuList, MenuItem, ListItemIcon, Divider, InputAdornment, OutlinedInput, Badge, List, ListItem, Button, Icon, CircularProgress } from '@mui/material';
 import styled$3 from '@emotion/styled';
 
 function getAugmentedNamespace(n) {
@@ -8064,7 +8064,7 @@ function create$3(definition) {
   return cache[key];
 }
 
-const NEBULA_VERSION_HASH = "9917" ;
+const NEBULA_VERSION_HASH = "a704" ;
 ClassNameGenerator$1.configure(componentName => {
   return "njs-".concat(NEBULA_VERSION_HASH, "-").concat(componentName.replace('Mui', ''));
 });
@@ -8272,7 +8272,7 @@ function boot(_ref2) {
   const appRef = React__default.createRef();
   const element = document.createElement('div');
   element.style.display = 'none';
-  element.setAttribute('data-nebulajs-version', "4.0.0-alpha.6" );
+  element.setAttribute('data-nebulajs-version', "4.0.0-alpha.7" );
   element.setAttribute('data-app-id', app.id);
   document.body.appendChild(element);
   const root = client.createRoot(element);
@@ -9348,6 +9348,84 @@ const KEYS = Object.freeze({
   isArrow: key => key === KEYS.ARROW_UP || key === KEYS.ARROW_DOWN || key === KEYS.ARROW_LEFT || key === KEYS.ARROW_RIGHT
 });
 
+function removeInnnerTabStops(container) {
+  container === null || container === void 0 ? void 0 : container.querySelectorAll('[tabIndex="0"]').forEach(elm => {
+    elm.setAttribute('tabIndex', -1);
+  });
+}
+function removeLastFocused(container) {
+  container === null || container === void 0 ? void 0 : container.querySelectorAll('.last-focused').forEach(elm => {
+    elm.classList.remove('last-focused');
+  });
+}
+function getVizCell(container) {
+  return (container === null || container === void 0 ? void 0 : container.closest('.njs-cell')) || (container === null || container === void 0 ? void 0 : container.closest('.qv-gridcell'));
+}
+
+// Emulate the keyboard hook, until we support it in the Listbox.
+function useTempKeyboard(_ref) {
+  let {
+    containerRef,
+    enabled
+  } = _ref;
+  const [keyboardActive, setKeyboardActive] = useState$1(false);
+  const innerTabStops = !enabled || keyboardActive;
+  const keyboard = {
+    enabled,
+    active: keyboardActive,
+    innerTabStops,
+    // does keyboard permit inner tab stops
+    outerTabStops: !innerTabStops,
+    // does keyboard permit outer tab stops
+    blur: resetFocus => {
+      var _containerRef$current;
+      if (!enabled) {
+        return;
+      }
+      setKeyboardActive(false);
+      const vizCell = getVizCell(containerRef.current) || ((_containerRef$current = containerRef.current) === null || _containerRef$current === void 0 ? void 0 : _containerRef$current.parentElement);
+      removeInnnerTabStops(containerRef.current);
+      removeLastFocused(containerRef.current);
+      if (resetFocus && vizCell) {
+        // Move focus to the viz's cell.
+        vizCell.setAttribute('tabIndex', 0);
+        vizCell.focus();
+      }
+    },
+    focus: () => {
+      if (!enabled) {
+        return;
+      }
+      setKeyboardActive(true);
+      const c = containerRef.current;
+      const searchField = c === null || c === void 0 ? void 0 : c.querySelector('.search input');
+      const lastSelectedRow = c === null || c === void 0 ? void 0 : c.querySelector('.value.last-focused');
+      const fieldElement = c === null || c === void 0 ? void 0 : c.querySelector('.value.selector, .value, .ActionsToolbar-item button');
+      const elementToFocus = searchField || lastSelectedRow || fieldElement;
+      elementToFocus === null || elementToFocus === void 0 ? void 0 : elementToFocus.setAttribute('tabIndex', 0);
+      elementToFocus === null || elementToFocus === void 0 ? void 0 : elementToFocus.focus();
+    },
+    focusSelection: () => {
+      const confirmButton = document.querySelector('.actions-toolbar-default-actions .actions-toolbar-confirm');
+      confirmButton === null || confirmButton === void 0 ? void 0 : confirmButton.setAttribute('tabIndex', 0);
+      confirmButton === null || confirmButton === void 0 ? void 0 : confirmButton.focus();
+    }
+  };
+  return keyboard;
+}
+
+const getElementIndex = currentTarget => +currentTarget.getAttribute('data-n');
+const focusSearch = container => {
+  const searchField = container === null || container === void 0 ? void 0 : container.querySelector('.search input');
+  searchField === null || searchField === void 0 ? void 0 : searchField.focus();
+  return searchField;
+};
+const focusRow = container => {
+  const row = container === null || container === void 0 ? void 0 : container.querySelector('.value.last-focused, .value.selector, .value');
+  row === null || row === void 0 ? void 0 : row.setAttribute('tabIndex', 0);
+  row === null || row === void 0 ? void 0 : row.focus();
+  return row;
+};
 function getFieldKeyboardNavigation(_ref) {
   let {
     select,
@@ -9356,7 +9434,9 @@ function getFieldKeyboardNavigation(_ref) {
     confirm,
     cancel,
     setScrollPosition,
-    focusListItems
+    focusListItems,
+    keyboard,
+    isModal
   } = _ref;
   const getElement = function (elm) {
     let next = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
@@ -9369,49 +9449,86 @@ function getFieldKeyboardNavigation(_ref) {
   };
   const handleKeyDown = event => {
     let elementToFocus;
+    const {
+      currentTarget,
+      nativeEvent
+    } = event;
     const {
       keyCode,
       shiftKey = false,
       ctrlKey = false,
       metaKey = false
-    } = event.nativeEvent;
+    } = nativeEvent;
     switch (keyCode) {
+      case KEYS.TAB:
+        {
+          // Try to focus search field, otherwise confirm button.
+          const container = currentTarget.closest('.listbox-container');
+          const inSelection = isModal();
+
+          // TODO: use a store to keep track of this row.
+          currentTarget.classList.add('last-focused'); // so that we can go back here when we tab back
+
+          if (shiftKey) {
+            if (!focusSearch(container)) {
+              if (inSelection) {
+                keyboard.focusSelection();
+              } else {
+                keyboard.blur(true);
+              }
+            }
+            break;
+          }
+
+          // Without shift key
+          if (inSelection) {
+            keyboard.focusSelection();
+          } else {
+            currentTarget.blur();
+            keyboard.blur();
+          }
+          break;
+        }
       case KEYS.SHIFT:
         // This is to ensure we include the first value when starting a range selection.
         setStartedRange(true);
         break;
       case KEYS.SPACE:
-        select([+event.currentTarget.getAttribute('data-n')], false, event);
+        select([getElementIndex(currentTarget)], false, event);
         break;
       case KEYS.ARROW_DOWN:
       case KEYS.ARROW_RIGHT:
-        elementToFocus = getElement(event.currentTarget, true);
+        elementToFocus = getElement(currentTarget, true);
         if (shiftKey && elementToFocus) {
           if (startedRange) {
-            select([+event.currentTarget.getAttribute('data-n')], true);
+            select([getElementIndex(currentTarget)], true);
             setStartedRange(false);
           }
-          select([+elementToFocus.getAttribute('data-n')], true);
+          select([getElementIndex(elementToFocus)], true);
         }
         break;
       case KEYS.ARROW_UP:
       case KEYS.ARROW_LEFT:
-        elementToFocus = getElement(event.currentTarget, false);
+        elementToFocus = getElement(currentTarget, false);
         if (shiftKey && elementToFocus) {
           if (startedRange) {
-            select([+event.currentTarget.getAttribute('data-n')], true);
+            select([getElementIndex(currentTarget)], true);
             setStartedRange(false);
           }
-          select([+elementToFocus.getAttribute('data-n')], true);
+          select([getElementIndex(elementToFocus)], true);
         }
         break;
       case KEYS.ENTER:
         confirm();
         break;
       case KEYS.ESCAPE:
-        cancel();
-        return;
-      // let it propagate to top-level
+        if (isModal()) {
+          cancel();
+        } else {
+          return; // propagate to other Esc handler
+        }
+
+        break;
       case KEYS.HOME:
         focusListItems.setFirst(true);
         if (ctrlKey) {
@@ -9455,39 +9572,41 @@ function getFieldKeyboardNavigation(_ref) {
 }
 function getListboxInlineKeyboardNavigation(_ref2) {
   let {
-    setKeyboardActive,
+    keyboard,
     hovering,
     setHovering,
     updateKeyScroll,
     containerRef,
     currentScrollIndex,
-    app,
-    appSelections,
+    isModal,
     constraints
   } = _ref2;
-  const focusInsideListbox = element => {
-    const fieldElement = element.querySelector('.search input, .value.selector, .value, .ActionsToolbar-item button');
-    setKeyboardActive(true);
-    if (fieldElement) {
-      fieldElement.focus();
-    }
-  };
-  const changeFocus = event => {
-    var _event$target;
-    if ((_event$target = event.target) !== null && _event$target !== void 0 && _event$target.classList.contains('listbox-container')) {
-      // Focus currently on a listbox
-      // Esc on a list box should move the focus to its parent, i.e. a filter pane if any
-      setKeyboardActive(false);
+  const blur = event => {
+    const {
+      currentTarget,
+      target
+    } = event;
+    const isFocusedOnListbox = target.classList.contains('listbox-container');
+    const container = currentTarget.closest('.listbox-container');
+    const vizCell = getVizCell(container);
+    const isSingleListbox = (vizCell === null || vizCell === void 0 ? void 0 : vizCell.querySelectorAll('.listbox-container').length) === 1;
+    if (isFocusedOnListbox || isSingleListbox) {
+      // Move the focus from listbox container to the viz container.
+      keyboard.blur(true);
     } else {
-      var _event$target2, _event$target3, _event$currentTarget, _event$currentTarget2;
-      // Focus currently on a row
-      // Esc on a row should move the focus to its parent, i.e. a listbox
-      // First unfocus the row
-      (_event$target2 = event.target) === null || _event$target2 === void 0 ? void 0 : _event$target2.setAttribute('tabIndex', '-1');
-      (_event$target3 = event.target) === null || _event$target3 === void 0 ? void 0 : _event$target3.blur();
-      // Then focus the listbox
-      (_event$currentTarget = event.currentTarget) === null || _event$currentTarget === void 0 ? void 0 : _event$currentTarget.setAttribute('tabIndex', '0');
-      (_event$currentTarget2 = event.currentTarget) === null || _event$currentTarget2 === void 0 ? void 0 : _event$currentTarget2.focus();
+      // More than one listbox: Move focus from row to listbox container.
+
+      // 1. Remove last-focused class from row siblings.
+      removeLastFocused(containerRef.current);
+
+      // 2. Add last-focused class so we can re-focus it later.
+      currentTarget.classList.add('last-focused');
+
+      // 3. Blur row and focus the listbox container.
+      keyboard.blur();
+      const c = currentTarget.closest('.listbox-container');
+      c.setAttribute('tabIndex', 0);
+      c === null || c === void 0 ? void 0 : c.focus();
     }
   };
   const updateKeyScrollOnHover = newState => {
@@ -9501,65 +9620,84 @@ function getListboxInlineKeyboardNavigation(_ref2) {
       ctrlKey = false,
       shiftKey = false
     } = event.nativeEvent;
+    const prevent = () => {
+      event.stopPropagation();
+      event.preventDefault();
+    };
     switch (keyCode) {
-      // case KEYS.TAB: TODO: Focus confirm button using keyboard.focusSelection when we can access the useKeyboard hook.
-      case KEYS.ENTER:
-      case KEYS.SPACE:
-        if (!event.target.classList.contains('listbox-container')) {
-          return; // don't mess with keydown handlers within the listbox
-        }
-
-        focusInsideListbox(event.currentTarget);
-        break;
-      case KEYS.ESCAPE:
-        changeFocus(event);
-        break;
-      case KEYS.ARROW_UP:
-        updateKeyScrollOnHover({
-          up: 1
-        });
-        break;
-      case KEYS.ARROW_DOWN:
-        updateKeyScrollOnHover({
-          down: 1
-        });
-        break;
-      case KEYS.ARROW_LEFT:
-      case KEYS.ARROW_RIGHT:
-        return;
-      // let it propagate to top-level
       case KEYS.PAGE_UP:
         updateKeyScrollOnHover({
           up: currentScrollIndex.stop - currentScrollIndex.start
         });
+        prevent();
         break;
       case KEYS.PAGE_DOWN:
         updateKeyScrollOnHover({
           down: currentScrollIndex.stop - currentScrollIndex.start
         });
+        prevent();
         break;
       case KEYS.HOME:
         updateKeyScrollOnHover({
           scrollPosition: ctrlKey && shiftKey ? 'overflowStart' : 'start'
         });
+        prevent();
         break;
       case KEYS.END:
         updateKeyScrollOnHover({
           scrollPosition: ctrlKey && shiftKey ? 'overflowEnd' : 'end'
         });
+        prevent();
         break;
-      default:
-        return;
+      case KEYS.ARROW_UP:
+        updateKeyScrollOnHover({
+          up: 1
+        });
+        prevent();
+        break;
+      case KEYS.ARROW_DOWN:
+        updateKeyScrollOnHover({
+          down: 1
+        });
+        prevent();
+        break;
+    }
+    if (!keyboard.enabled) {
+      // Other keys should not be handled unless keyboard is enabled.
+      return undefined;
     }
+    const container = event.currentTarget.closest('.listbox-container');
+    switch (keyCode) {
+      case KEYS.TAB:
+        if (shiftKey) {
+          focusRow(container) || focusSearch(container);
+        } else {
+          focusSearch(container) || focusRow(container);
+        }
+        prevent();
+        break;
+      case KEYS.ENTER:
+      case KEYS.SPACE:
+        if (!event.target.classList.contains('listbox-container')) {
+          return undefined; // don't mess with keydown handlers within the listbox (e.g. row seletion)
+        }
 
-    // Note: We should not stop propagation here as it will block the containing app
-    // from handling keydown events.
-    event.preventDefault();
+        keyboard.focus();
+        prevent();
+        break;
+      case KEYS.ESCAPE:
+        blur(event);
+        prevent();
+        break;
+      case KEYS.ARROW_LEFT:
+      case KEYS.ARROW_RIGHT:
+        return undefined;
+    }
+    return undefined;
   };
   const focusOnHoverDisabled = () => {
-    var _app$isInModalSelecti, _app$isInModalSelecti2;
     const selectNotAllowed = (constraints === null || constraints === void 0 ? void 0 : constraints.select) || (constraints === null || constraints === void 0 ? void 0 : constraints.active);
-    const appInModal = (_app$isInModalSelecti = (_app$isInModalSelecti2 = app.isInModalSelection) === null || _app$isInModalSelecti2 === void 0 ? void 0 : _app$isInModalSelecti2.call(app)) !== null && _app$isInModalSelecti !== void 0 ? _app$isInModalSelecti : appSelections.isInModal();
+    const appInModal = isModal();
     return selectNotAllowed || appInModal;
   };
   const handleOnMouseEnter = () => {
@@ -10247,13 +10385,15 @@ function Frequency(_ref) {
     dense,
     showGray
   } = _ref;
+  const frequencyText = getFrequencyText(cell === null || cell === void 0 ? void 0 : cell.qFrequency);
   return /*#__PURE__*/React__default.createElement(Grid, {
     item: true,
     style: {
       display: 'flex',
       alignItems: 'center'
     },
-    className: rowColClasses.frequencyCount
+    className: rowColClasses.frequencyCount,
+    "aria-label": frequencyText
   }, /*#__PURE__*/React__default.createElement(Typography, {
     noWrap: true,
     color: "inherit",
@@ -10262,7 +10402,7 @@ function Frequency(_ref) {
       cell,
       checkboxes
     }) && rowColClasses.excludedTextWithCheckbox])
-  }, getFrequencyText(cell === null || cell === void 0 ? void 0 : cell.qFrequency)));
+  }, frequencyText));
 }
 
 function getGridItemSizes(_ref) {
@@ -10299,7 +10439,7 @@ function getGridItemSizes(_ref) {
 }
 
 const ItemGrid = styled$1(Grid, {
-  shouldForwardProp: prop => !['dataLayout', 'layoutOrder', 'itemPadding', 'checkboxes'].includes(prop)
+  shouldForwardProp: prop => !['dataLayout', 'layoutOrder', 'itemPadding', 'cellPaddingRight'].includes(prop)
 })(_ref => {
   let {
     dataLayout,
@@ -10334,6 +10474,79 @@ function getCellFromPages(_ref) {
   return c;
 }
 
+/* eslint-disable import/prefer-default-export */
+const LOC_STATES = {
+  S: 'Object.Listbox.Selected',
+  A: 'Object.Listbox.Alternative',
+  O: 'Object.Listbox.Optional',
+  XS: 'Object.Listbox.SelectedExcluded',
+  L: 'Object.Listbox.Locked',
+  X: 'Object.Listbox.Excluded',
+  XL: 'Object.Listbox.ExcludedLock'
+};
+function getValueLabel(_ref) {
+  let {
+    translator,
+    label,
+    qState,
+    isSelected,
+    currentIndex,
+    maxIndex,
+    showSearch
+  } = _ref;
+  const stateTranslation = LOC_STATES[qState];
+  const state = translator.get(stateTranslation);
+  const srStringArr = [];
+  if (isSelected) {
+    const navTranslation = showSearch ? 'Listbox.ScreenReader.SearchThenSelectionsMenu.WithAccSelMenu' : 'Listbox.ScreenReader.SelectionMenu.WithAccSelMenu';
+    const nav = translator.get(navTranslation);
+    srStringArr.push(nav);
+  }
+  const valueString = "".concat(label, " ").concat(state);
+  const indexString = translator.get('CurrentSelections.Of', [currentIndex + 1, maxIndex + 1]); // E.g. 3 of 20
+  srStringArr.unshift(valueString, indexString);
+  const srString = srStringArr.join('. ').trim();
+  return srString;
+}
+
+/**
+ * Announces the selection state.
+ *
+ * @ignore
+ * @param {Layout} object
+ * @returns {Element} An (invisible) component.
+ */
+function ScreenReaderForSelections(_ref2) {
+  var _layout$qListObject;
+  let {
+    layout
+  } = _ref2;
+  const {
+    translator
+  } = useContext(InstanceContext);
+  const {
+    qStateCounts: s = {}
+  } = (layout === null || layout === void 0 ? void 0 : (_layout$qListObject = layout.qListObject) === null || _layout$qListObject === void 0 ? void 0 : _layout$qListObject.qDimensionInfo) || {};
+  const count = s.qSelected + s.qSelectedExcluded + s.qLocked + s.qLockedExcluded;
+  let t;
+  switch (count) {
+    case 0:
+      t = 'ScreenReader.ZeroSelected';
+      break;
+    case 1:
+      t = 'ScreenReader.OneSelected';
+      break;
+    default:
+      t = 'ScreenReader.ManySelected';
+      break;
+  }
+  const text = translator.get(t, [count]);
+  return /*#__PURE__*/React__default.createElement("div", {
+    className: "screenReaderOnly",
+    "aria-live": "assertive"
+  }, text);
+}
+
 function RowColumn(_ref) {
   var _cell$qText, _cell$qHighlightRange, _cell$qHighlightRange2;
   let {
@@ -10370,7 +10583,10 @@ function RowColumn(_ref) {
     focusListItems,
     listCount,
     itemPadding,
-    frequencyWidth
+    frequencyWidth,
+    translator,
+    showSearch,
+    isModal
   } = data;
   const {
     dense = false,
@@ -10420,8 +10636,10 @@ function RowColumn(_ref) {
     }
   }, [rowRef.current]);
   const handleKeyDownCallback = useCallback(getFieldKeyboardNavigation(_objectSpread2(_objectSpread2({}, actions), {}, {
-    focusListItems
-  })), [actions]);
+    focusListItems,
+    keyboard,
+    isModal
+  })), [actions, keyboard === null || keyboard === void 0 ? void 0 : keyboard.innerTabStops]);
   const cell = useMemo$1(() => getCellFromPages({
     pages,
     cellIndex
@@ -10486,6 +10704,14 @@ function RowColumn(_ref) {
   const showTick = !checkboxes && isSelected && !isLocked;
   const showIcon = !checkboxes && sizePermitsTickOrLock;
   const cellPaddingRight = checkboxes || !sizePermitsTickOrLock;
+  const ariaLabel = getValueLabel({
+    translator,
+    label,
+    qState: cell.qState,
+    currentIndex: count.currentIndex,
+    maxIndex: count.max,
+    showSearch
+  });
   return /*#__PURE__*/React__default.createElement(RowColRoot$1, {
     className: rowColClasses.barContainer,
     flexBasisProp: flexBasisVal,
@@ -10496,6 +10722,11 @@ function RowColumn(_ref) {
     frequencyWidth: frequencyWidth,
     "data-testid": "listbox.item"
   }, /*#__PURE__*/React__default.createElement(ItemGrid, {
+    role: "row",
+    "aria-label": ariaLabel,
+    "aria-selected": isSelected,
+    "aria-setsize": count.max,
+    "aria-rowindex": count.currentIndex,
     ref: rowRef,
     container: true,
     dataLayout: dataLayout,
@@ -10513,8 +10744,7 @@ function RowColumn(_ref) {
     onMouseEnter: onMouseEnter,
     onKeyDown: handleKeyDownCallback,
     onContextMenu: preventContextMenu,
-    role: column ? 'column' : 'row',
-    tabIndex: isFirstElement && (!keyboard.enabled || keyboard.active) ? 0 : -1,
+    tabIndex: isFirstElement && keyboard.innerTabStops ? 0 : -1,
     "data-n": cell === null || cell === void 0 ? void 0 : cell.qElemNumber
   }, (cell === null || cell === void 0 ? void 0 : cell.qFrequency) && /*#__PURE__*/React__default.createElement(Histogram, {
     qFrequency: cell === null || cell === void 0 ? void 0 : cell.qFrequency,
@@ -12130,7 +12360,10 @@ function getListBoxComponents(_ref) {
     setCurrentScrollIndex,
     constraints,
     frequencyMax,
-    freqIsAllowed
+    freqIsAllowed,
+    translator,
+    showSearch,
+    isModal
   } = _ref;
   const {
     layoutOptions = {}
@@ -12184,7 +12417,10 @@ function getListBoxComponents(_ref) {
     showTick,
     dataOffset: local.current.dataOffset,
     focusListItems,
-    direction
+    direction,
+    translator,
+    showSearch,
+    isModal
   });
   const List = _ref2 => {
     let {
@@ -12626,17 +12862,14 @@ function useDataStore(model) {
   };
 }
 
-function ListBoxDisclaimer(_ref) {
+const StyledText = styled$1(Typography, {
+  shouldForwardProp: p => !['width', 'dense'].includes(p)
+})(_ref => {
   let {
     width,
-    text,
-    dense,
-    tooltip
+    dense
   } = _ref;
-  const {
-    translator
-  } = useContext(InstanceContext);
-  const StyledText = styled$1(Typography)(() => _objectSpread2({
+  return _objectSpread2({
     minWidth: "".concat(width, "px"),
     textAlign: 'center',
     fontSize: "".concat(dense ? '12px' : '14px')
@@ -12645,10 +12878,23 @@ function ListBoxDisclaimer(_ref) {
     overflow: 'hidden',
     whiteSpace: 'nowrap',
     width
-  }));
+  });
+});
+function ListBoxDisclaimer(_ref2) {
+  let {
+    width,
+    text,
+    dense,
+    tooltip
+  } = _ref2;
+  const {
+    translator
+  } = useContext(InstanceContext);
   return /*#__PURE__*/React__default.createElement(Tooltip, {
     title: tooltip ? translator.get(text) : ''
   }, /*#__PURE__*/React__default.createElement(StyledText, {
+    width: width,
+    dense: dense,
     component: "div",
     variant: "body1",
     py: "12px"
@@ -13016,6 +13262,14 @@ const useFrequencyMax = (app, layout) => {
 
 const _excluded$4 = ["isLoadingData"];
 const DEFAULT_MIN_BATCH_SIZE = 100;
+const StyledWrapper = styled$4('div')(() => ({
+  ["& .screenReaderOnly"]: {
+    position: 'absolute',
+    height: 0,
+    width: 0,
+    overflow: 'hidden'
+  }
+}));
 function ListBox(_ref) {
   var _layout$qListObject$q, _loaderRef$current, _loaderRef$current$_l, _loaderRef$current$_l2;
   let {
@@ -13046,8 +13300,13 @@ function ListBox(_ref) {
       set: () => {}
     },
     renderedCallback,
-    onCtrlF
+    onCtrlF,
+    showSearch,
+    isModal
   } = _ref;
+  const {
+    translator
+  } = useContext(InstanceContext);
   const [initScrollPosIsSet, setInitScrollPosIsSet] = useState$1(false);
   const isSingleSelect = !!(layout && layout.qListObject.qDimensionInfo.qIsOneAndOnlyOne);
   const {
@@ -13302,7 +13561,10 @@ function ListBox(_ref) {
     setCurrentScrollIndex: currentScrollIndex.set,
     constraints,
     frequencyMax,
-    freqIsAllowed
+    freqIsAllowed,
+    translator,
+    showSearch,
+    isModal
   });
   const {
     columnWidth,
@@ -13317,7 +13579,10 @@ function ListBox(_ref) {
       itemHeight
     });
   }
-  return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, !listCount && /*#__PURE__*/React__default.createElement(ListBoxDisclaimer, {
+  return /*#__PURE__*/React__default.createElement(StyledWrapper, null, /*#__PURE__*/React__default.createElement(ScreenReaderForSelections, {
+    className: "screenReaderOnly",
+    layout: layout
+  }), !listCount && /*#__PURE__*/React__default.createElement(ListBoxDisclaimer, {
     width: width,
     text: "Listbox.NoMatchesForYourTerms"
   }), /*#__PURE__*/React__default.createElement(InfiniteLoader, {
@@ -13329,7 +13594,8 @@ function ListBox(_ref) {
     }),
     threshold: 0,
     minimumBatchSize: minimumBatchSize,
-    ref: loaderRef
+    ref: loaderRef,
+    role: "grid"
   }, isVertical ? List : Grid), overflowDisclaimer.show && !overflowDisclaimer.dismissed && /*#__PURE__*/React__default.createElement(ListBoxFooter, {
     text: "Listbox.ItemsOverflow",
     dismiss: () => setOverflowDisclaimer(state => _objectSpread2(_objectSpread2({}, state), {}, {
@@ -13481,6 +13747,7 @@ const Item = React__default.forwardRef((_ref, ref) => {
   if (hidden) return null;
   const spacing = Number.parseInt(theme.spacing(0.5), 10);
   const handleKeyDown = item.keyboardAction ? e => ['Enter', ' ', 'Spacebar'].includes(e.key) && item.keyboardAction() : null;
+  const btnId = "actions-toolbar-".concat(item.key);
   return /*#__PURE__*/React__default.createElement(IconButton, {
     ref: !addAnchor ? ref : null,
     title: item.label,
@@ -13488,12 +13755,12 @@ const Item = React__default.forwardRef((_ref, ref) => {
     onKeyDown: handleKeyDown,
     disabled: disabled,
     style: style,
-    className: ActionElement.className,
+    className: [ActionElement.className, btnId].join(' '),
     size: "large",
     disableRipple: true,
     "aria-expanded": ariaExpanded,
     "aria-controls": "moreMenuList",
-    "data-testid": "actions-toolbar-".concat(item.key)
+    "data-testid": btnId
   }, hasSvgIconShape && SvgIcon$2(item.getSvgIconShape()), addAnchor && /*#__PURE__*/React__default.createElement("div", {
     ref: ref,
     style: {
@@ -13672,6 +13939,70 @@ const More$1 = React__default.forwardRef((_ref3, ref) => {
   }))));
 });
 
+const getActionButtonIndex = btn => {
+  const toolbar = btn.closest('#actions-toolbar');
+  const nodeList = toolbar === null || toolbar === void 0 ? void 0 : toolbar.querySelectorAll('.njs-cell-action');
+  return Array.from(nodeList).indexOf(btn);
+};
+const focusButton = index => {
+  const toolbar = document.querySelector('#actions-toolbar');
+  const nodeList = toolbar === null || toolbar === void 0 ? void 0 : toolbar.querySelectorAll('.njs-cell-action');
+  if (!nodeList.length) {
+    return;
+  }
+  const ix = Math.min(Math.max(0, index), nodeList.length - 1);
+  const btn = nodeList[ix];
+  btn.focus();
+};
+function getActionsKeyDownHandler(_ref) {
+  let {
+    keyboardNavigation,
+    focusHandler,
+    getEnabledButton
+  } = _ref;
+  const handleActionsKeyDown = evt => {
+    const {
+      target,
+      nativeEvent
+    } = evt;
+    const {
+      keyCode
+    } = nativeEvent;
+    switch (keyCode) {
+      case KEYS.ARROW_LEFT:
+      case KEYS.ARROW_DOWN:
+      case KEYS.ARROW_RIGHT:
+      case KEYS.ARROW_UP:
+        {
+          const isActionButton = target.classList.contains('njs-cell-action');
+          if (isActionButton) {
+            const index = getActionButtonIndex(target);
+            const pressedLeft = [KEYS.ARROW_LEFT, KEYS.ARROW_DOWN].includes(keyCode);
+            focusButton(pressedLeft ? index - 1 : index + 1);
+          }
+          evt.stopPropagation();
+          evt.preventDefault();
+          break;
+        }
+      case KEYS.SPACE:
+        evt.preventDefault(); // prevent scrolling in listbox
+        break;
+      case KEYS.TAB:
+        if (keyboardNavigation && focusHandler !== null && focusHandler !== void 0 && focusHandler.refocusContent) {
+          const isTabbingOut = evt.shiftKey && getEnabledButton(false) === evt.target || !evt.shiftKey && getEnabledButton(true) === evt.target;
+          if (isTabbingOut) {
+            evt.preventDefault();
+            evt.stopPropagation();
+            // if keyboardNavigation is true, create a callback to handle tabbing from the first/last button in the toolbar that resets focus on the content
+            focusHandler.refocusContent();
+          }
+        }
+        break;
+    }
+  };
+  return handleActionsKeyDown;
+}
+
 const PREFIX$7 = 'ActionsToolbar';
 const classes$7 = {
   item: "".concat(PREFIX$7, "-item"),
@@ -13707,6 +14038,7 @@ const ActionToolbarElement = {
 };
 const ActionsGroup = React__default.forwardRef((_ref2, ref) => {
   let {
+    className,
     ariaExpanded = false,
     actions = [],
     first = false,
@@ -13719,7 +14051,8 @@ const ActionsGroup = React__default.forwardRef((_ref2, ref) => {
     container: true,
     gap: 0,
     flexDirection: isRtl ? 'row-reverse' : 'row',
-    wrap: "nowrap"
+    wrap: "nowrap",
+    className: className
   }, actions.map((e, ix) => {
     let cls = [];
     const isFirstItem = first && ix === 0;
@@ -13787,22 +14120,27 @@ function ActionsToolbar(_ref3) {
     keyboardNavigation
   } = useContext(InstanceContext);
   const [showMoreItems, setShowMoreItems] = useState$1(false);
-  const moreRef = useRef();
+  const popoverAnchorOrigin = {
+    vertical: 7,
+    horizontal: ((_popover$anchorEl$cli = (_popover$anchorEl = popover.anchorEl) === null || _popover$anchorEl === void 0 ? void 0 : _popover$anchorEl.clientWidth) !== null && _popover$anchorEl$cli !== void 0 ? _popover$anchorEl$cli : 0) - 7
+  };
   const actionsRef = useRef();
+  const moreRef = useRef();
   const theme = useTheme$1();
   const dividerStyle = useMemo$1(() => ({
     margin: theme.spacing(0.5, 0)
   }));
-  const popoverAnchorOrigin = {
-    vertical: 15,
-    horizontal: ((_popover$anchorEl$cli = (_popover$anchorEl = popover.anchorEl) === null || _popover$anchorEl === void 0 ? void 0 : _popover$anchorEl.clientWidth) !== null && _popover$anchorEl$cli !== void 0 ? _popover$anchorEl$cli : 0) - 7
-  };
   const getEnabledButton = last => {
     const actionsElement = actionsRef.current || actionsRefMock;
     if (!actionsElement) return null;
     const buttons = actionsElement.querySelectorAll('button:not(.Mui-disabled)');
     return buttons[last ? buttons.length - 1 : 0];
   };
+  const handleActionsKeyDown = useMemo$1(() => getActionsKeyDownHandler({
+    keyboardNavigation,
+    focusHandler,
+    getEnabledButton
+  }), [keyboardNavigation, focusHandler, getEnabledButton]);
   useEffect$1(() => () => {
     setShowMoreItems(false);
   }, [popover.show, show, selections.show]);
@@ -13842,27 +14180,18 @@ function ActionsToolbar(_ref3) {
     enabled: () => moreEnabled,
     action: () => setShowMoreItems(!showMoreItems)
   };
-  const tabCallback =
-  // if keyboardNavigation is true, create a callback to handle tabbing from the first/last button in the toolbar that resets focus on the content
-  keyboardNavigation && focusHandler && focusHandler.refocusContent ? evt => {
-    if (evt.key !== 'Tab') return;
-    const isTabbingOut = evt.shiftKey && getEnabledButton(false) === evt.target || !evt.shiftKey && getEnabledButton(true) === evt.target;
-    if (isTabbingOut) {
-      evt.preventDefault();
-      evt.stopPropagation();
-      focusHandler.refocusContent();
-    }
-  } : null;
   const showActions = newActions.length > 0;
   const showMore = moreActions.length > 0;
   const showDivider = showActions && selections.show || showMore && selections.show;
   const isRtl = direction === 'rtl';
   const Actions = /*#__PURE__*/React__default.createElement(Grid, {
     ref: actionsRef,
-    onKeyDown: tabCallback,
+    onKeyDown: handleActionsKeyDown,
     container: true,
     gap: 0,
     wrap: "nowrap",
+    id: "actions-toolbar",
+    "data-testid": "actions-toolbar",
     sx: {
       flexDirection: isRtl ? 'row-reverse' : 'row'
     }
@@ -13871,6 +14200,8 @@ function ActionsToolbar(_ref3) {
     first: true,
     last: !showMore && !selections.show
   }), showMore && /*#__PURE__*/React__default.createElement(ActionsGroup, {
+    id: "actions-toolbar-show-more",
+    "data-testid": "actions-toolbar-show-more",
     ref: moreRef,
     ariaExpanded: showMoreItems,
     actions: [moreItem],
@@ -13884,6 +14215,7 @@ function ActionsToolbar(_ref3) {
   }, /*#__PURE__*/React__default.createElement(Divider, {
     orientation: "vertical"
   })), selections.show && /*#__PURE__*/React__default.createElement(ActionsGroup, {
+    className: "actions-toolbar-default-actions",
     actions: defaultSelectionActions,
     first: !showActions && !showMore,
     last: true,
@@ -13907,6 +14239,8 @@ function ActionsToolbar(_ref3) {
     hideBackdrop: true,
     style: popoverStyle,
     PaperProps: {
+      id: 'njs-action-toolbar-popover',
+      'data-testid': 'njs-action-toolbar-popover',
       className: ActionToolbarElement.className,
       style: {
         pointerEvents: 'auto',
@@ -14034,29 +14368,57 @@ function ListBoxSearch(_ref3) {
     }
     return response;
   };
+  function focusRow(container) {
+    const row = (container === null || container === void 0 ? void 0 : container.querySelector('.last-focused')) || (container === null || container === void 0 ? void 0 : container.querySelector('[role="row"]:first-child'));
+    row.setAttribute('tabIndex', 0);
+    row === null || row === void 0 ? void 0 : row.focus();
+  }
   const onKeyDown = async e => {
-    let response;
+    const {
+      currentTarget
+    } = e;
+    const container = currentTarget.closest('.listbox-container');
     switch (e.key) {
       case 'Enter':
-        response = await performSearch();
+        performSearch();
         break;
       case 'Escape':
-        response = cancel();
-        e.preventDefault();
-        e.stopPropagation();
-        break;
+        {
+          focusRow(container);
+          cancel();
+          break;
+        }
+      case 'Tab':
+        {
+          if (e.shiftKey) {
+            keyboard.focusSelection();
+          } else {
+            // Focus the row we last visited or the first one.
+            focusRow(container);
+
+            // Clean up.
+            container === null || container === void 0 ? void 0 : container.querySelectorAll('.last-focused').forEach(elm => {
+              elm.classList.remove('last-focused');
+            });
+          }
+          break;
+        }
       case 'f':
       case 'F':
         if (e.ctrlKey || e.metaKey) {
           if (hide) {
             hide();
           }
-          e.preventDefault();
-          e.stopPropagation();
+        } else {
+          return undefined;
         }
         break;
+      default:
+        return undefined;
     }
-    return response;
+    e.preventDefault();
+    e.stopPropagation();
+    return undefined;
   };
   if (!visible || searchEnabled === false) {
     return null;
@@ -14102,10 +14464,11 @@ function ListBoxSearch(_ref3) {
     onKeyDown: onKeyDown,
     autoFocus: autoFocus,
     inputProps: {
-      tabIndex: keyboard && (!keyboard.enabled || keyboard.active) ? 0 : -1,
+      tabIndex: keyboard.innerTabStops ? 0 : -1,
       style: {
         textAlign: "".concat(inpuTextAlign)
-      }
+      },
+      'data-testid': 'search-input-field'
     }
   });
 }
@@ -14349,6 +14712,12 @@ function useObjectSelections(app, model, elements, options) {
     objectSelections.addListener('activated', activateClickOut);
     objectSelections.addListener('deactivated', deactivateClickOut);
     return () => {
+      // confirm selection before removing event handler
+      // to end the selection when the object is removed
+      // and remove the (ClickOut) mousedown handler from the document
+      if (objectSelections.isActive()) {
+        objectSelections.confirm();
+      }
       objectSelections.removeListener('activated', activateClickOut);
       objectSelections.removeListener('deactivated', deactivateClickOut);
     };
@@ -16004,6 +16373,13 @@ function getListboxActionProps(_ref) {
   };
 }
 
+const StyledDiv = styled$1('div')(() => ({
+  display: 'flex',
+  width: '100%',
+  height: '100%',
+  alignItems: 'center',
+  justifyContent: 'center'
+}));
 function ListBoxError(_ref) {
   let {
     text
@@ -16011,13 +16387,6 @@ function ListBoxError(_ref) {
   const {
     translator
   } = useContext(InstanceContext);
-  const StyledDiv = styled$1('div')(() => ({
-    display: 'flex',
-    width: '100%',
-    height: '100%',
-    alignItems: 'center',
-    justifyContent: 'center'
-  }));
   return /*#__PURE__*/React__default.createElement(StyledDiv, null, translator.get(text));
 }
 
@@ -16072,12 +16441,20 @@ const Title = styled$1(Typography)(_ref2 => {
     fontWeight: ((_theme$listBox5 = theme.listBox) === null || _theme$listBox5 === void 0 ? void 0 : (_theme$listBox5$title = _theme$listBox5.title) === null || _theme$listBox5$title === void 0 ? void 0 : (_theme$listBox5$title2 = _theme$listBox5$title.main) === null || _theme$listBox5$title2 === void 0 ? void 0 : _theme$listBox5$title2.fontWeight) || 'bold'
   };
 });
-function ListBoxInline(_ref3) {
+const isModal = _ref3 => {
+  var _app$isInModalSelecti, _app$isInModalSelecti2;
+  let {
+    app,
+    appSelections
+  } = _ref3;
+  return (_app$isInModalSelecti = (_app$isInModalSelecti2 = app.isInModalSelection) === null || _app$isInModalSelecti2 === void 0 ? void 0 : _app$isInModalSelecti2.call(app)) !== null && _app$isInModalSelecti !== void 0 ? _app$isInModalSelecti : appSelections.isInModal();
+};
+function ListBoxInline(_ref4) {
   var _layoutOptions$dense;
   let {
     options,
     layout
-  } = _ref3;
+  } = _ref4;
   const {
     app,
     direction,
@@ -16125,7 +16502,6 @@ function ListBoxInline(_ref3) {
   const [searchContainer, searchContainerRef] = useRefWithCallback();
   const [showToolbar, setShowToolbar] = useState$1(false);
   const [showSearch, setShowSearch] = useState$1(false);
-  const [keyboardActive, setKeyboardActive] = useState$1(false);
   const [hovering, setHovering] = useState$1(false);
   const [keyScroll, setKeyScroll] = useState$1({
     down: 0,
@@ -16140,6 +16516,14 @@ function ListBoxInline(_ref3) {
   const [appSelections] = useAppSelections(app);
   const titleRef = useRef(null);
   const [selectionState$1] = useState$1(() => selectionState());
+  const keyboard = useTempKeyboard({
+    containerRef,
+    enabled: keyboardNavigation
+  });
+  const isModalMode = useCallback(() => isModal({
+    app,
+    appSelections
+  }), [app, appSelections]);
   const isInvalid = layout === null || layout === void 0 ? void 0 : layout.qListObject.qDimensionInfo.qError;
   const errorText = isInvalid && constraints.active ? 'Visualization.Invalid.Dimension' : 'Visualization.Incomplete';
   const {
@@ -16147,7 +16531,7 @@ function ListBoxInline(_ref3) {
     handleOnMouseEnter,
     handleOnMouseLeave
   } = getListboxInlineKeyboardNavigation({
-    setKeyboardActive,
+    keyboard,
     hovering,
     setHovering,
     updateKeyScroll,
@@ -16155,15 +16539,9 @@ function ListBoxInline(_ref3) {
     currentScrollIndex,
     app,
     appSelections,
-    constraints
+    constraints,
+    isModal: isModalMode
   });
-
-  // Expose the keyboard flags in the same way as the keyboard hook does.
-  const keyboard = {
-    enabled: keyboardNavigation,
-    // this will be static until we can access the useKeyboard hook
-    active: keyboardActive
-  };
   const showDetachedToolbarOnly = toolbar && ((layout === null || layout === void 0 ? void 0 : layout.title) === '' || (layout === null || layout === void 0 ? void 0 : layout.showTitle) === false);
   const showToolbarWithTitle = toolbar && (layout === null || layout === void 0 ? void 0 : layout.title) !== '' && (layout === null || layout === void 0 ? void 0 : layout.showTitle) !== false;
   useEffect$1(() => {
@@ -16300,7 +16678,7 @@ function ListBoxInline(_ref3) {
   }, getActionToolbarProps(true))), /*#__PURE__*/React__default.createElement(StyledGrid$3, {
     className: "listbox-container",
     container: true,
-    tabIndex: keyboard.enabled && !keyboard.active ? 0 : -1,
+    tabIndex: keyboard.outerTabStops ? 0 : -1,
     direction: "column",
     gap: 0,
     containerPadding: containerPadding,
@@ -16406,11 +16784,11 @@ function ListBoxInline(_ref3) {
     className: classes$4.screenReaderOnly
   }, translator.get('Listbox.ScreenReaderInstructions')), isInvalid ? /*#__PURE__*/React__default.createElement(ListBoxError, {
     text: errorText
-  }) : /*#__PURE__*/React__default.createElement(AutoSizer, null, _ref4 => {
+  }) : /*#__PURE__*/React__default.createElement(AutoSizer, null, _ref5 => {
     let {
       height,
       width
-    } = _ref4;
+    } = _ref5;
     return /*#__PURE__*/React__default.createElement(ListBox, {
       model: model,
       app: app,
@@ -16445,15 +16823,16 @@ function ListBoxInline(_ref3) {
         set: setCurrentScrollIndex
       },
       renderedCallback: renderedCallback,
-      onCtrlF: onCtrlF
+      onCtrlF: onCtrlF,
+      isModal: isModalMode
     });
   })))));
 }
 const ListBoxInlineMemoed = React__default.memo(ListBoxInline);
-function IsolateUseLayoutWrapper(_ref5) {
+function IsolateUseLayoutWrapper(_ref6) {
   let {
     options = {}
-  } = _ref5;
+  } = _ref6;
   const {
     model
   } = options;
@@ -21550,7 +21929,7 @@ function useRenderState() {
  * Gets an event emitter instance for the visualization.
  * @entry
  * @experimental
- * @returns {Emitter} The emitter instance.
+ * @returns {Emitter} The emitter instance. Implements https://nodejs.org/api/events.html#class-eventemitter.
  * @example
  * // In a Nebula visualization
  * import { useEmitter } from '@nebula.js/stardust';