@itwin/itwinui-react 1.38.0 → 1.40.0

package/esm/core/ColorPicker/ColorPickerContext.d.ts

@@ -5,7 +5,7 @@ export declare const ColorPickerContext: React.Context<{
     setActiveColor: (color: ColorValue | ((prevColor: ColorValue) => ColorValue)) => void;
     hsvColor: HsvColor;
     onChangeComplete?: ((color: ColorValue) => void) | undefined;
-    applyHsvColorChange: (newColor: HsvColor, selectionChanged: boolean, newColorValue?: ColorValue | undefined) => void;
+    applyHsvColorChange: (newColor: HsvColor, selectionChanged: boolean, newColorValue?: ColorValue) => void;
     showAlpha: boolean;
 } | undefined>;
 export declare const useColorPickerContext: () => {
@@ -13,6 +13,6 @@ export declare const useColorPickerContext: () => {
     setActiveColor: (color: ColorValue | ((prevColor: ColorValue) => ColorValue)) => void;
     hsvColor: HsvColor;
     onChangeComplete?: ((color: ColorValue) => void) | undefined;
-    applyHsvColorChange: (newColor: HsvColor, selectionChanged: boolean, newColorValue?: ColorValue | undefined) => void;
+    applyHsvColorChange: (newColor: HsvColor, selectionChanged: boolean, newColorValue?: ColorValue) => void;
     showAlpha: boolean;
 };

package/esm/core/ComboBox/ComboBox.d.ts

@@ -35,9 +35,10 @@ export declare type ComboBoxProps<T> = {
     dropdownMenuProps?: PopoverProps;
     /**
      * Message shown when no options are available.
+     * If `JSX.Element` is provided, it will be rendered as is and won't be wrapped with `MenuExtraContent`.
      * @default 'No options found'
      */
-    emptyStateMessage?: string;
+    emptyStateMessage?: React.ReactNode;
     /**
      * A custom item renderer can be specified to control the rendering.
      *
@@ -51,6 +52,21 @@ export declare type ComboBoxProps<T> = {
         id: string;
         index: number;
     }) => JSX.Element;
+    /**
+     * If enabled, virtualization is used for the scrollable dropdown list.
+     * Use it if you expect a very long list of items.
+     * @default false
+     * @beta
+     */
+    enableVirtualization?: boolean;
+    /**
+     * Callback fired when dropdown menu is opened.
+     */
+    onShow?: () => void;
+    /**
+     * Callback fired when dropdown menu is closed.
+     */
+    onHide?: () => void;
 } & Pick<InputContainerProps, 'status'> & Omit<CommonProps, 'title'>;
 /**
  * ComboBox component that allows typing a value to filter the options in dropdown list.

package/esm/core/ComboBox/ComboBox.js

@@ -56,8 +56,8 @@ var getOptionId = function (option, idPrefix) {
  * />
  */
 export var ComboBox = function (props) {
-    var _a;
-    var options = props.options, valueProp = props.value, onChange = props.onChange, filterFunction = props.filterFunction, inputProps = props.inputProps, dropdownMenuProps = props.dropdownMenuProps, _b = props.emptyStateMessage, emptyStateMessage = _b === void 0 ? 'No options found' : _b, itemRenderer = props.itemRenderer, rest = __rest(props, ["options", "value", "onChange", "filterFunction", "inputProps", "dropdownMenuProps", "emptyStateMessage", "itemRenderer"]);
+    var _a, _b;
+    var options = props.options, valueProp = props.value, onChange = props.onChange, filterFunction = props.filterFunction, inputProps = props.inputProps, dropdownMenuProps = props.dropdownMenuProps, _c = props.emptyStateMessage, emptyStateMessage = _c === void 0 ? 'No options found' : _c, itemRenderer = props.itemRenderer, _d = props.enableVirtualization, enableVirtualization = _d === void 0 ? false : _d, onShow = props.onShow, onHide = props.onHide, rest = __rest(props, ["options", "value", "onChange", "filterFunction", "inputProps", "dropdownMenuProps", "emptyStateMessage", "itemRenderer", "enableVirtualization", "onShow", "onHide"]);
     // Generate a stateful random id if not specified
     var id = React.useState(function () {
         var _a, _b;
@@ -89,17 +89,18 @@ export var ComboBox = function (props) {
         });
     }
     // Reducer where all the component-wide state is stored
-    var _c = React.useReducer(comboBoxReducer, {
+    var _e = React.useReducer(comboBoxReducer, {
         isOpen: false,
         selectedIndex: -1,
         focusedIndex: -1,
-    }), _d = _c[0], isOpen = _d.isOpen, selectedIndex = _d.selectedIndex, focusedIndex = _d.focusedIndex, dispatch = _c[1];
-    React.useEffect(function () {
+    }), _f = _e[0], isOpen = _f.isOpen, selectedIndex = _f.selectedIndex, focusedIndex = _f.focusedIndex, dispatch = _e[1];
+    React.useLayoutEffect(function () {
         var _a, _b;
         // When the dropdown opens
         if (isOpen) {
             (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.focus(); // Focus the input
             setFilteredOptions(options); // Reset the filtered list
+            dispatch(['focus']);
         }
         // When the dropdown closes
         else {
@@ -112,19 +113,30 @@ export var ComboBox = function (props) {
         }
     }, [isOpen, options, selectedIndex]);
     // Set min-width of menu to be same as input
-    var _e = React.useState(0), minWidth = _e[0], setMinWidth = _e[1];
+    var _g = React.useState(0), minWidth = _g[0], setMinWidth = _g[1];
     React.useEffect(function () {
         if (inputRef.current) {
             setMinWidth(inputRef.current.offsetWidth);
         }
     }, [isOpen]);
-    // Initialize filtered options to the latest value options
-    var _f = React.useState(options), filteredOptions = _f[0], setFilteredOptions = _f[1];
+    // Update filtered options to the latest value options according to input value
+    var _h = React.useState(options), filteredOptions = _h[0], setFilteredOptions = _h[1];
     React.useEffect(function () {
-        setFilteredOptions(options);
+        var _a;
+        if (inputValue) {
+            setFilteredOptions((_a = filterFunction === null || filterFunction === void 0 ? void 0 : filterFunction(options, inputValue)) !== null && _a !== void 0 ? _a : options.filter(function (option) {
+                return option.label.toLowerCase().includes(inputValue.toLowerCase());
+            }));
+        }
+        else {
+            setFilteredOptions(options);
+        }
+        dispatch(['focus']);
+        // Only need to call on options update
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [options]);
     // Filter options based on input value
-    var _g = React.useState((_a = inputProps === null || inputProps === void 0 ? void 0 : inputProps.value) !== null && _a !== void 0 ? _a : ''), inputValue = _g[0], setInputValue = _g[1];
+    var _j = React.useState((_b = (_a = inputProps === null || inputProps === void 0 ? void 0 : inputProps.value) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : ''), inputValue = _j[0], setInputValue = _j[1];
     var handleOnInput = React.useCallback(function (event) {
         var _a, _b;
         var value = event.currentTarget.value;
@@ -133,12 +145,11 @@ export var ComboBox = function (props) {
         setFilteredOptions((_a = filterFunction === null || filterFunction === void 0 ? void 0 : filterFunction(options, value)) !== null && _a !== void 0 ? _a : options.filter(function (option) {
             return option.label.toLowerCase().includes(value.toLowerCase());
         }));
+        if (focusedIndex != -1) {
+            dispatch(['focus', -1]);
+        }
         (_b = inputProps === null || inputProps === void 0 ? void 0 : inputProps.onChange) === null || _b === void 0 ? void 0 : _b.call(inputProps, event);
-    }, [filterFunction, inputProps, options]);
-    // Reset focused item when filteredOptions change
-    React.useEffect(function () {
-        dispatch(['focus']);
-    }, [filteredOptions]);
+    }, [filterFunction, focusedIndex, inputProps, options]);
     // When the value prop changes, update the selectedIndex
     React.useEffect(function () {
         dispatch([
@@ -157,7 +168,7 @@ export var ComboBox = function (props) {
             (_b = onChangeProp.current) === null || _b === void 0 ? void 0 : _b.call(onChangeProp, value);
         }
     }, [options, selectedIndex, valueProp]);
-    var getMenuItem = React.useCallback(function (option) {
+    var getMenuItem = React.useCallback(function (option, filteredIndex) {
         var optionId = getOptionId(option, id);
         var __originalIndex = optionsExtraInfoRef.current[optionId].__originalIndex;
         var customItem = itemRenderer
@@ -172,6 +183,7 @@ export var ComboBox = function (props) {
             onClick: function (e) {
                 var _a, _b;
                 dispatch(['select', __originalIndex]);
+                dispatch(['close']);
                 (_b = (_a = customItem.props).onClick) === null || _b === void 0 ? void 0 : _b.call(_a, e);
             },
             // ComboBox.MenuItem handles scrollIntoView, data-iui-index and iui-focused through context
@@ -180,22 +192,36 @@ export var ComboBox = function (props) {
                 'iui-focused': focusedIndex === __originalIndex,
             }),
             'data-iui-index': __originalIndex,
+            'data-iui-filtered-index': filteredIndex,
             ref: mergeRefs(customItem.props.ref, function (el) {
-                // will need to check for virtualization here too
-                if (focusedIndex === __originalIndex) {
+                if (!enableVirtualization && focusedIndex === __originalIndex) {
                     el === null || el === void 0 ? void 0 : el.scrollIntoView({ block: 'nearest' });
                 }
             }),
-        })) : (React.createElement(ComboBoxMenuItem, __assign({ key: optionId, id: optionId }, option, { isSelected: selectedIndex === __originalIndex, onClick: function () { return dispatch(['select', __originalIndex]); }, index: __originalIndex }), option.label));
-    }, [focusedIndex, id, itemRenderer, selectedIndex]);
+        })) : (React.createElement(ComboBoxMenuItem, __assign({ key: optionId, id: optionId }, option, { isSelected: selectedIndex === __originalIndex, onClick: function () {
+                dispatch(['select', __originalIndex]);
+                dispatch(['close']);
+            }, index: __originalIndex, "data-iui-filtered-index": filteredIndex }), option.label));
+    }, [enableVirtualization, focusedIndex, id, itemRenderer, selectedIndex]);
+    var emptyContent = React.useMemo(function () { return (React.createElement(React.Fragment, null, React.isValidElement(emptyStateMessage) ? (emptyStateMessage) : (React.createElement(MenuExtraContent, null,
+        React.createElement(Text, { isMuted: true }, emptyStateMessage))))); }, [emptyStateMessage]);
     return (React.createElement(ComboBoxRefsContext.Provider, { value: { inputRef: inputRef, menuRef: menuRef, toggleButtonRef: toggleButtonRef, optionsExtraInfoRef: optionsExtraInfoRef } },
         React.createElement(ComboBoxActionContext.Provider, { value: dispatch },
-            React.createElement(ComboBoxStateContext.Provider, { value: { id: id, minWidth: minWidth, isOpen: isOpen, focusedIndex: focusedIndex } },
+            React.createElement(ComboBoxStateContext.Provider, { value: {
+                    id: id,
+                    minWidth: minWidth,
+                    isOpen: isOpen,
+                    focusedIndex: focusedIndex,
+                    enableVirtualization: enableVirtualization,
+                    filteredOptions: filteredOptions,
+                    getMenuItem: getMenuItem,
+                } },
                 React.createElement(ComboBoxInputContainer, __assign({ disabled: inputProps === null || inputProps === void 0 ? void 0 : inputProps.disabled }, rest),
                     React.createElement(ComboBoxInput, __assign({ value: inputValue }, inputProps, { onChange: handleOnInput })),
                     React.createElement(ComboBoxEndIcon, { disabled: inputProps === null || inputProps === void 0 ? void 0 : inputProps.disabled, isOpen: isOpen })),
-                React.createElement(ComboBoxDropdown, __assign({}, dropdownMenuProps),
-                    React.createElement(ComboBoxMenu, null, filteredOptions.length > 0 ? (filteredOptions.map(getMenuItem)) : (React.createElement(MenuExtraContent, null,
-                        React.createElement(Text, { isMuted: true }, emptyStateMessage)))))))));
+                React.createElement(ComboBoxDropdown, __assign({}, dropdownMenuProps, { onShow: onShow, onHide: onHide }),
+                    React.createElement(ComboBoxMenu, null, filteredOptions.length > 0 && !enableVirtualization
+                        ? filteredOptions.map(getMenuItem)
+                        : emptyContent))))));
 };
 export default ComboBox;

