@sprinklrjs/spaceweb 11.0.0 → 12.33.2-rc.1

package/esm/menu/helpers.d.ts

@@ -1,8 +1,15 @@
-import { Reducer } from './types';
+import { Reducer, TraversalFunction } from './types';
+export declare const nextItem: TraversalFunction;
+export declare const prevItem: TraversalFunction;
 /**
  * Checks if given item can be highlighted
  */
 export declare const canHighlightItem: (item?: HTMLElement | null | undefined) => boolean;
+/**
+ * https://github.com/mui-org/material-ui/blob/master/packages/material-ui/src/MenuList/MenuList.js
+ * Get index of next element which is not disabled
+ */
+export declare const getNextItemIndexToHighlight: (highlightedItem: HTMLElement | null, parentContainer: HTMLElement, traversalFunction: TraversalFunction) => HTMLElement | null;
 export declare const getFirstHighlightableElement: (listItemsContainerRef: HTMLElement) => {
     firstHighlightableItem: HTMLElement | null;
     firstSelectedItem: HTMLElement | null;

package/esm/menu/helpers.js

@@ -1,11 +1,11 @@
-var nextItem = function (highlightedItem, parentContainer) {
+export var nextItem = function (highlightedItem, parentContainer) {
     var _a;
     if (highlightedItem) {
         return ((_a = highlightedItem === null || highlightedItem === void 0 ? void 0 : highlightedItem.nextElementSibling) !== null && _a !== void 0 ? _a : highlightedItem);
     }
-    return parentContainer.firstElementChild;
+    return parentContainer === null || parentContainer === void 0 ? void 0 : parentContainer.firstElementChild;
 };
-var prevItem = function (highlightedItem) { var _a; return ((_a = highlightedItem === null || highlightedItem === void 0 ? void 0 : highlightedItem.previousElementSibling) !== null && _a !== void 0 ? _a : highlightedItem); };
+export var prevItem = function (highlightedItem) { var _a; return ((_a = highlightedItem === null || highlightedItem === void 0 ? void 0 : highlightedItem.previousElementSibling) !== null && _a !== void 0 ? _a : highlightedItem); };
 /**
  * Checks if given item can be highlighted
  */
@@ -14,7 +14,7 @@ export var canHighlightItem = function (item) { return (item === null || item ==
  * https://github.com/mui-org/material-ui/blob/master/packages/material-ui/src/MenuList/MenuList.js
  * Get index of next element which is not disabled
  */
-var getNextItemIndexToHighlight = function (highlightedItem, parentContainer, traversalFunction) {
+export var getNextItemIndexToHighlight = function (highlightedItem, parentContainer, traversalFunction) {
     var previousItem = highlightedItem, nextHighlightableItem = traversalFunction(highlightedItem, parentContainer);
     while (previousItem !== nextHighlightableItem) {
         if (!canHighlightItem(nextHighlightableItem)) {

package/esm/menu/menu-item.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<Omit<import("../list").ListItemProps, "overrides" | "onMouseEnter" | "onMouseLeave"> & {
+declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<Omit<import("../list").ListItemProps, "onMouseEnter" | "onMouseLeave" | "overrides"> & {
     getChildMenu?: (() => React.ReactElement<any, string | React.JSXElementConstructor<any>> | null) | undefined;
     onMouseEnter?: (() => void) | undefined;
     onMouseLeave?: (() => void) | undefined;
@@ -17,17 +17,19 @@ declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponen
             disabled?: boolean | undefined;
             endEnhancer?: import("../list/types").Enhancer<import("../list").ListItemSharedProps>;
             highlighted?: boolean | undefined;
-            onClick?: ((event: React.MouseEvent<Element, MouseEvent> | React.KeyboardEvent<Element>) => void) | undefined;
+            onClick?: ((event: React.KeyboardEvent<Element> | React.MouseEvent<Element, MouseEvent>) => void) | undefined;
             overrides?: {
                 ChildContainer?: import("../overrides").Override<import("../list").ListItemSharedProps & Record<string, any>> | undefined;
                 EndEnhancer?: import("../overrides").Override<import("../list").ListItemSharedProps & Record<string, any>> | undefined;
                 Root?: import("../overrides").Override<import("../list").ListItemSharedProps & Record<string, any>> | undefined;
                 StartEnhancer?: import("../overrides").Override<import("../list").ListItemSharedProps & Record<string, any>> | undefined;
+                StatefulTooltip?: import("../overrides").Override<import("../list").ListItemSharedProps & Record<string, any>> | undefined;
             } | undefined;
             selected?: boolean | undefined;
             startEnhancer?: import("../list/types").Enhancer<import("../list").ListItemSharedProps>;
+            tooltipContent?: React.ReactNode | import("../baseui/popover").StatefulContentRenderProp;
         } & Record<string, any>> | undefined;
-        Popover?: import("../overrides").Override<Omit<import("baseui/popover").PopoverProps, "children" | "overrides" | "triggerType" | "placement"> & {
+        Popover?: import("../overrides").Override<Omit<import("../baseui/popover").PopoverProps, "children" | "overrides" | "placement" | "triggerType"> & {
             overrides?: ({
                 Body?: import("../overrides").Override<any> | undefined;
                 Arrow?: import("../overrides").Override<any> | undefined;
@@ -42,6 +44,7 @@ declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponen
             triggerType?: import("../popover").TriggerType | undefined;
             placement?: "auto" | "bottom" | "left" | "right" | "top" | "topLeft" | "topRight" | "rightTop" | "rightBottom" | "bottomRight" | "bottomLeft" | "leftBottom" | "leftTop" | undefined;
             innerRef?: React.Ref<HTMLElement> | undefined;
+            viewportAsBoundary?: boolean | undefined;
         } & Record<string, any>> | undefined;
     } | undefined;
 } & React.RefAttributes<HTMLElement>>>;

package/esm/menu/menu-item.js

@@ -14,19 +14,24 @@ import { Popover } from '../popover';
 import { useLocale } from '../locale';
 import { canHighlightItem } from './helpers';
 import { useMenuContext } from './MenuContext';
+import cx from '../classNames';
 var listItemOverrides = {
     ListItem: {
         props: {
             overrides: {
                 Root: {
                     style: function (_a, _b) {
-                        var theme = _a.theme;
-                        var $disabled = _b.$disabled, $highlighted = _b.$highlighted, $selected = _b.$selected;
+                        var getStyle = _a.getStyle, theme = _a.theme;
+                        var $disabled = _b.$disabled, $highlighted = _b.$highlighted, $selected = _b.$selected, $outlined = _b.$outlined;
                         var hoverBackgroundColor = getComponentTheme(theme, 'list').hoverBackgroundColor;
-                        return {
+                        return getStyle(cx({ 'outline-01': $outlined }), {
                             backgroundColor: $highlighted || $selected ? hoverBackgroundColor : 'none',
                             cursor: $disabled ? 'not-allowed' : 'pointer',
-                        };
+                        }, $outlined
+                            ? {
+                                outlineOffset: '-2px',
+                            }
+                            : {});
                     },
                 },
             },
@@ -34,13 +39,12 @@ var listItemOverrides = {
     },
 };
 var MenuItem = React.forwardRef(function (_a, ref) {
-    var _b;
     var selected = _a.selected, highlighted = _a.highlighted, overrides = _a.overrides, getChildMenu = _a.getChildMenu, onMouseEnter = _a.onMouseEnter, onMouseLeave = _a.onMouseLeave, onMouseOver = _a.onMouseOver, renderAll = _a.renderAll, restProps = __rest(_a, ["selected", "highlighted", "overrides", "getChildMenu", "onMouseEnter", "onMouseLeave", "onMouseOver", "renderAll"]);
-    var _c = __read(useState(false), 2), hovered = _c[0], setHovered = _c[1];
+    var _b = __read(useState(false), 2), hovered = _b[0], setHovered = _b[1];
     var ChildMenu = getChildMenu === null || getChildMenu === void 0 ? void 0 : getChildMenu();
     var ownRef = useRef(null);
     var itemRef = useCombinedRefs(ref, ownRef);
-    var _d = useMenuContext(), highlightedItem = _d.highlightedItem, setHighlightedItem = _d.setHighlightedItem, setMenuContainerRef = _d.setMenuContainerRef, nestedMenuOpen = _d.nestedMenuOpen, setNestedMenuOpen = _d.setNestedMenuOpen;
+    var _c = useMenuContext(), highlightedItem = _c.highlightedItem, setHighlightedItem = _c.setHighlightedItem, setMenuContainerRef = _c.setMenuContainerRef, listItemFocusVisible = _c.listItemFocusVisible, nestedMenuOpen = _c.nestedMenuOpen, setNestedMenuOpen = _c.setNestedMenuOpen;
     var locale = useLocale();
     useEffect(function () {
         var _a, _b;
@@ -48,8 +52,8 @@ var MenuItem = React.forwardRef(function (_a, ref) {
     }, [setMenuContainerRef]);
     var isItemHighlighted = highlighted || (highlightedItem !== null && highlightedItem === ownRef.current);
     var mergedOverrides = useMemo(function () { return mergeOverrides(listItemOverrides, overrides); }, [overrides]);
-    var _e = __read(useOverrides(mergedOverrides === null || mergedOverrides === void 0 ? void 0 : mergedOverrides.ListItem, ListItem), 2), ListItemOverride = _e[0], listItemProps = _e[1];
-    var _f = __read(useOverrides(mergedOverrides === null || mergedOverrides === void 0 ? void 0 : mergedOverrides.Popover, Popover), 2), PopoverOverride = _f[0], popoverProps = _f[1];
+    var _d = __read(useOverrides(mergedOverrides === null || mergedOverrides === void 0 ? void 0 : mergedOverrides.ListItem, ListItem), 2), ListItemOverride = _d[0], listItemProps = _d[1];
+    var _e = __read(useOverrides(mergedOverrides === null || mergedOverrides === void 0 ? void 0 : mergedOverrides.Popover, Popover), 2), PopoverOverride = _e[0], popoverProps = _e[1];
     var onMouseOverRef = useLatest(onMouseOver);
     var handleMouseOver = useCallback(function (e) {
         var _a;
@@ -61,7 +65,7 @@ var MenuItem = React.forwardRef(function (_a, ref) {
     var resetMenu = useCallback(function () { return setHighlightedItem(null); }, [setHighlightedItem]);
     var closeNestedMenu = useCallback(function () { return setNestedMenuOpen(false); }, [setNestedMenuOpen]);
     var id = useUniqueId();
-    var listItem = (_jsx(ListItemOverride, __assign({ id: id.toString(), ref: itemRef, role: "menuitem", "aria-label": ChildMenu ? locale.menu.nestedMenuItemAriaLabel : undefined, selected: selected, "aria-selected": selected, "data-haschildmenu": Boolean(ChildMenu), highlighted: isItemHighlighted, endEnhancer: ChildMenu && _jsx(ChevronDown, { size: 10, className: "transform -rotate-90" }, void 0), onMouseEnter: onMouseEnter, onMouseLeave: onMouseLeave }, restProps, { onMouseOver: handleMouseOver }, listItemProps), void 0));
+    var listItem = (_jsx(ListItemOverride, __assign({ id: id.toString(), ref: itemRef, role: "menuitem", "aria-label": ChildMenu ? locale.menu.nestedMenuItemAriaLabel : undefined, selected: selected, "aria-selected": selected, "data-haschildmenu": Boolean(ChildMenu), highlighted: isItemHighlighted, "$outlined": isItemHighlighted && listItemFocusVisible, endEnhancer: ChildMenu && _jsx(ChevronDown, { size: 10, className: "transform -rotate-90" }, void 0), onMouseEnter: onMouseEnter, onMouseLeave: onMouseLeave }, restProps, { onMouseOver: handleMouseOver }, listItemProps), void 0));
     var handleMouseEnter = useCombinedHandler(function () { return setHovered(true); }, onMouseEnter);
     var handleMouseLeave = useCombinedHandler(function () { return setHovered(false); }, onMouseLeave);
     // when we have opened child menu using hover, then after switching to keyboard hovered state remains true
@@ -74,7 +78,7 @@ var MenuItem = React.forwardRef(function (_a, ref) {
     if (!ChildMenu) {
         return listItem;
     }
-    return (_jsx(PopoverOverride, __assign({ content: ChildMenu, isOpen: isItemHighlighted && (hovered || nestedMenuOpen), placement: "rightTop", onMouseEnter: handleMouseEnter, onMouseLeave: handleMouseLeave, onMouseLeaveDelay: 30, triggerType: "hover", mountNode: (_b = ownRef.current) === null || _b === void 0 ? void 0 : _b.parentElement, renderAll: renderAll, onClickOutside: resetMenu, onEsc: closeNestedMenu }, popoverProps, { children: listItem }), void 0));
+    return (_jsx(PopoverOverride, __assign({ content: ChildMenu, isOpen: isItemHighlighted && (hovered || nestedMenuOpen), placement: "rightTop", onMouseEnter: handleMouseEnter, onMouseLeave: handleMouseLeave, onMouseLeaveDelay: 30, triggerType: "hover", renderAll: renderAll, onClickOutside: resetMenu, onEsc: closeNestedMenu }, popoverProps, { children: listItem }), void 0));
 });
 MenuItem.displayName = 'MenuItem';
 export default React.memo(MenuItem);

package/esm/menu/menu.d.ts

@@ -26,5 +26,6 @@ declare const _default: import("react").MemoExoticComponent<import("react").Forw
     resetMenuOnMouseLeave?: boolean | undefined;
     reducer?: import("./types").Reducer | undefined;
     captureScroll?: boolean | undefined;
+    selectOnTab?: boolean | undefined;
 } & import("react").RefAttributes<MenuRef>>>;
 export default _default;

package/esm/menu/menu.js

@@ -9,20 +9,21 @@ import { defaultReducer } from './helpers';
 import { MenuProvider } from './MenuContext';
 import useItemContainerEventHandlers from './useItemContainerEventHandlers';
 import useStatefulMenu from './useStatefulMenu';
-import { useNestedMenuContext } from './nested-menu-context';
 var Menu = forwardRef(function (_a, ref) {
-    var _b = _a.disableNavigationOnMount, disableNavigationOnMount = _b === void 0 ? false : _b, _c = _a.focusWhenNavigationEnabled, focusWhenNavigationEnabled = _c === void 0 ? true : _c, _d = _a.virtual, virtual = _d === void 0 ? false : _d, overscanCount = _a.overscanCount, _e = _a.scrollElement, scrollElement = _e === void 0 ? null : _e, estimateItemSize = _a.estimateItemSize, children = _a.children, overrides = _a.overrides, onHighlightedItemChange = _a.onHighlightedItemChange, disableAutoHighlight = _a.disableAutoHighlight, resetMenuOnMouseLeave = _a.resetMenuOnMouseLeave, resetMenuHighlightOnMouseLeave = _a.resetMenuHighlightOnMouseLeave, _f = _a.reducer, reducer = _f === void 0 ? defaultReducer : _f, captureScroll = _a.captureScroll, restProps = __rest(_a, ["disableNavigationOnMount", "focusWhenNavigationEnabled", "virtual", "overscanCount", "scrollElement", "estimateItemSize", "children", "overrides", "onHighlightedItemChange", "disableAutoHighlight", "resetMenuOnMouseLeave", "resetMenuHighlightOnMouseLeave", "reducer", "captureScroll"]);
-    var _g = __read(useState(null), 2), listRef = _g[0], setListRef = _g[1];
-    var _h = __read(useOverrides(overrides === null || overrides === void 0 ? void 0 : overrides.List, List), 2), ListOverride = _h[0], listProps = _h[1];
-    var _j = __read(useState(null), 2), listItemsContainer = _j[0], setListItemsContainer = _j[1];
-    var _k = useStatefulMenu({
+    var _b = _a.disableNavigationOnMount, disableNavigationOnMount = _b === void 0 ? false : _b, _c = _a.focusWhenNavigationEnabled, focusWhenNavigationEnabled = _c === void 0 ? true : _c, _d = _a.virtual, virtual = _d === void 0 ? false : _d, overscanCount = _a.overscanCount, _e = _a.scrollElement, scrollElement = _e === void 0 ? null : _e, estimateItemSize = _a.estimateItemSize, children = _a.children, overrides = _a.overrides, onHighlightedItemChange = _a.onHighlightedItemChange, disableAutoHighlight = _a.disableAutoHighlight, resetMenuOnMouseLeave = _a.resetMenuOnMouseLeave, resetMenuHighlightOnMouseLeave = _a.resetMenuHighlightOnMouseLeave, _f = _a.reducer, reducer = _f === void 0 ? defaultReducer : _f, captureScroll = _a.captureScroll, _g = _a.selectOnTab, selectOnTab = _g === void 0 ? false : _g, restProps = __rest(_a, ["disableNavigationOnMount", "focusWhenNavigationEnabled", "virtual", "overscanCount", "scrollElement", "estimateItemSize", "children", "overrides", "onHighlightedItemChange", "disableAutoHighlight", "resetMenuOnMouseLeave", "resetMenuHighlightOnMouseLeave", "reducer", "captureScroll", "selectOnTab"]);
+    var _h = __read(useState(null), 2), listRef = _h[0], setListRef = _h[1];
+    var _j = __read(useOverrides(overrides === null || overrides === void 0 ? void 0 : overrides.List, List), 2), ListOverride = _j[0], listProps = _j[1];
+    var _k = __read(useState(null), 2), listItemsContainer = _k[0], setListItemsContainer = _k[1];
+    var _l = useStatefulMenu({
         disableNavigationOnMount: disableNavigationOnMount,
         disableAutoHighlight: disableAutoHighlight,
         focusWhenNavigationEnabled: focusWhenNavigationEnabled,
         onHighlightedItemChange: onHighlightedItemChange,
         listItemsContainerRef: listItemsContainer,
         reducer: reducer,
-    }), turnOnKeyboardNavigation = _k.turnOnKeyboardNavigation, turnOffKeyboardNavigation = _k.turnOffKeyboardNavigation, highlightedItem = _k.highlightedItem, setHighlightedItem = _k.setHighlightedItem, nestedMenuOpen = _k.nestedMenuOpen, setNestedMenuOpen = _k.setNestedMenuOpen;
+        selectOnTab: selectOnTab,
+        children: children,
+    }), turnOnKeyboardNavigation = _l.turnOnKeyboardNavigation, turnOffKeyboardNavigation = _l.turnOffKeyboardNavigation, highlightedItem = _l.highlightedItem, setHighlightedItem = _l.setHighlightedItem, nestedMenuOpen = _l.nestedMenuOpen, listItemFocusVisible = _l.listItemFocusVisible, setNestedMenuOpen = _l.setNestedMenuOpen;
     var setScrollTarget = useScrollCapture({ enabled: captureScroll });
     var setListCombinedRef = useCombinedRefs(setListRef, setScrollTarget);
     var menuContextValue = useMemo(function () { return ({
@@ -30,8 +31,9 @@ var Menu = forwardRef(function (_a, ref) {
         setHighlightedItem: setHighlightedItem,
         setMenuContainerRef: setListItemsContainer,
         nestedMenuOpen: nestedMenuOpen,
+        listItemFocusVisible: listItemFocusVisible,
         setNestedMenuOpen: setNestedMenuOpen,
-    }); }, [highlightedItem, setHighlightedItem, nestedMenuOpen, setNestedMenuOpen]);
+    }); }, [highlightedItem, setHighlightedItem, nestedMenuOpen, listItemFocusVisible, setNestedMenuOpen]);
     useItemContainerEventHandlers({
         listItemsContainer: listItemsContainer,
         resetMenuHighlightOnMouseLeave: resetMenuHighlightOnMouseLeave || resetMenuOnMouseLeave,
@@ -48,9 +50,7 @@ var Menu = forwardRef(function (_a, ref) {
         }
         return menuRef;
     }, [turnOnKeyboardNavigation, turnOffKeyboardNavigation, setHighlightedItem, listRef]);
-    var nestedMenuContext = useNestedMenuContext();
-    var $showFocusOutline = Object.keys(nestedMenuContext).length !== 0;
-    return (_jsx(MenuProvider, __assign({ value: menuContextValue }, { children: _jsx(ListOverride, __assign({ ref: setListCombinedRef, "$showFocusOutline": $showFocusOutline, role: "menu", virtual: virtual, overscanCount: overscanCount, scrollElement: scrollElement, estimateItemSize: estimateItemSize }, restProps, listProps, { children: children }), void 0) }), void 0));
+    return (_jsx(MenuProvider, __assign({ value: menuContextValue }, { children: _jsx(ListOverride, __assign({ ref: setListCombinedRef, role: "menu", virtual: virtual, overscanCount: overscanCount, scrollElement: scrollElement, estimateItemSize: estimateItemSize }, restProps, listProps, { children: children }), void 0) }), void 0));
 });
 Menu.displayName = 'Menu';
 export default memo(Menu);

package/esm/menu/types.d.ts

@@ -48,6 +48,7 @@ export declare type MenuProps = Omit<ListProps, 'overrides'> & {
     resetMenuOnMouseLeave?: boolean;
     reducer?: Reducer;
     captureScroll?: boolean;
+    selectOnTab?: boolean;
 };
 declare type MenuActions = {
     turnOnKeyboardNavigation?: () => void;

package/esm/menu/useKeyboardNavigation.d.ts

@@ -1,4 +1,4 @@
-import { Dispatch, SetStateAction } from 'react';
+import { ReactNode } from 'react';
 import { Reducer } from './types';
 declare type Params = {
     /**
@@ -9,15 +9,18 @@ declare type Params = {
     disableNavigationOnMount?: boolean;
     disableAutoHighlight?: boolean;
     reducer: Reducer;
+    selectOnTab?: boolean;
+    children?: ReactNode;
 };
 declare type NavigationUtils = {
     highlightedItem: HTMLElement | null;
-    setHighlightedItem: Dispatch<SetStateAction<HTMLElement | null>>;
+    setHighlightedItem: (item: HTMLElement | null, showFocusVisibleStyles?: boolean) => void;
     turnOnKeyboardNavigation: () => void;
     turnOffKeyboardNavigation: () => void;
+    listItemFocusVisible: boolean;
     navigationEnabled: boolean;
     nestedMenuOpen: boolean;
     setNestedMenuOpen: (open: boolean) => void;
 };
-declare const useKeyboardNavigation: ({ listItemsContainerRef, disableNavigationOnMount, focusWhenNavigationEnabled, disableAutoHighlight, reducer, }: Params) => NavigationUtils;
+declare const useKeyboardNavigation: ({ listItemsContainerRef, disableNavigationOnMount, focusWhenNavigationEnabled, disableAutoHighlight, reducer, selectOnTab, children, }: Params) => NavigationUtils;
 export default useKeyboardNavigation;

package/esm/menu/useKeyboardNavigation.js

@@ -5,27 +5,29 @@ import { useDocument } from '../spacewebProvider/DocumentProvider';
 import { getFirstHighlightableElement, getNextHighlightedItem } from './helpers';
 import { useNestedMenuContext } from './nested-menu-context';
 var useKeyboardNavigation = function (_a) {
-    var listItemsContainerRef = _a.listItemsContainerRef, _b = _a.disableNavigationOnMount, disableNavigationOnMount = _b === void 0 ? false : _b, _c = _a.focusWhenNavigationEnabled, focusWhenNavigationEnabled = _c === void 0 ? true : _c, disableAutoHighlight = _a.disableAutoHighlight, reducer = _a.reducer;
-    var _d = __read(useState(null), 2), highlightedItem = _d[0], setHighlightedItem = _d[1];
-    var _e = __read(useState(!disableNavigationOnMount), 2), navigationEnabled = _e[0], setNavigationEnabled = _e[1];
-    var _f = __read(useState(false), 2), nestedMenuOpen = _f[0], setNestedMenuOpen = _f[1];
+    var listItemsContainerRef = _a.listItemsContainerRef, _b = _a.disableNavigationOnMount, disableNavigationOnMount = _b === void 0 ? false : _b, _c = _a.focusWhenNavigationEnabled, focusWhenNavigationEnabled = _c === void 0 ? true : _c, disableAutoHighlight = _a.disableAutoHighlight, reducer = _a.reducer, selectOnTab = _a.selectOnTab, children = _a.children;
+    var _d = __read(useState(null), 2), highlightedItem = _d[0], _setHighlightedItem = _d[1];
+    var _e = __read(useState(false), 2), listItemFocusVisible = _e[0], setListItemFocusVisible = _e[1];
+    var _f = __read(useState(!disableNavigationOnMount), 2), navigationEnabled = _f[0], setNavigationEnabled = _f[1];
+    var _g = __read(useState(false), 2), nestedMenuOpen = _g[0], setNestedMenuOpen = _g[1];
     var highlightedItemRef = useLatest(highlightedItem);
     var reducerRef = useLatest(reducer);
     var ownerDocument = useDocument();
+    var setHighlightedItem = function (item, showFocusVisibleStyles) {
+        if (showFocusVisibleStyles === void 0) { showFocusVisibleStyles = false; }
+        _setHighlightedItem(item);
+        setListItemFocusVisible(showFocusVisibleStyles);
+    };
     // highlight first item in the list if prevHighlighted item is no longer in dom
-    // eslint-disable-next-line react-hooks/exhaustive-deps -- run this hook whenever menu re-renders
     useLayoutEffect(function () {
         var isHighlightedItemInDom = ownerDocument === null || ownerDocument === void 0 ? void 0 : ownerDocument.body.contains(highlightedItem);
-        if (!highlightedItem ||
-            disableAutoHighlight ||
-            isHighlightedItemInDom ||
-            !navigationEnabled ||
-            !listItemsContainerRef) {
+        if (disableAutoHighlight || isHighlightedItemInDom || !navigationEnabled || !listItemsContainerRef) {
             return;
         }
         var firstHighlightableItem = getFirstHighlightableElement(listItemsContainerRef).firstHighlightableItem;
         firstHighlightableItem && setHighlightedItem(firstHighlightableItem);
-    });
+        // eslint-disable-next-line react-hooks/exhaustive-deps -- run this hook only when children changes
+    }, [children]);
     useEffect(function () {
         // Scroll the selected item into view for the first time when menu opens up
         window.requestAnimationFrame(function () {
@@ -38,7 +40,7 @@ var useKeyboardNavigation = function (_a) {
         setNestedMenuOpen(false);
     }, [setNavigationEnabled, setNestedMenuOpen]);
     var turnOffKeyboardNavigation = useCallback(function () { return setNavigationEnabled(false); }, []);
-    var _g = useNestedMenuContext(), getMenuInfo = _g.getMenuInfo, getParentMenuInfo = _g.getParentMenuInfo, getChildMenuInfo = _g.getChildMenuInfo;
+    var _h = useNestedMenuContext(), getMenuInfo = _h.getMenuInfo, getParentMenuInfo = _h.getParentMenuInfo, getChildMenuInfo = _h.getChildMenuInfo;
     // Highlight previously selected item or first highlightable item on mount
     useEffect(function () {
         if (disableAutoHighlight || !listItemsContainerRef) {
@@ -75,13 +77,17 @@ var useKeyboardNavigation = function (_a) {
             // Stop scrolling the menu
             event.preventDefault();
         }
-        setHighlightedItem(nextItemToHighlight);
+        else if (event.key === 'Tab' && selectOnTab) {
+            _highlightedItem === null || _highlightedItem === void 0 ? void 0 : _highlightedItem.click();
+            event.preventDefault();
+        }
+        setHighlightedItem(nextItemToHighlight, true);
         /**
          * When Menu mounts for the first time inside popover, it renders outside visible viewport until popover measures position of anchor/target element.
          * By calling `scrollIntoView` after keydown(instead useEffect), avoiding scrollIntoView call for the first render.
          */
         (_a = nextItemToHighlight === null || nextItemToHighlight === void 0 ? void 0 : nextItemToHighlight.scrollIntoView) === null || _a === void 0 ? void 0 : _a.call(nextItemToHighlight, { block: 'nearest' });
-    }, [getMenuInfo, getParentMenuInfo, highlightedItemRef, listItemsContainerRef, ownerDocument === null || ownerDocument === void 0 ? void 0 : ownerDocument.body]);
+    }, [getMenuInfo, getParentMenuInfo, highlightedItemRef, listItemsContainerRef, ownerDocument === null || ownerDocument === void 0 ? void 0 : ownerDocument.body, selectOnTab]);
     useEffect(function () {
         if (!navigationEnabled) {
             return undefined;
@@ -115,6 +121,7 @@ var useKeyboardNavigation = function (_a) {
     return {
         highlightedItem: highlightedItem,
         setHighlightedItem: setHighlightedItem,
+        listItemFocusVisible: listItemFocusVisible,
         turnOffKeyboardNavigation: turnOffKeyboardNavigation,
         turnOnKeyboardNavigation: turnOnKeyboardNavigation,
         navigationEnabled: navigationEnabled,

package/esm/menu/useStatefulMenu.d.ts

@@ -1,4 +1,4 @@
-import { Dispatch, SetStateAction } from 'react';
+import { ReactNode } from 'react';
 import { Reducer } from './types';
 declare type UseStatefulMenu = (params: {
     disableNavigationOnMount?: boolean;
@@ -7,11 +7,14 @@ declare type UseStatefulMenu = (params: {
     listItemsContainerRef: HTMLElement | null;
     onHighlightedItemChange?: (item?: HTMLElement | null) => void;
     reducer?: Reducer;
+    selectOnTab?: boolean;
+    children?: ReactNode;
 }) => {
     highlightedItem: HTMLElement | null;
-    setHighlightedItem: Dispatch<SetStateAction<HTMLElement | null>>;
+    setHighlightedItem: (item: HTMLElement | null, showFocusVisibleStyles?: boolean) => void;
     turnOnKeyboardNavigation: () => void;
     turnOffKeyboardNavigation: () => void;
+    listItemFocusVisible: boolean;
     navigationEnabled: boolean;
     nestedMenuOpen: boolean;
     setNestedMenuOpen: (open: boolean) => void;

package/esm/menu/useStatefulMenu.js

@@ -4,7 +4,7 @@ import { defaultReducer } from './helpers';
 import { useNestedMenuContext } from './nested-menu-context';
 import useKeyboardNavigation from './useKeyboardNavigation';
 var useStatefulMenu = function (_a) {
-    var _b = _a.disableNavigationOnMount, disableNavigationOnMount = _b === void 0 ? false : _b, focusWhenNavigationEnabled = _a.focusWhenNavigationEnabled, listItemsContainerRef = _a.listItemsContainerRef, onHighlightedItemChange = _a.onHighlightedItemChange, disableAutoHighlight = _a.disableAutoHighlight, _c = _a.reducer, reducer = _c === void 0 ? defaultReducer : _c;
+    var _b = _a.disableNavigationOnMount, disableNavigationOnMount = _b === void 0 ? false : _b, focusWhenNavigationEnabled = _a.focusWhenNavigationEnabled, listItemsContainerRef = _a.listItemsContainerRef, onHighlightedItemChange = _a.onHighlightedItemChange, disableAutoHighlight = _a.disableAutoHighlight, _c = _a.reducer, reducer = _c === void 0 ? defaultReducer : _c, selectOnTab = _a.selectOnTab, children = _a.children;
     useEffect(function () {
         // focusWhenNavigationEnabled is true, then make listContainer focusable if required
         if (focusWhenNavigationEnabled && listItemsContainerRef && listItemsContainerRef.tabIndex < 0) {
@@ -17,7 +17,9 @@ var useStatefulMenu = function (_a) {
         focusWhenNavigationEnabled: focusWhenNavigationEnabled,
         listItemsContainerRef: listItemsContainerRef,
         reducer: reducer,
-    }), highlightedItem = _d.highlightedItem, setHighlightedItem = _d.setHighlightedItem, turnOnKeyboardNavigation = _d.turnOnKeyboardNavigation, turnOffKeyboardNavigation = _d.turnOffKeyboardNavigation, navigationEnabled = _d.navigationEnabled, nestedMenuOpen = _d.nestedMenuOpen, setNestedMenuOpen = _d.setNestedMenuOpen;
+        selectOnTab: selectOnTab,
+        children: children,
+    }), highlightedItem = _d.highlightedItem, setHighlightedItem = _d.setHighlightedItem, turnOnKeyboardNavigation = _d.turnOnKeyboardNavigation, turnOffKeyboardNavigation = _d.turnOffKeyboardNavigation, listItemFocusVisible = _d.listItemFocusVisible, navigationEnabled = _d.navigationEnabled, nestedMenuOpen = _d.nestedMenuOpen, setNestedMenuOpen = _d.setNestedMenuOpen;
     var _e = useNestedMenuContext(), unregisterMenu = _e.unregisterMenu, registerMenu = _e.registerMenu, getParentMenuInfo = _e.getParentMenuInfo;
     useEffect(function () {
         if (!listItemsContainerRef)
@@ -44,20 +46,24 @@ var useStatefulMenu = function (_a) {
         (_a = onHighlightedItemChangeRef.current) === null || _a === void 0 ? void 0 : _a.call(onHighlightedItemChangeRef, highlightedItem);
     }, [highlightedItem, onHighlightedItemChangeRef]);
     useEffect(function () {
-        var _a, _b;
+        var activeElement;
         // set aria-activedescendant to current focused element whenever highlighted item changes
-        if (navigationEnabled && (highlightedItem === null || highlightedItem === void 0 ? void 0 : highlightedItem.id)) {
-            if (highlightedItem === null || highlightedItem === void 0 ? void 0 : highlightedItem.id)
-                (_a = document.activeElement) === null || _a === void 0 ? void 0 : _a.setAttribute('aria-activedescendant', highlightedItem === null || highlightedItem === void 0 ? void 0 : highlightedItem.id);
+        if (navigationEnabled && (highlightedItem === null || highlightedItem === void 0 ? void 0 : highlightedItem.id) && document.activeElement) {
+            activeElement = document.activeElement;
+            activeElement.setAttribute('aria-activedescendant', highlightedItem.id);
         }
-        else
-            (_b = document.activeElement) === null || _b === void 0 ? void 0 : _b.removeAttribute('aria-activedescendant');
+        return function () {
+            if (activeElement) {
+                activeElement.removeAttribute('aria-activedescendant');
+            }
+        };
     }, [navigationEnabled, highlightedItem]);
     return {
         highlightedItem: highlightedItem,
         setHighlightedItem: setHighlightedItem,
         turnOffKeyboardNavigation: turnOffKeyboardNavigation,
         turnOnKeyboardNavigation: turnOnKeyboardNavigation,
+        listItemFocusVisible: listItemFocusVisible,
         navigationEnabled: navigationEnabled,
         nestedMenuOpen: nestedMenuOpen,
         setNestedMenuOpen: setNestedMenuOpen,

package/esm/modal/adapter.d.ts

@@ -1,4 +1,4 @@
-import { ROLE } from 'baseui/modal';
+import { ROLE } from '../baseui/modal';
 import { StyleUtils } from '../types';
 import { Role, Size } from './types';
 import { ValueOf } from '../utility-types';

package/esm/modal/adapter.js

@@ -1,4 +1,4 @@
-import { ROLE } from 'baseui/modal';
+import { ROLE } from '../baseui/modal';
 export var getWidthFromSize = function (_a, size) {
     var px2rem = _a.px2rem;
     switch (size) {

package/esm/modal/index.d.ts

@@ -1,7 +1,7 @@
 export { default as Modal } from './modal';
 export { default as ModalHeader } from './modal-header';
 export { default as ModalFooter } from './modal-footer';
-export { FocusOnce } from 'baseui/modal';
+export { FocusOnce } from '../baseui/modal';
 export { ModalBody, StyledRoot, StyledClose, StyledDialog, StyledDialogContainer, StyledModal, } from './styled-components';
 export type { SharedProps, ModalProps, ModalState, Size, Role, } from './types';
 export { CLOSE_SOURCE } from './types';

package/esm/modal/index.js

@@ -1,6 +1,6 @@
 export { default as Modal } from './modal';
 export { default as ModalHeader } from './modal-header';
 export { default as ModalFooter } from './modal-footer';
-export { FocusOnce } from 'baseui/modal';
+export { FocusOnce } from '../baseui/modal';
 export { ModalBody, StyledRoot, StyledClose, StyledDialog, StyledDialogContainer, StyledModal, } from './styled-components';
 export { CLOSE_SOURCE } from './types';

package/esm/modal/modal-footer.d.ts

@@ -1,7 +1,7 @@
 import { ReactElement } from 'react';
 import { ModalFooterProps } from './types';
 declare const ModalFooter: {
-    (props: ModalFooterProps): ReactElement;
+    ({ noBorder, ...props }: ModalFooterProps): ReactElement;
     displayName: string;
 };
 export default ModalFooter;

package/esm/modal/modal-footer.js

@@ -1,9 +1,10 @@
-import { __assign } from "tslib";
+import { __assign, __rest } from "tslib";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { StyledModalFooter } from './styled-components';
 import { add$props } from '../helpers';
-var ModalFooter = function (props) {
-    var sharedProps = add$props({ noBorder: props.noBorder });
+var ModalFooter = function (_a) {
+    var noBorder = _a.noBorder, props = __rest(_a, ["noBorder"]);
+    var sharedProps = add$props({ noBorder: noBorder });
     return _jsx(StyledModalFooter, __assign({}, props, sharedProps), void 0);
 };
 ModalFooter.displayName = 'ModalFooter';

package/esm/modal/modal.js

@@ -1,31 +1,36 @@
 import { __assign, __rest } from "tslib";
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
+import { useMemo } from 'react';
 import { IconButton } from '../button';
-import { useConvertOverrides } from '../helpers/baseui/useConvertOverrides';
 import Close from '../icon/components/close';
 import { useStyle } from '../style';
 import { getWidthFromSize, roleMap } from './adapter';
 import { getCloseButtonProps, getDialogContainerStyles, getDialogStyles } from './overrides';
 import { StyledModal } from './styled-components';
 import { add$props } from '../helpers';
+import { useLocale } from '../locale';
+import { mergeOverrides } from '../overrides';
 var CloseButton = function (closeProps) { return (_jsx(IconButton, __assign({}, closeProps, { children: _jsx(Close, {}, void 0) }), void 0)); };
 var Modal = function (_a) {
     var _b = _a.size, size = _b === void 0 ? 'md' : _b, _c = _a.role, role = _c === void 0 ? 'dialog' : _c, ariaLabel = _a.ariaLabel, overrides = _a.overrides, props = __rest(_a, ["size", "role", "ariaLabel", "overrides"]);
     var utils = useStyle();
     var theme = utils.theme;
-    var sharedProps = add$props({ dialogSize: size });
-    var _overrides = useConvertOverrides({
-        DialogContainer: { style: getDialogContainerStyles, props: sharedProps },
-        Dialog: {
-            style: getDialogStyles,
-            props: __assign(__assign({}, (ariaLabel ? { 'aria-label': ariaLabel } : undefined)), sharedProps),
-        },
-        Close: {
-            component: CloseButton,
-            props: getCloseButtonProps(utils, sharedProps),
-        },
-    }, overrides, [overrides, theme]);
+    var sharedProps = useMemo(function () { return add$props({ dialogSize: size }); }, [size]);
+    var locale = useLocale();
+    var _overrides = useMemo(function () {
+        return mergeOverrides({
+            DialogContainer: { style: getDialogContainerStyles, props: sharedProps },
+            Dialog: {
+                style: getDialogStyles,
+                props: __assign(__assign({}, (ariaLabel ? { 'aria-label': ariaLabel } : undefined)), sharedProps),
+            },
+            Close: {
+                component: CloseButton,
+                props: getCloseButtonProps(utils, sharedProps, locale.modal.closeAriaLabel),
+            },
+        }, overrides);
+    }, [sharedProps, ariaLabel, utils, locale.modal.closeAriaLabel, overrides]);
     return (_jsx(StyledModal, __assign({}, props, { size: getWidthFromSize(utils, size), role: roleMap[role], overrides: _overrides }), void 0));
 };
 Modal.displayName = 'Modal';

package/esm/modal/overrides.d.ts

@@ -3,6 +3,6 @@ import { Styles, StyleUtils } from '../types';
 import { SharedProps } from './types';
 export declare const getDialogContainerStyles: Styles;
 export declare const getDialogStyles: Styles;
-export declare const getCloseButtonProps: ({ px2rem, direction, theme }: StyleUtils, { $dialogSize }: {
+export declare const getCloseButtonProps: ({ px2rem, theme }: StyleUtils, { $dialogSize }: {
     $dialogSize: SharedProps['$size'];
-}) => IconButtonProps;
+}, ariaLabel: string) => IconButtonProps;

package/esm/modal/overrides.js

@@ -1,12 +1,13 @@
 import { __assign } from "tslib";
+import { borderColor } from '../helpers/longHandHelpers';
 var getDialogHeightControl = function (_a, _b) {
     var px2rem = _a.px2rem;
     var $dialogSize = _b.$dialogSize;
     switch ($dialogSize) {
         case 'sm':
-            return { maxHeight: px2rem(560) };
+            return { maxHeight: "min(".concat(px2rem(560), ",95%)") };
         case 'md':
-            return { maxHeight: px2rem(660) };
+            return { maxHeight: "min(".concat(px2rem(660), ", 95%)") };
         case 'lg':
             return { height: '90%' };
         case 'fullPage':
@@ -29,7 +30,7 @@ var transitionDuration = function (_a, _b) {
     return ($animate ? { transitionDuration: '200ms' } : {});
 };
 export var getDialogContainerStyles = [
-    'border-box spr-overlay',
+    'border-box spr-overlay h-full',
     getDialogContainerHeightControl,
     transitionDuration,
 ];
@@ -38,29 +39,20 @@ export var getDialogStyles = [
     getDialogHeightControl,
     transitionDuration,
 ];
-export var getCloseButtonProps = function (_a, _b) {
-    var _c;
-    var px2rem = _a.px2rem, direction = _a.direction, theme = _a.theme;
+export var getCloseButtonProps = function (_a, _b, ariaLabel) {
+    var px2rem = _a.px2rem, theme = _a.theme;
     var $dialogSize = _b.$dialogSize;
-    var buttonDirection = direction === 'rtl' ? 'left' : 'right';
-    return {
+    return ({
         size: 'sm',
+        'aria-label': ariaLabel,
         overrides: {
             BaseButton: {
-                style: __assign((_c = { position: 'absolute', top: px2rem(16) }, _c[buttonDirection] = px2rem(20), _c), ($dialogSize === 'fullPage'
-                    ? {
-                        top: px2rem(-44),
-                        right: px2rem(0),
-                        backgroundColor: theme.spr.ui01,
-                        color: theme.spr.icon02,
-                        borderColor: theme.borderColor.transparent,
-                        ':hover': {
+                style: __assign({ position: 'absolute', top: px2rem(12), right: px2rem(16) }, ($dialogSize === 'fullPage'
+                    ? __assign(__assign({ top: px2rem(-44), right: px2rem(0), backgroundColor: theme.spr.ui01, color: theme.spr.icon02 }, borderColor(theme.borderColor.transparent)), { ':hover': {
                             color: theme.spr.ui04,
                             backgroundColor: theme.spr.ui06,
-                        },
-                    }
-                    : {})),
+                        } }) : {})),
             },
         },
-    };
+    });
 };

package/esm/modal/styled-components.d.ts

@@ -1,6 +1,6 @@
-import { ModalProps as BaseModalProps } from 'baseui/modal';
+import { ModalProps as BaseModalProps } from '../baseui/modal';
 import * as React from 'react';
-export { StyledRoot, StyledClose, StyledDialog, StyledDialogContainer } from 'baseui/modal';
+export { StyledRoot, StyledClose, StyledDialog, StyledDialogContainer } from '../baseui/modal';
 export declare const StyledModal: React.ComponentType<BaseModalProps>;
 export declare const StyledModalHeader: import("../style/styled").StyledComponent;
 export declare const ModalBody: import("../style/styled").StyledComponent;