@itwin/itwinui-react 1.37.3 → 1.39.0

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

@@ -17,5 +17,5 @@ export declare type ColorSwatchProps = {
  * <ColorSwatch color='#23450b' onClick={onClick}/>
  * <ColorSwatch color={{ r: 255, g: 255, b: 0 }} onClick={onClick}/>
  */
-export declare const ColorSwatch: React.ForwardRefExoticComponent<Pick<ColorSwatchProps, "dir" | "slot" | "style" | "title" | "id" | "aria-disabled" | "role" | "children" | "className" | "onClick" | "accessKey" | "draggable" | "hidden" | "lang" | "translate" | "prefix" | "contentEditable" | "inputMode" | "tabIndex" | "onFocus" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "color" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "key" | "contextMenu" | "placeholder" | "spellCheck" | "radioGroup" | "about" | "datatype" | "inlist" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "is" | "isActive"> & React.RefAttributes<HTMLDivElement>>;
+export declare const ColorSwatch: React.ForwardRefExoticComponent<Pick<ColorSwatchProps, "dir" | "slot" | "style" | "title" | "id" | "aria-disabled" | "children" | "role" | "className" | "onClick" | "accessKey" | "draggable" | "hidden" | "lang" | "translate" | "prefix" | "contentEditable" | "inputMode" | "tabIndex" | "onFocus" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "color" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "key" | "contextMenu" | "placeholder" | "spellCheck" | "radioGroup" | "about" | "datatype" | "inlist" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "is" | "isActive"> & React.RefAttributes<HTMLDivElement>>;
 export default ColorSwatch;

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

@@ -40,8 +40,10 @@ export declare type ComboBoxProps<T> = {
     emptyStateMessage?: string;
     /**
      * A custom item renderer can be specified to control the rendering.
-     * This function should ideally return a customized version of `MenuItem`,
-     * otherwise you will need to make sure to provide styling for the `isFocused` state.
+     *
+     * For keyboard navigation to work, the returned element should use the `id` provided by this function.
+     * The `isFocused` state is calculated using this `id` and can be used for specifying the focus styling.
+     * If a `MenuItem` is returned, then focus styling is automatically handled.
      */
     itemRenderer?: (option: SelectOption<T>, states: {
         isSelected: boolean;
@@ -49,6 +51,13 @@ 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;
 } & 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

@@ -26,13 +26,22 @@ var __rest = (this && this.__rest) || function (s, e) {
  *--------------------------------------------------------------------------------------------*/
 import React from 'react';
 import cx from 'classnames';
-import { Input } from '../Input';
-import { Menu, MenuExtraContent, MenuItem } from '../Menu';
+import { MenuExtraContent } from '../Menu';
 import { Text } from '../Typography';
-import { InputContainer, useTheme, Popover, getFocusableElements, getRandomValue, mergeRefs, } from '../utils';
-import SvgCaretDownSmall from '@itwin/itwinui-icons-react/cjs/icons/CaretDownSmall';
+import { useTheme, getRandomValue, mergeRefs, } from '../utils';
 import 'tippy.js/animations/shift-away.css';
-import { StatusMessage } from '../StatusMessage';
+import { ComboBoxActionContext, comboBoxReducer, ComboBoxRefsContext, ComboBoxStateContext, } from './helpers';
+import { ComboBoxDropdown } from './ComboBoxDropdown';
+import { ComboBoxEndIcon } from './ComboBoxEndIcon';
+import { ComboBoxInput } from './ComboBoxInput';
+import { ComboBoxInputContainer } from './ComboBoxInputContainer';
+import { ComboBoxMenu } from './ComboBoxMenu';
+import { ComboBoxMenuItem } from './ComboBoxMenuItem';
+/** Returns either `option.id` or derives a stable id using `idPrefix` and `option.label` (without whitespace) */
+var getOptionId = function (option, idPrefix) {
+    var _a;
+    return (_a = option.id) !== null && _a !== void 0 ? _a : "".concat(idPrefix, "-option-").concat(option.label.replace(/\s/g, '-'));
+};
 /**
  * ComboBox component that allows typing a value to filter the options in dropdown list.
  * Values can be selected either using mouse clicks or using the Enter key.
@@ -47,272 +56,155 @@ import { StatusMessage } from '../StatusMessage';
  * />
  */
 export var ComboBox = function (props) {
-    var options = props.options, value = props.value, onChange = props.onChange, filterFunction = props.filterFunction, className = props.className, inputProps = props.inputProps, dropdownMenuProps = props.dropdownMenuProps, message = props.message, status = props.status, _a = props.emptyStateMessage, emptyStateMessage = _a === void 0 ? 'No options found' : _a, itemRenderer = props.itemRenderer, rest = __rest(props, ["options", "value", "onChange", "filterFunction", "className", "inputProps", "dropdownMenuProps", "message", "status", "emptyStateMessage", "itemRenderer"]);
+    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, _c = props.enableVirtualization, enableVirtualization = _c === void 0 ? false : _c, rest = __rest(props, ["options", "value", "onChange", "filterFunction", "inputProps", "dropdownMenuProps", "emptyStateMessage", "itemRenderer", "enableVirtualization"]);
     // Generate a stateful random id if not specified
     var id = React.useState(function () {
         var _a, _b;
         return (_b = (_a = props.id) !== null && _a !== void 0 ? _a : ((inputProps === null || inputProps === void 0 ? void 0 : inputProps.id) && "".concat(inputProps.id, "-cb"))) !== null && _b !== void 0 ? _b : "iui-cb-".concat(getRandomValue(10));
     })[0];
     useTheme();
-    /** Generates a memoized id for an option, given the index from original list */
-    var getOptionId = React.useCallback(function (index) {
-        var _a;
-        return (_a = options[index].id) !== null && _a !== void 0 ? _a : "".concat(id, "-option").concat(options.findIndex(function (_a) {
-            var value = _a.value;
-            return value === options[index].value;
-        }));
-    }, [options, id]);
-    var userOnChange = React.useRef(onChange);
+    // Refs get set in subcomponents
+    var inputRef = React.useRef(null);
+    var menuRef = React.useRef(null);
+    var toggleButtonRef = React.useRef(null);
+    // Latest value of the onChange prop
+    var onChangeProp = React.useRef(onChange);
     React.useEffect(function () {
-        userOnChange.current = onChange;
+        onChangeProp.current = onChange;
     }, [onChange]);
-    var memoizedItems = React.useMemo(function () {
-        return options.map(function (option, index) {
-            var label = option.label, value = option.value, rest = __rest(option, ["label", "value"]);
-            var additionalProps = {
-                value: value,
-                role: 'option',
-                onClick: function () {
-                    var _a;
-                    setSelectedValue(value);
-                    (_a = userOnChange.current) === null || _a === void 0 ? void 0 : _a.call(userOnChange, value);
-                    setIsOpen(false);
-                },
+    // Record to store all extra information (e.g. original indexes), where the key is the id of the option
+    var optionsExtraInfoRef = React.useRef({});
+    // Clear the extra info when the options change so that it can be reinitialized below
+    React.useEffect(function () {
+        optionsExtraInfoRef.current = {};
+    }, [options]);
+    // Initialize the extra info only if it is not already initialized
+    if (options.length > 0 &&
+        Object.keys(optionsExtraInfoRef.current).length === 0) {
+        options.forEach(function (option, index) {
+            optionsExtraInfoRef.current[getOptionId(option, id)] = {
+                __originalIndex: index,
             };
-            if (itemRenderer) {
-                return React.cloneElement(itemRenderer(option, {
-                    id: getOptionId(index),
-                    index: index,
-                    isSelected: false,
-                    isFocused: false,
-                }), additionalProps);
-            }
-            return (React.createElement(MenuItem, __assign({ id: getOptionId(index), key: getOptionId(index) }, additionalProps, rest), label));
         });
-    }, [options, getOptionId, itemRenderer]);
-    var inputRef = React.useRef(null);
-    var menuRef = React.useRef(null);
-    var toggleButtonRef = React.useRef(null);
-    var _b = React.useState(false), isOpen = _b[0], setIsOpen = _b[1];
+    }
+    // Reducer where all the component-wide state is stored
+    var _d = React.useReducer(comboBoxReducer, {
+        isOpen: false,
+        selectedIndex: -1,
+        focusedIndex: -1,
+    }), _e = _d[0], isOpen = _e.isOpen, selectedIndex = _e.selectedIndex, focusedIndex = _e.focusedIndex, dispatch = _d[1];
+    React.useEffect(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 {
+            // Reset the focused index
+            dispatch(['focus']);
+            // Reset the input value
+            setInputValue(selectedIndex != undefined && selectedIndex >= 0
+                ? (_b = options[selectedIndex]) === null || _b === void 0 ? void 0 : _b.label
+                : '');
+        }
+    }, [isOpen, options, selectedIndex]);
     // Set min-width of menu to be same as input
-    var _c = React.useState(0), minWidth = _c[0], setMinWidth = _c[1];
+    var _f = React.useState(0), minWidth = _f[0], setMinWidth = _f[1];
     React.useEffect(function () {
         if (inputRef.current) {
             setMinWidth(inputRef.current.offsetWidth);
         }
     }, [isOpen]);
-    var _d = React.useState(options), filteredOptions = _d[0], setFilteredOptions = _d[1];
+    // Initialize filtered options to the latest value options
+    var _g = React.useState(options), filteredOptions = _g[0], setFilteredOptions = _g[1];
     React.useEffect(function () {
         setFilteredOptions(options);
+        dispatch(['focus']);
     }, [options]);
-    var _e = React.useState(function () {
-        return options.findIndex(function (option) { return value === option.value; });
-    }), focusedIndex = _e[0], setFocusedIndex = _e[1];
-    // Maintain internal selected value state synced with `value` prop
-    var _f = React.useState(value), selectedValue = _f[0], setSelectedValue = _f[1];
-    React.useEffect(function () {
-        setSelectedValue(value);
-    }, [value]);
-    // Controlled input value
-    var _g = React.useState(''), inputValue = _g[0], setInputValue = _g[1];
-    var onInput = React.useCallback(function (event) {
-        var _a;
-        setInputValue(event.target.value);
-        (_a = inputProps === null || inputProps === void 0 ? void 0 : inputProps.onChange) === null || _a === void 0 ? void 0 : _a.call(inputProps, event);
-    }, [inputProps]);
-    // update inputValue and focusedIndex every time selected value changes
+    // Filter options based on input value
+    var _h = React.useState((_a = inputProps === null || inputProps === void 0 ? void 0 : inputProps.value) !== null && _a !== void 0 ? _a : ''), inputValue = _h[0], setInputValue = _h[1];
+    var handleOnInput = React.useCallback(function (event) {
+        var _a, _b;
+        var value = event.currentTarget.value;
+        setInputValue(value);
+        dispatch(['open']); // reopen when typing
+        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, focusedIndex, inputProps, options]);
+    // When the value prop changes, update the selectedIndex
     React.useEffect(function () {
-        var _a;
-        var selectedOption = options.find(function (_a) {
-            var value = _a.value;
-            return value === selectedValue;
-        });
-        setInputValue((_a = selectedOption === null || selectedOption === void 0 ? void 0 : selectedOption.label) !== null && _a !== void 0 ? _a : '');
-        setFocusedIndex(selectedOption ? options.indexOf(selectedOption) : -1);
-    }, [selectedValue, options]);
-    // Filter options and update focus when input value changes
+        dispatch([
+            'select',
+            options.findIndex(function (option) { return option.value === valueProp; }),
+        ]);
+    }, [options, valueProp]);
+    // Call user-defined onChange when the value actually changes
     React.useEffect(function () {
-        var _a;
-        if (!isOpen) {
-            return;
-        }
-        // if input is empty or same as selected value, show the whole list
-        var selectedOption = options.find(function (_a) {
-            var value = _a.value;
-            return value === selectedValue;
-        });
-        if (!inputValue || (selectedOption === null || selectedOption === void 0 ? void 0 : selectedOption.label) === inputValue) {
-            setFilteredOptions(options);
-            return;
-        }
-        var _filteredOptions = (_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 === null || inputValue === void 0 ? void 0 : inputValue.trim().toLowerCase());
-        });
-        setFilteredOptions(_filteredOptions);
-        setFocusedIndex(function (previouslyFocusedIndex) {
-            if (_filteredOptions.includes(options[previouslyFocusedIndex])) {
-                return previouslyFocusedIndex;
-            }
-            else if (_filteredOptions.find(function (_a) {
-                var value = _a.value;
-                return value === selectedValue;
-            })) {
-                return options.findIndex(function (_a) {
-                    var value = _a.value;
-                    return value === selectedValue;
-                });
-            }
-            else {
-                return -1; // reset focus if previously focused or selected value is not in filtered list
+        var _a, _b;
+        if (selectedIndex != undefined && selectedIndex >= 0) {
+            var value = (_a = options[selectedIndex]) === null || _a === void 0 ? void 0 : _a.value;
+            if (value === valueProp) {
+                return;
             }
-        });
-    }, [inputValue, options, selectedValue, isOpen, filterFunction]);
-    var onKeyDown = React.useCallback(function (event) {
-        var _a;
-        var focusableOptions = getFocusableElements(menuRef.current);
-        var focusedIndexInFilteredList = focusableOptions.findIndex(function (_a) {
-            var _b;
-            var id = _a.id;
-            return id === ((_b = inputRef.current) === null || _b === void 0 ? void 0 : _b.getAttribute('aria-activedescendant'));
-        });
-        switch (event.key) {
-            case 'ArrowDown':
-                if (isOpen) {
-                    var nextIndex_1 = Math.min(focusedIndexInFilteredList + 1, focusableOptions.length - 1);
-                    setFocusedIndex(options.findIndex(function (_, index) {
-                        return getOptionId(index) === focusableOptions[nextIndex_1].id;
-                    }));
-                }
-                else {
-                    setIsOpen(true); // reopen menu if closed when typing
-                }
-                event.preventDefault();
-                event.stopPropagation();
-                break;
-            case 'ArrowUp':
-                if (isOpen) {
-                    var previousIndex_1 = Math.max(focusedIndexInFilteredList - 1, 0);
-                    setFocusedIndex(options.findIndex(function (_, index) {
-                        return getOptionId(index) === focusableOptions[previousIndex_1].id;
-                    }));
-                }
-                event.preventDefault();
-                event.stopPropagation();
-                break;
-            case 'Enter':
-                if (isOpen) {
-                    setSelectedValue(options[focusedIndex].value);
-                    (_a = userOnChange.current) === null || _a === void 0 ? void 0 : _a.call(userOnChange, options[focusedIndex].value);
-                }
-                setIsOpen(function (open) { return !open; });
-                event.preventDefault();
-                event.stopPropagation();
-                break;
-            case 'Escape':
-                setIsOpen(false);
-                event.preventDefault();
-                event.stopPropagation();
-                break;
-            case 'Tab':
-                setIsOpen(false);
-                break;
-            default:
-                if (!isOpen) {
-                    setIsOpen(true); // reopen menu if closed when typing
-                }
-                break;
-        }
-    }, [focusedIndex, isOpen, options, getOptionId]);
-    var menuItems = React.useMemo(function () {
-        if (filteredOptions.length === 0) {
-            return [
-                React.createElement(MenuExtraContent, { key: 0 },
-                    React.createElement(Text, { isMuted: true }, emptyStateMessage)),
-            ];
+            (_b = onChangeProp.current) === null || _b === void 0 ? void 0 : _b.call(onChangeProp, value);
         }
-        return filteredOptions.map(function (option) {
-            var _a;
-            var index = options.findIndex(function (_a) {
-                var value = _a.value;
-                return option.value === value;
-            });
-            if (index < 0) {
-                return React.createElement(React.Fragment, null);
-            }
-            var id = getOptionId(index);
-            var isSelected = selectedValue === option.value;
-            var isFocused = focusedIndex === index;
-            var focusScrollRef = function (el) {
-                return isFocused && (el === null || el === void 0 ? void 0 : el.scrollIntoView({ block: 'nearest' }));
-            };
-            if (isSelected || isFocused) {
-                var item = (_a = itemRenderer === null || itemRenderer === void 0 ? void 0 : itemRenderer(option, { index: index, id: id, isSelected: isSelected, isFocused: isFocused })) !== null && _a !== void 0 ? _a : React.cloneElement(memoizedItems[index], { isSelected: isSelected });
-                return React.cloneElement(item, {
-                    className: cx({ 'iui-focused': isFocused }, item.props.className),
-                    ref: mergeRefs(focusScrollRef, item.props.ref),
-                    value: option.value,
-                    role: 'option',
-                    onClick: function () {
-                        var _a;
-                        setSelectedValue(option.value);
-                        (_a = userOnChange.current) === null || _a === void 0 ? void 0 : _a.call(userOnChange, option.value);
-                        setIsOpen(false);
-                    },
-                });
-            }
-            return memoizedItems[index];
-        });
-    }, [
-        filteredOptions,
-        emptyStateMessage,
-        options,
-        getOptionId,
-        selectedValue,
-        focusedIndex,
-        itemRenderer,
-        memoizedItems,
-    ]);
-    return (React.createElement(InputContainer, __assign({ className: className, status: status, statusMessage: typeof message === 'string' ? (React.createElement(StatusMessage, { status: status }, message)) : (React.isValidElement(message) &&
-            React.cloneElement(message, { status: status })) }, rest, { id: id }),
-        React.createElement("div", { className: 'iui-input-with-icon' },
-            React.createElement(Popover, __assign({ placement: 'bottom-start', visible: isOpen, onClickOutside: function (_, _a) {
-                    var _b;
-                    var target = _a.target;
-                    if (!((_b = toggleButtonRef.current) === null || _b === void 0 ? void 0 : _b.contains(target))) {
-                        setIsOpen(false);
-                    }
-                }, animation: 'shift-away', duration: 200 }, dropdownMenuProps, { content: React.createElement(Menu, { id: "".concat(id, "-list"), className: 'iui-scroll', style: {
-                        minWidth: minWidth,
-                        maxWidth: "min(".concat(minWidth * 2, "px, 90vw)"),
-                        maxHeight: 300,
-                    }, setFocus: false, role: 'listbox', ref: menuRef }, menuItems), onHide: function (instance) {
-                    var _a;
-                    var selectedIndex = options.findIndex(function (_a) {
-                        var value = _a.value;
-                        return value === selectedValue;
-                    });
-                    setFocusedIndex(selectedIndex);
-                    if (selectedIndex > -1) {
-                        setInputValue(options[selectedIndex].label); // update input value to be same as selected value
-                    }
-                    (_a = dropdownMenuProps === null || dropdownMenuProps === void 0 ? void 0 : dropdownMenuProps.onHide) === null || _a === void 0 ? void 0 : _a.call(dropdownMenuProps, instance);
-                } }),
-                React.createElement(Input, __assign({ ref: inputRef, onKeyDown: onKeyDown, onFocus: function () { return setIsOpen(true); }, value: inputValue, "aria-activedescendant": isOpen && focusedIndex > -1
-                        ? getOptionId(focusedIndex)
-                        : undefined, role: 'combobox', "aria-controls": isOpen ? "".concat(id, "-list") : undefined, "aria-autocomplete": 'list', spellCheck: false, autoCapitalize: 'none', autoCorrect: 'off' }, inputProps, { onChange: onInput }))),
-            React.createElement("span", { ref: toggleButtonRef, className: cx('iui-end-icon', {
-                    'iui-actionable': !(inputProps === null || inputProps === void 0 ? void 0 : inputProps.disabled),
-                    'iui-disabled': inputProps === null || inputProps === void 0 ? void 0 : inputProps.disabled,
-                    'iui-open': isOpen,
-                }), onClick: function () {
-                    var _a;
-                    if (isOpen) {
-                        setIsOpen(false);
-                    }
-                    else {
-                        (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
-                    }
+    }, [options, selectedIndex, valueProp]);
+    var getMenuItem = React.useCallback(function (option, filteredIndex) {
+        var optionId = getOptionId(option, id);
+        var __originalIndex = optionsExtraInfoRef.current[optionId].__originalIndex;
+        var customItem = itemRenderer
+            ? itemRenderer(option, {
+                isFocused: focusedIndex === __originalIndex,
+                isSelected: selectedIndex === __originalIndex,
+                index: __originalIndex,
+                id: optionId,
+            })
+            : null;
+        return customItem ? (React.cloneElement(customItem, {
+            onClick: function (e) {
+                var _a, _b;
+                dispatch(['select', __originalIndex]);
+                (_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
+            // but we still need to pass them here for backwards compatibility with MenuItem
+            className: cx(customItem.props.className, {
+                'iui-focused': focusedIndex === __originalIndex,
+            }),
+            'data-iui-index': __originalIndex,
+            'data-iui-filtered-index': filteredIndex,
+            ref: mergeRefs(customItem.props.ref, function (el) {
+                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, "data-iui-filtered-index": filteredIndex }), option.label));
+    }, [enableVirtualization, focusedIndex, id, itemRenderer, selectedIndex]);
+    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,
+                    enableVirtualization: enableVirtualization,
+                    filteredOptions: filteredOptions,
+                    getMenuItem: getMenuItem,
                 } },
-                React.createElement(SvgCaretDownSmall, { "aria-hidden": true })))));
+                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 && !enableVirtualization ? (filteredOptions.map(getMenuItem)) : (React.createElement(MenuExtraContent, null,
+                        React.createElement(Text, { isMuted: true }, emptyStateMessage)))))))));
 };
 export default ComboBox;

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

