@sprinklrjs/spaceweb 10.1.0 → 12.14.4

package/esm/menu/menu-item.js

@@ -14,19 +14,20 @@ 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 outline-offset-0': $outlined }), {
                             backgroundColor: $highlighted || $selected ? hoverBackgroundColor : 'none',
                             cursor: $disabled ? 'not-allowed' : 'pointer',
-                        };
+                        });
                     },
                 },
             },
@@ -34,13 +35,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 +48,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 +61,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 +74,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

@@ -10,9 +10,14 @@ declare const _default: import("react").MemoExoticComponent<import("react").Forw
             style?: import("..").Styles;
         } & {
             children?: import("react").ReactNode;
+            virtual?: boolean | undefined;
             overrides?: {
                 Root?: import("../overrides").Override<Record<string, any>> | undefined;
             } | undefined;
+            scrollElement?: HTMLElement | null | undefined;
+            overscanCount?: number | undefined;
+            estimateItemSize?: number | undefined;
+            $showFocusOutline?: boolean | undefined;
         } & Record<string, any>> | undefined;
     } | undefined;
     onHighlightedItemChange?: ((item?: HTMLElement | null | undefined) => void) | undefined;
@@ -21,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, children = _a.children, overrides = _a.overrides, onHighlightedItemChange = _a.onHighlightedItemChange, disableAutoHighlight = _a.disableAutoHighlight, resetMenuOnMouseLeave = _a.resetMenuOnMouseLeave, resetMenuHighlightOnMouseLeave = _a.resetMenuHighlightOnMouseLeave, _d = _a.reducer, reducer = _d === void 0 ? defaultReducer : _d, captureScroll = _a.captureScroll, restProps = __rest(_a, ["disableNavigationOnMount", "focusWhenNavigationEnabled", "children", "overrides", "onHighlightedItemChange", "disableAutoHighlight", "resetMenuOnMouseLeave", "resetMenuHighlightOnMouseLeave", "reducer", "captureScroll"]);
-    var _e = __read(useState(null), 2), listRef = _e[0], setListRef = _e[1];
-    var _f = __read(useOverrides(overrides === null || overrides === void 0 ? void 0 : overrides.List, List), 2), ListOverride = _f[0], listProps = _f[1];
-    var _g = __read(useState(null), 2), listItemsContainer = _g[0], setListItemsContainer = _g[1];
-    var _h = 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 = _h.turnOnKeyboardNavigation, turnOffKeyboardNavigation = _h.turnOffKeyboardNavigation, highlightedItem = _h.highlightedItem, setHighlightedItem = _h.setHighlightedItem, nestedMenuOpen = _h.nestedMenuOpen, setNestedMenuOpen = _h.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" }, 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

@@ -3,4 +3,4 @@ import { StyleUtils } from '../types';
 import { Role, Size } from './types';
 import { ValueOf } from '../utility-types';
 export declare const getWidthFromSize: ({ px2rem }: StyleUtils, size: Size) => string;
-export declare const roleMap: Record<Role, ValueOf<ROLE>>;
+export declare const roleMap: Record<Role, ValueOf<typeof ROLE>>;

package/esm/modal/index.d.ts

@@ -2,6 +2,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 { ModalBody, StyledRoot, StyledBackdrop, StyledClose, StyledDialog, StyledDialogContainer, StyledModal, } from './styled-components';
+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

@@ -2,5 +2,5 @@ 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 { ModalBody, StyledRoot, StyledBackdrop, StyledClose, StyledDialog, StyledDialogContainer, StyledModal, } from './styled-components';
+export { ModalBody, StyledRoot, StyledClose, StyledDialog, StyledDialogContainer, StyledModal, } from './styled-components';
 export { CLOSE_SOURCE } from './types';

package/esm/modal/modal.js

@@ -6,15 +6,17 @@ 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, getBackdropStyles } from './overrides';
+import { getCloseButtonProps, getDialogContainerStyles, getDialogStyles } from './overrides';
 import { StyledModal } from './styled-components';
 import { add$props } from '../helpers';
+import { useLocale } from '../locale';
 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 locale = useLocale();
     var _overrides = useConvertOverrides({
         DialogContainer: { style: getDialogContainerStyles, props: sharedProps },
         Dialog: {
@@ -23,12 +25,10 @@ var Modal = function (_a) {
         },
         Close: {
             component: CloseButton,
-            props: getCloseButtonProps(utils, sharedProps),
+            props: getCloseButtonProps(utils, sharedProps, locale.modal.closeAriaLabel),
         },
-        Backdrop: { style: getBackdropStyles, props: sharedProps },
     }, overrides, [overrides, theme]);
-    // NOTE: `unstable_ModalBackdropScroll` is to make compatible for future version.
-    return (_jsx(StyledModal, __assign({}, props, { size: getWidthFromSize(utils, size), role: roleMap[role], unstable_ModalBackdropScroll: true, overrides: _overrides }), void 0));
+    return (_jsx(StyledModal, __assign({}, props, { size: getWidthFromSize(utils, size), role: roleMap[role], overrides: _overrides }), void 0));
 };
 Modal.displayName = 'Modal';
 export default React.memo(Modal);