package/esm/core/ComboBox/ComboBoxDropdown.d.ts

@@ -1,8 +1,7 @@
 import React from 'react';
-export declare const ComboBoxDropdown: React.ForwardRefExoticComponent<Pick<{
-    visible?: boolean | undefined;
-    trigger?: string | undefined;
-    placement?: import("@popperjs/core").Placement | undefined;
-} & Omit<import("@tippyjs/react").TippyProps, "placement" | "trigger" | "visible"> & {
+import { PopoverProps } from '../utils';
+declare type ComboBoxDropdownProps = PopoverProps & {
     children: JSX.Element;
-}, "disabled" | "children" | "placement" | "trigger" | "visible" | "content" | "render" | "animateFill" | "appendTo" | "aria" | "delay" | "duration" | "followCursor" | "getReferenceClientRect" | "hideOnClick" | "ignoreAttributes" | "inlinePositioning" | "interactive" | "interactiveBorder" | "interactiveDebounce" | "moveTransition" | "offset" | "plugins" | "popperOptions" | "showOnCreate" | "sticky" | "touch" | "triggerTarget" | "onAfterUpdate" | "onBeforeUpdate" | "onCreate" | "onDestroy" | "onHidden" | "onHide" | "onMount" | "onShow" | "onShown" | "onTrigger" | "onUntrigger" | "onClickOutside" | "allowHTML" | "animation" | "arrow" | "inertia" | "maxWidth" | "role" | "theme" | "zIndex" | "className" | "singleton" | "reference"> & React.RefAttributes<Element>>;
+};
+export declare const ComboBoxDropdown: React.ForwardRefExoticComponent<Pick<ComboBoxDropdownProps, "disabled" | "children" | "placement" | "trigger" | "visible" | "content" | "render" | "animateFill" | "appendTo" | "aria" | "delay" | "duration" | "followCursor" | "getReferenceClientRect" | "hideOnClick" | "ignoreAttributes" | "inlinePositioning" | "interactive" | "interactiveBorder" | "interactiveDebounce" | "moveTransition" | "offset" | "plugins" | "popperOptions" | "showOnCreate" | "sticky" | "touch" | "triggerTarget" | "onAfterUpdate" | "onBeforeUpdate" | "onCreate" | "onDestroy" | "onHidden" | "onHide" | "onMount" | "onShow" | "onShown" | "onTrigger" | "onUntrigger" | "onClickOutside" | "allowHTML" | "animation" | "arrow" | "inertia" | "maxWidth" | "role" | "theme" | "zIndex" | "className" | "singleton" | "reference"> & React.RefAttributes<Element>>;
+export {};

