@itwin/itwinui-react 1.38.1 → 1.39.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [1.39.0](https://www.github.com/iTwin/iTwinUI-react/compare/v1.38.0...v1.39.0) (2022-06-03)
+
+### What's new
+
+* Add support of react 18 ([#656](https://www.github.com/iTwin/iTwinUI-react/issues/656)) ([b7a4c7b](https://www.github.com/iTwin/iTwinUI-react/commit/b7a4c7ba1e26445308dcb7f1fd5a374743de4e6f))
+* **Combobox:** Virtualization ([#539](https://www.github.com/iTwin/iTwinUI-react/issues/539)) ([9e93871](https://www.github.com/iTwin/iTwinUI-react/commit/9e93871c59935a39f6ee1d633d96df04b78f33a1))
+
+### Fixes
+
+* **Carousel:** Use event handler instead of useEffect for scroll ([#683](https://www.github.com/iTwin/iTwinUI-react/issues/683)) ([bcf125b](https://www.github.com/iTwin/iTwinUI-react/commit/bcf125be76495352a06c063bc7a0d5d2a884c860))
+* **Toaster:** Fix inital position setting ([#687](https://www.github.com/iTwin/iTwinUI-react/issues/687)) ([c58b747](https://www.github.com/iTwin/iTwinUI-react/commit/c58b74786bf90a165993afb2eec926f74b37a1eb))
+
 ### [1.38.1](https://www.github.com/iTwin/iTwinUI-react/compare/v1.38.0...v1.38.1) (2022-05-23)
 
 ### Fixes

package/cjs/core/Carousel/Carousel.js

@@ -64,19 +64,24 @@ exports.Carousel = Object.assign(react_1.default.forwardRef(function (props, ref
     var id = react_1.default.useState(function () { var _a; return (_a = props.id) !== null && _a !== void 0 ? _a : "iui-carousel-".concat((0, utils_1.getRandomValue)(10)); })[0];
     (0, utils_1.useTheme)();
     var isManuallyUpdating = react_1.default.useRef(false);
-    var scrollInstantly = react_1.default.useRef(false);
     var carouselRef = react_1.default.useRef(null);
     var refs = (0, utils_1.useMergedRefs)(carouselRef, ref);
-    var _b = react_1.default.useState(userActiveIndex), currentIndex = _b[0], _setCurrentIndex = _b[1];
+    var _b = react_1.default.useState(userActiveIndex), currentIndex = _b[0], setCurrentIndex = _b[1];
+    var scrollToSlide = react_1.default.useRef(function () { }); // stub function populated in CarouselSlider
+    var justMounted = react_1.default.useRef(true);
     react_1.default.useEffect(function () {
-        _setCurrentIndex(userActiveIndex);
-    }, [userActiveIndex]);
-    var setCurrentIndex = react_1.default.useCallback(function (index) {
         var _a;
-        _setCurrentIndex(index);
-        isManuallyUpdating.current = true;
-        (_a = carouselRef.current) === null || _a === void 0 ? void 0 : _a.focus();
-    }, []);
+        setCurrentIndex(userActiveIndex);
+        scrollToSlide.current(userActiveIndex, {
+            instant: justMounted.current,
+        });
+        // re-focus the carousel for keyboard nav, but not on first mount
+        // because it shows outline and might interfere with other components
+        if (!justMounted.current) {
+            (_a = carouselRef.current) === null || _a === void 0 ? void 0 : _a.focus({ preventScroll: true });
+        }
+        justMounted.current = false;
+    }, [userActiveIndex]);
     var _c = react_1.default.useState(0), slideCount = _c[0], setSlideCount = _c[1];
     var _d = react_1.default.useState({}), keysPressed = _d[0], setKeysPressed = _d[1];
     var handleKeyDown = function (event) {
@@ -94,12 +99,16 @@ exports.Carousel = Object.assign(react_1.default.forwardRef(function (props, ref
         switch (event.key) {
             case 'ArrowLeft': {
                 setKeysPressed(function (old) { return (__assign(__assign({}, old), { ArrowLeft: false })); });
-                setCurrentIndex(function (old) { return (slideCount + old - 1) % slideCount; });
+                var prevIndex = (slideCount + currentIndex - 1) % slideCount;
+                scrollToSlide.current(prevIndex);
+                setCurrentIndex(prevIndex);
                 break;
             }
             case 'ArrowRight': {
                 setKeysPressed(function (old) { return (__assign(__assign({}, old), { ArrowRight: false })); });
-                setCurrentIndex(function (old) { return (slideCount + old + 1) % slideCount; });
+                var nextIndex = (slideCount + currentIndex + 1) % slideCount;
+                scrollToSlide.current(nextIndex);
+                setCurrentIndex(nextIndex);
                 break;
             }
         }
@@ -118,7 +127,7 @@ exports.Carousel = Object.assign(react_1.default.forwardRef(function (props, ref
                 keysPressed: keysPressed,
                 idPrefix: id,
                 isManuallyUpdating: isManuallyUpdating,
-                scrollInstantly: scrollInstantly,
+                scrollToSlide: scrollToSlide,
             } }, children)));
 }), {
     Slider: CarouselSlider_1.CarouselSlider,

package/cjs/core/Carousel/CarouselContext.d.ts

@@ -31,7 +31,9 @@ export declare const CarouselContext: React.Context<{
      */
     isManuallyUpdating: React.MutableRefObject<boolean>;
     /**
-     * Ref object used to skip smooth scrolling when button is clicked too many times.
+     * Function that scrolls to the current slide. Should be called on all managed events (clicks and keydowns).
      */
-    scrollInstantly: React.MutableRefObject<boolean>;
+    scrollToSlide: React.MutableRefObject<(slideIndex: number, options?: {
+        instant?: boolean;
+    }) => void>;
 } | undefined>;

package/cjs/core/Carousel/CarouselDotsList.js

@@ -69,6 +69,7 @@ exports.CarouselDotsList = react_1.default.forwardRef(function (props, ref) {
     var handleSlideChange = react_1.default.useCallback(function (index) {
         if (context) {
             context.setCurrentIndex(index);
+            context.scrollToSlide.current(index);
         }
         onSlideChange === null || onSlideChange === void 0 ? void 0 : onSlideChange(index);
     }, [context, onSlideChange]);

package/cjs/core/Carousel/CarouselNavigation.js

@@ -43,13 +43,12 @@ var PreviousButton = react_1.default.forwardRef(function (props, ref) {
     if (!context) {
         throw new Error('CarouselNavigation should be used inside Carousel');
     }
-    var slideCount = context.slideCount, setCurrentIndex = context.setCurrentIndex, keysPressed = context.keysPressed, scrollInstantly = context.scrollInstantly;
+    var slideCount = context.slideCount, currentIndex = context.currentIndex, setCurrentIndex = context.setCurrentIndex, keysPressed = context.keysPressed, scrollToSlide = context.scrollToSlide;
     return (react_1.default.createElement(Buttons_1.IconButton, __assign({ styleType: 'borderless', size: 'small', tabIndex: -1, "data-pressed": keysPressed['ArrowLeft'] || undefined, ref: ref }, props, { onClick: function (e) {
             var _a;
-            if (e.detail > 3) {
-                scrollInstantly.current = true;
-            }
-            setCurrentIndex(function (old) { return (slideCount + old - 1) % slideCount; });
+            var prevIndex = (slideCount + currentIndex - 1) % slideCount;
+            setCurrentIndex(prevIndex);
+            scrollToSlide.current(prevIndex, { instant: e.detail > 3 });
             (_a = props === null || props === void 0 ? void 0 : props.onClick) === null || _a === void 0 ? void 0 : _a.call(props, e);
         } }),
         react_1.default.createElement(ChevronLeft_1.default, null)));
@@ -60,13 +59,12 @@ var NextButton = react_1.default.forwardRef(function (props, ref) {
     if (!context) {
         throw new Error('CarouselNavigation should be used inside Carousel');
     }
-    var slideCount = context.slideCount, setCurrentIndex = context.setCurrentIndex, keysPressed = context.keysPressed, scrollInstantly = context.scrollInstantly;
+    var slideCount = context.slideCount, currentIndex = context.currentIndex, setCurrentIndex = context.setCurrentIndex, keysPressed = context.keysPressed, scrollToSlide = context.scrollToSlide;
     return (react_1.default.createElement(Buttons_1.IconButton, __assign({ styleType: 'borderless', size: 'small', tabIndex: -1, "data-pressed": keysPressed['ArrowRight'] || undefined, ref: ref }, props, { onClick: function (e) {
             var _a;
-            if (e.detail > 3) {
-                scrollInstantly.current = true;
-            }
-            setCurrentIndex(function (old) { return (slideCount + old + 1) % slideCount; });
+            var nextIndex = (slideCount + currentIndex + 1) % slideCount;
+            setCurrentIndex(nextIndex);
+            scrollToSlide.current(nextIndex, { instant: e.detail > 3 });
             (_a = props === null || props === void 0 ? void 0 : props.onClick) === null || _a === void 0 ? void 0 : _a.call(props, e);
         } }),
         react_1.default.createElement(ChevronRight_1.default, null)));

package/cjs/core/Carousel/CarouselSlide.js

@@ -46,17 +46,13 @@ exports.CarouselSlide = react_1.default.forwardRef(function (props, ref) {
     if (!context || index == null) {
         throw new Error('CarouselSlide must be used within Carousel');
     }
-    var currentIndex = context.currentIndex, isManuallyUpdating = context.isManuallyUpdating, setCurrentIndex = context.setCurrentIndex;
+    var isManuallyUpdating = context.isManuallyUpdating, setCurrentIndex = context.setCurrentIndex;
     var updateActiveIndexOnScroll = react_1.default.useCallback(function () {
         // only update index if scroll was triggered by browser
-        if (!isManuallyUpdating.current && currentIndex !== index) {
+        if (!isManuallyUpdating.current) {
             setCurrentIndex(index);
         }
-        // when manual scroll completes, reset the state of `isManuallyUpdating` so that it's ready for future actions
-        if (currentIndex === index) {
-            isManuallyUpdating.current = false;
-        }
-    }, [currentIndex, index, isManuallyUpdating, setCurrentIndex]);
+    }, [index, isManuallyUpdating, setCurrentIndex]);
     var intersectionRef = (0, utils_1.useIntersection)(updateActiveIndexOnScroll, { threshold: 0.5 }, false);
     var refs = (0, utils_1.useMergedRefs)(intersectionRef, ref);
     return (react_1.default.createElement("li", __assign({ className: (0, classnames_1.default)('iui-carousel-slider-item', className), role: 'tabpanel', "aria-roledescription": 'slide', ref: refs }, rest), children));

package/cjs/core/Carousel/CarouselSlider.js

@@ -43,7 +43,7 @@ exports.CarouselSlider = react_1.default.forwardRef(function (props, ref) {
     if (!context) {
         throw new Error('CarouselSlider must be used within Carousel');
     }
-    var currentIndex = context.currentIndex, setSlideCount = context.setSlideCount, idPrefix = context.idPrefix, isManuallyUpdating = context.isManuallyUpdating, scrollInstantly = context.scrollInstantly;
+    var setSlideCount = context.setSlideCount, idPrefix = context.idPrefix, scrollToSlide = context.scrollToSlide, isManuallyUpdating = context.isManuallyUpdating;
     var items = react_1.default.useMemo(function () {
         var _a;
         return (_a = react_1.default.Children.map(children, function (child, index) {
@@ -58,37 +58,32 @@ exports.CarouselSlider = react_1.default.forwardRef(function (props, ref) {
     react_1.default.useLayoutEffect(function () {
         setSlideCount(items.length);
     }, [items.length, setSlideCount]);
-    var _a = react_1.default.useState(), width = _a[0], setWidth = _a[1];
-    var resizeRef = (0, utils_1.useResizeObserver)(function (_a) {
-        var width = _a.width;
-        return setWidth(width);
-    })[0];
     var sliderRef = react_1.default.useRef(null);
-    var refs = (0, utils_1.useMergedRefs)(sliderRef, resizeRef, ref);
-    var justMounted = react_1.default.useRef(true);
-    var previousWidth = react_1.default.useRef();
-    react_1.default.useLayoutEffect(function () {
-        var _a, _b, _c;
-        var slideToShow = (_a = sliderRef.current) === null || _a === void 0 ? void 0 : _a.children.item(currentIndex);
-        if (!sliderRef.current ||
-            !slideToShow ||
-            (!isManuallyUpdating.current && previousWidth.current === width)) {
+    var refs = (0, utils_1.useMergedRefs)(sliderRef, ref);
+    scrollToSlide.current = function (slideIndex, _a) {
+        var _b, _c, _d;
+        var _e = _a === void 0 ? {} : _a, instant = _e.instant;
+        isManuallyUpdating.current = true; // start manual update
+        var slideToShow = (_b = sliderRef.current) === null || _b === void 0 ? void 0 : _b.children.item(slideIndex);
+        if (!sliderRef.current || !slideToShow) {
             return;
         }
-        // instant scroll on first mount
-        if (justMounted.current) {
-            scrollInstantly.current = true;
-            justMounted.current = false;
-        }
-        var motionOk = (_c = (_b = (0, utils_1.getWindow)()) === null || _b === void 0 ? void 0 : _b.matchMedia('(prefers-reduced-motion: no-preference)')) === null || _c === void 0 ? void 0 : _c.matches;
+        var motionOk = (_d = (_c = (0, utils_1.getWindow)()) === null || _c === void 0 ? void 0 : _c.matchMedia('(prefers-reduced-motion: no-preference)')) === null || _d === void 0 ? void 0 : _d.matches;
         sliderRef.current.scrollTo({
             left: slideToShow.offsetLeft - sliderRef.current.offsetLeft,
-            behavior: (scrollInstantly.current || !motionOk
-                ? 'instant'
-                : 'smooth'), // scrollTo accepts 'instant' but ScrollBehavior type is wrong
+            behavior: (instant || !motionOk ? 'instant' : 'smooth'), // scrollTo accepts 'instant' but ScrollBehavior type is wrong
         });
-        scrollInstantly.current = false;
-        previousWidth.current = width;
-    }, [currentIndex, isManuallyUpdating, scrollInstantly, width]);
-    return (react_1.default.createElement("ol", __assign({ "aria-live": 'polite', className: (0, classnames_1.default)('iui-carousel-slider', className), ref: refs }, rest), items));
+    };
+    var scrollTimeout = react_1.default.useRef();
+    // reset isManuallyUpdating.current to false after the last scroll event
+    var handleOnScroll = react_1.default.useCallback(function () {
+        var _a, _b;
+        if (scrollTimeout.current) {
+            (_a = (0, utils_1.getWindow)()) === null || _a === void 0 ? void 0 : _a.clearTimeout(scrollTimeout.current);
+        }
+        scrollTimeout.current = (_b = (0, utils_1.getWindow)()) === null || _b === void 0 ? void 0 : _b.setTimeout(function () {
+            isManuallyUpdating.current = false;
+        }, 100);
+    }, [isManuallyUpdating]);
+    return (react_1.default.createElement("ol", __assign({ "aria-live": 'polite', className: (0, classnames_1.default)('iui-carousel-slider', className), ref: refs, onScroll: handleOnScroll }, rest), items));
 });

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

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

package/cjs/core/ComboBox/ComboBox.js

@@ -106,6 +106,7 @@ var ComboBox = function (props) {
         if (isOpen) {
             (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.focus(); // Focus the input
             setFilteredOptions(options); // Reset the filtered list
+            dispatch(['focus']);
         }
         // When the dropdown closes
         else {
@@ -128,6 +129,7 @@ var ComboBox = function (props) {
     var _g = react_1.default.useState(options), filteredOptions = _g[0], setFilteredOptions = _g[1];
     react_1.default.useEffect(function () {
         setFilteredOptions(options);
+        dispatch(['focus']);
     }, [options]);
     // Filter options based on input value
     var _h = react_1.default.useState((_a = inputProps === null || inputProps === void 0 ? void 0 : inputProps.value) !== null && _a !== void 0 ? _a : ''), inputValue = _h[0], setInputValue = _h[1];
@@ -139,12 +141,11 @@ var ComboBox = function (props) {
         setFilteredOptions((_a = filterFunction === null || filterFunction === void 0 ? void 0 : filterFunction(options, value)) !== null && _a !== void 0 ? _a : options.filter(function (option) {
             return option.label.toLowerCase().includes(value.toLowerCase());
         }));
+        if (focusedIndex != -1) {
+            dispatch(['focus', -1]);
+        }
         (_b = inputProps === null || inputProps === void 0 ? void 0 : inputProps.onChange) === null || _b === void 0 ? void 0 : _b.call(inputProps, event);
-    }, [filterFunction, inputProps, options]);
-    // Reset focused item when filteredOptions change
-    react_1.default.useEffect(function () {
-        dispatch(['focus']);
-    }, [filteredOptions]);
+    }, [filterFunction, focusedIndex, inputProps, options]);
     // When the value prop changes, update the selectedIndex
     react_1.default.useEffect(function () {
         dispatch([
@@ -163,7 +164,7 @@ var ComboBox = function (props) {
             (_b = onChangeProp.current) === null || _b === void 0 ? void 0 : _b.call(onChangeProp, value);
         }
     }, [options, selectedIndex, valueProp]);
-    var getMenuItem = react_1.default.useCallback(function (option) {
+    var getMenuItem = react_1.default.useCallback(function (option, filteredIndex) {
         var optionId = getOptionId(option, id);
         var __originalIndex = optionsExtraInfoRef.current[optionId].__originalIndex;
         var customItem = itemRenderer
@@ -186,12 +187,13 @@ var ComboBox = function (props) {
                 'iui-focused': focusedIndex === __originalIndex,
             }),
             'data-iui-index': __originalIndex,
+            'data-iui-filtered-index': filteredIndex,
             ref: (0, utils_1.mergeRefs)(customItem.props.ref, function (el) {
                 if (!enableVirtualization && focusedIndex === __originalIndex) {
                     el === null || el === void 0 ? void 0 : el.scrollIntoView({ block: 'nearest' });
                 }
             }),
-        })) : (react_1.default.createElement(ComboBoxMenuItem_1.ComboBoxMenuItem, __assign({ key: optionId, id: optionId }, option, { isSelected: selectedIndex === __originalIndex, onClick: function () { return dispatch(['select', __originalIndex]); }, index: __originalIndex }), option.label));
+        })) : (react_1.default.createElement(ComboBoxMenuItem_1.ComboBoxMenuItem, __assign({ key: optionId, id: optionId }, option, { isSelected: selectedIndex === __originalIndex, onClick: function () { return dispatch(['select', __originalIndex]); }, index: __originalIndex, "data-iui-filtered-index": filteredIndex }), option.label));
     }, [enableVirtualization, focusedIndex, id, itemRenderer, selectedIndex]);
     return (react_1.default.createElement(helpers_1.ComboBoxRefsContext.Provider, { value: { inputRef: inputRef, menuRef: menuRef, toggleButtonRef: toggleButtonRef, optionsExtraInfoRef: optionsExtraInfoRef } },
         react_1.default.createElement(helpers_1.ComboBoxActionContext.Provider, { value: dispatch },

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

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

package/cjs/core/ComboBox/ComboBoxInput.js

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

package/cjs/core/ComboBox/ComboBoxMenu.js

@@ -43,16 +43,24 @@ var VirtualizedComboBoxMenu = react_1.default.forwardRef(function (_a, forwarded
     var menuRef = (0, utils_1.useSafeContext)(helpers_1.ComboBoxRefsContext).menuRef;
     var virtualItemRenderer = react_1.default.useCallback(function (index) {
         return filteredOptions.length > 0
-            ? getMenuItem(filteredOptions[index])
+            ? getMenuItem(filteredOptions[index], index)
             : children;
     }, // Here is expected empty state content
     [filteredOptions, getMenuItem, children]);
+    var focusedVisibleIndex = react_1.default.useMemo(function () {
+        var _a, _b;
+        var currentElement = (_a = menuRef.current) === null || _a === void 0 ? void 0 : _a.querySelector("[data-iui-index=\"".concat(focusedIndex, "\"]"));
+        if (!currentElement) {
+            return focusedIndex;
+        }
+        return Number((_b = currentElement.getAttribute('data-iui-filtered-index')) !== null && _b !== void 0 ? _b : focusedIndex);
+    }, [focusedIndex, menuRef]);
     var _f = (0, utils_1.useVirtualization)({
         // 'Fool' VirtualScroll by passing length 1
         // whenever there is no elements, to show empty state message
         itemsLength: filteredOptions.length || 1,
         itemRenderer: virtualItemRenderer,
-        scrollToIndex: focusedIndex,
+        scrollToIndex: focusedVisibleIndex,
     }), outerProps = _f.outerProps, innerProps = _f.innerProps, visibleChildren = _f.visibleChildren;
     var overflowY = ((_d = (_c = (_b = (0, utils_1.getWindow)()) === null || _b === void 0 ? void 0 : _b.CSS) === null || _c === void 0 ? void 0 : _c.supports) === null || _d === void 0 ? void 0 : _d.call(_c, 'overflow-x: overlay'))
         ? { overflowY: 'overlay' }

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

@@ -24,7 +24,7 @@ declare type ComboBoxStateContextProps<T = unknown> = {
     minWidth: number;
     enableVirtualization: boolean;
     filteredOptions: SelectOption<T>[];
-    getMenuItem: (option: SelectOption<T>) => JSX.Element;
+    getMenuItem: (option: SelectOption<T>, filteredIndex?: number) => JSX.Element;
     focusedIndex?: number;
 };
 export declare const ComboBoxStateContext: React.Context<ComboBoxStateContextProps<unknown> | undefined>;

package/cjs/core/DatePicker/DatePicker.d.ts

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

package/cjs/core/Table/Table.js

@@ -187,6 +187,12 @@ var Table = function (props) {
         return result;
     }, {});
     var areFiltersSet = allColumns.some(function (column) { return column.filterValue != null && column.filterValue !== ''; });
+    var showFilterButton = function (column) {
+        return (data.length !== 0 || areFiltersSet) && column.canFilter;
+    };
+    var showSortButton = function (column) {
+        return data.length !== 0 && column.canSort;
+    };
     var onRowClickHandler = react_1.default.useCallback(function (event, row) {
         var isDisabled = isRowDisabled === null || isRowDisabled === void 0 ? void 0 : isRowDisabled(row.original);
         if (!isDisabled) {
@@ -297,28 +303,32 @@ var Table = function (props) {
             className: (0, classnames_1.default)('iui-table', (_a = {}, _a["iui-".concat(density)] = density !== 'default', _a), className),
             style: style,
         }), ariaDataAttributes),
-            react_1.default.createElement("div", { className: 'iui-table-header', ref: headerRef }, headerGroups.slice(1).map(function (headerGroup) {
-                var headerGroupProps = headerGroup.getHeaderGroupProps({
-                    className: 'iui-row',
-                });
-                return (react_1.default.createElement("div", __assign({}, headerGroupProps, { key: headerGroupProps.key }), headerGroup.headers.map(function (column, index) {
-                    var columnProps = column.getHeaderProps(__assign(__assign({}, column.getSortByToggleProps()), { className: (0, classnames_1.default)('iui-cell', { 'iui-actionable': column.canSort }, { 'iui-sorted': column.isSorted }, column.columnClassName), style: __assign(__assign({}, (0, utils_2.getCellStyle)(column, !!state.isTableResizing)), { flexWrap: 'unset' }) }));
-                    return (react_1.default.createElement("div", __assign({}, columnProps, column.getDragAndDropProps(), { key: columnProps.key, title: undefined, ref: function (el) {
-                            if (el && isResizable) {
-                                columnRefs.current[column.id] = el;
-                                column.resizeWidth = el.getBoundingClientRect().width;
-                            }
-                        } }),
-                        column.render('Header'),
-                        (data.length !== 0 || areFiltersSet) && (react_1.default.createElement(filters_1.FilterToggle, { column: column, ownerDocument: ownerDocument })),
-                        data.length !== 0 && column.canSort && (react_1.default.createElement("div", { className: 'iui-cell-end-icon' }, column.isSorted && column.isSortedDesc ? (react_1.default.createElement(SortDown_1.default, { className: 'iui-icon iui-sort', "aria-hidden": true })) : (react_1.default.createElement(SortUp_1.default, { className: 'iui-icon iui-sort', "aria-hidden": true })))),
-                        isResizable &&
-                            column.isResizerVisible &&
-                            index !== headerGroup.headers.length - 1 && (react_1.default.createElement("div", __assign({}, column.getResizerProps(), { className: 'iui-resizer' }),
-                            react_1.default.createElement("div", { className: 'iui-resizer-bar' }))),
-                        enableColumnReordering && !column.disableReordering && (react_1.default.createElement("div", { className: 'iui-reorder-bar' }))));
-                })));
-            })),
+            react_1.default.createElement("div", { className: 'iui-table-header-wrapper', ref: headerRef },
+                react_1.default.createElement("div", { className: 'iui-table-header' }, headerGroups.slice(1).map(function (headerGroup) {
+                    var headerGroupProps = headerGroup.getHeaderGroupProps({
+                        className: 'iui-row',
+                    });
+                    return (react_1.default.createElement("div", __assign({}, headerGroupProps, { key: headerGroupProps.key }), headerGroup.headers.map(function (column, index) {
+                        var columnProps = column.getHeaderProps(__assign(__assign({}, column.getSortByToggleProps()), { className: (0, classnames_1.default)('iui-cell', { 'iui-actionable': column.canSort }, { 'iui-sorted': column.isSorted }, column.columnClassName), style: (0, utils_2.getCellStyle)(column, !!state.isTableResizing) }));
+                        return (react_1.default.createElement("div", __assign({}, columnProps, column.getDragAndDropProps(), { key: columnProps.key, title: undefined, ref: function (el) {
+                                if (el && isResizable) {
+                                    columnRefs.current[column.id] = el;
+                                    column.resizeWidth = el.getBoundingClientRect().width;
+                                }
+                            } }),
+                            column.render('Header'),
+                            (showFilterButton(column) ||
+                                showSortButton(column)) && (react_1.default.createElement("div", { className: 'iui-table-header-actions-container' },
+                                showFilterButton(column) && (react_1.default.createElement(filters_1.FilterToggle, { column: column, ownerDocument: ownerDocument })),
+                                showSortButton(column) && (react_1.default.createElement("div", { className: 'iui-cell-end-icon' }, column.isSorted && column.isSortedDesc ? (react_1.default.createElement(SortDown_1.default, { className: 'iui-icon iui-sort', "aria-hidden": true })) : (react_1.default.createElement(SortUp_1.default, { className: 'iui-icon iui-sort', "aria-hidden": true })))))),
+                            isResizable &&
+                                column.isResizerVisible &&
+                                index !== headerGroup.headers.length - 1 && (react_1.default.createElement("div", __assign({}, column.getResizerProps(), { className: 'iui-resizer' }),
+                                react_1.default.createElement("div", { className: 'iui-resizer-bar' }))),
+                            enableColumnReordering &&
+                                !column.disableReordering && (react_1.default.createElement("div", { className: 'iui-reorder-bar' }))));
+                    })));
+                }))),
             react_1.default.createElement("div", __assign({}, getTableBodyProps({
                 className: (0, classnames_1.default)('iui-table-body', {
                     'iui-zebra-striping': styleType === 'zebra-rows',

package/cjs/core/Table/TablePaginator.js

@@ -149,7 +149,7 @@ var TablePaginator = function (props) {
     }
     var hasNoRows = totalPagesCount === 0;
     var showPagesList = totalPagesCount > 1 || isLoading;
-    var showPageSizeList = pageSizeList && onPageSizeChange && !!totalRowsCount;
+    var showPageSizeList = pageSizeList && !!onPageSizeChange && !!totalRowsCount;
     var ellipsis = (react_1.default.createElement("span", { className: (0, classnames_1.default)('iui-paginator-ellipsis', {
             'iui-paginator-ellipsis-small': size === 'small',
         }) }, "\u2026"));

package/cjs/core/Table/filters/tableFilters.d.ts

@@ -28,7 +28,7 @@ export declare const tableFilters: {
      * Basic filter with a single input field.
      * @param translatedLabels Translated filter labels.
      */
-    TextFilter: (translatedLabels?: FilterButtonBarTranslation | undefined) => <T extends Record<string, unknown>>(props: TableFilterProps<T>) => JSX.Element;
+    TextFilter: (translatedLabels?: FilterButtonBarTranslation) => <T extends Record<string, unknown>>(props: TableFilterProps<T>) => JSX.Element;
     /**
      * Date range filter.
      *
@@ -39,7 +39,7 @@ export declare const tableFilters: {
      * If your data is different type e.g. `string`, you can use `accessor` property in column description:
      * `accessor: (rowData) => new Date(rowData.date)`.
      */
-    DateRangeFilter: (options?: DateRangeFilterOptions | undefined) => <T_1 extends Record<string, unknown>>(props: TableFilterProps<T_1>) => JSX.Element;
+    DateRangeFilter: (options?: DateRangeFilterOptions) => <T_1 extends Record<string, unknown>>(props: TableFilterProps<T_1>) => JSX.Element;
     /**
      * Number range filter.
      *
@@ -48,5 +48,5 @@ export declare const tableFilters: {
      * `accessor: (rowData) => Number(rowData.numberProp)`.
      * @param translatedLabels Translated filter labels.
      */
-    NumberRangeFilter: (translatedLabels?: (NumberRangeTranslation & FilterButtonBarTranslation) | undefined) => <T_2 extends Record<string, unknown>>(props: NumberRangeFilterProps<T_2>) => JSX.Element;
+    NumberRangeFilter: (translatedLabels?: NumberRangeTranslation & FilterButtonBarTranslation) => <T_2 extends Record<string, unknown>>(props: NumberRangeFilterProps<T_2>) => JSX.Element;
 };

package/cjs/core/Table/hooks/useExpanderCell.js

@@ -19,8 +19,16 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useExpanderCell = void 0;
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+ * See LICENSE.md in the project root for license terms and full copyright notice.
+ *--------------------------------------------------------------------------------------------*/
+var react_1 = __importDefault(require("react"));
 var columns_1 = require("../columns");
 var useExpanderCell = function (subComponent, expanderCell, isRowDisabled) { return function (hooks) {
     if (!subComponent) {
@@ -36,7 +44,9 @@ var useExpanderCell = function (subComponent, expanderCell, isRowDisabled) { ret
             isDisabled: isRowDisabled,
         });
         return __spreadArray([
-            __assign(__assign({}, expanderColumn), { Cell: expanderCell !== null && expanderCell !== void 0 ? expanderCell : expanderColumn.Cell })
+            __assign(__assign({}, expanderColumn), { Cell: expanderCell
+                    ? function (cellProps) { return react_1.default.createElement(react_1.default.Fragment, null, expanderCell(cellProps)); }
+                    : expanderColumn.Cell })
         ], columns, true);
     });
 }; };