@itwin/itwinui-react 2.11.5 → 3.0.0-dev.1

package/esm/core/ColorPicker/ColorBuilder.js

@@ -4,9 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 import * as React from 'react';
 import cx from 'classnames';
-import { ColorValue, getBoundedValue, useEventListener, useMergedRefs, useTheme, } from '../utils/index.js';
+import { ColorValue, getBoundedValue, useEventListener, useMergedRefs, Box, } from '../utils/index.js';
 import { Slider } from '../Slider/index.js';
-import '@itwin/itwinui-css/css/color-picker.css';
 import { useColorPickerContext } from './ColorPickerContext.js';
 const getVerticalPercentageOfRectangle = (rect, pointer) => {
     const position = getBoundedValue(pointer, rect.top, rect.bottom);
@@ -26,7 +25,6 @@ export const ColorBuilder = React.forwardRef((props, ref) => {
     const { className, ...rest } = props;
     const builderRef = React.useRef();
     const refs = useMergedRefs(builderRef, ref);
-    useTheme();
     const { activeColor, hsvColor, onChangeComplete, applyHsvColorChange, showAlpha, } = useColorPickerContext();
     // Set values for slider
     const hueSliderColor = React.useMemo(() => ColorValue.create({ h: hsvColor.h, s: 100, v: 100 }), [hsvColor.h]);
@@ -159,8 +157,8 @@ export const ColorBuilder = React.forwardRef((props, ref) => {
                 break;
         }
     };
-    return (React.createElement("div", { className: cx('iui-color-selection-wrapper', className), ref: refs, ...rest },
-        React.createElement("div", { className: 'iui-color-field', style: {
+    return (React.createElement(Box, { className: cx('iui-color-selection-wrapper', className), ref: refs, ...rest },
+        React.createElement(Box, { className: 'iui-color-field', style: {
                 '--iui-color-field-hue': hueColorString,
                 '--iui-color-picker-selected-color': dotColorString,
             }, ref: squareRef, onPointerDown: (event) => {
@@ -170,7 +168,7 @@ export const ColorBuilder = React.forwardRef((props, ref) => {
                 setColorDotActive(true);
                 (_a = colorDotRef.current) === null || _a === void 0 ? void 0 : _a.focus();
             } },
-            React.createElement("div", { className: 'iui-color-dot', style: {
+            React.createElement(Box, { className: 'iui-color-dot', style: {
                     '--iui-color-dot-inset': `${squareTop.toString()}% auto auto ${squareLeft.toString()}%`,
                 }, onPointerDown: () => {
                     var _a;

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

@@ -1,7 +1,5 @@
-import * as React from 'react';
-import type { CommonProps } from '../utils/index.js';
-import '@itwin/itwinui-css/css/color-picker.css';
-export declare type ColorInputPanelProps = {
+import type { PolymorphicForwardRefComponent } from '../utils/index.js';
+declare type ColorInputPanelProps = {
     /**
      * The default color format to be inputted in the panel.
      */
@@ -14,7 +12,7 @@ export declare type ColorInputPanelProps = {
      * @default ['hsl', 'rgb', 'hex']
      */
     allowedColorFormats?: ('hsl' | 'rgb' | 'hex')[];
-} & Omit<CommonProps, 'title'>;
+};
 /**
  * `ColorInputPanel` shows input fields to enter precise color values in the specified format.
  * It also allows switching between the specified formats using a swap button.
@@ -24,18 +22,5 @@ export declare type ColorInputPanelProps = {
  *   <ColorInputPanel defaultColorFormat='hsl' />
  * </ColorPicker>
  */
-export declare const ColorInputPanel: React.ForwardRefExoticComponent<{
-    /**
-     * The default color format to be inputted in the panel.
-     */
-    defaultColorFormat: 'hsl' | 'rgb' | 'hex';
-    /**
-     * Color formats to switch between. The swap button will cycle between these formats.
-     *
-     * If array only has one option, then swap button will not be shown.
-     *
-     * @default ['hsl', 'rgb', 'hex']
-     */
-    allowedColorFormats?: ("rgb" | "hsl" | "hex")[] | undefined;
-} & Omit<CommonProps, "title"> & React.RefAttributes<HTMLDivElement>>;
+export declare const ColorInputPanel: PolymorphicForwardRefComponent<"div", ColorInputPanelProps>;
 export default ColorInputPanel;

package/esm/core/ColorPicker/ColorInputPanel.js

@@ -6,9 +6,8 @@ import * as React from 'react';
 import cx from 'classnames';
 import { IconButton } from '../Buttons/index.js';
 import { Input } from '../Input/index.js';
-import { ColorValue, InputContainer, useTheme, SvgSwap, } from '../utils/index.js';
+import { ColorValue, InputContainer, SvgSwap, Box } from '../utils/index.js';
 import { useColorPickerContext } from './ColorPickerContext.js';
-import '@itwin/itwinui-css/css/color-picker.css';
 /**
  * `ColorInputPanel` shows input fields to enter precise color values in the specified format.
  * It also allows switching between the specified formats using a swap button.
@@ -21,7 +20,6 @@ import '@itwin/itwinui-css/css/color-picker.css';
 export const ColorInputPanel = React.forwardRef((props, ref) => {
     var _a, _b, _c, _d, _f, _g, _h, _j;
     const { defaultColorFormat, allowedColorFormats = ['hsl', 'rgb', 'hex'], className, ...rest } = props;
-    useTheme();
     const inputsContainerRef = React.useRef(null);
     const { activeColor, applyHsvColorChange, hsvColor, showAlpha } = useColorPickerContext();
     const [currentFormat, setCurrentFormat] = React.useState(defaultColorFormat);
@@ -266,14 +264,14 @@ export const ColorInputPanel = React.forwardRef((props, ref) => {
                         handleColorInputChange();
                     }
                 } })))));
-    return (React.createElement("div", { className: cx('iui-color-input-wrapper', className), ref: ref, ...rest },
-        React.createElement("div", { className: 'iui-color-picker-section-label' }, showAlpha && currentFormat != 'hex'
+    return (React.createElement(Box, { className: cx('iui-color-input-wrapper', className), ref: ref, ...rest },
+        React.createElement(Box, { className: 'iui-color-picker-section-label' }, showAlpha && currentFormat != 'hex'
             ? currentFormat.toUpperCase() + 'A'
             : currentFormat.toUpperCase()),
-        React.createElement("div", { className: 'iui-color-input' },
+        React.createElement(Box, { className: 'iui-color-input' },
             allowedColorFormats.length > 1 && (React.createElement(IconButton, { styleType: 'borderless', onClick: swapColorFormat, size: 'small' },
                 React.createElement(SvgSwap, null))),
-            React.createElement("div", { ref: inputsContainerRef, className: 'iui-color-input-fields' },
+            React.createElement(Box, { ref: inputsContainerRef, className: 'iui-color-input-fields' },
                 currentFormat === 'hex' && hexInputField,
                 currentFormat === 'rgb' && rgbInputs,
                 currentFormat === 'hsl' && hslInputs))));

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

@@ -1,7 +1,6 @@
 import * as React from 'react';
 import { ColorValue } from '../utils/index.js';
-import type { CommonProps, ColorType } from '../utils/index.js';
-import '@itwin/itwinui-css/css/color-picker.css';
+import type { ColorType, PolymorphicForwardRefComponent } from '../utils/index.js';
 export declare type ColorPaletteProps = {
     /**
      * Label shown above the palette.
@@ -15,7 +14,7 @@ export declare type ColorPaletteProps = {
      * Pass any custom swatches as children.
      */
     children?: React.ReactNode;
-} & Omit<CommonProps, 'title'>;
+};
 /**
  * `ColorPalette` is used to show a group of `ColorSwatch` components.
  * @example
@@ -27,18 +26,5 @@ export declare type ColorPaletteProps = {
  *   // ...
  * </ColorPalette>
  */
-export declare const ColorPalette: React.ForwardRefExoticComponent<{
-    /**
-     * Label shown above the palette.
-     */
-    label?: React.ReactNode;
-    /**
-     * List of colors shown as swatches in the palette.
-     */
-    colors?: (ColorType | ColorValue)[] | undefined;
-    /**
-     * Pass any custom swatches as children.
-     */
-    children?: React.ReactNode;
-} & Omit<CommonProps, "title"> & React.RefAttributes<HTMLDivElement>>;
+export declare const ColorPalette: PolymorphicForwardRefComponent<"div", ColorPaletteProps>;
 export default ColorPalette;

package/esm/core/ColorPicker/ColorPalette.js

@@ -4,11 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 import * as React from 'react';
 import cx from 'classnames';
-import { ColorValue, getFocusableElements, useMergedRefs, useTheme, } from '../utils/index.js';
+import { ColorValue, getFocusableElements, useMergedRefs, Box, } from '../utils/index.js';
 import { getColorValue } from './ColorPicker.js';
 import { ColorSwatch } from './ColorSwatch.js';
 import { useColorPickerContext } from './ColorPickerContext.js';
-import '@itwin/itwinui-css/css/color-picker.css';
 /**
  * `ColorPalette` is used to show a group of `ColorSwatch` components.
  * @example
@@ -22,7 +21,6 @@ import '@itwin/itwinui-css/css/color-picker.css';
  */
 export const ColorPalette = React.forwardRef((props, ref) => {
     const { colors, label, className, children, ...rest } = props;
-    useTheme();
     const { activeColor, setActiveColor, onChangeComplete } = useColorPickerContext();
     const [focusedIndex, setFocusedIndex] = React.useState();
     // callback ref to set tabindex=0 on first child if none of the swatches are tabbable
@@ -91,9 +89,9 @@ export const ColorPalette = React.forwardRef((props, ref) => {
             (_a = swatches[focusedIndex]) === null || _a === void 0 ? void 0 : _a.focus();
         }
     }, [focusedIndex]);
-    return (React.createElement("div", { className: cx('iui-color-palette-wrapper', className), ref: ref, ...rest },
-        label && React.createElement("div", { className: 'iui-color-picker-section-label' }, label),
-        React.createElement("div", { className: 'iui-color-palette', onKeyDown: handleKeyDown, ref: paletteRefs },
+    return (React.createElement(Box, { className: cx('iui-color-palette-wrapper', className), ref: ref, ...rest },
+        label && React.createElement(Box, { className: 'iui-color-picker-section-label' }, label),
+        React.createElement(Box, { className: 'iui-color-palette', onKeyDown: handleKeyDown, ref: paletteRefs },
             children,
             colors &&
                 colors.map((_color, index) => {

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

@@ -1,9 +1,8 @@
 import * as React from 'react';
-import '@itwin/itwinui-css/css/color-picker.css';
 import { ColorValue } from '../utils/index.js';
-import type { CommonProps, ColorType } from '../utils/index.js';
+import type { ColorType, PolymorphicForwardRefComponent } from '../utils/index.js';
 export declare const getColorValue: (color: ColorType | ColorValue | undefined) => ColorValue;
-export declare type ColorPickerProps = {
+declare type ColorPickerProps = {
     /**
      * Content of the color palette.
      *
@@ -36,7 +35,7 @@ export declare type ColorPickerProps = {
      * @default false
      */
     showAlpha?: boolean;
-} & Omit<CommonProps, 'title'>;
+};
 /**
  * ColorPicker to display color builder options, color inputs, and a palette of ColorSwatches.
  * @example
@@ -50,5 +49,5 @@ export declare type ColorPickerProps = {
  *   <ColorPalette label='Saved colors' colors={['#FFFFFF', '#5A6973']} />
  * </ColorPicker>
  */
-export declare const ColorPicker: (props: ColorPickerProps) => JSX.Element;
+export declare const ColorPicker: PolymorphicForwardRefComponent<"div", ColorPickerProps>;
 export default ColorPicker;

package/esm/core/ColorPicker/ColorPicker.js

@@ -3,8 +3,7 @@
  * See LICENSE.md in the project root for license terms and full copyright notice.
  *--------------------------------------------------------------------------------------------*/
 import * as React from 'react';
-import '@itwin/itwinui-css/css/color-picker.css';
-import { useTheme, ColorValue, getTabbableElements } from '../utils/index.js';
+import { ColorValue, getTabbableElements, useMergedRefs, Box, } from '../utils/index.js';
 import cx from 'classnames';
 import { ColorPickerContext } from './ColorPickerContext.js';
 export const getColorValue = (color) => {
@@ -26,9 +25,8 @@ export const getColorValue = (color) => {
  *   <ColorPalette label='Saved colors' colors={['#FFFFFF', '#5A6973']} />
  * </ColorPicker>
  */
-export const ColorPicker = (props) => {
+export const ColorPicker = React.forwardRef((props, forwardedRef) => {
     const { children, className, selectedColor, onChange, onChangeComplete, setFocus = false, showAlpha = false, ...rest } = props;
-    useTheme();
     const ref = React.useRef(null);
     // set focus on the first tabbable element
     React.useEffect(() => {
@@ -68,7 +66,7 @@ export const ColorPicker = (props) => {
         // this converts it to store in tbgr
         setActiveColor(newActiveColor);
     }, [onChange, onChangeComplete]);
-    return (React.createElement("div", { className: cx('iui-color-picker', className), ref: ref, ...rest },
+    return (React.createElement(Box, { className: cx('iui-color-picker', className), ref: useMergedRefs(ref, forwardedRef), ...rest },
         React.createElement(ColorPickerContext.Provider, { value: {
                 activeColor,
                 setActiveColor,
@@ -77,5 +75,5 @@ export const ColorPicker = (props) => {
                 onChangeComplete,
                 showAlpha,
             } }, children)));
-};
+});
 export default ColorPicker;

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

@@ -1,8 +1,6 @@
-import * as React from 'react';
-import '@itwin/itwinui-css/css/color-picker.css';
 import { ColorValue } from '../utils/index.js';
-import type { ColorType } from '../utils/index.js';
-export declare type ColorSwatchProps = {
+import type { ColorType, PolymorphicForwardRefComponent } from '../utils/index.js';
+declare type ColorSwatchProps = {
     /**
      * Color code.
      */
@@ -11,12 +9,12 @@ export declare type ColorSwatchProps = {
      * Is color selected.
      */
     isActive?: boolean;
-} & Omit<React.ComponentPropsWithRef<'div'>, 'color'>;
+};
 /**
  * ColorSwatch component to display within a color palette.
  * @example
  * <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" | "children" | "key" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "className" | "contentEditable" | "contextMenu" | "draggable" | "hidden" | "lang" | "placeholder" | "spellCheck" | "tabIndex" | "translate" | "radioGroup" | "role" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "color" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "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" | "onFocus" | "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" | "onClick" | "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" | "isActive"> & React.RefAttributes<HTMLDivElement>>;
+export declare const ColorSwatch: PolymorphicForwardRefComponent<"div", ColorSwatchProps>;
 export default ColorSwatch;

package/esm/core/ColorPicker/ColorSwatch.js

@@ -4,8 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 import * as React from 'react';
 import cx from 'classnames';
-import '@itwin/itwinui-css/css/color-picker.css';
-import { useTheme, ColorValue } from '../utils/index.js';
+import { ColorValue, Box } from '../utils/index.js';
 import { getColorValue } from './ColorPicker.js';
 /**
  * ColorSwatch component to display within a color palette.
@@ -15,11 +14,10 @@ import { getColorValue } from './ColorPicker.js';
  */
 export const ColorSwatch = React.forwardRef((props, ref) => {
     const { color, style, onClick, isActive, className, ...rest } = props;
-    useTheme();
     const colorString = React.useMemo(() => typeof color === 'string'
         ? color
         : getColorValue(color).toHslString(true), [color]);
-    return (React.createElement("div", { className: cx('iui-color-swatch', { 'iui-active': isActive }, className), style: {
+    return (React.createElement(Box, { className: cx('iui-color-swatch', { 'iui-active': isActive }, className), style: {
             '--iui-color-swatch-background': colorString,
             ...style,
         }, onClick: onClick, tabIndex: isActive ? 0 : -1, "aria-selected": isActive, ref: ref, ...rest }));

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

@@ -1,12 +1,7 @@
 export { ColorPicker } from './ColorPicker.js';
-export type { ColorPickerProps } from './ColorPicker.js';
 declare const _default: "./ColorPicker";
 export default _default;
 export { ColorSwatch } from './ColorSwatch.js';
-export type { ColorSwatchProps } from './ColorSwatch.js';
 export { ColorPalette } from './ColorPalette.js';
-export type { ColorPaletteProps } from './ColorPalette.js';
 export { ColorBuilder } from './ColorBuilder.js';
-export type { ColorBuilderProps } from './ColorBuilder.js';
 export { ColorInputPanel } from './ColorInputPanel.js';
-export type { ColorInputPanelProps } from './ColorInputPanel.js';

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

@@ -1,8 +1,7 @@
 import * as React from 'react';
-import type { InputProps } from '../Input/index.js';
 import type { SelectOption } from '../Select/index.js';
-import type { PopoverProps, CommonProps, InputContainerProps } from '../utils/index.js';
-import 'tippy.js/animations/shift-away.css';
+import type { Input } from '../Input/Input.js';
+import type { PopoverProps, InputContainerProps, CommonProps } from '../utils/index.js';
 declare type ActionType = 'added' | 'removed';
 declare type MultipleOnChangeProps<T> = {
     value: T;
@@ -45,7 +44,7 @@ export declare type ComboBoxProps<T> = {
     /**
      * Native input element props.
      */
-    inputProps?: Omit<InputProps, 'setFocus'>;
+    inputProps?: Omit<React.ComponentProps<typeof Input>, 'setFocus'>;
     /**
      * Props to customize dropdown menu behavior.
      */
@@ -84,7 +83,7 @@ export declare type ComboBoxProps<T> = {
      * Callback fired when dropdown menu is closed.
      */
     onHide?: () => void;
-} & ComboboxMultipleTypeProps<T> & Pick<InputContainerProps, 'status'> & Omit<CommonProps, 'title'>;
+} & ComboboxMultipleTypeProps<T> & Pick<InputContainerProps, 'status'> & CommonProps;
 /**
  * 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.

package/esm/core/ComboBox/ComboBox.js

@@ -3,12 +3,10 @@
  * See LICENSE.md in the project root for license terms and full copyright notice.
  *--------------------------------------------------------------------------------------------*/
 import * as React from 'react';
-import cx from 'classnames';
 import { MenuExtraContent } from '../Menu/index.js';
 import SelectTag from '../Select/SelectTag.js';
 import { Text } from '../Typography/index.js';
-import { useTheme, getRandomValue, mergeRefs, useLatestRef, useIsomorphicLayoutEffect, AutoclearingHiddenLiveRegion, } from '../utils/index.js';
-import 'tippy.js/animations/shift-away.css';
+import { getRandomValue, mergeRefs, useLatestRef, useIsomorphicLayoutEffect, AutoclearingHiddenLiveRegion, } from '../utils/index.js';
 import { ComboBoxActionContext, comboBoxReducer, ComboBoxRefsContext, ComboBoxStateContext, } from './helpers.js';
 import { ComboBoxDropdown } from './ComboBoxDropdown.js';
 import { ComboBoxEndIcon } from './ComboBoxEndIcon.js';
@@ -50,7 +48,6 @@ export const ComboBox = (props) => {
         var _a, _b;
         return (_b = (_a = props.id) !== null && _a !== void 0 ? _a : ((inputProps === null || inputProps === void 0 ? void 0 : inputProps.id) && `${inputProps.id}-cb`)) !== null && _b !== void 0 ? _b : `iui-cb-${getRandomValue(10)}`;
     });
-    useTheme();
     // Refs get set in subcomponents
     const inputRef = React.useRef(null);
     const menuRef = React.useRef(null);
@@ -247,6 +244,8 @@ export const ComboBox = (props) => {
     const getMenuItem = React.useCallback((option, filteredIndex) => {
         const optionId = getOptionId(option, id);
         const { __originalIndex } = optionsExtraInfoRef.current[optionId];
+        const { icon, startIcon: startIconProp, ...restOptions } = option;
+        const startIcon = startIconProp !== null && startIconProp !== void 0 ? startIconProp : icon;
         const customItem = itemRenderer
             ? itemRenderer(option, {
                 isFocused: focusedIndex === __originalIndex,
@@ -261,11 +260,9 @@ export const ComboBox = (props) => {
                 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
+            // ComboBox.MenuItem handles scrollIntoView, data-iui-index and 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,
-            }),
+            focused: focusedIndex === __originalIndex,
             'data-iui-index': __originalIndex,
             'data-iui-filtered-index': filteredIndex,
             ref: mergeRefs(customItem.props.ref, (el) => {
@@ -273,7 +270,7 @@ export const ComboBox = (props) => {
                     el === null || el === void 0 ? void 0 : el.scrollIntoView({ block: 'nearest' });
                 }
             }),
-        })) : (React.createElement(ComboBoxMenuItem, { key: optionId, id: optionId, ...option, isSelected: isMenuItemSelected(__originalIndex), onClick: () => {
+        })) : (React.createElement(ComboBoxMenuItem, { key: optionId, id: optionId, startIcon: startIcon, ...restOptions, isSelected: isMenuItemSelected(__originalIndex), onClick: () => {
                 onClickHandler(__originalIndex);
             }, index: __originalIndex, "data-iui-filtered-index": filteredIndex }, option.label));
     }, [

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

@@ -1,7 +1,7 @@
-import * as React from 'react';
-import type { PopoverProps } from '../utils/index.js';
+/// <reference types="react" />
+import type { PopoverProps, PolymorphicForwardRefComponent } from '../utils/index.js';
 declare type ComboBoxDropdownProps = PopoverProps & {
     children: JSX.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 declare const ComboBoxDropdown: PolymorphicForwardRefComponent<"div", ComboBoxDropdownProps>;
 export {};

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

@@ -1,5 +1,7 @@
-import * as 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>>;
+import type { PolymorphicForwardRefComponent } from '../utils/index.js';
+declare type ComboBoxEndIconProps = {
+    disabled?: boolean;
+    isOpen?: boolean;
+};
+export declare const ComboBoxEndIcon: PolymorphicForwardRefComponent<"span", ComboBoxEndIconProps>;
+export {};

package/esm/core/ComboBox/ComboBoxEndIcon.js

@@ -4,14 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 import cx from 'classnames';
 import * as React from 'react';
-import { useSafeContext, useMergedRefs, SvgCaretDownSmall, mergeEventHandlers, } from '../utils/index.js';
+import { useSafeContext, useMergedRefs, SvgCaretDownSmall, mergeEventHandlers, Box, } from '../utils/index.js';
 import { ComboBoxActionContext, ComboBoxRefsContext } from './helpers.js';
 export const ComboBoxEndIcon = React.forwardRef((props, forwardedRef) => {
     const { className, children, onClick: onClickProp, disabled, isOpen, ...rest } = props;
     const dispatch = useSafeContext(ComboBoxActionContext);
     const { toggleButtonRef } = useSafeContext(ComboBoxRefsContext);
     const refs = useMergedRefs(toggleButtonRef, forwardedRef);
-    return (React.createElement("span", { ref: refs, className: cx('iui-end-icon', {
+    return (React.createElement(Box, { as: 'span', ref: refs, className: cx('iui-end-icon', {
             'iui-actionable': !disabled,
             'iui-disabled': disabled,
             'iui-open': isOpen,

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

@@ -1,7 +1,8 @@
 import * as 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>>;
+import { Input } from '../Input/index.js';
+import { type PolymorphicForwardRefComponent } from '../utils/index.js';
+declare type ComboBoxInputProps = {
+    selectTags?: JSX.Element[];
+} & React.ComponentProps<typeof Input>;
+export declare const ComboBoxInput: PolymorphicForwardRefComponent<"input", ComboBoxInputProps>;
+export {};

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

@@ -1,8 +1,4 @@
-import * as React from 'react';
-import type { InputContainerProps } from '../utils/index.js';
-declare type ComboBoxInputContainerProps = React.ComponentPropsWithoutRef<'div'> & Pick<InputContainerProps, 'status' | 'message' | 'disabled'>;
-export declare const ComboBoxInputContainer: {
-    (props: ComboBoxInputContainerProps): JSX.Element;
-    displayName: string;
-};
+import type { InputContainerProps, PolymorphicForwardRefComponent } from '../utils/index.js';
+declare type ComboBoxInputContainerProps = Pick<InputContainerProps, 'status' | 'message' | 'disabled'>;
+export declare const ComboBoxInputContainer: PolymorphicForwardRefComponent<"div", ComboBoxInputContainerProps>;
 export {};

package/esm/core/ComboBox/ComboBoxInputContainer.js

@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 import * as React from 'react';
 import { StatusMessage } from '../StatusMessage/index.js';
-import { InputContainer, useSafeContext } from '../utils/index.js';
+import { InputContainer, useSafeContext, Box } from '../utils/index.js';
 import { ComboBoxStateContext } from './helpers.js';
-export const ComboBoxInputContainer = (props) => {
+export const ComboBoxInputContainer = React.forwardRef((props, forwardedRef) => {
     const { className, status, message, children, ...rest } = props;
     const { id } = useSafeContext(ComboBoxStateContext);
     return (React.createElement(InputContainer, { className: className, status: status, statusMessage: typeof message === 'string' ? (React.createElement(StatusMessage, { status: status }, message)) : (React.isValidElement(message) &&
-            React.cloneElement(message, { status })), ...rest, id: id },
-        React.createElement("div", { className: 'iui-input-with-icon' }, children)));
-};
+            React.cloneElement(message, { status })), ref: forwardedRef, ...rest, id: id },
+        React.createElement(Box, { className: 'iui-input-with-icon' }, children)));
+});
 ComboBoxInputContainer.displayName = 'ComboBoxInputContainer';

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

@@ -1,3 +1,6 @@
 import * as React from 'react';
-import type { MenuProps } from '../Menu/index.js';
-export declare const ComboBoxMenu: React.ForwardRefExoticComponent<Omit<MenuProps, "onClick"> & Pick<React.DetailedHTMLProps<React.HTMLAttributes<HTMLUListElement>, HTMLUListElement>, "key" | keyof React.HTMLAttributes<HTMLUListElement>> & React.RefAttributes<HTMLUListElement>>;
+import { Menu } from '../Menu/index.js';
+import type { PolymorphicForwardRefComponent } from '../utils/index.js';
+declare type ComboBoxMenuProps = Omit<React.ComponentPropsWithoutRef<typeof Menu>, 'onClick'> & React.ComponentPropsWithoutRef<'ul'>;
+export declare const ComboBoxMenu: PolymorphicForwardRefComponent<"ul", ComboBoxMenuProps>;
+export {};

package/esm/core/ComboBox/ComboBoxMenu.js

@@ -40,9 +40,9 @@ const VirtualizedComboBoxMenu = React.forwardRef(({ children, className, style,
         overflowY: isOverflowOverlaySupported() ? 'overlay' : 'auto',
         ...style,
     };
-    return (React.createElement(Surface, { style: surfaceStyles, ...rest },
+    return (React.createElement(Surface, { style: surfaceStyles },
         React.createElement("div", { ...outerProps },
-            React.createElement(Menu, { id: `${id}-list`, setFocus: false, role: 'listbox', ref: mergeRefs(menuRef, innerProps.ref, forwardedRef), className: className, style: innerProps.style }, visibleChildren))));
+            React.createElement(Menu, { id: `${id}-list`, setFocus: false, role: 'listbox', ref: mergeRefs(menuRef, innerProps.ref, forwardedRef), className: className, style: innerProps.style, ...rest }, visibleChildren))));
 });
 export const ComboBoxMenu = React.forwardRef((props, forwardedRef) => {
     const { className, style, ...rest } = props;

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

@@ -1,21 +1,8 @@
 import * as React from 'react';
-export declare const ComboBoxMenuItem: React.MemoExoticComponent<React.ForwardRefExoticComponent<{
-    isSelected?: boolean | undefined;
-    disabled?: boolean | undefined;
-    value?: unknown;
-    onClick?: ((value?: unknown) => void) | undefined;
-    size?: "default" | "large" | undefined;
-    sublabel?: React.ReactNode;
-    icon?: JSX.Element | undefined;
-    badge?: JSX.Element | undefined;
-    role?: string | undefined;
-    subMenuItems?: JSX.Element[] | undefined;
-    children?: React.ReactNode;
-} & {
-    title?: string | undefined;
-    id?: string | undefined;
-} & {
-    style?: React.CSSProperties | undefined;
-} & import("../utils/props.js").ClassNameProps & {
+import type { MenuItemProps } from '../Menu/MenuItem.js';
+import type { PolymorphicForwardRefComponent } from '../utils/index.js';
+declare type ComboBoxMenuItemProps = MenuItemProps & {
     index: number;
-} & React.RefAttributes<HTMLLIElement>>>;
+};
+export declare const ComboBoxMenuItem: React.MemoExoticComponent<PolymorphicForwardRefComponent<"li", ComboBoxMenuItemProps>>;
+export {};

package/esm/core/ComboBox/ComboBoxMenuItem.js

@@ -2,12 +2,12 @@
  * 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 * as React from 'react';
 import { useSafeContext, useMergedRefs } from '../utils/index.js';
 import { ComboBoxStateContext } from './helpers.js';
+import { ListItem } from '../List/ListItem.js';
 export const ComboBoxMenuItem = React.memo(React.forwardRef((props, forwardedRef) => {
-    const { children, isSelected, disabled, value, onClick, sublabel, size = !!sublabel ? 'large' : 'default', icon, badge, className, role = 'option', index, ...rest } = props;
+    const { children, isSelected, disabled, value, onClick, sublabel, size = !!sublabel ? 'large' : 'default', startIcon, endIcon, role = 'option', index, ...rest } = props;
     const { focusedIndex, enableVirtualization } = useSafeContext(ComboBoxStateContext);
     const focusRef = (el) => {
         if (!enableVirtualization && focusedIndex === index) {
@@ -15,22 +15,11 @@ export const ComboBoxMenuItem = React.memo(React.forwardRef((props, forwardedRef
         }
     };
     const refs = useMergedRefs(forwardedRef, focusRef);
-    return (React.createElement("li", { className: cx('iui-menu-item', {
-            'iui-large': size === 'large',
-            'iui-active': isSelected,
-            'iui-disabled': disabled,
-            'iui-focused': focusedIndex === index,
-        }, className), ref: refs, onClick: () => onClick === null || onClick === void 0 ? void 0 : onClick(value), role: role, tabIndex: role === 'presentation' ? undefined : -1, "aria-selected": isSelected, "aria-disabled": disabled, "data-iui-index": index, ...rest },
-        icon &&
-            React.cloneElement(icon, {
-                className: cx(icon.props.className, 'iui-icon'),
-            }),
-        React.createElement("span", { className: 'iui-content' },
-            React.createElement("div", { className: 'iui-menu-label' }, children),
-            sublabel && React.createElement("div", { className: 'iui-menu-description' }, sublabel)),
-        badge &&
-            React.cloneElement(badge, {
-                className: cx(badge.props.className, 'iui-icon'),
-            })));
+    return (React.createElement(ListItem, { actionable: true, size: size, active: isSelected, disabled: disabled, focused: focusedIndex === index, ref: refs, onClick: () => onClick === null || onClick === void 0 ? void 0 : onClick(value), role: role, tabIndex: role === 'presentation' ? undefined : -1, "aria-selected": isSelected, "aria-disabled": disabled, "data-iui-index": index, ...rest },
+        startIcon && (React.createElement(ListItem.Icon, { as: 'span', "aria-hidden": true }, startIcon)),
+        React.createElement(ListItem.Content, null,
+            children,
+            sublabel && React.createElement(ListItem.Description, null, sublabel)),
+        endIcon && (React.createElement(ListItem.Icon, { as: 'span', "aria-hidden": true }, endIcon))));
 }));
 ComboBoxMenuItem.displayName = 'ComboBoxMenuItem';