package/esm/core/ComboBox/ComboBoxInput.js

@@ -30,7 +30,7 @@ import { useSafeContext, useMergedRefs } from '../utils';
 import { ComboBoxStateContext, ComboBoxActionContext, ComboBoxRefsContext, } from './helpers';
 export var ComboBoxInput = React.forwardRef(function (props, forwardedRef) {
     var onKeyDownProp = props.onKeyDown, onFocusProp = props.onFocus, rest = __rest(props, ["onKeyDown", "onFocus"]);
-    var _a = useSafeContext(ComboBoxStateContext), isOpen = _a.isOpen, id = _a.id, focusedIndex = _a.focusedIndex;
+    var _a = useSafeContext(ComboBoxStateContext), isOpen = _a.isOpen, id = _a.id, focusedIndex = _a.focusedIndex, enableVirtualization = _a.enableVirtualization;
     var dispatch = useSafeContext(ComboBoxActionContext);
     var _b = useSafeContext(ComboBoxRefsContext), inputRef = _b.inputRef, menuRef = _b.menuRef, optionsExtraInfoRef = _b.optionsExtraInfoRef;
     var refs = useMergedRefs(inputRef, forwardedRef);
@@ -43,7 +43,7 @@ export var ComboBoxInput = React.forwardRef(function (props, forwardedRef) {
         return ((_c = (_b = (_a = menuRef.current) === null || _a === void 0 ? void 0 : _a.querySelector("[data-iui-index=\"".concat(index, "\"]"))) === null || _b === void 0 ? void 0 : _b.id) !== null && _c !== void 0 ? _c : '');
     };
     var handleKeyDown = React.useCallback(function (event) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         onKeyDownProp === null || onKeyDownProp === void 0 ? void 0 : onKeyDownProp(event);
         var length = (_a = Object.keys(optionsExtraInfoRef.current).length) !== null && _a !== void 0 ? _a : 0;
         switch (event.key) {
@@ -56,15 +56,21 @@ export var ComboBoxInput = React.forwardRef(function (props, forwardedRef) {
                     return;
                 }
                 if (focusedIndexRef.current === -1) {
+                    var currentElement = (_b = menuRef.current) === null || _b === void 0 ? void 0 : _b.querySelector('[data-iui-index]');
                     return dispatch([
                         'focus',
-                        (_c = (_b = Object.values(optionsExtraInfoRef.current)) === null || _b === void 0 ? void 0 : _b[0].__originalIndex) !== null && _c !== void 0 ? _c : -1,
+                        Number((_c = currentElement === null || currentElement === void 0 ? void 0 : currentElement.getAttribute('data-iui-index')) !== null && _c !== void 0 ? _c : 0),
                     ]);
                 }
+                // If virtualization is enabled, dont let round scrolling
+                if (enableVirtualization &&
+                    !((_e = (_d = menuRef.current) === null || _d === void 0 ? void 0 : _d.querySelector("[data-iui-index=\"".concat(focusedIndexRef.current, "\"]"))) === null || _e === void 0 ? void 0 : _e.nextElementSibling)) {
+                    return;
+                }
                 var nextIndex = focusedIndexRef.current;
                 do {
-                    var currentElement = (_d = menuRef.current) === null || _d === void 0 ? void 0 : _d.querySelector("[data-iui-index=\"".concat(nextIndex, "\"]"));
-                    var nextElement = (_e = currentElement === null || currentElement === void 0 ? void 0 : currentElement.nextElementSibling) !== null && _e !== void 0 ? _e : (_f = menuRef.current) === null || _f === void 0 ? void 0 : _f.querySelector('[data-iui-index]');
+                    var currentElement = (_f = menuRef.current) === null || _f === void 0 ? void 0 : _f.querySelector("[data-iui-index=\"".concat(nextIndex, "\"]"));
+                    var nextElement = (_g = currentElement === null || currentElement === void 0 ? void 0 : currentElement.nextElementSibling) !== null && _g !== void 0 ? _g : (_h = menuRef.current) === null || _h === void 0 ? void 0 : _h.querySelector('[data-iui-index]');
                     nextIndex = Number(nextElement === null || nextElement === void 0 ? void 0 : nextElement.getAttribute('data-iui-index'));
                     if ((nextElement === null || nextElement === void 0 ? void 0 : nextElement.ariaDisabled) !== 'true') {
                         return dispatch(['focus', nextIndex]);
@@ -80,16 +86,21 @@ export var ComboBoxInput = React.forwardRef(function (props, forwardedRef) {
                 if (length === 0) {
                     return;
                 }
+                // If virtualization is enabled, dont let round scrolling
+                if (enableVirtualization &&
+                    !((_k = (_j = menuRef.current) === null || _j === void 0 ? void 0 : _j.querySelector("[data-iui-index=\"".concat(focusedIndexRef.current, "\"]"))) === null || _k === void 0 ? void 0 : _k.previousElementSibling)) {
+                    return;
+                }
                 if (focusedIndexRef.current === -1) {
                     return dispatch([
                         'focus',
-                        (_h = (_g = Object.values(optionsExtraInfoRef.current)) === null || _g === void 0 ? void 0 : _g[length - 1].__originalIndex) !== null && _h !== void 0 ? _h : -1,
+                        (_m = (_l = Object.values(optionsExtraInfoRef.current)) === null || _l === void 0 ? void 0 : _l[length - 1].__originalIndex) !== null && _m !== void 0 ? _m : -1,
                     ]);
                 }
                 var prevIndex = focusedIndexRef.current;
                 do {
-                    var currentElement = (_j = menuRef.current) === null || _j === void 0 ? void 0 : _j.querySelector("[data-iui-index=\"".concat(prevIndex, "\"]"));
-                    var prevElement = (_k = currentElement === null || currentElement === void 0 ? void 0 : currentElement.previousElementSibling) !== null && _k !== void 0 ? _k : (_l = menuRef.current) === null || _l === void 0 ? void 0 : _l.querySelector('[data-iui-index]:last-of-type');
+                    var currentElement = (_o = menuRef.current) === null || _o === void 0 ? void 0 : _o.querySelector("[data-iui-index=\"".concat(prevIndex, "\"]"));
+                    var prevElement = (_p = currentElement === null || currentElement === void 0 ? void 0 : currentElement.previousElementSibling) !== null && _p !== void 0 ? _p : (_q = menuRef.current) === null || _q === void 0 ? void 0 : _q.querySelector('[data-iui-index]:last-of-type');
                     prevIndex = Number(prevElement === null || prevElement === void 0 ? void 0 : prevElement.getAttribute('data-iui-index'));
                     if ((prevElement === null || prevElement === void 0 ? void 0 : prevElement.ariaDisabled) !== 'true') {
                         return dispatch(['focus', prevIndex]);
@@ -101,6 +112,7 @@ export var ComboBoxInput = React.forwardRef(function (props, forwardedRef) {
                 event.preventDefault();
                 if (isOpen) {
                     dispatch(['select', focusedIndexRef.current]);
+                    dispatch(['close']);
                 }
                 else {
                     dispatch(['open']);
@@ -116,7 +128,14 @@ export var ComboBoxInput = React.forwardRef(function (props, forwardedRef) {
                 dispatch(['close']);
                 break;
         }
-    }, [dispatch, isOpen, menuRef, onKeyDownProp, optionsExtraInfoRef]);
+    }, [
+        dispatch,
+        enableVirtualization,
+        isOpen,
+        menuRef,
+        onKeyDownProp,
+        optionsExtraInfoRef,
+    ]);
     var handleFocus = React.useCallback(function (event) {
         dispatch(['open']);
         onFocusProp === null || onFocusProp === void 0 ? void 0 : onFocusProp(event);

package/esm/core/ComboBox/ComboBoxMenu.js

@@ -27,13 +27,57 @@ var __rest = (this && this.__rest) || function (s, e) {
 import cx from 'classnames';
 import React from 'react';
 import { Menu } from '../Menu';
-import { useSafeContext, useMergedRefs } from '../utils';
+import { Surface } from '../Surface';
+import { useSafeContext, useMergedRefs, useVirtualization, mergeRefs, getWindow, } from '../utils';
 import { ComboBoxStateContext, ComboBoxRefsContext } from './helpers';
+var VirtualizedComboBoxMenu = React.forwardRef(function (_a, forwardedRef) {
+    var _b, _c, _d;
+    var children = _a.children, style = _a.style, rest = __rest(_a, ["children", "style"]);
+    var _e = useSafeContext(ComboBoxStateContext), minWidth = _e.minWidth, id = _e.id, filteredOptions = _e.filteredOptions, getMenuItem = _e.getMenuItem, focusedIndex = _e.focusedIndex;
+    var menuRef = useSafeContext(ComboBoxRefsContext).menuRef;
+    var virtualItemRenderer = React.useCallback(function (index) {
+        return filteredOptions.length > 0
+            ? getMenuItem(filteredOptions[index], index)
+            : children;
+    }, // Here is expected empty state content
+    [filteredOptions, getMenuItem, children]);
+    var focusedVisibleIndex = React.useMemo(function () {
+        var _a, _b;
+        var currentElement = (_a = menuRef.current) === null || _a === void 0 ? void 0 : _a.querySelector("[data-iui-index=\"".concat(focusedIndex, "\"]"));
+        if (!currentElement) {
+            return focusedIndex;
+        }
+        return Number((_b = currentElement.getAttribute('data-iui-filtered-index')) !== null && _b !== void 0 ? _b : focusedIndex);
+    }, [focusedIndex, menuRef]);
+    var _f = useVirtualization({
+        // 'Fool' VirtualScroll by passing length 1
+        // whenever there is no elements, to show empty state message
+        itemsLength: filteredOptions.length || 1,
+        itemRenderer: virtualItemRenderer,
+        scrollToIndex: focusedVisibleIndex,
+    }), outerProps = _f.outerProps, innerProps = _f.innerProps, visibleChildren = _f.visibleChildren;
+    var overflowY = ((_d = (_c = (_b = getWindow()) === null || _b === void 0 ? void 0 : _b.CSS) === null || _c === void 0 ? void 0 : _c.supports) === null || _d === void 0 ? void 0 : _d.call(_c, 'overflow-x: overlay'))
+        ? { overflowY: 'overlay' }
+        : { overflowY: 'auto' };
+    var styles = React.useMemo(function () { return ({
+        minWidth: minWidth,
+        maxWidth: "min(".concat(minWidth * 2, "px, 90vw)"),
+        maxHeight: 315,
+    }); }, [minWidth]);
+    return (React.createElement(Surface, __assign({ elevation: 1, style: __assign(__assign(__assign({}, styles), overflowY), style) }, rest),
+        React.createElement("div", __assign({}, outerProps),
+            React.createElement(Menu, { id: "".concat(id, "-list"), setFocus: false, role: 'listbox', ref: mergeRefs(menuRef, innerProps.ref, forwardedRef), style: innerProps.style }, visibleChildren))));
+});
 export var ComboBoxMenu = React.forwardRef(function (props, forwardedRef) {
     var className = props.className, style = props.style, rest = __rest(props, ["className", "style"]);
-    var _a = useSafeContext(ComboBoxStateContext), minWidth = _a.minWidth, id = _a.id;
+    var _a = useSafeContext(ComboBoxStateContext), minWidth = _a.minWidth, id = _a.id, enableVirtualization = _a.enableVirtualization;
     var menuRef = useSafeContext(ComboBoxRefsContext).menuRef;
     var refs = useMergedRefs(menuRef, forwardedRef);
-    return (React.createElement(Menu, __assign({ id: "".concat(id, "-list"), style: React.useMemo(function () { return (__assign({ minWidth: minWidth, maxWidth: "min(".concat(minWidth * 2, "px, 90vw)"), maxHeight: 300 }, style)); }, [minWidth, style]), setFocus: false, role: 'listbox', ref: refs, className: cx('iui-scroll', className) }, rest)));
+    var styles = React.useMemo(function () { return ({
+        minWidth: minWidth,
+        maxWidth: "min(".concat(minWidth * 2, "px, 90vw)"),
+        maxHeight: 315,
+    }); }, [minWidth]);
+    return (React.createElement(React.Fragment, null, !enableVirtualization ? (React.createElement(Menu, __assign({ id: "".concat(id, "-list"), style: __assign(__assign({}, styles), style), setFocus: false, role: 'listbox', ref: refs, className: cx('iui-scroll', className) }, rest))) : (React.createElement(VirtualizedComboBoxMenu, __assign({ ref: forwardedRef }, props)))));
 });
 ComboBoxMenu.displayName = 'ComboBoxMenu';

package/esm/core/ComboBox/ComboBoxMenuItem.js

@@ -30,10 +30,9 @@ import { useSafeContext, useMergedRefs } from '../utils';
 import { ComboBoxStateContext } from './helpers';
 export var ComboBoxMenuItem = React.memo(React.forwardRef(function (props, forwardedRef) {
     var children = props.children, isSelected = props.isSelected, disabled = props.disabled, value = props.value, onClick = props.onClick, sublabel = props.sublabel, _a = props.size, size = _a === void 0 ? !!sublabel ? 'large' : 'default' : _a, icon = props.icon, badge = props.badge, className = props.className, _b = props.role, role = _b === void 0 ? 'menuitem' : _b, index = props.index, rest = __rest(props, ["children", "isSelected", "disabled", "value", "onClick", "sublabel", "size", "icon", "badge", "className", "role", "index"]);
-    var focusedIndex = useSafeContext(ComboBoxStateContext).focusedIndex;
+    var _c = useSafeContext(ComboBoxStateContext), focusedIndex = _c.focusedIndex, enableVirtualization = _c.enableVirtualization;
     var focusRef = function (el) {
-        // will need to check for virtualization here too
-        if (focusedIndex === index) {
+        if (!enableVirtualization && focusedIndex === index) {
             el === null || el === void 0 ? void 0 : el.scrollIntoView({ block: 'nearest' });
         }
     };

package/esm/core/ComboBox/helpers.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { SelectOption } from '../Select/Select';
 declare type ComboBoxAction = 'open' | 'close' | 'select' | 'focus';
 export declare const comboBoxReducer: (state: {
     isOpen: boolean;
@@ -17,11 +18,15 @@ export declare const ComboBoxRefsContext: React.Context<{
         __originalIndex: number;
     }>>;
 } | undefined>;
-export declare const ComboBoxStateContext: React.Context<{
+declare type ComboBoxStateContextProps<T = unknown> = {
     isOpen: boolean;
     id: string;
     minWidth: number;
-    focusedIndex?: number | undefined;
-} | undefined>;
+    enableVirtualization: boolean;
+    filteredOptions: SelectOption<T>[];
+    getMenuItem: (option: SelectOption<T>, filteredIndex?: number) => JSX.Element;
+    focusedIndex?: number;
+};
+export declare const ComboBoxStateContext: React.Context<ComboBoxStateContextProps<unknown> | undefined>;
 export declare const ComboBoxActionContext: React.Context<((x: [ComboBoxAction] | [ComboBoxAction, number]) => void) | undefined>;
 export {};

package/esm/core/ComboBox/helpers.js

@@ -25,7 +25,7 @@ export var comboBoxReducer = function (state, _a) {
             return __assign(__assign({}, state), { isOpen: false });
         }
         case 'select': {
-            return __assign(__assign({}, state), { isOpen: false, selectedIndex: value !== null && value !== void 0 ? value : state.selectedIndex, focusedIndex: value !== null && value !== void 0 ? value : state.focusedIndex });
+            return __assign(__assign({}, state), { selectedIndex: value !== null && value !== void 0 ? value : state.selectedIndex, focusedIndex: value !== null && value !== void 0 ? value : state.focusedIndex });
         }
         case 'focus': {
             return __assign(__assign({}, state), { focusedIndex: (_b = value !== null && value !== void 0 ? value : state.selectedIndex) !== null && _b !== void 0 ? _b : -1 });

package/esm/core/DatePicker/DatePicker.d.ts

@@ -5,7 +5,7 @@ import { TimePickerProps } from '../TimePicker';
  * Generate localized months and days strings using `Intl.DateTimeFormat` for passed locale to use in DatePicker component.
  * If locale is not passed, browser locale will be used.
  */
-export declare const generateLocalizedStrings: (locale?: string | undefined) => {
+export declare const generateLocalizedStrings: (locale?: string) => {
     months: string[];
     shortDays: string[];
     days: string[];

package/esm/core/Menu/MenuItemSkeleton.d.ts

@@ -0,0 +1,32 @@
+/// <reference types="react" />
+import { CommonProps } from '../utils';
+import '@itwin/itwinui-css/css/menu.css';
+export declare type MenuItemSkeletonProps = {
+    /**
+     * Flag whether to show skeleton for sub-label.
+     */
+    hasSublabel?: boolean;
+    /**
+     * Flag whether to show skeleton for icon.
+     */
+    hasIcon?: boolean;
+    /**
+     * Skeleton content width.
+     */
+    contentWidth?: string;
+    /**
+     * Translated strings used for accessibility.
+     */
+    translatedStrings?: {
+        /**
+         * Label for loading state. Defaults to "Loading…".
+         * It is only visible for the screen readers.
+         */
+        loading: string;
+    };
+} & CommonProps;
+/**
+ * Menu item that uses skeletons to indicate loading state.
+ */
+export declare const MenuItemSkeleton: (props: MenuItemSkeletonProps) => JSX.Element;
+export default MenuItemSkeleton;

package/esm/core/Menu/MenuItemSkeleton.js

@@ -0,0 +1,46 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+ * See LICENSE.md in the project root for license terms and full copyright notice.
+ *--------------------------------------------------------------------------------------------*/
+import React from 'react';
+import cx from 'classnames';
+import { useTheme, VisuallyHidden } from '../utils';
+import '@itwin/itwinui-css/css/menu.css';
+/**
+ * Menu item that uses skeletons to indicate loading state.
+ */
+export var MenuItemSkeleton = function (props) {
+    var hasSublabel = props.hasSublabel, hasIcon = props.hasIcon, contentWidth = props.contentWidth, _a = props.translatedStrings, translatedStrings = _a === void 0 ? { loading: 'Loading…' } : _a, className = props.className, style = props.style, rest = __rest(props, ["hasSublabel", "hasIcon", "contentWidth", "translatedStrings", "className", "style"]);
+    useTheme();
+    return (React.createElement("li", __assign({ className: cx('iui-menu-item', 'iui-menu-item-skeleton', { 'iui-large': hasSublabel }, className), style: __assign({
+            '--iui-menu-item-content-skeleton-max-width': contentWidth,
+        }, style) }, rest),
+        hasIcon && React.createElement("div", { className: 'iui-icon iui-skeleton', "aria-hidden": true }),
+        React.createElement("span", { className: 'iui-content' },
+            React.createElement("div", { className: 'iui-menu-label iui-skeleton', "aria-hidden": true }),
+            hasSublabel && (React.createElement("div", { className: 'iui-menu-description iui-skeleton', "aria-hidden": true })),
+            React.createElement(VisuallyHidden, null, translatedStrings.loading))));
+};
+export default MenuItemSkeleton;

package/esm/core/Menu/index.d.ts

@@ -6,3 +6,5 @@ export { MenuDivider } from './MenuDivider';
 export type { MenuDividerProps } from './MenuDivider';
 export { MenuExtraContent } from './MenuExtraContent';
 export type { MenuExtraContentProps } from './MenuExtraContent';
+export { MenuItemSkeleton } from './MenuItemSkeleton';
+export type { MenuItemSkeletonProps } from './MenuItemSkeleton';

package/esm/core/Menu/index.js

@@ -6,3 +6,4 @@ export { Menu } from './Menu';
 export { MenuItem } from './MenuItem';
 export { MenuDivider } from './MenuDivider';
 export { MenuExtraContent } from './MenuExtraContent';
+export { MenuItemSkeleton } from './MenuItemSkeleton';

package/esm/core/Select/Select.js

@@ -140,7 +140,7 @@ export var Select = function (props) {
         return options.find(function (option) { return option.value === value; });
     }, [options, value]);
     return (React.createElement("div", __assign({ className: cx('iui-input-with-icon', className), "aria-expanded": isOpen, "aria-haspopup": 'listbox', style: style }, rest),
-        React.createElement(DropdownMenu, __assign({ menuItems: menuItems, placement: 'bottom-start', className: cx('iui-scroll', menuClassName), style: __assign({ minWidth: minWidth, maxWidth: "min(".concat(minWidth * 2, "px, 90vw)"), maxHeight: "300px" }, menuStyle), role: 'listbox', onShow: onShowHandler, onHide: onHideHandler, disabled: disabled }, popoverProps, { visible: isOpen, onClickOutside: function (_, _a) {
+        React.createElement(DropdownMenu, __assign({ menuItems: menuItems, placement: 'bottom-start', className: cx('iui-scroll', menuClassName), style: __assign({ minWidth: minWidth, maxWidth: "min(".concat(minWidth * 2, "px, 90vw)"), maxHeight: 315 }, menuStyle), role: 'listbox', onShow: onShowHandler, onHide: onHideHandler, disabled: disabled }, popoverProps, { visible: isOpen, onClickOutside: function (_, _a) {
                 var _b;
                 var target = _a.target;
                 if (!((_b = toggleButtonRef.current) === null || _b === void 0 ? void 0 : _b.contains(target))) {