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

package/cjs/core/ColorPicker/ColorInputPanel.js

@@ -47,7 +47,6 @@ const ColorPickerContext_js_1 = require("./ColorPickerContext.js");
  * </ColorPicker>
  */
 exports.ColorInputPanel = React.forwardRef((props, ref) => {
-    var _a, _b, _c, _d, _f, _g, _h, _j;
     const { defaultColorFormat, allowedColorFormats = ['hsl', 'rgb', 'hex'], className, ...rest } = props;
     const inputsContainerRef = React.useRef(null);
     const { activeColor, applyHsvColorChange, hsvColor, showAlpha } = (0, ColorPickerContext_js_1.useColorPickerContext)();
@@ -58,14 +57,13 @@ exports.ColorInputPanel = React.forwardRef((props, ref) => {
     // need to use state since input may have parsing error
     const [input, setInput] = React.useState(['', '', '', '']);
     React.useEffect(() => {
-        var _a, _b;
         if (currentFormat === 'hsl') {
             const hsl = activeColor.toHslColor();
             setInput([
                 index_js_3.ColorValue.getFormattedColorNumber(hsvColor.h),
                 index_js_3.ColorValue.getFormattedColorNumber(hsl.s),
                 index_js_3.ColorValue.getFormattedColorNumber(hsl.l),
-                index_js_3.ColorValue.getFormattedColorNumber((_a = hsl.a) !== null && _a !== void 0 ? _a : activeColor.getAlpha() / 255, 2),
+                index_js_3.ColorValue.getFormattedColorNumber(hsl.a ?? activeColor.getAlpha() / 255, 2),
             ]);
         }
         else if (currentFormat === 'rgb') {
@@ -74,7 +72,7 @@ exports.ColorInputPanel = React.forwardRef((props, ref) => {
                 rgb.r.toString(),
                 rgb.g.toString(),
                 rgb.b.toString(),
-                index_js_3.ColorValue.getFormattedColorNumber((_b = rgb.a) !== null && _b !== void 0 ? _b : activeColor.getAlpha() / 255, 2),
+                index_js_3.ColorValue.getFormattedColorNumber(rgb.a ?? activeColor.getAlpha() / 255, 2),
             ]);
         }
         else {
@@ -84,9 +82,8 @@ exports.ColorInputPanel = React.forwardRef((props, ref) => {
     }, [activeColor, hsvColor.h, currentFormat, showAlpha]);
     const [validHexInput, setValidHexInput] = React.useState(true);
     const swapColorFormat = React.useCallback(() => {
-        var _a;
-        const newFormat = (_a = allowedColorFormats[(allowedColorFormats.indexOf(currentFormat) + 1) %
-            allowedColorFormats.length]) !== null && _a !== void 0 ? _a : allowedColorFormats[0];
+        const newFormat = allowedColorFormats[(allowedColorFormats.indexOf(currentFormat) + 1) %
+            allowedColorFormats.length] ?? allowedColorFormats[0];
         setCurrentFormat(newFormat);
     }, [currentFormat, allowedColorFormats]);
     const isFocusInside = (focused) => !!(focused &&
@@ -167,7 +164,7 @@ exports.ColorInputPanel = React.forwardRef((props, ref) => {
         React.createElement(index_js_3.InputContainer, { status: Number(input[0]) < 0 || Number(input[0]) > 360
                 ? 'negative'
                 : undefined },
-            React.createElement(index_js_2.Input, { size: 'small', type: 'number', min: '0', max: '359', step: '.1', placeholder: 'H', value: (_a = input[0]) !== null && _a !== void 0 ? _a : '', onChange: (event) => {
+            React.createElement(index_js_2.Input, { size: 'small', type: 'number', min: '0', max: '359', step: '.1', placeholder: 'H', value: input[0] ?? '', onChange: (event) => {
                     setInput([event.target.value, input[1], input[2], input[3]]);
                 }, onKeyDown: (event) => {
                     if (event.key === 'Enter') {
@@ -183,7 +180,7 @@ exports.ColorInputPanel = React.forwardRef((props, ref) => {
         React.createElement(index_js_3.InputContainer, { status: Number(input[1]) < 0 || Number(input[1]) > 100
                 ? 'negative'
                 : undefined },
-            React.createElement(index_js_2.Input, { size: 'small', type: 'number', min: '0', max: '100', step: '.1', placeholder: 'S', value: (_b = input[1]) !== null && _b !== void 0 ? _b : '', onChange: (event) => {
+            React.createElement(index_js_2.Input, { size: 'small', type: 'number', min: '0', max: '100', step: '.1', placeholder: 'S', value: input[1] ?? '', onChange: (event) => {
                     setInput([input[0], event.target.value, input[2], input[3]]);
                 }, onKeyDown: (event) => {
                     if (event.key === 'Enter') {
@@ -199,7 +196,7 @@ exports.ColorInputPanel = React.forwardRef((props, ref) => {
         React.createElement(index_js_3.InputContainer, { status: Number(input[2]) < 0 || Number(input[2]) > 100
                 ? 'negative'
                 : undefined },
-            React.createElement(index_js_2.Input, { size: 'small', type: 'number', min: '0', max: '100', step: '.1', placeholder: 'L', value: (_c = input[2]) !== null && _c !== void 0 ? _c : '', onChange: (event) => {
+            React.createElement(index_js_2.Input, { size: 'small', type: 'number', min: '0', max: '100', step: '.1', placeholder: 'L', value: input[2] ?? '', onChange: (event) => {
                     setInput([input[0], input[1], event.target.value, input[3]]);
                 }, onKeyDown: (event) => {
                     if (event.key === 'Enter') {
@@ -215,7 +212,7 @@ exports.ColorInputPanel = React.forwardRef((props, ref) => {
         showAlpha && (React.createElement(index_js_3.InputContainer, { status: Number(input[3]) < 0 || Number(input[3]) > 1
                 ? 'negative'
                 : undefined },
-            React.createElement(index_js_2.Input, { size: 'small', type: 'number', min: '0', max: '1', step: '.01', placeholder: 'A', value: (_d = input[3]) !== null && _d !== void 0 ? _d : '', onChange: (event) => {
+            React.createElement(index_js_2.Input, { size: 'small', type: 'number', min: '0', max: '1', step: '.01', placeholder: 'A', value: input[3] ?? '', onChange: (event) => {
                     setInput([input[0], input[1], input[2], event.target.value]);
                 }, onKeyDown: (event) => {
                     if (event.key === 'Enter') {
@@ -232,7 +229,7 @@ exports.ColorInputPanel = React.forwardRef((props, ref) => {
         React.createElement(index_js_3.InputContainer, { status: Number(input[0]) < 0 || Number(input[0]) > 255
                 ? 'negative'
                 : undefined },
-            React.createElement(index_js_2.Input, { size: 'small', type: 'number', min: '0', max: '255', placeholder: 'R', value: (_f = input[0]) !== null && _f !== void 0 ? _f : '', onChange: (event) => {
+            React.createElement(index_js_2.Input, { size: 'small', type: 'number', min: '0', max: '255', placeholder: 'R', value: input[0] ?? '', onChange: (event) => {
                     setInput([event.target.value, input[1], input[2], input[3]]);
                 }, onKeyDown: (event) => {
                     if (event.key === 'Enter') {
@@ -248,7 +245,7 @@ exports.ColorInputPanel = React.forwardRef((props, ref) => {
         React.createElement(index_js_3.InputContainer, { status: Number(input[1]) < 0 || Number(input[1]) > 255
                 ? 'negative'
                 : undefined },
-            React.createElement(index_js_2.Input, { size: 'small', type: 'number', min: '0', max: '255', placeholder: 'G', value: (_g = input[1]) !== null && _g !== void 0 ? _g : '', onChange: (event) => {
+            React.createElement(index_js_2.Input, { size: 'small', type: 'number', min: '0', max: '255', placeholder: 'G', value: input[1] ?? '', onChange: (event) => {
                     setInput([input[0], event.target.value, input[2], input[3]]);
                 }, onKeyDown: (event) => {
                     if (event.key === 'Enter') {
@@ -264,7 +261,7 @@ exports.ColorInputPanel = React.forwardRef((props, ref) => {
         React.createElement(index_js_3.InputContainer, { status: Number(input[2]) < 0 || Number(input[2]) > 255
                 ? 'negative'
                 : undefined },
-            React.createElement(index_js_2.Input, { size: 'small', type: 'number', min: '0', max: '255', placeholder: 'B', value: (_h = input[2]) !== null && _h !== void 0 ? _h : '', onChange: (event) => {
+            React.createElement(index_js_2.Input, { size: 'small', type: 'number', min: '0', max: '255', placeholder: 'B', value: input[2] ?? '', onChange: (event) => {
                     setInput([input[0], input[1], event.target.value, input[3]]);
                 }, onKeyDown: (event) => {
                     if (event.key === 'Enter') {
@@ -280,7 +277,7 @@ exports.ColorInputPanel = React.forwardRef((props, ref) => {
         showAlpha && (React.createElement(index_js_3.InputContainer, { status: Number(input[3]) < 0 || Number(input[3]) > 1
                 ? 'negative'
                 : undefined },
-            React.createElement(index_js_2.Input, { size: 'small', type: 'number', min: '0', max: '1', step: '.01', placeholder: 'A', value: (_j = input[3]) !== null && _j !== void 0 ? _j : '', onChange: (event) => {
+            React.createElement(index_js_2.Input, { size: 'small', type: 'number', min: '0', max: '1', step: '.01', placeholder: 'A', value: input[3] ?? '', onChange: (event) => {
                     setInput([input[0], input[1], input[2], event.target.value]);
                 }, onKeyDown: (event) => {
                     if (event.key === 'Enter') {

package/cjs/core/ColorPicker/ColorPalette.js

@@ -54,9 +54,8 @@ exports.ColorPalette = React.forwardRef((props, ref) => {
     const [focusedIndex, setFocusedIndex] = React.useState();
     // callback ref to set tabindex=0 on first child if none of the swatches are tabbable
     const setDefaultTabIndex = (el) => {
-        var _a;
         if (el && !el.querySelector('[tabindex="0"]')) {
-            (_a = el.firstElementChild) === null || _a === void 0 ? void 0 : _a.setAttribute('tabindex', '0');
+            el.firstElementChild?.setAttribute('tabindex', '0');
         }
     };
     const paletteRef = React.useRef(null);
@@ -70,7 +69,7 @@ exports.ColorPalette = React.forwardRef((props, ref) => {
         if (!swatches.length) {
             return;
         }
-        const currentIndex = swatches.findIndex((swatch) => { var _a; return swatch === ((_a = paletteRef.current) === null || _a === void 0 ? void 0 : _a.ownerDocument.activeElement); });
+        const currentIndex = swatches.findIndex((swatch) => swatch === paletteRef.current?.ownerDocument.activeElement);
         if (currentIndex < 0) {
             return;
         }
@@ -112,10 +111,9 @@ exports.ColorPalette = React.forwardRef((props, ref) => {
     };
     // call focus() when focusedIndex changes
     React.useEffect(() => {
-        var _a;
         if (focusedIndex != null) {
             const swatches = (0, index_js_1.getFocusableElements)(paletteRef.current);
-            (_a = swatches[focusedIndex]) === null || _a === void 0 ? void 0 : _a.focus();
+            swatches[focusedIndex]?.focus();
         }
     }, [focusedIndex]);
     return (React.createElement(index_js_1.Box, { className: (0, classnames_1.default)('iui-color-palette-wrapper', className), ref: ref, ...rest },
@@ -127,7 +125,7 @@ exports.ColorPalette = React.forwardRef((props, ref) => {
                     const color = (0, ColorPicker_js_1.getColorValue)(_color);
                     return (React.createElement(ColorSwatch_js_1.ColorSwatch, { key: index, color: color, onClick: (event) => {
                             event.preventDefault();
-                            onChangeComplete === null || onChangeComplete === void 0 ? void 0 : onChangeComplete(color);
+                            onChangeComplete?.(color);
                             setActiveColor(color);
                         }, isActive: color.equals(activeColor) }));
                 }))));

package/cjs/core/ColorPicker/ColorPicker.js

@@ -84,13 +84,13 @@ exports.ColorPicker = React.forwardRef((props, forwardedRef) => {
     const applyHsvColorChange = React.useCallback((newColor, selectionChanged, newColorValue) => {
         // save the HSV values
         setHsvColor(newColor);
-        const newActiveColor = newColorValue !== null && newColorValue !== void 0 ? newColorValue : index_js_1.ColorValue.create(newColor);
+        const newActiveColor = newColorValue ?? index_js_1.ColorValue.create(newColor);
         // Only update selected color when dragging is done
         if (selectionChanged) {
-            onChangeComplete === null || onChangeComplete === void 0 ? void 0 : onChangeComplete(newActiveColor);
+            onChangeComplete?.(newActiveColor);
         }
         else {
-            onChange === null || onChange === void 0 ? void 0 : onChange(newActiveColor);
+            onChange?.(newActiveColor);
         }
         activeColorTbgr.current = newActiveColor.toTbgr();
         // this converts it to store in tbgr

package/cjs/core/ComboBox/ComboBox.js

@@ -53,8 +53,7 @@ const isSingleOnChange = (onChange, multiple) => {
 };
 /** Returns either `option.id` or derives a stable id using `idPrefix` and `option.label` (without whitespace) */
 const getOptionId = (option, idPrefix) => {
-    var _a;
-    return (_a = option.id) !== null && _a !== void 0 ? _a : `${idPrefix}-option-${option.label.replace(/\s/g, '-')}`;
+    return option.id ?? `${idPrefix}-option-${option.label.replace(/\s/g, '-')}`;
 };
 /**
  * ComboBox component that allows typing a value to filter the options in dropdown list.
@@ -70,13 +69,11 @@ const getOptionId = (option, idPrefix) => {
  * />
  */
 const ComboBox = (props) => {
-    var _a, _b;
     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;
-        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-${(0, index_js_3.getRandomValue)(10)}`;
-    });
+    const [id] = React.useState(() => props.id ??
+        (inputProps?.id && `${inputProps.id}-cb`) ??
+        `iui-cb-${(0, index_js_3.getRandomValue)(10)}`);
     // Refs get set in subcomponents
     const inputRef = React.useRef(null);
     const menuRef = React.useRef(null);
@@ -102,7 +99,7 @@ const ComboBox = (props) => {
     const getSelectedIndexes = React.useCallback(() => {
         if (isMultipleEnabled(valueProp, multiple)) {
             const indexArray = [];
-            valueProp === null || valueProp === void 0 ? void 0 : valueProp.forEach((value) => {
+            valueProp?.forEach((value) => {
                 const indexToAdd = options.findIndex((option) => option.value === value);
                 if (indexToAdd > -1) {
                     indexArray.push(indexToAdd);
@@ -121,10 +118,9 @@ const ComboBox = (props) => {
         focusedIndex: -1,
     });
     (0, index_js_3.useIsomorphicLayoutEffect)(() => {
-        var _a, _b;
         // When the dropdown opens
         if (isOpen) {
-            (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.focus(); // Focus the input
+            inputRef.current?.focus(); // Focus the input
             // Reset the filtered list (does not reset when multiple enabled)
             if (!multiple) {
                 setFilteredOptions(optionsRef.current);
@@ -138,7 +134,7 @@ const ComboBox = (props) => {
             // 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
+                    ? optionsRef.current[selected]?.label
                     : '');
             }
         }
@@ -153,9 +149,9 @@ const ComboBox = (props) => {
     // Update filtered options to the latest value options according to input value
     const [filteredOptions, setFilteredOptions] = React.useState(options);
     React.useEffect(() => {
-        var _a;
         if (inputValue) {
-            setFilteredOptions((_a = filterFunction === null || filterFunction === void 0 ? void 0 : filterFunction(options, inputValue)) !== null && _a !== void 0 ? _a : options.filter((option) => option.label.toLowerCase().includes(inputValue.toLowerCase())));
+            setFilteredOptions(filterFunction?.(options, inputValue) ??
+                options.filter((option) => option.label.toLowerCase().includes(inputValue.toLowerCase())));
         }
         else {
             setFilteredOptions(options);
@@ -165,18 +161,18 @@ const ComboBox = (props) => {
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [options]);
     // Filter options based on input value
-    const [inputValue, setInputValue] = React.useState((_b = (_a = inputProps === null || inputProps === void 0 ? void 0 : inputProps.value) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : '');
+    const [inputValue, setInputValue] = React.useState(inputProps?.value?.toString() ?? '');
     const [liveRegionSelection, setLiveRegionSelection] = React.useState('');
     const handleOnInput = React.useCallback((event) => {
-        var _a, _b;
         const { value } = event.currentTarget;
         setInputValue(value);
         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())));
+        setFilteredOptions(filterFunction?.(optionsRef.current, value) ??
+            optionsRef.current.filter((option) => option.label.toLowerCase().includes(value.toLowerCase())));
         if (focusedIndex != -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);
+        inputProps?.onChange?.(event);
     }, [filterFunction, focusedIndex, inputProps, optionsRef]);
     // When the value prop changes, update the selected index/indices
     React.useEffect(() => {
@@ -225,23 +221,21 @@ const ComboBox = (props) => {
     }, [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);
+            onChangeProp.current?.(optionsRef.current[__originalIndex]?.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,
+                onChangeProp.current?.(newArray?.map((item) => optionsRef.current[item]?.value), {
+                    value: optionsRef.current[__originalIndex]?.value,
                     type: actionType,
-                }));
+                });
         }
     }, [multiple, onChangeProp, optionsRef]);
     const onClickHandler = React.useCallback((__originalIndex) => {
-        var _a, _b;
-        (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.focus({ preventScroll: true }); // return focus to input
-        if ((_b = optionsRef.current[__originalIndex]) === null || _b === void 0 ? void 0 : _b.disabled) {
+        inputRef.current?.focus({ preventScroll: true }); // return focus to input
+        if (optionsRef.current[__originalIndex]?.disabled) {
             return;
         }
         if (isMultipleEnabled(selected, multiple)) {
@@ -253,7 +247,7 @@ const ComboBox = (props) => {
             onChangeHandler(__originalIndex, actionType, newArray);
             // update live region
             setLiveRegionSelection(newArray
-                .map((item) => { var _a; return (_a = optionsRef.current[item]) === null || _a === void 0 ? void 0 : _a.label; })
+                .map((item) => optionsRef.current[item]?.label)
                 .filter(Boolean)
                 .join(', '));
         }
@@ -274,7 +268,7 @@ const ComboBox = (props) => {
         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 startIcon = startIconProp ?? icon;
         const customItem = itemRenderer
             ? itemRenderer(option, {
                 isFocused: focusedIndex === __originalIndex,
@@ -285,9 +279,8 @@ const ComboBox = (props) => {
             : null;
         return customItem ? (React.cloneElement(customItem, {
             onClick: (e) => {
-                var _a, _b;
                 onClickHandler(__originalIndex);
-                (_b = (_a = customItem.props).onClick) === null || _b === void 0 ? void 0 : _b.call(_a, e);
+                customItem.props.onClick?.(e);
             },
             // ComboBox.MenuItem handles scrollIntoView, data-iui-index and focused through context
             // but we still need to pass them here for backwards compatibility with MenuItem
@@ -296,7 +289,7 @@ const ComboBox = (props) => {
             'data-iui-filtered-index': filteredIndex,
             ref: (0, index_js_3.mergeRefs)(customItem.props.ref, (el) => {
                 if (!enableVirtualization && focusedIndex === __originalIndex) {
-                    el === null || el === void 0 ? void 0 : el.scrollIntoView({ block: 'nearest' });
+                    el?.scrollIntoView({ block: 'nearest' });
                 }
             }),
         })) : (React.createElement(ComboBoxMenuItem_js_1.ComboBoxMenuItem, { key: optionId, id: optionId, startIcon: startIcon, ...restOptions, isSelected: isMenuItemSelected(__originalIndex), onClick: () => {
@@ -326,7 +319,7 @@ const ComboBox = (props) => {
                     getMenuItem,
                     multiple,
                 } },
-                React.createElement(ComboBoxInputContainer_js_1.ComboBoxInputContainer, { disabled: inputProps === null || inputProps === void 0 ? void 0 : inputProps.disabled, ...rest },
+                React.createElement(ComboBoxInputContainer_js_1.ComboBoxInputContainer, { disabled: inputProps?.disabled, ...rest },
                     React.createElement(React.Fragment, null,
                         React.createElement(ComboBoxInput_js_1.ComboBoxInput, { value: inputValue, ...inputProps, onChange: handleOnInput, selectTags: isMultipleEnabled(selected, multiple)
                                 ? selected.map((index) => {
@@ -334,7 +327,7 @@ const ComboBox = (props) => {
                                     return (React.createElement(SelectTag_js_1.default, { key: item.label, label: item.label }));
                                 })
                                 : undefined })),
-                    React.createElement(ComboBoxEndIcon_js_1.ComboBoxEndIcon, { disabled: inputProps === null || inputProps === void 0 ? void 0 : inputProps.disabled, isOpen: isOpen }),
+                    React.createElement(ComboBoxEndIcon_js_1.ComboBoxEndIcon, { disabled: inputProps?.disabled, isOpen: isOpen }),
                     multiple ? (React.createElement(index_js_3.AutoclearingHiddenLiveRegion, { text: liveRegionSelection })) : null),
                 React.createElement(ComboBoxDropdown_js_1.ComboBoxDropdown, { ...dropdownMenuProps, onShow: onShow, onHide: onHide },
                     React.createElement(ComboBoxMenu_js_1.ComboBoxMenu, null, filteredOptions.length > 0 && !enableVirtualization

package/cjs/core/ComboBox/ComboBoxDropdown.js

@@ -43,8 +43,7 @@ exports.ComboBoxDropdown = React.forwardRef((props, forwardedRef) => {
         }
     }, [dispatch, props.visible]);
     return (React.createElement(index_js_1.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))) {
+            if (!toggleButtonRef.current?.contains(target)) {
                 dispatch({ type: 'close' });
             }
         }, [dispatch, toggleButtonRef]), animation: 'shift-away', duration: 200, reference: inputRef, ref: forwardedRef, content: children, ...rest }));

package/cjs/core/ComboBox/ComboBoxEndIcon.js

@@ -46,6 +46,6 @@ exports.ComboBoxEndIcon = React.forwardRef((props, forwardedRef) => {
             'iui-open': isOpen,
         }, className), onClick: (0, index_js_1.mergeEventHandlers)(onClickProp, () => {
             dispatch({ type: isOpen ? 'close' : 'open' });
-        }), ...rest }, children !== null && children !== void 0 ? children : React.createElement(index_js_1.SvgCaretDownSmall, { "aria-hidden": true })));
+        }), ...rest }, children ?? React.createElement(index_js_1.SvgCaretDownSmall, { "aria-hidden": true })));
 });
 exports.ComboBoxEndIcon.displayName = 'ComboBoxEndIcon';

package/cjs/core/ComboBox/ComboBoxInput.js

@@ -39,18 +39,16 @@ exports.ComboBoxInput = React.forwardRef((props, forwardedRef) => {
     const dispatch = (0, index_js_2.useSafeContext)(helpers_js_1.ComboBoxActionContext);
     const { inputRef, menuRef, optionsExtraInfoRef } = (0, index_js_2.useSafeContext)(helpers_js_1.ComboBoxRefsContext);
     const refs = (0, index_js_2.useMergedRefs)(inputRef, forwardedRef);
-    const focusedIndexRef = React.useRef(focusedIndex !== null && focusedIndex !== void 0 ? focusedIndex : -1);
+    const focusedIndexRef = React.useRef(focusedIndex ?? -1);
     React.useEffect(() => {
-        focusedIndexRef.current = focusedIndex !== null && focusedIndex !== void 0 ? focusedIndex : -1;
+        focusedIndexRef.current = focusedIndex ?? -1;
     }, [focusedIndex]);
     const getIdFromIndex = (index) => {
-        var _a, _b, _c;
-        return ((_c = (_b = (_a = menuRef.current) === null || _a === void 0 ? void 0 : _a.querySelector(`[data-iui-index="${index}"]`)) === null || _b === void 0 ? void 0 : _b.id) !== null && _c !== void 0 ? _c : '');
+        return (menuRef.current?.querySelector(`[data-iui-index="${index}"]`)?.id ?? '');
     };
     const handleKeyDown = React.useCallback((event) => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
-        onKeyDownProp === null || onKeyDownProp === void 0 ? void 0 : onKeyDownProp(event);
-        const length = (_a = Object.keys(optionsExtraInfoRef.current).length) !== null && _a !== void 0 ? _a : 0;
+        onKeyDownProp?.(event);
+        const length = Object.keys(optionsExtraInfoRef.current).length ?? 0;
         if (event.altKey) {
             return;
         }
@@ -64,22 +62,23 @@ exports.ComboBoxInput = React.forwardRef((props, forwardedRef) => {
                     return;
                 }
                 if (focusedIndexRef.current === -1) {
-                    const currentElement = (_b = menuRef.current) === null || _b === void 0 ? void 0 : _b.querySelector('[data-iui-index]');
+                    const currentElement = menuRef.current?.querySelector('[data-iui-index]');
                     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),
+                        value: Number(currentElement?.getAttribute('data-iui-index') ?? 0),
                     });
                 }
                 // If virtualization is enabled, dont let round scrolling
                 if (enableVirtualization &&
-                    !((_e = (_d = menuRef.current) === null || _d === void 0 ? void 0 : _d.querySelector(`[data-iui-index="${focusedIndexRef.current}"]`)) === null || _e === void 0 ? void 0 : _e.nextElementSibling)) {
+                    !menuRef.current?.querySelector(`[data-iui-index="${focusedIndexRef.current}"]`)?.nextElementSibling) {
                     return;
                 }
                 let nextIndex = focusedIndexRef.current;
                 do {
-                    const currentElement = (_f = menuRef.current) === null || _f === void 0 ? void 0 : _f.querySelector(`[data-iui-index="${nextIndex}"]`);
-                    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'));
+                    const currentElement = menuRef.current?.querySelector(`[data-iui-index="${nextIndex}"]`);
+                    const nextElement = currentElement?.nextElementSibling ??
+                        menuRef.current?.querySelector('[data-iui-index]');
+                    nextIndex = Number(nextElement?.getAttribute('data-iui-index'));
                     if (nextElement) {
                         return dispatch({ type: 'focus', value: nextIndex });
                     }
@@ -96,20 +95,22 @@ exports.ComboBoxInput = React.forwardRef((props, forwardedRef) => {
                 }
                 // If virtualization is enabled, dont let round scrolling
                 if (enableVirtualization &&
-                    !((_k = (_j = menuRef.current) === null || _j === void 0 ? void 0 : _j.querySelector(`[data-iui-index="${focusedIndexRef.current}"]`)) === null || _k === void 0 ? void 0 : _k.previousElementSibling)) {
+                    !menuRef.current?.querySelector(`[data-iui-index="${focusedIndexRef.current}"]`)?.previousElementSibling) {
                     return;
                 }
                 if (focusedIndexRef.current === -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,
+                        value: Object.values(optionsExtraInfoRef.current)?.[length - 1]
+                            .__originalIndex ?? -1,
                     });
                 }
                 let prevIndex = focusedIndexRef.current;
                 do {
-                    const currentElement = (_o = menuRef.current) === null || _o === void 0 ? void 0 : _o.querySelector(`[data-iui-index="${prevIndex}"]`);
-                    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'));
+                    const currentElement = menuRef.current?.querySelector(`[data-iui-index="${prevIndex}"]`);
+                    const prevElement = currentElement?.previousElementSibling ??
+                        menuRef.current?.querySelector('[data-iui-index]:last-of-type');
+                    prevIndex = Number(prevElement?.getAttribute('data-iui-index'));
                     if (prevElement) {
                         return dispatch({ type: 'focus', value: prevIndex });
                     }
@@ -120,7 +121,7 @@ exports.ComboBoxInput = React.forwardRef((props, forwardedRef) => {
                 event.preventDefault();
                 if (isOpen) {
                     if (focusedIndexRef.current > -1) {
-                        onClickHandler === null || onClickHandler === void 0 ? void 0 : onClickHandler(focusedIndexRef.current);
+                        onClickHandler?.(focusedIndexRef.current);
                     }
                 }
                 else {
@@ -148,7 +149,7 @@ exports.ComboBoxInput = React.forwardRef((props, forwardedRef) => {
     ]);
     const handleFocus = React.useCallback((event) => {
         dispatch({ type: 'open' });
-        onFocusProp === null || onFocusProp === void 0 ? void 0 : onFocusProp(event);
+        onFocusProp?.(event);
     }, [dispatch, onFocusProp]);
     const handleClick = React.useCallback(() => {
         if (!isOpen) {

package/cjs/core/ComboBox/ComboBoxMenu.js

@@ -37,7 +37,7 @@ const index_js_1 = require("../Menu/index.js");
 const index_js_2 = require("../Surface/index.js");
 const index_js_3 = require("../utils/index.js");
 const helpers_js_1 = require("./helpers.js");
-const isOverflowOverlaySupported = () => { var _a, _b, _c; return (_c = (_b = (_a = (0, index_js_3.getWindow)()) === null || _a === void 0 ? void 0 : _a.CSS) === null || _b === void 0 ? void 0 : _b.supports) === null || _c === void 0 ? void 0 : _c.call(_b, 'overflow: overlay'); };
+const isOverflowOverlaySupported = () => (0, index_js_3.getWindow)()?.CSS?.supports?.('overflow: overlay');
 const VirtualizedComboBoxMenu = React.forwardRef(({ children, className, style, ...rest }, forwardedRef) => {
     const { minWidth, id, filteredOptions, getMenuItem, focusedIndex } = (0, index_js_3.useSafeContext)(helpers_js_1.ComboBoxStateContext);
     const { menuRef } = (0, index_js_3.useSafeContext)(helpers_js_1.ComboBoxRefsContext);
@@ -46,12 +46,11 @@ const VirtualizedComboBoxMenu = React.forwardRef(({ children, className, style,
         : children, // Here is expected empty state content
     [filteredOptions, getMenuItem, children]);
     const focusedVisibleIndex = React.useMemo(() => {
-        var _a, _b;
-        const currentElement = (_a = menuRef.current) === null || _a === void 0 ? void 0 : _a.querySelector(`[data-iui-index="${focusedIndex}"]`);
+        const currentElement = menuRef.current?.querySelector(`[data-iui-index="${focusedIndex}"]`);
         if (!currentElement) {
             return focusedIndex;
         }
-        return Number((_b = currentElement.getAttribute('data-iui-filtered-index')) !== null && _b !== void 0 ? _b : focusedIndex);
+        return Number(currentElement.getAttribute('data-iui-filtered-index') ?? focusedIndex);
     }, [focusedIndex, menuRef]);
     const { outerProps, innerProps, visibleChildren } = (0, index_js_3.useVirtualization)({
         // 'Fool' VirtualScroll by passing length 1

package/cjs/core/ComboBox/ComboBoxMenuItem.js

@@ -37,11 +37,11 @@ exports.ComboBoxMenuItem = React.memo(React.forwardRef((props, forwardedRef) =>
     const { focusedIndex, enableVirtualization } = (0, index_js_1.useSafeContext)(helpers_js_1.ComboBoxStateContext);
     const focusRef = (el) => {
         if (!enableVirtualization && focusedIndex === index) {
-            el === null || el === void 0 ? void 0 : el.scrollIntoView({ block: 'nearest' });
+            el?.scrollIntoView({ block: 'nearest' });
         }
     };
     const refs = (0, index_js_1.useMergedRefs)(forwardedRef, focusRef);
-    return (React.createElement(ListItem_js_1.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 },
+    return (React.createElement(ListItem_js_1.ListItem, { actionable: true, size: size, active: isSelected, disabled: disabled, focused: focusedIndex === index, ref: refs, onClick: () => onClick?.(value), role: role, tabIndex: role === 'presentation' ? undefined : -1, "aria-selected": isSelected, "aria-disabled": disabled, "data-iui-index": index, ...rest },
         startIcon && (React.createElement(ListItem_js_1.ListItem.Icon, { as: 'span', "aria-hidden": true }, startIcon)),
         React.createElement(ListItem_js_1.ListItem.Content, null,
             children,

package/cjs/core/ComboBox/helpers.js

@@ -30,7 +30,6 @@ exports.ComboBoxActionContext = exports.ComboBoxStateContext = exports.ComboBoxR
  *--------------------------------------------------------------------------------------------*/
 const React = __importStar(require("react"));
 const comboBoxReducer = (state, action) => {
-    var _a, _b, _c, _d, _e;
     switch (action.type) {
         case 'open': {
             return { ...state, isOpen: true };
@@ -44,8 +43,8 @@ const comboBoxReducer = (state, action) => {
             }
             return {
                 ...state,
-                selected: (_a = action.value) !== null && _a !== void 0 ? _a : state.selected,
-                focusedIndex: (_b = action.value) !== null && _b !== void 0 ? _b : state.focusedIndex,
+                selected: action.value ?? state.selected,
+                focusedIndex: action.value ?? state.focusedIndex,
             };
         }
         case 'multiselect': {
@@ -58,12 +57,12 @@ const comboBoxReducer = (state, action) => {
             if (Array.isArray(state.selected)) {
                 return {
                     ...state,
-                    focusedIndex: (_c = action.value) !== null && _c !== void 0 ? _c : -1,
+                    focusedIndex: action.value ?? -1,
                 };
             }
             return {
                 ...state,
-                focusedIndex: (_e = (_d = action.value) !== null && _d !== void 0 ? _d : state.selected) !== null && _e !== void 0 ? _e : -1,
+                focusedIndex: action.value ?? state.selected ?? -1,
             };
         }
         default: {