@@ -0,0 +1,7 @@
+import React from 'react';
+import { PopoverProps } from '../utils';
+declare type ComboBoxDropdownProps = PopoverProps & {
+    children: JSX.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/ComboBoxDropdown.js

@@ -0,0 +1,49 @@
+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 { Popover, useSafeContext } from '../utils';
+import { ComboBoxStateContext, ComboBoxActionContext, ComboBoxRefsContext, } from './helpers';
+export var ComboBoxDropdown = React.forwardRef(function (props, forwardedRef) {
+    var children = props.children, rest = __rest(props, ["children"]);
+    var isOpen = useSafeContext(ComboBoxStateContext).isOpen;
+    var dispatch = useSafeContext(ComboBoxActionContext);
+    var _a = useSafeContext(ComboBoxRefsContext), inputRef = _a.inputRef, toggleButtonRef = _a.toggleButtonRef;
+    // sync internal isOpen state with user's visible prop
+    React.useEffect(function () {
+        if (props.visible != undefined) {
+            dispatch([props.visible ? 'open' : 'close']);
+        }
+    }, [dispatch, props.visible]);
+    return (React.createElement(Popover, __assign({ placement: 'bottom-start', visible: isOpen, onClickOutside: React.useCallback(function (_, _a) {
+            var _b;
+            var target = _a.target;
+            if (!((_b = toggleButtonRef.current) === null || _b === void 0 ? void 0 : _b.contains(target))) {
+                dispatch(['close']);
+            }
+        }, [dispatch, toggleButtonRef]), animation: 'shift-away', duration: 200, reference: inputRef, ref: forwardedRef, content: children }, rest)));
+});
+ComboBoxDropdown.displayName = 'ComboBoxDropdown';

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

@@ -0,0 +1,5 @@
+import React from 'react';
+export declare const ComboBoxEndIcon: React.ForwardRefExoticComponent<Pick<React.DetailedHTMLProps<React.HTMLAttributes<HTMLSpanElement>, HTMLSpanElement>, "key" | keyof React.HTMLAttributes<HTMLSpanElement>> & {
+    disabled?: boolean | undefined;
+    isOpen?: boolean | undefined;
+} & React.RefAttributes<HTMLSpanElement>>;

package/esm/core/ComboBox/ComboBoxEndIcon.js

@@ -0,0 +1,48 @@
+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 cx from 'classnames';
+import React from 'react';
+import { useSafeContext, useMergedRefs } from '../utils';
+import { ComboBoxActionContext, ComboBoxRefsContext } from './helpers';
+import SvgCaretDownSmall from '@itwin/itwinui-icons-react/cjs/icons/CaretDownSmall';
+export var ComboBoxEndIcon = React.forwardRef(function (props, forwardedRef) {
+    var className = props.className, children = props.children, onClickProp = props.onClick, disabled = props.disabled, isOpen = props.isOpen, rest = __rest(props, ["className", "children", "onClick", "disabled", "isOpen"]);
+    var dispatch = useSafeContext(ComboBoxActionContext);
+    var toggleButtonRef = useSafeContext(ComboBoxRefsContext).toggleButtonRef;
+    var refs = useMergedRefs(toggleButtonRef, forwardedRef);
+    return (React.createElement("span", __assign({ ref: refs, className: cx('iui-end-icon', {
+            'iui-actionable': !disabled,
+            'iui-disabled': disabled,
+            'iui-open': isOpen,
+        }, className), onClick: function (e) {
+            onClickProp === null || onClickProp === void 0 ? void 0 : onClickProp(e);
+            if (!e.isDefaultPrevented()) {
+                dispatch([isOpen ? 'close' : 'open']);
+            }
+        } }, rest), children !== null && children !== void 0 ? children : React.createElement(SvgCaretDownSmall, { "aria-hidden": true })));
+});
+ComboBoxEndIcon.displayName = 'ComboBoxEndIcon';

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

@@ -0,0 +1,5 @@
+import React from 'react';
+export declare const ComboBoxInput: React.ForwardRefExoticComponent<{
+    setFocus?: boolean | undefined;
+    size?: "small" | "large" | undefined;
+} & Omit<React.InputHTMLAttributes<HTMLInputElement>, "size"> & React.RefAttributes<HTMLInputElement>>;