package/esm/modal/overrides.d.ts

@@ -3,7 +3,6 @@ import { Styles, StyleUtils } from '../types';
 import { SharedProps } from './types';
 export declare const getDialogContainerStyles: Styles;
 export declare const getDialogStyles: Styles;
-export declare const getBackdropStyles: 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

@@ -38,17 +38,15 @@ export var getDialogStyles = [
     getDialogHeightControl,
     transitionDuration,
 ];
-export var getBackdropStyles = [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'
+                style: __assign({ position: 'absolute', top: px2rem(12), right: px2rem(16) }, ($dialogSize === 'fullPage'
                     ? {
                         top: px2rem(-44),
                         right: px2rem(0),
@@ -63,5 +61,5 @@ export var getCloseButtonProps = function (_a, _b) {
                     : {})),
             },
         },
-    };
+    });
 };

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

@@ -1,6 +1,6 @@
 import { ModalProps as BaseModalProps } from 'baseui/modal';
 import * as React from 'react';
-export { StyledRoot, StyledBackdrop, 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;

package/esm/modal/styled-components.js

@@ -1,7 +1,7 @@
 import { Modal as BaseModal } from 'baseui/modal';
 import withThemeOverride from '../helpers/baseui/withThemeOverride';
 import { styled } from '../style';
-export { StyledRoot, StyledBackdrop, StyledClose, StyledDialog, StyledDialogContainer } from 'baseui/modal';
+export { StyledRoot, StyledClose, StyledDialog, StyledDialogContainer } from 'baseui/modal';
 // @ts-ignore
 BaseModal.displayName = 'BaseUIModal';
 export var StyledModal = withThemeOverride(BaseModal, function (theme) { return ({
@@ -13,19 +13,19 @@ export var StyledModal = withThemeOverride(BaseModal, function (theme) { return
         contentSecondary: theme.spr.text02,
     },
 }); });
-export var StyledModalHeader = styled('div', 'typography-h4 spr-text-01 font-bold border-t-0 border-r-0 border-l-0', function (_a, _b) {
+export var StyledModalHeader = styled('div', 'typography-h4 spr-text-01 font-bold border-t-0 border-r-0 border-l-0 pt-4 px-6', function (_a, _b) {
     var px2rem = _a.px2rem;
     var $noBorder = _b.$noBorder;
     return ({ lineHeight: $noBorder ? px2rem(28) : px2rem(24) });
 }, function (utils, _a) {
     var $noBorder = _a.$noBorder;
-    return ($noBorder ? 'py-6 px-7' : 'border-b-1 border-solid spr-border-02 py-5 px-7');
+    return ($noBorder ? 'pb-0' : 'border-b-1 border-solid spr-border-02 pb-4');
 });
-export var ModalBody = styled('div', 'typography-bl1 spr-text-01 overflow-auto flex-grow');
-export var StyledModalFooter = styled('div', 'border-b-0 border-l-0 border-r-0', function (_a) {
-    var px2rem = _a.px2rem, direction = _a.direction;
-    return ({ lineHeight: px2rem(28), textAlign: direction === 'rtl' ? 'left' : 'right' });
+export var ModalBody = styled('div', 'typography-bl1 spr-text-01 overflow-auto flex-grow px-6 py-4');
+export var StyledModalFooter = styled('div', 'border-b-0 border-l-0 border-r-0 pb-4 px-6', function (_a) {
+    var px2rem = _a.px2rem;
+    return ({ lineHeight: px2rem(28), textAlign: 'right' });
 }, function (utils, _a) {
     var $noBorder = _a.$noBorder;
-    return ($noBorder ? 'py-6 px-7' : 'border-t-1 border-solid spr-border-02 py-5 px-7');
+    return ($noBorder ? 'pt-0' : 'border-t-1 border-solid spr-border-02 pt-4');
 });

package/esm/number/Number.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+import { NumberProps } from './types';
+export declare const Number: ({ value, variant, numberOptions }: NumberProps) => JSX.Element;

package/esm/number/Number.js

@@ -0,0 +1,10 @@
+import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
+//hooks
+import { useNumber } from './useNumber';
+//constants
+import { DEFAULT_VARIANT } from './constants';
+export var Number = function (_a) {
+    var value = _a.value, _b = _a.variant, variant = _b === void 0 ? DEFAULT_VARIANT : _b, numberOptions = _a.numberOptions;
+    var formattedNumber = useNumber({ value: value, variant: variant, numberOptions: numberOptions });
+    return _jsx(_Fragment, { children: formattedNumber }, void 0);
+};

package/esm/number/constants.d.ts

@@ -0,0 +1,2 @@
+import { CompactAutoFormat } from '../utils/intlNumberFormatUtils/types';
+export declare const DEFAULT_VARIANT: CompactAutoFormat;

package/esm/number/constants.js

@@ -0,0 +1,4 @@
+import { NUMBER_VARIANTS } from '../utils/intlNumberFormatUtils/types';
+export var DEFAULT_VARIANT = {
+    type: NUMBER_VARIANTS.COMPACT_AUTO_FORMAT,
+};

package/esm/number/index.d.ts

@@ -0,0 +1,5 @@
+export { Number } from './Number';
+export { useNumber } from './useNumber';
+export { getFormattedNumber } from '../utils/intlNumberFormatUtils';
+export * from './types';
+export * from '../utils/intlNumberFormatUtils/types';

package/esm/number/index.js

@@ -0,0 +1,5 @@
+export { Number } from './Number';
+export { useNumber } from './useNumber';
+export { getFormattedNumber } from '../utils/intlNumberFormatUtils';
+export * from './types';
+export * from '../utils/intlNumberFormatUtils/types';

package/esm/number/types.d.ts

@@ -0,0 +1,6 @@
+import { NumberVariant } from '../utils/intlNumberFormatUtils/types';
+export declare type NumberProps = {
+    value: number;
+    variant?: NumberVariant;
+    numberOptions?: Intl.NumberFormatOptions;
+};

package/esm/number/types.js

@@ -0,0 +1 @@
+export {};

package/esm/number/useNumber.d.ts

@@ -0,0 +1,2 @@
+import { NumberProps } from './types';
+export declare const useNumber: ({ value, variant, numberOptions }: NumberProps) => string;

package/esm/number/useNumber.js

@@ -0,0 +1,8 @@
+import { useLocale } from '../locale';
+import { getFormattedNumber } from '../utils/intlNumberFormatUtils';
+import { DEFAULT_VARIANT } from './constants';
+export var useNumber = function (_a) {
+    var value = _a.value, _b = _a.variant, variant = _b === void 0 ? DEFAULT_VARIANT : _b, numberOptions = _a.numberOptions;
+    var langCode = useLocale().langCode;
+    return getFormattedNumber({ value: value, locale: langCode, variant: variant, numberOptions: numberOptions });
+};

package/esm/overrides/index.d.ts

@@ -1,3 +1,3 @@
 export * from './types';
-export { mergeOverrides } from './mergeOverrides';
+export { mergeOverrides, mergeOverride } from './mergeOverrides';
 export { useOverrides, getOverrides } from './useOverrides';

package/esm/overrides/index.js

@@ -1,3 +1,3 @@
 export * from './types';
-export { mergeOverrides } from './mergeOverrides';
+export { mergeOverrides, mergeOverride } from './mergeOverrides';
 export { useOverrides, getOverrides } from './useOverrides';

package/esm/overrides/mergeOverrides.d.ts

@@ -1,3 +1,4 @@
-import { Overrides, OverridesObject } from './types';
+import { Override, OverrideObject, Overrides, OverridesObject } from './types';
+declare const mergeOverride: <T>(_target?: Override<T> | undefined, _source?: Override<T> | undefined) => OverrideObject<T>;
 declare const mergeOverrides: <T>(target: Overrides<T>, source?: Overrides<T>) => OverridesObject<T>;
-export { mergeOverrides };
+export { mergeOverrides, mergeOverride };

package/esm/overrides/mergeOverrides.js

@@ -1,11 +1,12 @@
 import { __assign } from "tslib";
 import { isValidElement } from 'react';
+import { isValidElementType } from 'react-is';
 import _mergeWith from 'lodash/mergeWith';
 import _isObject from 'lodash/isObject';
 import { combineRefs } from '../hooks/useCombinedRef';
 var mergeOverride = function (_target, _source) {
-    var target = typeof _target === 'function' ? { component: _target } : _target;
-    var source = typeof _source === 'function' ? { component: _source } : _source;
+    var target = isValidElementType(_target) ? { component: _target } : _target;
+    var source = isValidElementType(_source) ? { component: _source } : _source;
     var merged = __assign(__assign({}, target), source);
     if ((target === null || target === void 0 ? void 0 : target.props) && (source === null || source === void 0 ? void 0 : source.props)) {
         // deep merge
@@ -14,7 +15,7 @@ var mergeOverride = function (_target, _source) {
              * React elements are object. _merge deep merges react elements as well, which is not we usually want.
              * Check tests for more information
              */
-            if (isValidElement(b))
+            if (isValidElement(b) || isValidElementType(b))
                 return b;
             return undefined;
         });
@@ -39,4 +40,4 @@ var mergeOverrides = function (target, source) {
         return acc;
     }, {});
 };
-export { mergeOverrides };
+export { mergeOverrides, mergeOverride };