@itwin/itwinui-react 2.0.4 → 2.1.1

package/esm/core/ComboBox/ComboBox.js

@@ -5,6 +5,7 @@
 import React from 'react';
 import cx from 'classnames';
 import { MenuExtraContent } from '../Menu';
+import SelectTag from '../Select/SelectTag';
 import { Text } from '../Typography';
 import { useTheme, getRandomValue, mergeRefs, useLatestRef, useIsomorphicLayoutEffect, } from '../utils';
 import 'tippy.js/animations/shift-away.css';
@@ -15,6 +16,14 @@ import { ComboBoxInput } from './ComboBoxInput';
 import { ComboBoxInputContainer } from './ComboBoxInputContainer';
 import { ComboBoxMenu } from './ComboBoxMenu';
 import { ComboBoxMenuItem } from './ComboBoxMenuItem';
+// Type guard for enabling multiple
+const isMultipleEnabled = (variable, multiple) => {
+    return multiple && (Array.isArray(variable) || variable === undefined);
+};
+// Type guard for user onChange
+const isSingleOnChange = (onChange, multiple) => {
+    return !multiple;
+};
 /** Returns either `option.id` or derives a stable id using `idPrefix` and `option.label` (without whitespace) */
 const getOptionId = (option, idPrefix) => {
     var _a;
@@ -35,7 +44,7 @@ const getOptionId = (option, idPrefix) => {
  */
 export const ComboBox = (props) => {
     var _a, _b;
-    const { options, value: valueProp, onChange, filterFunction, inputProps, dropdownMenuProps, emptyStateMessage = 'No options found', itemRenderer, enableVirtualization = false, onShow, onHide, ...rest } = props;
+    const { options, value: valueProp, onChange, filterFunction, inputProps, dropdownMenuProps, emptyStateMessage = 'No options found', itemRenderer, enableVirtualization = false, multiple = false, onShow, onHide, ...rest } = props;
     // Generate a stateful random id if not specified
     const [id] = React.useState(() => {
         var _a, _b;
@@ -46,8 +55,6 @@ export const ComboBox = (props) => {
     const inputRef = React.useRef(null);
     const menuRef = React.useRef(null);
     const toggleButtonRef = React.useRef(null);
-    const mounted = React.useRef(false);
-    const valuePropRef = useLatestRef(valueProp);
     const onChangeProp = useLatestRef(onChange);
     const optionsRef = useLatestRef(options);
     // Record to store all extra information (e.g. original indexes), where the key is the id of the option
@@ -65,12 +72,23 @@ export const ComboBox = (props) => {
             };
         });
     }
+    // Get indices of selected elements in options array when we have selected values.
+    const getSelectedIndexes = React.useCallback(() => {
+        if (isMultipleEnabled(valueProp, multiple)) {
+            const indexArray = [];
+            valueProp === null || valueProp === void 0 ? void 0 : valueProp.forEach((value) => {
+                indexArray.push(options.findIndex((option) => option.value === value));
+            });
+            return indexArray;
+        }
+        else {
+            return options.findIndex((option) => option.value === valueProp);
+        }
+    }, [multiple, options, valueProp]);
     // Reducer where all the component-wide state is stored
-    const [{ isOpen, selectedIndex, focusedIndex }, dispatch] = React.useReducer(comboBoxReducer, {
+    const [{ isOpen, selected, focusedIndex }, dispatch] = React.useReducer(comboBoxReducer, {
         isOpen: false,
-        selectedIndex: valueProp
-            ? optionsRef.current.findIndex((option) => option.value === valueProp)
-            : -1,
+        selected: getSelectedIndexes(),
         focusedIndex: -1,
     });
     useIsomorphicLayoutEffect(() => {
@@ -78,19 +96,24 @@ export const ComboBox = (props) => {
         // When the dropdown opens
         if (isOpen) {
             (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.focus(); // Focus the input
-            setFilteredOptions(optionsRef.current); // Reset the filtered list
-            dispatch(['focus']);
+            // Reset the filtered list (does not reset when multiple enabled)
+            if (!multiple) {
+                setFilteredOptions(optionsRef.current);
+                dispatch({ type: 'focus', value: undefined });
+            }
         }
         // When the dropdown closes
         else {
             // Reset the focused index
-            dispatch(['focus']);
-            // Reset the input value
-            setInputValue(selectedIndex != undefined && selectedIndex >= 0
-                ? (_b = optionsRef.current[selectedIndex]) === null || _b === void 0 ? void 0 : _b.label
-                : '');
+            dispatch({ type: 'focus', value: undefined });
+            // Reset the input value if not multiple
+            if (!isMultipleEnabled(selected, multiple)) {
+                setInputValue(selected != undefined && selected >= 0
+                    ? (_b = optionsRef.current[selected]) === null || _b === void 0 ? void 0 : _b.label
+                    : '');
+            }
         }
-    }, [isOpen, optionsRef, selectedIndex]);
+    }, [isOpen, multiple, optionsRef, selected]);
     // Set min-width of menu to be same as input
     const [minWidth, setMinWidth] = React.useState(0);
     React.useEffect(() => {
@@ -108,7 +131,7 @@ export const ComboBox = (props) => {
         else {
             setFilteredOptions(options);
         }
-        dispatch(['focus']);
+        dispatch({ type: 'focus', value: undefined });
         // Only need to call on options update
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [options]);
@@ -118,41 +141,101 @@ export const ComboBox = (props) => {
         var _a, _b;
         const { value } = event.currentTarget;
         setInputValue(value);
-        dispatch(['open']); // reopen when typing
+        dispatch({ type: 'open' }); // reopen when typing
         setFilteredOptions((_a = filterFunction === null || filterFunction === void 0 ? void 0 : filterFunction(optionsRef.current, value)) !== null && _a !== void 0 ? _a : optionsRef.current.filter((option) => option.label.toLowerCase().includes(value.toLowerCase())));
         if (focusedIndex != -1) {
-            dispatch(['focus', -1]);
+            dispatch({ type: 'focus', value: -1 });
         }
         (_b = inputProps === null || inputProps === void 0 ? void 0 : inputProps.onChange) === null || _b === void 0 ? void 0 : _b.call(inputProps, event);
     }, [filterFunction, focusedIndex, inputProps, optionsRef]);
-    // When the value prop changes, update the selectedIndex
+    // When the value prop changes, update the selected index/indices
     React.useEffect(() => {
-        dispatch([
-            'select',
-            options.findIndex((option) => option.value === valueProp),
-        ]);
-    }, [options, valueProp]);
-    // Call user-defined onChange when the value actually changes
-    React.useEffect(() => {
-        var _a, _b;
-        // Prevent user-defined onChange to be called on mount
-        if (!mounted.current) {
-            mounted.current = true;
-            return;
+        if (isMultipleEnabled(valueProp, multiple)) {
+            if (valueProp) {
+                // If user provided array of selected values
+                const indexes = valueProp.map((value) => {
+                    return options.findIndex((option) => option.value === value);
+                });
+                dispatch({
+                    type: 'multiselect',
+                    value: indexes.filter((index) => index !== -1), // Add available options
+                });
+            }
+            else {
+                // if user provided one value or undefined
+                dispatch({
+                    type: 'multiselect',
+                    value: [], // Add empty list
+                });
+            }
+        }
+        else {
+            dispatch({
+                type: 'select',
+                value: options.findIndex((option) => option.value === valueProp),
+            });
+        }
+    }, [valueProp, options, multiple]);
+    const isMenuItemSelected = React.useCallback((index) => {
+        if (isMultipleEnabled(selected, multiple)) {
+            return !!selected.includes(index);
         }
-        const currentValue = (_a = optionsRef.current[selectedIndex]) === null || _a === void 0 ? void 0 : _a.value;
-        if (currentValue === valuePropRef.current || selectedIndex === -1) {
-            return;
+        else {
+            return selected === index;
+        }
+    }, [multiple, selected]);
+    // Generates new array when item is added or removed
+    const selectedChangeHandler = React.useCallback((__originalIndex, action) => {
+        if (action === 'added') {
+            return [...selected, __originalIndex];
+        }
+        else {
+            return selected.filter((index) => index !== __originalIndex);
+        }
+    }, [selected]);
+    // Calls user defined onChange
+    const onChangeHandler = React.useCallback((__originalIndex, actionType, newArray) => {
+        var _a, _b, _c, _d;
+        if (isSingleOnChange(onChangeProp.current, multiple)) {
+            (_a = onChangeProp.current) === null || _a === void 0 ? void 0 : _a.call(onChangeProp, (_b = optionsRef.current[__originalIndex]) === null || _b === void 0 ? void 0 : _b.value);
+        }
+        else {
+            actionType &&
+                newArray &&
+                ((_c = onChangeProp.current) === null || _c === void 0 ? void 0 : _c.call(onChangeProp, newArray === null || newArray === void 0 ? void 0 : newArray.map((item) => { var _a; return (_a = optionsRef.current[item]) === null || _a === void 0 ? void 0 : _a.value; }), {
+                    value: (_d = optionsRef.current[__originalIndex]) === null || _d === void 0 ? void 0 : _d.value,
+                    type: actionType,
+                }));
+        }
+    }, [multiple, onChangeProp, optionsRef]);
+    const onClickHandler = React.useCallback((__originalIndex) => {
+        if (isMultipleEnabled(selected, multiple)) {
+            const actionType = isMenuItemSelected(__originalIndex)
+                ? 'removed'
+                : 'added';
+            const newArray = selectedChangeHandler(__originalIndex, actionType);
+            dispatch({ type: 'multiselect', value: newArray });
+            onChangeHandler(__originalIndex, actionType, newArray);
+        }
+        else {
+            dispatch({ type: 'select', value: __originalIndex });
+            dispatch({ type: 'close' });
+            onChangeHandler(__originalIndex);
         }
-        (_b = onChangeProp.current) === null || _b === void 0 ? void 0 : _b.call(onChangeProp, currentValue);
-    }, [onChangeProp, optionsRef, selectedIndex, valuePropRef]);
+    }, [
+        selectedChangeHandler,
+        isMenuItemSelected,
+        multiple,
+        onChangeHandler,
+        selected,
+    ]);
     const getMenuItem = React.useCallback((option, filteredIndex) => {
         const optionId = getOptionId(option, id);
         const { __originalIndex } = optionsExtraInfoRef.current[optionId];
         const customItem = itemRenderer
             ? itemRenderer(option, {
                 isFocused: focusedIndex === __originalIndex,
-                isSelected: selectedIndex === __originalIndex,
+                isSelected: selected === __originalIndex,
                 index: __originalIndex,
                 id: optionId,
             })
@@ -160,8 +243,7 @@ export const ComboBox = (props) => {
         return customItem ? (React.cloneElement(customItem, {
             onClick: (e) => {
                 var _a, _b;
-                dispatch(['select', __originalIndex]);
-                dispatch(['close']);
+                onClickHandler(__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
@@ -176,11 +258,18 @@ export const ComboBox = (props) => {
                     el === null || el === void 0 ? void 0 : el.scrollIntoView({ block: 'nearest' });
                 }
             }),
-        })) : (React.createElement(ComboBoxMenuItem, { key: optionId, id: optionId, ...option, isSelected: selectedIndex === __originalIndex, onClick: () => {
-                dispatch(['select', __originalIndex]);
-                dispatch(['close']);
+        })) : (React.createElement(ComboBoxMenuItem, { key: optionId, id: optionId, ...option, isSelected: isMenuItemSelected(__originalIndex), onClick: () => {
+                onClickHandler(__originalIndex);
             }, index: __originalIndex, "data-iui-filtered-index": filteredIndex }, option.label));
-    }, [enableVirtualization, focusedIndex, id, itemRenderer, selectedIndex]);
+    }, [
+        enableVirtualization,
+        focusedIndex,
+        id,
+        isMenuItemSelected,
+        itemRenderer,
+        onClickHandler,
+        selected,
+    ]);
     const emptyContent = React.useMemo(() => (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, menuRef, toggleButtonRef, optionsExtraInfoRef } },
@@ -190,12 +279,20 @@ export const ComboBox = (props) => {
                     minWidth,
                     isOpen,
                     focusedIndex,
+                    onClickHandler,
                     enableVirtualization,
                     filteredOptions,
                     getMenuItem,
+                    multiple,
                 } },
                 React.createElement(ComboBoxInputContainer, { disabled: inputProps === null || inputProps === void 0 ? void 0 : inputProps.disabled, ...rest },
-                    React.createElement(ComboBoxInput, { value: inputValue, ...inputProps, onChange: handleOnInput }),
+                    React.createElement(React.Fragment, null,
+                        React.createElement(ComboBoxInput, { value: inputValue, ...inputProps, onChange: handleOnInput, selectTags: isMultipleEnabled(selected, multiple)
+                                ? selected.map((index) => {
+                                    const item = optionsRef.current[index];
+                                    return (React.createElement(SelectTag, { key: item.label, label: item.label }));
+                                })
+                                : undefined })),
                     React.createElement(ComboBoxEndIcon, { disabled: inputProps === null || inputProps === void 0 ? void 0 : inputProps.disabled, isOpen: isOpen })),
                 React.createElement(ComboBoxDropdown, { ...dropdownMenuProps, onShow: onShow, onHide: onHide },
                     React.createElement(ComboBoxMenu, null, filteredOptions.length > 0 && !enableVirtualization

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

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

package/esm/core/ComboBox/ComboBoxDropdown.js

@@ -13,13 +13,13 @@ export const ComboBoxDropdown = React.forwardRef((props, forwardedRef) => {
     // sync internal isOpen state with user's visible prop
     React.useEffect(() => {
         if (props.visible != undefined) {
-            dispatch([props.visible ? 'open' : 'close']);
+            dispatch({ type: props.visible ? 'open' : 'close' });
         }
     }, [dispatch, props.visible]);
     return (React.createElement(Popover, { placement: 'bottom-start', visible: isOpen, onClickOutside: React.useCallback((_, { target }) => {
             var _a;
             if (!((_a = toggleButtonRef.current) === null || _a === void 0 ? void 0 : _a.contains(target))) {
-                dispatch(['close']);
+                dispatch({ type: 'close' });
             }
         }, [dispatch, toggleButtonRef]), animation: 'shift-away', duration: 200, reference: inputRef, ref: forwardedRef, content: children, ...rest }));
 });

package/esm/core/ComboBox/ComboBoxEndIcon.js

@@ -18,7 +18,7 @@ export const ComboBoxEndIcon = React.forwardRef((props, forwardedRef) => {
         }, className), onClick: (e) => {
             onClickProp === null || onClickProp === void 0 ? void 0 : onClickProp(e);
             if (!e.isDefaultPrevented()) {
-                dispatch([isOpen ? 'close' : 'open']);
+                dispatch({ type: isOpen ? 'close' : 'open' });
             }
         }, ...rest }, children !== null && children !== void 0 ? children : React.createElement(SvgCaretDownSmall, { "aria-hidden": true })));
 });

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

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

package/esm/core/ComboBox/ComboBoxInput.js

@@ -4,11 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 import React from 'react';
 import { Input } from '../Input';
-import { useSafeContext, useMergedRefs } from '../utils';
+import { useSafeContext, useMergedRefs, useContainerWidth } from '../utils';
+import { ComboBoxMultipleContainer } from './ComboBoxMultipleContainer';
 import { ComboBoxStateContext, ComboBoxActionContext, ComboBoxRefsContext, } from './helpers';
 export const ComboBoxInput = React.forwardRef((props, forwardedRef) => {
-    const { onKeyDown: onKeyDownProp, onFocus: onFocusProp, ...rest } = props;
-    const { isOpen, id, focusedIndex, enableVirtualization } = useSafeContext(ComboBoxStateContext);
+    const { onKeyDown: onKeyDownProp, onFocus: onFocusProp, selectTags, ...rest } = props;
+    const { isOpen, id, focusedIndex, enableVirtualization, multiple, onClickHandler, } = useSafeContext(ComboBoxStateContext);
     const dispatch = useSafeContext(ComboBoxActionContext);
     const { inputRef, menuRef, optionsExtraInfoRef } = useSafeContext(ComboBoxRefsContext);
     const refs = useMergedRefs(inputRef, forwardedRef);
@@ -28,17 +29,17 @@ export const ComboBoxInput = React.forwardRef((props, forwardedRef) => {
             case 'ArrowDown': {
                 event.preventDefault();
                 if (!isOpen) {
-                    return dispatch(['open']);
+                    return dispatch({ type: 'open' });
                 }
                 if (length === 0) {
                     return;
                 }
                 if (focusedIndexRef.current === -1) {
                     const currentElement = (_b = menuRef.current) === null || _b === void 0 ? void 0 : _b.querySelector('[data-iui-index]');
-                    return dispatch([
-                        'focus',
-                        Number((_c = currentElement === null || currentElement === void 0 ? void 0 : currentElement.getAttribute('data-iui-index')) !== null && _c !== void 0 ? _c : 0),
-                    ]);
+                    return dispatch({
+                        type: 'focus',
+                        value: 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 &&
@@ -51,7 +52,7 @@ export const ComboBoxInput = React.forwardRef((props, forwardedRef) => {
                     const 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]);
+                        return dispatch({ type: 'focus', value: nextIndex });
                     }
                 } while (nextIndex !== focusedIndexRef.current);
                 break;
@@ -59,7 +60,7 @@ export const ComboBoxInput = React.forwardRef((props, forwardedRef) => {
             case 'ArrowUp': {
                 event.preventDefault();
                 if (!isOpen) {
-                    return dispatch(['open']);
+                    return dispatch({ type: 'open' });
                 }
                 if (length === 0) {
                     return;
@@ -70,10 +71,10 @@ export const ComboBoxInput = React.forwardRef((props, forwardedRef) => {
                     return;
                 }
                 if (focusedIndexRef.current === -1) {
-                    return dispatch([
-                        'focus',
-                        (_m = (_l = Object.values(optionsExtraInfoRef.current)) === null || _l === void 0 ? void 0 : _l[length - 1].__originalIndex) !== null && _m !== void 0 ? _m : -1,
-                    ]);
+                    return dispatch({
+                        type: 'focus',
+                        value: (_m = (_l = Object.values(optionsExtraInfoRef.current)) === null || _l === void 0 ? void 0 : _l[length - 1].__originalIndex) !== null && _m !== void 0 ? _m : -1,
+                    });
                 }
                 let prevIndex = focusedIndexRef.current;
                 do {
@@ -81,7 +82,7 @@ export const ComboBoxInput = React.forwardRef((props, forwardedRef) => {
                     const 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]);
+                        return dispatch({ type: 'focus', value: prevIndex });
                     }
                 } while (prevIndex !== focusedIndexRef.current);
                 break;
@@ -89,21 +90,32 @@ export const ComboBoxInput = React.forwardRef((props, forwardedRef) => {
             case 'Enter': {
                 event.preventDefault();
                 if (isOpen) {
-                    dispatch(['select', focusedIndexRef.current]);
-                    dispatch(['close']);
+                    if (multiple) {
+                        // Keep menu open when multiselect is enabled and user selects an item
+                        if (focusedIndexRef.current > -1) {
+                            onClickHandler === null || onClickHandler === void 0 ? void 0 : onClickHandler(focusedIndexRef.current);
+                        }
+                        else {
+                            dispatch({ type: 'close' });
+                        }
+                    }
+                    else {
+                        onClickHandler === null || onClickHandler === void 0 ? void 0 : onClickHandler(focusedIndexRef.current);
+                        dispatch({ type: 'close' });
+                    }
                 }
                 else {
-                    dispatch(['open']);
+                    dispatch({ type: 'open' });
                 }
                 break;
             }
             case 'Escape': {
                 event.preventDefault();
-                dispatch(['close']);
+                dispatch({ type: 'close' });
                 break;
             }
             case 'Tab':
-                dispatch(['close']);
+                dispatch({ type: 'close' });
                 break;
         }
     }, [
@@ -111,15 +123,20 @@ export const ComboBoxInput = React.forwardRef((props, forwardedRef) => {
         enableVirtualization,
         isOpen,
         menuRef,
+        multiple,
+        onClickHandler,
         onKeyDownProp,
         optionsExtraInfoRef,
     ]);
     const handleFocus = React.useCallback((event) => {
-        dispatch(['open']);
+        dispatch({ type: 'open' });
         onFocusProp === null || onFocusProp === void 0 ? void 0 : onFocusProp(event);
     }, [dispatch, onFocusProp]);
-    return (React.createElement(Input, { ref: refs, onKeyDown: handleKeyDown, onFocus: handleFocus, "aria-activedescendant": isOpen && focusedIndex != undefined && focusedIndex > -1
-            ? getIdFromIndex(focusedIndex)
-            : undefined, role: 'combobox', "aria-controls": isOpen ? `${id}-list` : undefined, "aria-autocomplete": 'list', spellCheck: false, autoCapitalize: 'none', autoCorrect: 'off', ...rest }));
+    const [tagContainerWidthRef, tagContainerWidth] = useContainerWidth();
+    return (React.createElement(React.Fragment, null,
+        React.createElement(Input, { ref: refs, onKeyDown: handleKeyDown, onFocus: handleFocus, "aria-activedescendant": isOpen && focusedIndex != undefined && focusedIndex > -1
+                ? getIdFromIndex(focusedIndex)
+                : undefined, role: 'combobox', "aria-controls": isOpen ? `${id}-list` : undefined, "aria-autocomplete": 'list', spellCheck: false, autoCapitalize: 'none', autoCorrect: 'off', style: multiple ? { paddingLeft: tagContainerWidth + 18 } : {}, ...rest }),
+        multiple && selectTags && (React.createElement(ComboBoxMultipleContainer, { ref: tagContainerWidthRef, selectedItems: selectTags }))));
 });
 ComboBoxInput.displayName = 'ComboBoxInput';

package/esm/core/ComboBox/ComboBoxMenuItem.js

@@ -7,7 +7,7 @@ import React from 'react';
 import { useSafeContext, useMergedRefs } from '../utils';
 import { ComboBoxStateContext } from './helpers';
 export const ComboBoxMenuItem = React.memo(React.forwardRef((props, forwardedRef) => {
-    const { children, isSelected, disabled, value, onClick, sublabel, size = !!sublabel ? 'large' : 'default', icon, badge, className, role = 'menuitem', index, ...rest } = props;
+    const { children, isSelected, disabled, value, onClick, sublabel, size = !!sublabel ? 'large' : 'default', icon, badge, className, role = 'option', index, ...rest } = props;
     const { focusedIndex, enableVirtualization } = useSafeContext(ComboBoxStateContext);
     const focusRef = (el) => {
         if (!enableVirtualization && focusedIndex === index) {

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

@@ -0,0 +1,4 @@
+import React from 'react';
+export declare const ComboBoxMultipleContainer: React.ForwardRefExoticComponent<{
+    selectedItems?: React.ReactNode[] | undefined;
+} & Omit<Pick<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, "key" | keyof React.HTMLAttributes<HTMLDivElement>>, "children"> & React.RefAttributes<HTMLDivElement>>;

package/esm/core/ComboBox/ComboBoxMultipleContainer.js

@@ -0,0 +1,11 @@
+/*---------------------------------------------------------------------------------------------
+ * 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 SelectTagContainer from '../Select/SelectTagContainer';
+export const ComboBoxMultipleContainer = React.forwardRef((props, ref) => {
+    const { selectedItems = [], ...rest } = props;
+    return React.createElement(SelectTagContainer, { ref: ref, tags: selectedItems, ...rest });
+});
+ComboBoxMultipleContainer.displayName = 'ComboBoxMultipleContainer';

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

@@ -1,13 +1,26 @@
 import React from 'react';
 import { SelectOption } from '../Select/Select';
-declare type ComboBoxAction = 'open' | 'close' | 'select' | 'focus';
+declare type ComboBoxAction = {
+    type: 'multiselect';
+    value: number[];
+} | {
+    type: 'open';
+} | {
+    type: 'close';
+} | {
+    type: 'select';
+    value: number;
+} | {
+    type: 'focus';
+    value: number | undefined;
+};
 export declare const comboBoxReducer: (state: {
     isOpen: boolean;
-    selectedIndex: number;
+    selected: number | number[];
     focusedIndex: number;
-}, [type, value]: [ComboBoxAction] | [ComboBoxAction, number | undefined]) => {
+}, action: ComboBoxAction) => {
     isOpen: boolean;
-    selectedIndex: number;
+    selected: number | number[];
     focusedIndex: number;
 };
 export declare const ComboBoxRefsContext: React.Context<{
@@ -24,9 +37,11 @@ declare type ComboBoxStateContextProps<T = unknown> = {
     minWidth: number;
     enableVirtualization: boolean;
     filteredOptions: SelectOption<T>[];
+    onClickHandler?: (prop: number) => void;
     getMenuItem: (option: SelectOption<T>, filteredIndex?: number) => JSX.Element;
     focusedIndex?: number;
+    multiple?: boolean;
 };
 export declare const ComboBoxStateContext: React.Context<ComboBoxStateContextProps<unknown> | undefined>;
-export declare const ComboBoxActionContext: React.Context<((x: [ComboBoxAction] | [ComboBoxAction, number]) => void) | undefined>;
+export declare const ComboBoxActionContext: React.Context<((x: ComboBoxAction) => void) | undefined>;
 export {};

package/esm/core/ComboBox/helpers.js

@@ -3,9 +3,9 @@
  * See LICENSE.md in the project root for license terms and full copyright notice.
  *--------------------------------------------------------------------------------------------*/
 import React from 'react';
-export const comboBoxReducer = (state, [type, value]) => {
-    var _a;
-    switch (type) {
+export const comboBoxReducer = (state, action) => {
+    var _a, _b, _c, _d, _e;
+    switch (action.type) {
         case 'open': {
             return { ...state, isOpen: true };
         }
@@ -13,14 +13,32 @@ export const comboBoxReducer = (state, [type, value]) => {
             return { ...state, isOpen: false };
         }
         case 'select': {
+            if (Array.isArray(state.selected)) {
+                return { ...state };
+            }
             return {
                 ...state,
-                selectedIndex: value !== null && value !== void 0 ? value : state.selectedIndex,
-                focusedIndex: value !== null && value !== void 0 ? value : state.focusedIndex,
+                selected: (_a = action.value) !== null && _a !== void 0 ? _a : state.selected,
+                focusedIndex: (_b = action.value) !== null && _b !== void 0 ? _b : state.focusedIndex,
             };
         }
+        case 'multiselect': {
+            if (!Array.isArray(state.selected)) {
+                return { ...state };
+            }
+            return { ...state, selected: action.value };
+        }
         case 'focus': {
-            return { ...state, focusedIndex: (_a = value !== null && value !== void 0 ? value : state.selectedIndex) !== null && _a !== void 0 ? _a : -1 };
+            if (Array.isArray(state.selected)) {
+                return {
+                    ...state,
+                    focusedIndex: (_c = action.value) !== null && _c !== void 0 ? _c : -1,
+                };
+            }
+            return {
+                ...state,
+                focusedIndex: (_e = (_d = action.value) !== null && _d !== void 0 ? _d : state.selected) !== null && _e !== void 0 ? _e : -1,
+            };
         }
         default: {
             return state;

package/esm/core/Select/Select.js

@@ -6,9 +6,10 @@ import React from 'react';
 import cx from 'classnames';
 import { DropdownMenu } from '../DropdownMenu';
 import { MenuItem } from '../Menu/MenuItem';
-import { useTheme, useOverflow, SvgCaretDownSmall, } from '../utils';
+import { useTheme, SvgCaretDownSmall, } from '../utils';
 import '@itwin/itwinui-css/css/select.css';
 import SelectTag from './SelectTag';
+import SelectTagContainer from './SelectTagContainer';
 const isMultipleEnabled = (variable, multiple) => {
     return multiple;
 };
@@ -197,17 +198,11 @@ const MultipleSelectButton = ({ selectedItems, selectedItemsRenderer, tagRendere
         }
         return selectedItems.map((item) => tagRenderer(item));
     }, [selectedItems, tagRenderer]);
-    const [containerRef, visibleCount] = useOverflow(selectedItemsElements);
     return (React.createElement(React.Fragment, null,
         selectedItems &&
             selectedItemsRenderer &&
             selectedItemsRenderer(selectedItems),
         selectedItems && !selectedItemsRenderer && (React.createElement("span", { className: 'iui-content' },
-            React.createElement("div", { className: 'iui-select-tag-container', ref: containerRef },
-                React.createElement(React.Fragment, null,
-                    visibleCount < selectedItemsElements.length
-                        ? selectedItemsElements.slice(0, visibleCount - 1)
-                        : selectedItemsElements,
-                    visibleCount < selectedItemsElements.length && (React.createElement(SelectTag, { label: `+${selectedItemsElements.length - visibleCount + 1} item(s)` }))))))));
+            React.createElement(SelectTagContainer, { tags: selectedItemsElements })))));
 };
 export default Select;