@sprinklrjs/spaceweb 11.0.0 → 12.33.2-rc.1

package/menu/menu.js

@@ -11,20 +11,21 @@ var helpers_1 = require("./helpers");
 var MenuContext_1 = require("./MenuContext");
 var useItemContainerEventHandlers_1 = (0, tslib_1.__importDefault)(require("./useItemContainerEventHandlers"));
 var useStatefulMenu_1 = (0, tslib_1.__importDefault)(require("./useStatefulMenu"));
-var nested_menu_context_1 = require("./nested-menu-context");
 var Menu = (0, react_1.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 ? helpers_1.defaultReducer : _f, captureScroll = _a.captureScroll, restProps = (0, tslib_1.__rest)(_a, ["disableNavigationOnMount", "focusWhenNavigationEnabled", "virtual", "overscanCount", "scrollElement", "estimateItemSize", "children", "overrides", "onHighlightedItemChange", "disableAutoHighlight", "resetMenuOnMouseLeave", "resetMenuHighlightOnMouseLeave", "reducer", "captureScroll"]);
-    var _g = (0, tslib_1.__read)((0, react_1.useState)(null), 2), listRef = _g[0], setListRef = _g[1];
-    var _h = (0, tslib_1.__read)((0, overrides_1.useOverrides)(overrides === null || overrides === void 0 ? void 0 : overrides.List, list_1.List), 2), ListOverride = _h[0], listProps = _h[1];
-    var _j = (0, tslib_1.__read)((0, react_1.useState)(null), 2), listItemsContainer = _j[0], setListItemsContainer = _j[1];
-    var _k = (0, useStatefulMenu_1.default)({
+    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 ? helpers_1.defaultReducer : _f, captureScroll = _a.captureScroll, _g = _a.selectOnTab, selectOnTab = _g === void 0 ? false : _g, restProps = (0, tslib_1.__rest)(_a, ["disableNavigationOnMount", "focusWhenNavigationEnabled", "virtual", "overscanCount", "scrollElement", "estimateItemSize", "children", "overrides", "onHighlightedItemChange", "disableAutoHighlight", "resetMenuOnMouseLeave", "resetMenuHighlightOnMouseLeave", "reducer", "captureScroll", "selectOnTab"]);
+    var _h = (0, tslib_1.__read)((0, react_1.useState)(null), 2), listRef = _h[0], setListRef = _h[1];
+    var _j = (0, tslib_1.__read)((0, overrides_1.useOverrides)(overrides === null || overrides === void 0 ? void 0 : overrides.List, list_1.List), 2), ListOverride = _j[0], listProps = _j[1];
+    var _k = (0, tslib_1.__read)((0, react_1.useState)(null), 2), listItemsContainer = _k[0], setListItemsContainer = _k[1];
+    var _l = (0, useStatefulMenu_1.default)({
         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 = (0, useScrollCapture_1.default)({ enabled: captureScroll });
     var setListCombinedRef = (0, useCombinedRef_1.default)(setListRef, setScrollTarget);
     var menuContextValue = (0, react_1.useMemo)(function () { return ({
@@ -32,8 +33,9 @@ var Menu = (0, react_1.forwardRef)(function (_a, ref) {
         setHighlightedItem: setHighlightedItem,
         setMenuContainerRef: setListItemsContainer,
         nestedMenuOpen: nestedMenuOpen,
+        listItemFocusVisible: listItemFocusVisible,
         setNestedMenuOpen: setNestedMenuOpen,
-    }); }, [highlightedItem, setHighlightedItem, nestedMenuOpen, setNestedMenuOpen]);
+    }); }, [highlightedItem, setHighlightedItem, nestedMenuOpen, listItemFocusVisible, setNestedMenuOpen]);
     (0, useItemContainerEventHandlers_1.default)({
         listItemsContainer: listItemsContainer,
         resetMenuHighlightOnMouseLeave: resetMenuHighlightOnMouseLeave || resetMenuOnMouseLeave,
@@ -50,9 +52,7 @@ var Menu = (0, react_1.forwardRef)(function (_a, ref) {
         }
         return menuRef;
     }, [turnOnKeyboardNavigation, turnOffKeyboardNavigation, setHighlightedItem, listRef]);
-    var nestedMenuContext = (0, nested_menu_context_1.useNestedMenuContext)();
-    var $showFocusOutline = Object.keys(nestedMenuContext).length !== 0;
-    return ((0, jsx_runtime_1.jsx)(MenuContext_1.MenuProvider, (0, tslib_1.__assign)({ value: menuContextValue }, { children: (0, jsx_runtime_1.jsx)(ListOverride, (0, tslib_1.__assign)({ ref: setListCombinedRef, "$showFocusOutline": $showFocusOutline, role: "menu", virtual: virtual, overscanCount: overscanCount, scrollElement: scrollElement, estimateItemSize: estimateItemSize }, restProps, listProps, { children: children }), void 0) }), void 0));
+    return ((0, jsx_runtime_1.jsx)(MenuContext_1.MenuProvider, (0, tslib_1.__assign)({ value: menuContextValue }, { children: (0, jsx_runtime_1.jsx)(ListOverride, (0, tslib_1.__assign)({ ref: setListCombinedRef, role: "menu", virtual: virtual, overscanCount: overscanCount, scrollElement: scrollElement, estimateItemSize: estimateItemSize }, restProps, listProps, { children: children }), void 0) }), void 0));
 });
 Menu.displayName = 'Menu';
 exports.default = (0, react_1.memo)(Menu);

package/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/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/menu/useKeyboardNavigation.js

@@ -7,27 +7,29 @@ var DocumentProvider_1 = require("../spacewebProvider/DocumentProvider");
 var helpers_1 = require("./helpers");
 var nested_menu_context_1 = require("./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 = (0, tslib_1.__read)((0, react_1.useState)(null), 2), highlightedItem = _d[0], setHighlightedItem = _d[1];
-    var _e = (0, tslib_1.__read)((0, react_1.useState)(!disableNavigationOnMount), 2), navigationEnabled = _e[0], setNavigationEnabled = _e[1];
-    var _f = (0, tslib_1.__read)((0, react_1.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 = (0, tslib_1.__read)((0, react_1.useState)(null), 2), highlightedItem = _d[0], _setHighlightedItem = _d[1];
+    var _e = (0, tslib_1.__read)((0, react_1.useState)(false), 2), listItemFocusVisible = _e[0], setListItemFocusVisible = _e[1];
+    var _f = (0, tslib_1.__read)((0, react_1.useState)(!disableNavigationOnMount), 2), navigationEnabled = _f[0], setNavigationEnabled = _f[1];
+    var _g = (0, tslib_1.__read)((0, react_1.useState)(false), 2), nestedMenuOpen = _g[0], setNestedMenuOpen = _g[1];
     var highlightedItemRef = (0, useLatest_1.useLatest)(highlightedItem);
     var reducerRef = (0, useLatest_1.useLatest)(reducer);
     var ownerDocument = (0, DocumentProvider_1.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
     (0, react_1.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 = (0, helpers_1.getFirstHighlightableElement)(listItemsContainerRef).firstHighlightableItem;
         firstHighlightableItem && setHighlightedItem(firstHighlightableItem);
-    });
+        // eslint-disable-next-line react-hooks/exhaustive-deps -- run this hook only when children changes
+    }, [children]);
     (0, react_1.useEffect)(function () {
         // Scroll the selected item into view for the first time when menu opens up
         window.requestAnimationFrame(function () {
@@ -40,7 +42,7 @@ var useKeyboardNavigation = function (_a) {
         setNestedMenuOpen(false);
     }, [setNavigationEnabled, setNestedMenuOpen]);
     var turnOffKeyboardNavigation = (0, react_1.useCallback)(function () { return setNavigationEnabled(false); }, []);
-    var _g = (0, nested_menu_context_1.useNestedMenuContext)(), getMenuInfo = _g.getMenuInfo, getParentMenuInfo = _g.getParentMenuInfo, getChildMenuInfo = _g.getChildMenuInfo;
+    var _h = (0, nested_menu_context_1.useNestedMenuContext)(), getMenuInfo = _h.getMenuInfo, getParentMenuInfo = _h.getParentMenuInfo, getChildMenuInfo = _h.getChildMenuInfo;
     // Highlight previously selected item or first highlightable item on mount
     (0, react_1.useEffect)(function () {
         if (disableAutoHighlight || !listItemsContainerRef) {
@@ -77,13 +79,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]);
     (0, react_1.useEffect)(function () {
         if (!navigationEnabled) {
             return undefined;
@@ -117,6 +123,7 @@ var useKeyboardNavigation = function (_a) {
     return {
         highlightedItem: highlightedItem,
         setHighlightedItem: setHighlightedItem,
+        listItemFocusVisible: listItemFocusVisible,
         turnOffKeyboardNavigation: turnOffKeyboardNavigation,
         turnOnKeyboardNavigation: turnOnKeyboardNavigation,
         navigationEnabled: navigationEnabled,

package/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/menu/useStatefulMenu.js

@@ -7,7 +7,7 @@ var helpers_1 = require("./helpers");
 var nested_menu_context_1 = require("./nested-menu-context");
 var useKeyboardNavigation_1 = (0, tslib_1.__importDefault)(require("./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 ? helpers_1.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 ? helpers_1.defaultReducer : _c, selectOnTab = _a.selectOnTab, children = _a.children;
     (0, react_1.useEffect)(function () {
         // focusWhenNavigationEnabled is true, then make listContainer focusable if required
         if (focusWhenNavigationEnabled && listItemsContainerRef && listItemsContainerRef.tabIndex < 0) {
@@ -20,7 +20,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 = (0, nested_menu_context_1.useNestedMenuContext)(), unregisterMenu = _e.unregisterMenu, registerMenu = _e.registerMenu, getParentMenuInfo = _e.getParentMenuInfo;
     (0, react_1.useEffect)(function () {
         if (!listItemsContainerRef)
@@ -47,20 +49,24 @@ var useStatefulMenu = function (_a) {
         (_a = onHighlightedItemChangeRef.current) === null || _a === void 0 ? void 0 : _a.call(onHighlightedItemChangeRef, highlightedItem);
     }, [highlightedItem, onHighlightedItemChangeRef]);
     (0, react_1.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/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/modal/adapter.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.roleMap = exports.getWidthFromSize = void 0;
-var modal_1 = require("baseui/modal");
+var modal_1 = require("../baseui/modal");
 var getWidthFromSize = function (_a, size) {
     var px2rem = _a.px2rem;
     switch (size) {

package/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/modal/index.js

@@ -10,7 +10,7 @@ var modal_header_1 = require("./modal-header");
 Object.defineProperty(exports, "ModalHeader", { enumerable: true, get: function () { return __importDefault(modal_header_1).default; } });
 var modal_footer_1 = require("./modal-footer");
 Object.defineProperty(exports, "ModalFooter", { enumerable: true, get: function () { return __importDefault(modal_footer_1).default; } });
-var modal_2 = require("baseui/modal");
+var modal_2 = require("../baseui/modal");
 Object.defineProperty(exports, "FocusOnce", { enumerable: true, get: function () { return modal_2.FocusOnce; } });
 var styled_components_1 = require("./styled-components");
 Object.defineProperty(exports, "ModalBody", { enumerable: true, get: function () { return styled_components_1.ModalBody; } });

package/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/modal/modal-footer.js

@@ -4,8 +4,9 @@ var tslib_1 = require("tslib");
 var jsx_runtime_1 = require("react/jsx-runtime");
 var styled_components_1 = require("./styled-components");
 var helpers_1 = require("../helpers");
-var ModalFooter = function (props) {
-    var sharedProps = (0, helpers_1.add$props)({ noBorder: props.noBorder });
+var ModalFooter = function (_a) {
+    var noBorder = _a.noBorder, props = (0, tslib_1.__rest)(_a, ["noBorder"]);
+    var sharedProps = (0, helpers_1.add$props)({ noBorder: noBorder });
     return (0, jsx_runtime_1.jsx)(styled_components_1.StyledModalFooter, (0, tslib_1.__assign)({}, props, sharedProps), void 0);
 };
 ModalFooter.displayName = 'ModalFooter';

package/modal/modal.js

@@ -3,31 +3,36 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var jsx_runtime_1 = require("react/jsx-runtime");
 var React = (0, tslib_1.__importStar)(require("react"));
+var react_1 = require("react");
 var button_1 = require("../button");
-var useConvertOverrides_1 = require("../helpers/baseui/useConvertOverrides");
 var close_1 = (0, tslib_1.__importDefault)(require("../icon/components/close"));
 var style_1 = require("../style");
 var adapter_1 = require("./adapter");
 var overrides_1 = require("./overrides");
 var styled_components_1 = require("./styled-components");
 var helpers_1 = require("../helpers");
+var locale_1 = require("../locale");
+var overrides_2 = require("../overrides");
 var CloseButton = function (closeProps) { return ((0, jsx_runtime_1.jsx)(button_1.IconButton, (0, tslib_1.__assign)({}, closeProps, { children: (0, jsx_runtime_1.jsx)(close_1.default, {}, 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 = (0, tslib_1.__rest)(_a, ["size", "role", "ariaLabel", "overrides"]);
     var utils = (0, style_1.useStyle)();
     var theme = utils.theme;
-    var sharedProps = (0, helpers_1.add$props)({ dialogSize: size });
-    var _overrides = (0, useConvertOverrides_1.useConvertOverrides)({
-        DialogContainer: { style: overrides_1.getDialogContainerStyles, props: sharedProps },
-        Dialog: {
-            style: overrides_1.getDialogStyles,
-            props: (0, tslib_1.__assign)((0, tslib_1.__assign)({}, (ariaLabel ? { 'aria-label': ariaLabel } : undefined)), sharedProps),
-        },
-        Close: {
-            component: CloseButton,
-            props: (0, overrides_1.getCloseButtonProps)(utils, sharedProps),
-        },
-    }, overrides, [overrides, theme]);
+    var sharedProps = (0, react_1.useMemo)(function () { return (0, helpers_1.add$props)({ dialogSize: size }); }, [size]);
+    var locale = (0, locale_1.useLocale)();
+    var _overrides = (0, react_1.useMemo)(function () {
+        return (0, overrides_2.mergeOverrides)({
+            DialogContainer: { style: overrides_1.getDialogContainerStyles, props: sharedProps },
+            Dialog: {
+                style: overrides_1.getDialogStyles,
+                props: (0, tslib_1.__assign)((0, tslib_1.__assign)({}, (ariaLabel ? { 'aria-label': ariaLabel } : undefined)), sharedProps),
+            },
+            Close: {
+                component: CloseButton,
+                props: (0, overrides_1.getCloseButtonProps)(utils, sharedProps, locale.modal.closeAriaLabel),
+            },
+        }, overrides);
+    }, [sharedProps, ariaLabel, utils, locale.modal.closeAriaLabel, overrides]);
     return ((0, jsx_runtime_1.jsx)(styled_components_1.StyledModal, (0, tslib_1.__assign)({}, props, { size: (0, adapter_1.getWidthFromSize)(utils, size), role: adapter_1.roleMap[role], overrides: _overrides }), void 0));
 };
 Modal.displayName = 'Modal';

package/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/modal/overrides.js

@@ -2,14 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCloseButtonProps = exports.getDialogStyles = exports.getDialogContainerStyles = void 0;
 var tslib_1 = require("tslib");
+var longHandHelpers_1 = require("../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':
@@ -32,7 +33,7 @@ var transitionDuration = function (_a, _b) {
     return ($animate ? { transitionDuration: '200ms' } : {});
 };
 exports.getDialogContainerStyles = [
-    'border-box spr-overlay',
+    'border-box spr-overlay h-full',
     getDialogContainerHeightControl,
     transitionDuration,
 ];
@@ -41,30 +42,21 @@ exports.getDialogStyles = [
     getDialogHeightControl,
     transitionDuration,
 ];
-var getCloseButtonProps = function (_a, _b) {
-    var _c;
-    var px2rem = _a.px2rem, direction = _a.direction, theme = _a.theme;
+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: (0, tslib_1.__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: (0, tslib_1.__assign)({ position: 'absolute', top: px2rem(12), right: px2rem(16) }, ($dialogSize === 'fullPage'
+                    ? (0, tslib_1.__assign)((0, tslib_1.__assign)({ top: px2rem(-44), right: px2rem(0), backgroundColor: theme.spr.ui01, color: theme.spr.icon02 }, (0, longHandHelpers_1.borderColor)(theme.borderColor.transparent)), { ':hover': {
                             color: theme.spr.ui04,
                             backgroundColor: theme.spr.ui06,
-                        },
-                    }
-                    : {})),
+                        } }) : {})),
             },
         },
-    };
+    });
 };
 exports.getCloseButtonProps = getCloseButtonProps;

package/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;

package/modal/styled-components.js

@@ -1,39 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StyledModalFooter = exports.ModalBody = exports.StyledModalHeader = exports.StyledModal = exports.StyledDialogContainer = exports.StyledDialog = exports.StyledClose = exports.StyledRoot = void 0;
-var tslib_1 = require("tslib");
-var modal_1 = require("baseui/modal");
-var withThemeOverride_1 = (0, tslib_1.__importDefault)(require("../helpers/baseui/withThemeOverride"));
+var modal_1 = require("../baseui/modal");
 var style_1 = require("../style");
-var modal_2 = require("baseui/modal");
+var modal_2 = require("../baseui/modal");
 Object.defineProperty(exports, "StyledRoot", { enumerable: true, get: function () { return modal_2.StyledRoot; } });
 Object.defineProperty(exports, "StyledClose", { enumerable: true, get: function () { return modal_2.StyledClose; } });
 Object.defineProperty(exports, "StyledDialog", { enumerable: true, get: function () { return modal_2.StyledDialog; } });
 Object.defineProperty(exports, "StyledDialogContainer", { enumerable: true, get: function () { return modal_2.StyledDialogContainer; } });
 // @ts-ignore
 modal_1.Modal.displayName = 'BaseUIModal';
-exports.StyledModal = (0, withThemeOverride_1.default)(modal_1.Modal, function (theme) { return ({
-    colors: {
-        backgroundPrimary: theme.spr.popup,
-        modalCloseColor: theme.spr.icon02,
-        modalCloseColorHover: theme.spr.icon01,
-        contentPrimary: theme.spr.text01,
-        contentSecondary: theme.spr.text02,
-    },
-}); });
-exports.StyledModalHeader = (0, style_1.styled)('div', 'typography-h4 spr-text-01 font-bold border-t-0 border-r-0 border-l-0', function (_a, _b) {
+exports.StyledModal = modal_1.Modal;
+exports.StyledModalHeader = (0, style_1.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');
 });
-exports.ModalBody = (0, style_1.styled)('div', 'typography-bl1 spr-text-01 overflow-auto flex-grow');
-exports.StyledModalFooter = (0, style_1.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' });
+exports.ModalBody = (0, style_1.styled)('div', 'typography-bl1 spr-text-01 overflow-auto flex-grow px-6 py-4');
+exports.StyledModalFooter = (0, style_1.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/modal/types.d.ts

@@ -1,4 +1,4 @@
-import { ModalOverrides, ModalProps as BaseModalProps, SharedStylePropsArg } from 'baseui/modal';
+import { ModalOverrides, ModalProps as BaseModalProps, SharedStylePropsArg } from '../baseui/modal';
 import { Override } from '../overrides';
 import { SpacewebComponentProps } from '../types';
 export declare type Size = 'sm' | 'md' | 'lg' | 'fullPage';
@@ -20,5 +20,5 @@ export declare type ModalHeaderProps = SpacewebComponentProps & {
 export declare type ModalFooterProps = SpacewebComponentProps & {
     noBorder?: boolean;
 };
-export type { ModalState } from 'baseui/modal';
-export { CLOSE_SOURCE } from 'baseui/modal';
+export type { ModalState } from '../baseui/modal';
+export { CLOSE_SOURCE } from '../baseui/modal';

package/modal/types.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CLOSE_SOURCE = void 0;
-var modal_1 = require("baseui/modal");
+var modal_1 = require("../baseui/modal");
 Object.defineProperty(exports, "CLOSE_SOURCE", { enumerable: true, get: function () { return modal_1.CLOSE_SOURCE; } });

package/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/number/Number.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Number = void 0;
+var jsx_runtime_1 = require("react/jsx-runtime");
+//hooks
+var useNumber_1 = require("./useNumber");
+//constants
+var constants_1 = require("./constants");
+var Number = function (_a) {
+    var value = _a.value, _b = _a.variant, variant = _b === void 0 ? constants_1.DEFAULT_VARIANT : _b, numberOptions = _a.numberOptions;
+    var formattedNumber = (0, useNumber_1.useNumber)({ value: value, variant: variant, numberOptions: numberOptions });
+    return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: formattedNumber }, void 0);
+};
+exports.Number = Number;

package/number/constants.d.ts

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

package/number/constants.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_VARIANT = void 0;
+var types_1 = require("../utils/intlNumberFormatUtils/types");
+exports.DEFAULT_VARIANT = {
+    type: types_1.NUMBER_VARIANTS.COMPACT_AUTO_FORMAT,
+};

package/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/number/index.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFormattedNumber = exports.useNumber = exports.Number = void 0;
+var tslib_1 = require("tslib");
+var Number_1 = require("./Number");
+Object.defineProperty(exports, "Number", { enumerable: true, get: function () { return Number_1.Number; } });
+var useNumber_1 = require("./useNumber");
+Object.defineProperty(exports, "useNumber", { enumerable: true, get: function () { return useNumber_1.useNumber; } });
+var intlNumberFormatUtils_1 = require("../utils/intlNumberFormatUtils");
+Object.defineProperty(exports, "getFormattedNumber", { enumerable: true, get: function () { return intlNumberFormatUtils_1.getFormattedNumber; } });
+(0, tslib_1.__exportStar)(require("./types"), exports);
+(0, tslib_1.__exportStar)(require("../utils/intlNumberFormatUtils/types"), exports);

package/number/package.json

@@ -0,0 +1,4 @@
+{
+  "sideEffects": false,
+  "module": "../esm/number/index.js"
+}

package/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/number/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/number/useNumber.d.ts

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

package/number/useNumber.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useNumber = void 0;
+var locale_1 = require("../locale");
+var intlNumberFormatUtils_1 = require("../utils/intlNumberFormatUtils");
+var constants_1 = require("./constants");
+var useNumber = function (_a) {
+    var value = _a.value, _b = _a.variant, variant = _b === void 0 ? constants_1.DEFAULT_VARIANT : _b, numberOptions = _a.numberOptions;
+    var langCode = (0, locale_1.useLocale)().langCode;
+    return (0, intlNumberFormatUtils_1.getFormattedNumber)({ value: value, locale: langCode, variant: variant, numberOptions: numberOptions });
+};
+exports.useNumber = useNumber;

package/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';