@itwin/itwinui-react 1.41.0 → 1.42.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [1.42.0](https://www.github.com/iTwin/iTwinUI-react/compare/v1.41.0...v1.42.0) (2022-07-26)
+
+### Fixes
+
+* **ComboBox:** Prevent infinite loop when `options` change ([#738](https://www.github.com/iTwin/iTwinUI-react/issues/738)) ([7788f45](https://www.github.com/iTwin/iTwinUI-react/commit/7788f451fcbf9dd7959d3fa727c0cdee3485bbcd))
+* **Small:** Use `small` element instead of `p` ([#735](https://www.github.com/iTwin/iTwinUI-react/issues/735)) ([c59f213](https://www.github.com/iTwin/iTwinUI-react/commit/c59f21326e049bce50e24c729a46482b74ef63c3))
+
+
+### What's new
+
+* **Table:** Scroll table to selected item ([#689](https://www.github.com/iTwin/iTwinUI-react/issues/689)) ([afa947b](https://www.github.com/iTwin/iTwinUI-react/commit/afa947b15411305c1bfc57b239d916fc599acfbe))
+* **Tree:** Virtualization ([#713](https://www.github.com/iTwin/iTwinUI-react/issues/713)) ([d4d3575](https://www.github.com/iTwin/iTwinUI-react/commit/d4d35758fa0c8f00811f387cc8453b82e9773c85))
+
 ## [1.41.0](https://www.github.com/iTwin/iTwinUI-react/compare/v1.40.1...v1.41.0) (2022-07-13)
 
 ### What's new

package/cjs/core/ComboBox/ComboBox.js

@@ -75,11 +75,9 @@ var ComboBox = function (props) {
     var menuRef = react_1.default.useRef(null);
     var toggleButtonRef = react_1.default.useRef(null);
     var mounted = react_1.default.useRef(false);
-    // Latest value of the onChange prop
-    var onChangeProp = react_1.default.useRef(onChange);
-    react_1.default.useEffect(function () {
-        onChangeProp.current = onChange;
-    }, [onChange]);
+    var valuePropRef = (0, utils_1.useLatestRef)(valueProp);
+    var onChangeProp = (0, utils_1.useLatestRef)(onChange);
+    var optionsRef = (0, utils_1.useLatestRef)(options);
     // Record to store all extra information (e.g. original indexes), where the key is the id of the option
     var optionsExtraInfoRef = react_1.default.useRef({});
     // Clear the extra info when the options change so that it can be reinitialized below
@@ -99,7 +97,7 @@ var ComboBox = function (props) {
     var _e = react_1.default.useReducer(helpers_1.comboBoxReducer, {
         isOpen: false,
         selectedIndex: valueProp
-            ? options.findIndex(function (option) { return option.value === valueProp; })
+            ? optionsRef.current.findIndex(function (option) { return option.value === valueProp; })
             : -1,
         focusedIndex: -1,
     }), _f = _e[0], isOpen = _f.isOpen, selectedIndex = _f.selectedIndex, focusedIndex = _f.focusedIndex, dispatch = _e[1];
@@ -108,7 +106,7 @@ var ComboBox = function (props) {
         // When the dropdown opens
         if (isOpen) {
             (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.focus(); // Focus the input
-            setFilteredOptions(options); // Reset the filtered list
+            setFilteredOptions(optionsRef.current); // Reset the filtered list
             dispatch(['focus']);
         }
         // When the dropdown closes
@@ -117,10 +115,10 @@ var ComboBox = function (props) {
             dispatch(['focus']);
             // Reset the input value
             setInputValue(selectedIndex != undefined && selectedIndex >= 0
-                ? (_b = options[selectedIndex]) === null || _b === void 0 ? void 0 : _b.label
+                ? (_b = optionsRef.current[selectedIndex]) === null || _b === void 0 ? void 0 : _b.label
                 : '');
         }
-    }, [isOpen, options, selectedIndex]);
+    }, [isOpen, optionsRef, selectedIndex]);
     // Set min-width of menu to be same as input
     var _g = react_1.default.useState(0), minWidth = _g[0], setMinWidth = _g[1];
     react_1.default.useEffect(function () {
@@ -151,14 +149,14 @@ var ComboBox = function (props) {
         var value = event.currentTarget.value;
         setInputValue(value);
         dispatch(['open']); // reopen when typing
-        setFilteredOptions((_a = filterFunction === null || filterFunction === void 0 ? void 0 : filterFunction(options, value)) !== null && _a !== void 0 ? _a : options.filter(function (option) {
+        setFilteredOptions((_a = filterFunction === null || filterFunction === void 0 ? void 0 : filterFunction(optionsRef.current, value)) !== null && _a !== void 0 ? _a : optionsRef.current.filter(function (option) {
             return option.label.toLowerCase().includes(value.toLowerCase());
         }));
         if (focusedIndex != -1) {
             dispatch(['focus', -1]);
         }
         (_b = inputProps === null || inputProps === void 0 ? void 0 : inputProps.onChange) === null || _b === void 0 ? void 0 : _b.call(inputProps, event);
-    }, [filterFunction, focusedIndex, inputProps, options]);
+    }, [filterFunction, focusedIndex, inputProps, optionsRef]);
     // When the value prop changes, update the selectedIndex
     react_1.default.useEffect(function () {
         dispatch([
@@ -174,9 +172,12 @@ var ComboBox = function (props) {
             mounted.current = true;
             return;
         }
-        var value = (_a = options[selectedIndex]) === null || _a === void 0 ? void 0 : _a.value;
-        (_b = onChangeProp.current) === null || _b === void 0 ? void 0 : _b.call(onChangeProp, value);
-    }, [options, selectedIndex]);
+        var currentValue = (_a = optionsRef.current[selectedIndex]) === null || _a === void 0 ? void 0 : _a.value;
+        if (currentValue === valuePropRef.current || selectedIndex === -1) {
+            return;
+        }
+        (_b = onChangeProp.current) === null || _b === void 0 ? void 0 : _b.call(onChangeProp, currentValue);
+    }, [onChangeProp, optionsRef, selectedIndex, valuePropRef]);
     var getMenuItem = react_1.default.useCallback(function (option, filteredIndex) {
         var optionId = getOptionId(option, id);
         var __originalIndex = optionsExtraInfoRef.current[optionId].__originalIndex;

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

@@ -182,6 +182,29 @@ export declare type TableProps<T extends Record<string, unknown> = Record<string
      * @default false
      */
     enableColumnReordering?: boolean;
+    /**
+     * Function that returns index of the row that you want to scroll to.
+     *
+     * It doesn't work with paginated tables and with lazy-loading.
+     * @beta
+     * @example
+     * <Table
+     *   scrollToRow={React.useCallback(
+     *     (rows, data) => rows.findIndex((row) => row.original === data[250]),
+     *     []
+     *   )}
+     *   {...restProps}
+     * />
+     * @example
+     * <Table
+     *   scrollToRow={React.useCallback(
+     *     (rows, data) => rows.findIndex((row) => row.original.id === data[250].id),
+     *     []
+     *   )}
+     *   {...restProps}
+     * />
+     */
+    scrollToRow?: (rows: Row<T>[], data: T[]) => number;
 } & Omit<CommonProps, 'title'>;
 /**
  * Table based on [react-table](https://react-table.tanstack.com/docs/api/overview).

package/cjs/core/Table/Table.js

@@ -240,6 +240,7 @@ var Table = function (props) {
         state.pageIndex,
         state.pageSize,
     ]);
+    var _r = (0, hooks_1.useScrollToRow)(__assign(__assign({}, props), { page: page })), scrollToIndex = _r.scrollToIndex, tableRowRef = _r.tableRowRef;
     var columnRefs = react_1.default.useRef({});
     var previousTableWidth = react_1.default.useRef(0);
     var onTableResize = react_1.default.useCallback(function (_a) {
@@ -276,11 +277,11 @@ var Table = function (props) {
     var headerRef = react_1.default.useRef(null);
     var bodyRef = react_1.default.useRef(null);
     // Using `useState` to rerender rows when table body ref is available
-    var _r = react_1.default.useState(null), bodyRefState = _r[0], setBodyRefState = _r[1];
+    var _s = react_1.default.useState(null), bodyRefState = _s[0], setBodyRefState = _s[1];
     var getPreparedRow = react_1.default.useCallback(function (index) {
         var row = page[index];
         prepareRow(row);
-        return (react_1.default.createElement(TableRowMemoized_1.TableRowMemoized, { row: row, rowProps: rowProps, isLast: index === page.length - 1, onRowInViewport: onRowInViewportRef, onBottomReached: onBottomReachedRef, intersectionMargin: intersectionMargin, state: state, key: row.getRowProps().key, onClick: onRowClickHandler, subComponent: subComponent, isDisabled: !!(isRowDisabled === null || isRowDisabled === void 0 ? void 0 : isRowDisabled(row.original)), tableHasSubRows: hasAnySubRows, tableInstance: instance, expanderCell: expanderCell, bodyRef: bodyRefState }));
+        return (react_1.default.createElement(TableRowMemoized_1.TableRowMemoized, { row: row, rowProps: rowProps, isLast: index === page.length - 1, onRowInViewport: onRowInViewportRef, onBottomReached: onBottomReachedRef, intersectionMargin: intersectionMargin, state: state, key: row.getRowProps().key, onClick: onRowClickHandler, subComponent: subComponent, isDisabled: !!(isRowDisabled === null || isRowDisabled === void 0 ? void 0 : isRowDisabled(row.original)), tableHasSubRows: hasAnySubRows, tableInstance: instance, expanderCell: expanderCell, bodyRef: bodyRefState, tableRowRef: enableVirtualization ? undefined : tableRowRef(row) }));
     }, [
         page,
         prepareRow,
@@ -294,6 +295,8 @@ var Table = function (props) {
         instance,
         expanderCell,
         bodyRefState,
+        enableVirtualization,
+        tableRowRef,
     ]);
     var virtualizedItemRenderer = react_1.default.useCallback(function (index) { return getPreparedRow(index); }, [getPreparedRow]);
     var updateStickyState = function () {
@@ -375,7 +378,7 @@ var Table = function (props) {
                         updateStickyState();
                     }
                 }, tabIndex: -1 }),
-                data.length !== 0 && (react_1.default.createElement(react_1.default.Fragment, null, enableVirtualization ? (react_1.default.createElement(VirtualScroll_1.default, { itemsLength: page.length, itemRenderer: virtualizedItemRenderer })) : (page.map(function (_, index) { return getPreparedRow(index); })))),
+                data.length !== 0 && (react_1.default.createElement(react_1.default.Fragment, null, enableVirtualization ? (react_1.default.createElement(VirtualScroll_1.default, { itemsLength: page.length, itemRenderer: virtualizedItemRenderer, scrollToIndex: scrollToIndex })) : (page.map(function (_, index) { return getPreparedRow(index); })))),
                 isLoading && data.length === 0 && (react_1.default.createElement("div", { className: 'iui-table-empty' },
                     react_1.default.createElement(ProgressIndicators_1.ProgressRadial, { indeterminate: true }))),
                 isLoading && data.length !== 0 && (react_1.default.createElement("div", { className: 'iui-row' },

package/cjs/core/Table/TableRowMemoized.d.ts

@@ -21,6 +21,7 @@ export declare const TableRow: <T extends Record<string, unknown>>(props: {
     tableInstance: TableInstance<T>;
     expanderCell?: ((cellProps: CellProps<T, any>) => React.ReactNode) | undefined;
     bodyRef: HTMLDivElement | null;
+    tableRowRef?: React.Ref<HTMLDivElement> | undefined;
 }) => JSX.Element;
 export declare const TableRowMemoized: <T extends Record<string, unknown>>(props: {
     row: Row<T>;
@@ -37,4 +38,5 @@ export declare const TableRowMemoized: <T extends Record<string, unknown>>(props
     tableInstance: TableInstance<T>;
     expanderCell?: ((cellProps: CellProps<T, any>) => React.ReactNode) | undefined;
     bodyRef: HTMLDivElement | null;
+    tableRowRef?: React.Ref<HTMLDivElement> | undefined;
 }) => JSX.Element;

package/cjs/core/Table/TableRowMemoized.js

@@ -30,7 +30,7 @@ var TableCell_1 = require("./TableCell");
  * When adding new features check whether it changes state that affects row. If it does then add equality check to `React.memo`.
  */
 var TableRow = function (props) {
-    var row = props.row, rowProps = props.rowProps, isLast = props.isLast, onRowInViewport = props.onRowInViewport, onBottomReached = props.onBottomReached, intersectionMargin = props.intersectionMargin, onClick = props.onClick, subComponent = props.subComponent, isDisabled = props.isDisabled, tableHasSubRows = props.tableHasSubRows, tableInstance = props.tableInstance, expanderCell = props.expanderCell, bodyRef = props.bodyRef;
+    var row = props.row, rowProps = props.rowProps, isLast = props.isLast, onRowInViewport = props.onRowInViewport, onBottomReached = props.onBottomReached, intersectionMargin = props.intersectionMargin, onClick = props.onClick, subComponent = props.subComponent, isDisabled = props.isDisabled, tableHasSubRows = props.tableHasSubRows, tableInstance = props.tableInstance, expanderCell = props.expanderCell, bodyRef = props.bodyRef, tableRowRef = props.tableRowRef;
     var onIntersect = react_1.default.useCallback(function () {
         var _a, _b;
         (_a = onRowInViewport.current) === null || _a === void 0 ? void 0 : _a.call(onRowInViewport, row.original);
@@ -58,7 +58,7 @@ var TableRow = function (props) {
             'iui-disabled': isDisabled,
         }, userRowProps === null || userRowProps === void 0 ? void 0 : userRowProps.className),
     });
-    var refs = (0, utils_1.useMergedRefs)(intersectionRef, mergedProps.ref);
+    var refs = (0, utils_1.useMergedRefs)(intersectionRef, mergedProps.ref, tableRowRef);
     return (react_1.default.createElement(react_1.default.Fragment, null,
         react_1.default.createElement("div", __assign({}, mergedProps, { ref: refs, onClick: function (event) {
                 var _a;

package/cjs/core/Table/hooks/index.d.ts

@@ -4,4 +4,5 @@ export { useSubRowFiltering } from './useSubRowFiltering';
 export { useSubRowSelection } from './useSubRowSelection';
 export { useResizeColumns } from './useResizeColumns';
 export { useColumnDragAndDrop } from './useColumnDragAndDrop';
+export { useScrollToRow } from './useScrollToRow';
 export { useStickyColumns } from './useStickyColumns';

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useStickyColumns = exports.useColumnDragAndDrop = exports.useResizeColumns = exports.useSubRowSelection = exports.useSubRowFiltering = exports.useSelectionCell = exports.useExpanderCell = void 0;
+exports.useStickyColumns = exports.useScrollToRow = exports.useColumnDragAndDrop = exports.useResizeColumns = exports.useSubRowSelection = exports.useSubRowFiltering = exports.useSelectionCell = 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.
@@ -17,5 +17,7 @@ var useResizeColumns_1 = require("./useResizeColumns");
 Object.defineProperty(exports, "useResizeColumns", { enumerable: true, get: function () { return useResizeColumns_1.useResizeColumns; } });
 var useColumnDragAndDrop_1 = require("./useColumnDragAndDrop");
 Object.defineProperty(exports, "useColumnDragAndDrop", { enumerable: true, get: function () { return useColumnDragAndDrop_1.useColumnDragAndDrop; } });
+var useScrollToRow_1 = require("./useScrollToRow");
+Object.defineProperty(exports, "useScrollToRow", { enumerable: true, get: function () { return useScrollToRow_1.useScrollToRow; } });
 var useStickyColumns_1 = require("./useStickyColumns");
 Object.defineProperty(exports, "useStickyColumns", { enumerable: true, get: function () { return useStickyColumns_1.useStickyColumns; } });

package/cjs/core/Table/hooks/useScrollToRow.d.ts

@@ -0,0 +1,11 @@
+import type { Row } from 'react-table';
+import { TableProps } from '../Table';
+declare type ScrollToRow<T extends Record<string, unknown>> = {
+    scrollToIndex: number | undefined;
+    tableRowRef: (row: Row<T>) => (element: HTMLDivElement) => void;
+};
+declare type ScrollToRowProps<T extends Record<string, unknown>> = TableProps<T> & {
+    page: Row<T>[];
+};
+export declare function useScrollToRow<T extends Record<string, unknown>>({ data, enableVirtualization, page, paginatorRenderer, scrollToRow, onBottomReached, }: ScrollToRowProps<T>): ScrollToRow<T>;
+export {};

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

@@ -0,0 +1,49 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useScrollToRow = 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"));
+function useScrollToRow(_a) {
+    var data = _a.data, enableVirtualization = _a.enableVirtualization, page = _a.page, paginatorRenderer = _a.paginatorRenderer, scrollToRow = _a.scrollToRow, onBottomReached = _a.onBottomReached;
+    var rowRefs = react_1.default.useRef({});
+    // Refs prevents from having `page` and `data` as dependencies
+    // therefore we avoid unnecessary scroll to row.
+    var pageRef = react_1.default.useRef(page);
+    pageRef.current = page;
+    var dataRef = react_1.default.useRef(data);
+    dataRef.current = data;
+    // For virtualized tables, all we need to do is pass the index of the item
+    // to the VirtualScroll component
+    var scrollToIndex = react_1.default.useMemo(function () {
+        if (!scrollToRow || paginatorRenderer || onBottomReached) {
+            return undefined;
+        }
+        var index = scrollToRow(pageRef.current, dataRef.current);
+        return index < 0 ? undefined : index;
+    }, [onBottomReached, paginatorRenderer, scrollToRow]);
+    // For non-virtualized tables, we need to add a ref to each row
+    // and scroll to the element
+    react_1.default.useEffect(function () {
+        var _a;
+        if (enableVirtualization ||
+            scrollToIndex === undefined ||
+            scrollToIndex === null ||
+            scrollToIndex < 0) {
+            return;
+        }
+        (_a = rowRefs.current[pageRef.current[scrollToIndex].id]) === null || _a === void 0 ? void 0 : _a.scrollIntoView();
+    }, [enableVirtualization, scrollToIndex]);
+    var tableRowRef = react_1.default.useCallback(function (row) {
+        return function (element) {
+            rowRefs.current[row.id] = element;
+        };
+    }, []);
+    return { scrollToIndex: scrollToIndex, tableRowRef: tableRowRef };
+}
+exports.useScrollToRow = useScrollToRow;

package/cjs/core/Tree/Tree.d.ts

@@ -68,6 +68,15 @@ export declare type TreeProps<T> = {
      * }, [expandedNodes]);
      */
     getNode: (node: T) => NodeData<T>;
+    /**
+     * Virtualization is used to have a better performance with a lot of nodes.
+     *
+     * When enabled, Tree DOM structure will change - it will have a wrapper div
+     * to which `className` and `style` will be applied.
+     * @default false
+     * @beta
+     */
+    enableVirtualization?: boolean;
 } & Omit<CommonProps, 'title'>;
 /**
  * Tree component used to display a hierarchical structure of `TreeNodes`.

package/cjs/core/Tree/Tree.js

@@ -86,7 +86,7 @@ var TreeContext_1 = require("./TreeContext");
   />
  */
 var Tree = function (props) {
-    var data = props.data, className = props.className, nodeRenderer = props.nodeRenderer, getNode = props.getNode, rest = __rest(props, ["data", "className", "nodeRenderer", "getNode"]);
+    var data = props.data, className = props.className, nodeRenderer = props.nodeRenderer, getNode = props.getNode, _a = props.enableVirtualization, enableVirtualization = _a === void 0 ? false : _a, style = props.style, rest = __rest(props, ["data", "className", "nodeRenderer", "getNode", "enableVirtualization", "style"]);
     (0, utils_1.useTheme)();
     var treeRef = react_1.default.useRef(null);
     var focusedIndex = react_1.default.useRef(0);
@@ -124,7 +124,7 @@ var Tree = function (props) {
                 break;
         }
     };
-    var _a = react_1.default.useMemo(function () {
+    var _b = react_1.default.useMemo(function () {
         var flatList = [];
         var firstLevelNodes = [];
         var flattenNodes = function (nodes, depth, parentNode) {
@@ -153,25 +153,73 @@ var Tree = function (props) {
         };
         flattenNodes(data);
         return [flatList, firstLevelNodes];
-    }, [data, getNode]), flatNodesList = _a[0], firstLevelNodesList = _a[1];
-    return (react_1.default.createElement("ul", __assign({ className: (0, classnames_1.default)('iui-tree', className), role: 'tree', onKeyDown: handleKeyDown, ref: treeRef, tabIndex: 0, onFocus: function () {
-            var _a;
-            var items = getFocusableNodes();
-            if (items.length > 0) {
-                (_a = items[focusedIndex.current]) === null || _a === void 0 ? void 0 : _a.focus();
-            }
-        } }, rest), flatNodesList.map(function (flatNode) {
+    }, [data, getNode]), flatNodesList = _b[0], firstLevelNodesList = _b[1];
+    var itemRenderer = react_1.default.useCallback(function (index) {
         var _a, _b, _c, _d;
-        return (react_1.default.createElement(TreeContext_1.TreeContext.Provider, { key: flatNode.nodeProps.nodeId, value: {
-                nodeDepth: flatNode.depth,
-                subNodeIds: flatNode.subNodeIds,
-                groupSize: flatNode.depth === 0
+        var node = flatNodesList[index];
+        return (react_1.default.createElement(TreeContext_1.TreeContext.Provider, { key: node.nodeProps.nodeId, value: {
+                nodeDepth: node.depth,
+                subNodeIds: node.subNodeIds,
+                groupSize: node.depth === 0
                     ? firstLevelNodesList.length
-                    : (_c = (_b = (_a = flatNode.parentNode) === null || _a === void 0 ? void 0 : _a.subNodeIds) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0,
-                indexInGroup: flatNode.indexInGroup,
-                parentNodeId: (_d = flatNode.parentNode) === null || _d === void 0 ? void 0 : _d.nodeProps.nodeId,
-            } }, nodeRenderer(flatNode.nodeProps)));
-    })));
+                    : (_c = (_b = (_a = node.parentNode) === null || _a === void 0 ? void 0 : _a.subNodeIds) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0,
+                indexInGroup: node.indexInGroup,
+                parentNodeId: (_d = node.parentNode) === null || _d === void 0 ? void 0 : _d.nodeProps.nodeId,
+                scrollToParent: node.parentNode
+                    ? function () {
+                        var _a;
+                        var parentNodeId = (_a = node.parentNode) === null || _a === void 0 ? void 0 : _a.nodeProps.nodeId;
+                        var parentNodeIndex = flatNodesList.findIndex(function (n) { return n.nodeProps.nodeId === parentNodeId; });
+                        setScrollToIndex(parentNodeIndex);
+                    }
+                    : undefined,
+            } }, nodeRenderer(node.nodeProps)));
+    }, [firstLevelNodesList.length, flatNodesList, nodeRenderer]);
+    var _c = react_1.default.useState(), scrollToIndex = _c[0], setScrollToIndex = _c[1];
+    var flatNodesListRef = react_1.default.useRef(flatNodesList);
+    react_1.default.useEffect(function () {
+        flatNodesListRef.current = flatNodesList;
+    }, [flatNodesList]);
+    react_1.default.useEffect(function () {
+        setTimeout(function () {
+            var _a;
+            if (scrollToIndex !== undefined) {
+                var nodeId = flatNodesListRef.current[scrollToIndex].nodeProps.nodeId;
+                var nodeElement = (_a = treeRef.current) === null || _a === void 0 ? void 0 : _a.ownerDocument.querySelector("#".concat(nodeId));
+                nodeElement === null || nodeElement === void 0 ? void 0 : nodeElement.focus();
+                // Need to reset that if navigating with mouse and keyboard,
+                // e.g. pressing arrow left to go to parent node and then with mouse
+                // clicking some other child node and then pressing arrow left
+                setScrollToIndex(undefined);
+            }
+        });
+    }, [scrollToIndex]);
+    var handleFocus = function (event) {
+        var _a, _b;
+        if ((_a = treeRef.current) === null || _a === void 0 ? void 0 : _a.contains(event.relatedTarget)) {
+            return;
+        }
+        var items = getFocusableNodes();
+        if (items.length > 0) {
+            (_b = items[focusedIndex.current]) === null || _b === void 0 ? void 0 : _b.focus();
+        }
+    };
+    return (react_1.default.createElement(react_1.default.Fragment, null, enableVirtualization ? (react_1.default.createElement(VirtualizedTree, __assign({ flatNodesList: flatNodesList, itemRenderer: itemRenderer, scrollToIndex: scrollToIndex, onFocus: handleFocus, onKeyDown: handleKeyDown, ref: treeRef, className: className, style: style }, rest))) : (react_1.default.createElement(TreeElement, __assign({ onKeyDown: handleKeyDown, onFocus: handleFocus, className: className, style: style, ref: treeRef }, rest), flatNodesList.map(function (_, i) { return itemRenderer(i); })))));
 };
 exports.Tree = Tree;
+var TreeElement = react_1.default.forwardRef(function (_a, ref) {
+    var children = _a.children, className = _a.className, rest = __rest(_a, ["children", "className"]);
+    return (react_1.default.createElement("ul", __assign({ className: (0, classnames_1.default)('iui-tree', className), role: 'tree', ref: ref, tabIndex: 0 }, rest), children));
+});
+// Having virtualized tree separately prevents from running all virtualization logic
+var VirtualizedTree = react_1.default.forwardRef(function (_a, ref) {
+    var flatNodesList = _a.flatNodesList, itemRenderer = _a.itemRenderer, scrollToIndex = _a.scrollToIndex, className = _a.className, style = _a.style, rest = __rest(_a, ["flatNodesList", "itemRenderer", "scrollToIndex", "className", "style"]);
+    var _b = (0, utils_1.useVirtualization)({
+        itemsLength: flatNodesList.length,
+        itemRenderer: itemRenderer,
+        scrollToIndex: scrollToIndex,
+    }), outerProps = _b.outerProps, innerProps = _b.innerProps, visibleChildren = _b.visibleChildren;
+    return (react_1.default.createElement("div", __assign({}, __assign(__assign({}, outerProps), { className: (0, classnames_1.default)(className, outerProps.className), style: __assign(__assign({}, style), outerProps.style) })),
+        react_1.default.createElement(TreeElement, __assign({}, innerProps, rest, { ref: (0, utils_1.mergeRefs)(ref, innerProps.ref) }), visibleChildren)));
+});
 exports.default = exports.Tree;

package/cjs/core/Tree/TreeContext.d.ts

@@ -20,6 +20,10 @@ export declare type TreeContextProps = {
      * Node index in the list of nodes under the same parent node or in the root. Used for an accessibility attribute.
      */
     indexInGroup: number;
+    /**
+     * Function that scrolls to the node's parent node.
+     */
+    scrollToParent?: () => void;
 };
 export declare const TreeContext: React.Context<TreeContextProps | undefined>;
 export declare const useTreeContext: () => TreeContextProps;

package/cjs/core/Tree/TreeNode.js

@@ -58,7 +58,7 @@ var TreeContext_1 = require("./TreeContext");
 var TreeNode = function (props) {
     var nodeId = props.nodeId, label = props.label, sublabel = props.sublabel, children = props.children, className = props.className, icon = props.icon, _a = props.hasSubNodes, hasSubNodes = _a === void 0 ? false : _a, _b = props.isDisabled, isDisabled = _b === void 0 ? false : _b, _c = props.isExpanded, isExpanded = _c === void 0 ? false : _c, _d = props.isSelected, isSelected = _d === void 0 ? false : _d, onSelected = props.onSelected, onExpanded = props.onExpanded, checkbox = props.checkbox, expander = props.expander, rest = __rest(props, ["nodeId", "label", "sublabel", "children", "className", "icon", "hasSubNodes", "isDisabled", "isExpanded", "isSelected", "onSelected", "onExpanded", "checkbox", "expander"]);
     (0, utils_1.useTheme)();
-    var _e = (0, TreeContext_1.useTreeContext)(), nodeDepth = _e.nodeDepth, _f = _e.subNodeIds, subNodeIds = _f === void 0 ? [] : _f, parentNodeId = _e.parentNodeId, groupSize = _e.groupSize, indexInGroup = _e.indexInGroup;
+    var _e = (0, TreeContext_1.useTreeContext)(), nodeDepth = _e.nodeDepth, _f = _e.subNodeIds, subNodeIds = _f === void 0 ? [] : _f, parentNodeId = _e.parentNodeId, scrollToParent = _e.scrollToParent, groupSize = _e.groupSize, indexInGroup = _e.indexInGroup;
     var _g = react_1.default.useState(false), isFocused = _g[0], setIsFocused = _g[1];
     var nodeRef = react_1.default.useRef(null);
     var styleDepth = react_1.default.useMemo(function () {
@@ -68,7 +68,7 @@ var TreeNode = function (props) {
             : { marginLeft: nodeDepth ? nodeDepth * 28 : 0 };
     }, [nodeDepth]);
     var onKeyDown = function (event) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f;
         var isNodeFocused = nodeRef.current === ((_a = nodeRef.current) === null || _a === void 0 ? void 0 : _a.ownerDocument.activeElement);
         switch (event.key) {
             case 'ArrowLeft': {
@@ -79,20 +79,19 @@ var TreeNode = function (props) {
                         break;
                     }
                     if (parentNodeId) {
-                        var parentNode = (_b = nodeRef.current) === null || _b === void 0 ? void 0 : _b.ownerDocument.querySelector("#".concat(parentNodeId));
-                        parentNode === null || parentNode === void 0 ? void 0 : parentNode.focus();
+                        scrollToParent === null || scrollToParent === void 0 ? void 0 : scrollToParent();
                         break;
                     }
                     // If it is top level node (doesn't have parent node), then do nothing.
                     break;
                 }
                 var focusableElements = (0, utils_1.getFocusableElements)(nodeRef.current);
-                var currentIndex = focusableElements.indexOf((_c = nodeRef.current) === null || _c === void 0 ? void 0 : _c.ownerDocument.activeElement);
+                var currentIndex = focusableElements.indexOf((_b = nodeRef.current) === null || _b === void 0 ? void 0 : _b.ownerDocument.activeElement);
                 if (currentIndex === 0) {
-                    (_d = nodeRef.current) === null || _d === void 0 ? void 0 : _d.focus();
+                    (_c = nodeRef.current) === null || _c === void 0 ? void 0 : _c.focus();
                 }
                 else {
-                    (_e = focusableElements[currentIndex - 1]) === null || _e === void 0 ? void 0 : _e.focus();
+                    (_d = focusableElements[currentIndex - 1]) === null || _d === void 0 ? void 0 : _d.focus();
                 }
                 break;
             }
@@ -104,10 +103,10 @@ var TreeNode = function (props) {
                         onExpanded(nodeId, true);
                         break;
                     }
-                    (_f = focusableElements[0]) === null || _f === void 0 ? void 0 : _f.focus();
+                    (_e = focusableElements[0]) === null || _e === void 0 ? void 0 : _e.focus();
                     break;
                 }
-                var currentIndex = focusableElements.indexOf((_g = nodeRef.current) === null || _g === void 0 ? void 0 : _g.ownerDocument.activeElement);
+                var currentIndex = focusableElements.indexOf((_f = nodeRef.current) === null || _f === void 0 ? void 0 : _f.ownerDocument.activeElement);
                 if (currentIndex < focusableElements.length - 1) {
                     focusableElements[currentIndex + 1].focus();
                     break;

package/cjs/core/Typography/Small/Small.js

@@ -43,6 +43,6 @@ require("@itwin/itwinui-css/css/text.css");
 exports.Small = react_1.default.forwardRef(function (props, ref) {
     var className = props.className, _a = props.isMuted, isMuted = _a === void 0 ? false : _a, rest = __rest(props, ["className", "isMuted"]);
     (0, utils_1.useTheme)();
-    return (react_1.default.createElement("p", __assign({ ref: ref, className: (0, classnames_1.default)('iui-text-small', { 'iui-text-muted': isMuted }, className) }, rest)));
+    return (react_1.default.createElement("small", __assign({ ref: ref, className: (0, classnames_1.default)('iui-text-small', { 'iui-text-muted': isMuted }, className) }, rest)));
 });
 exports.default = exports.Small;

package/cjs/core/utils/hooks/index.d.ts

@@ -7,3 +7,4 @@ export * from './useTheme';
 export * from './useIntersection';
 export * from './useMediaQuery';
 export * from './useSafeContext';
+export * from './useLatestRef';

package/cjs/core/utils/hooks/index.js

@@ -27,3 +27,4 @@ __exportStar(require("./useTheme"), exports);
 __exportStar(require("./useIntersection"), exports);
 __exportStar(require("./useMediaQuery"), exports);
 __exportStar(require("./useSafeContext"), exports);
+__exportStar(require("./useLatestRef"), exports);

package/cjs/core/utils/hooks/useLatestRef.d.ts

@@ -0,0 +1,9 @@
+import React from 'react';
+/**
+ * Hook that keeps track of the latest value in a ref.
+ * @private
+ * @example
+ * const { value } = props;
+ * const valueRef = useLatestRef(value);
+ */
+export declare const useLatestRef: <T>(value: T) => React.MutableRefObject<T>;

package/cjs/core/utils/hooks/useLatestRef.js

@@ -0,0 +1,26 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useLatestRef = 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"));
+/**
+ * Hook that keeps track of the latest value in a ref.
+ * @private
+ * @example
+ * const { value } = props;
+ * const valueRef = useLatestRef(value);
+ */
+var useLatestRef = function (value) {
+    var valueRef = react_1.default.useRef(value);
+    react_1.default.useEffect(function () {
+        valueRef.current = value;
+    }, [value]);
+    return valueRef;
+};
+exports.useLatestRef = useLatestRef;

package/esm/core/ComboBox/ComboBox.js

@@ -28,7 +28,7 @@ import React from 'react';
 import cx from 'classnames';
 import { MenuExtraContent } from '../Menu';
 import { Text } from '../Typography';
-import { useTheme, getRandomValue, mergeRefs, } from '../utils';
+import { useTheme, getRandomValue, mergeRefs, useLatestRef, } from '../utils';
 import 'tippy.js/animations/shift-away.css';
 import { ComboBoxActionContext, comboBoxReducer, ComboBoxRefsContext, ComboBoxStateContext, } from './helpers';
 import { ComboBoxDropdown } from './ComboBoxDropdown';
@@ -69,11 +69,9 @@ export var ComboBox = function (props) {
     var menuRef = React.useRef(null);
     var toggleButtonRef = React.useRef(null);
     var mounted = React.useRef(false);
-    // Latest value of the onChange prop
-    var onChangeProp = React.useRef(onChange);
-    React.useEffect(function () {
-        onChangeProp.current = onChange;
-    }, [onChange]);
+    var valuePropRef = useLatestRef(valueProp);
+    var onChangeProp = useLatestRef(onChange);
+    var optionsRef = useLatestRef(options);
     // Record to store all extra information (e.g. original indexes), where the key is the id of the option
     var optionsExtraInfoRef = React.useRef({});
     // Clear the extra info when the options change so that it can be reinitialized below
@@ -93,7 +91,7 @@ export var ComboBox = function (props) {
     var _e = React.useReducer(comboBoxReducer, {
         isOpen: false,
         selectedIndex: valueProp
-            ? options.findIndex(function (option) { return option.value === valueProp; })
+            ? optionsRef.current.findIndex(function (option) { return option.value === valueProp; })
             : -1,
         focusedIndex: -1,
     }), _f = _e[0], isOpen = _f.isOpen, selectedIndex = _f.selectedIndex, focusedIndex = _f.focusedIndex, dispatch = _e[1];
@@ -102,7 +100,7 @@ export var ComboBox = function (props) {
         // When the dropdown opens
         if (isOpen) {
             (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.focus(); // Focus the input
-            setFilteredOptions(options); // Reset the filtered list
+            setFilteredOptions(optionsRef.current); // Reset the filtered list
             dispatch(['focus']);
         }
         // When the dropdown closes
@@ -111,10 +109,10 @@ export var ComboBox = function (props) {
             dispatch(['focus']);
             // Reset the input value
             setInputValue(selectedIndex != undefined && selectedIndex >= 0
-                ? (_b = options[selectedIndex]) === null || _b === void 0 ? void 0 : _b.label
+                ? (_b = optionsRef.current[selectedIndex]) === null || _b === void 0 ? void 0 : _b.label
                 : '');
         }
-    }, [isOpen, options, selectedIndex]);
+    }, [isOpen, optionsRef, selectedIndex]);
     // Set min-width of menu to be same as input
     var _g = React.useState(0), minWidth = _g[0], setMinWidth = _g[1];
     React.useEffect(function () {
@@ -145,14 +143,14 @@ export var ComboBox = function (props) {
         var value = event.currentTarget.value;
         setInputValue(value);
         dispatch(['open']); // reopen when typing
-        setFilteredOptions((_a = filterFunction === null || filterFunction === void 0 ? void 0 : filterFunction(options, value)) !== null && _a !== void 0 ? _a : options.filter(function (option) {
+        setFilteredOptions((_a = filterFunction === null || filterFunction === void 0 ? void 0 : filterFunction(optionsRef.current, value)) !== null && _a !== void 0 ? _a : optionsRef.current.filter(function (option) {
             return option.label.toLowerCase().includes(value.toLowerCase());
         }));
         if (focusedIndex != -1) {
             dispatch(['focus', -1]);
         }
         (_b = inputProps === null || inputProps === void 0 ? void 0 : inputProps.onChange) === null || _b === void 0 ? void 0 : _b.call(inputProps, event);
-    }, [filterFunction, focusedIndex, inputProps, options]);
+    }, [filterFunction, focusedIndex, inputProps, optionsRef]);
     // When the value prop changes, update the selectedIndex
     React.useEffect(function () {
         dispatch([
@@ -168,9 +166,12 @@ export var ComboBox = function (props) {
             mounted.current = true;
             return;
         }
-        var value = (_a = options[selectedIndex]) === null || _a === void 0 ? void 0 : _a.value;
-        (_b = onChangeProp.current) === null || _b === void 0 ? void 0 : _b.call(onChangeProp, value);
-    }, [options, selectedIndex]);
+        var currentValue = (_a = optionsRef.current[selectedIndex]) === null || _a === void 0 ? void 0 : _a.value;
+        if (currentValue === valuePropRef.current || selectedIndex === -1) {
+            return;
+        }
+        (_b = onChangeProp.current) === null || _b === void 0 ? void 0 : _b.call(onChangeProp, currentValue);
+    }, [onChangeProp, optionsRef, selectedIndex, valuePropRef]);
     var getMenuItem = React.useCallback(function (option, filteredIndex) {
         var optionId = getOptionId(option, id);
         var __originalIndex = optionsExtraInfoRef.current[optionId].__originalIndex;

package/esm/core/Table/Table.d.ts

@@ -182,6 +182,29 @@ export declare type TableProps<T extends Record<string, unknown> = Record<string
      * @default false
      */
     enableColumnReordering?: boolean;
+    /**
+     * Function that returns index of the row that you want to scroll to.
+     *
+     * It doesn't work with paginated tables and with lazy-loading.
+     * @beta
+     * @example
+     * <Table
+     *   scrollToRow={React.useCallback(
+     *     (rows, data) => rows.findIndex((row) => row.original === data[250]),
+     *     []
+     *   )}
+     *   {...restProps}
+     * />
+     * @example
+     * <Table
+     *   scrollToRow={React.useCallback(
+     *     (rows, data) => rows.findIndex((row) => row.original.id === data[250].id),
+     *     []
+     *   )}
+     *   {...restProps}
+     * />
+     */
+    scrollToRow?: (rows: Row<T>[], data: T[]) => number;
 } & Omit<CommonProps, 'title'>;
 /**
  * Table based on [react-table](https://react-table.tanstack.com/docs/api/overview).

package/esm/core/Table/Table.js

@@ -36,7 +36,7 @@ import { getCellStyle, getStickyStyle } from './utils';
 import { TableRowMemoized } from './TableRowMemoized';
 import { FilterToggle } from './filters';
 import { customFilterFunctions } from './filters/customFilterFunctions';
-import { useExpanderCell, useSelectionCell, useSubRowFiltering, useSubRowSelection, useResizeColumns, useColumnDragAndDrop, useStickyColumns, } from './hooks';
+import { useExpanderCell, useSelectionCell, useSubRowFiltering, useSubRowSelection, useResizeColumns, useColumnDragAndDrop, useScrollToRow, useStickyColumns, } from './hooks';
 import { onExpandHandler, onFilterHandler, onSelectHandler, onSingleSelectHandler, onTableResizeEnd, onTableResizeStart, } from './actionHandlers';
 import VirtualScroll from '../utils/components/VirtualScroll';
 import { SELECTION_CELL_ID } from './columns';
@@ -234,6 +234,7 @@ export var Table = function (props) {
         state.pageIndex,
         state.pageSize,
     ]);
+    var _r = useScrollToRow(__assign(__assign({}, props), { page: page })), scrollToIndex = _r.scrollToIndex, tableRowRef = _r.tableRowRef;
     var columnRefs = React.useRef({});
     var previousTableWidth = React.useRef(0);
     var onTableResize = React.useCallback(function (_a) {
@@ -270,11 +271,11 @@ export var Table = function (props) {
     var headerRef = React.useRef(null);
     var bodyRef = React.useRef(null);
     // Using `useState` to rerender rows when table body ref is available
-    var _r = React.useState(null), bodyRefState = _r[0], setBodyRefState = _r[1];
+    var _s = React.useState(null), bodyRefState = _s[0], setBodyRefState = _s[1];
     var getPreparedRow = React.useCallback(function (index) {
         var row = page[index];
         prepareRow(row);
-        return (React.createElement(TableRowMemoized, { row: row, rowProps: rowProps, isLast: index === page.length - 1, onRowInViewport: onRowInViewportRef, onBottomReached: onBottomReachedRef, intersectionMargin: intersectionMargin, state: state, key: row.getRowProps().key, onClick: onRowClickHandler, subComponent: subComponent, isDisabled: !!(isRowDisabled === null || isRowDisabled === void 0 ? void 0 : isRowDisabled(row.original)), tableHasSubRows: hasAnySubRows, tableInstance: instance, expanderCell: expanderCell, bodyRef: bodyRefState }));
+        return (React.createElement(TableRowMemoized, { row: row, rowProps: rowProps, isLast: index === page.length - 1, onRowInViewport: onRowInViewportRef, onBottomReached: onBottomReachedRef, intersectionMargin: intersectionMargin, state: state, key: row.getRowProps().key, onClick: onRowClickHandler, subComponent: subComponent, isDisabled: !!(isRowDisabled === null || isRowDisabled === void 0 ? void 0 : isRowDisabled(row.original)), tableHasSubRows: hasAnySubRows, tableInstance: instance, expanderCell: expanderCell, bodyRef: bodyRefState, tableRowRef: enableVirtualization ? undefined : tableRowRef(row) }));
     }, [
         page,
         prepareRow,
@@ -288,6 +289,8 @@ export var Table = function (props) {
         instance,
         expanderCell,
         bodyRefState,
+        enableVirtualization,
+        tableRowRef,
     ]);
     var virtualizedItemRenderer = React.useCallback(function (index) { return getPreparedRow(index); }, [getPreparedRow]);
     var updateStickyState = function () {
@@ -369,7 +372,7 @@ export var Table = function (props) {
                         updateStickyState();
                     }
                 }, tabIndex: -1 }),
-                data.length !== 0 && (React.createElement(React.Fragment, null, enableVirtualization ? (React.createElement(VirtualScroll, { itemsLength: page.length, itemRenderer: virtualizedItemRenderer })) : (page.map(function (_, index) { return getPreparedRow(index); })))),
+                data.length !== 0 && (React.createElement(React.Fragment, null, enableVirtualization ? (React.createElement(VirtualScroll, { itemsLength: page.length, itemRenderer: virtualizedItemRenderer, scrollToIndex: scrollToIndex })) : (page.map(function (_, index) { return getPreparedRow(index); })))),
                 isLoading && data.length === 0 && (React.createElement("div", { className: 'iui-table-empty' },
                     React.createElement(ProgressRadial, { indeterminate: true }))),
                 isLoading && data.length !== 0 && (React.createElement("div", { className: 'iui-row' },

package/esm/core/Table/TableRowMemoized.d.ts

@@ -21,6 +21,7 @@ export declare const TableRow: <T extends Record<string, unknown>>(props: {
     tableInstance: TableInstance<T>;
     expanderCell?: ((cellProps: CellProps<T, any>) => React.ReactNode) | undefined;
     bodyRef: HTMLDivElement | null;
+    tableRowRef?: React.Ref<HTMLDivElement> | undefined;
 }) => JSX.Element;
 export declare const TableRowMemoized: <T extends Record<string, unknown>>(props: {
     row: Row<T>;
@@ -37,4 +38,5 @@ export declare const TableRowMemoized: <T extends Record<string, unknown>>(props
     tableInstance: TableInstance<T>;
     expanderCell?: ((cellProps: CellProps<T, any>) => React.ReactNode) | undefined;
     bodyRef: HTMLDivElement | null;
+    tableRowRef?: React.Ref<HTMLDivElement> | undefined;
 }) => JSX.Element;

package/esm/core/Table/TableRowMemoized.js

@@ -24,7 +24,7 @@ import { TableCell } from './TableCell';
  * When adding new features check whether it changes state that affects row. If it does then add equality check to `React.memo`.
  */
 export var TableRow = function (props) {
-    var row = props.row, rowProps = props.rowProps, isLast = props.isLast, onRowInViewport = props.onRowInViewport, onBottomReached = props.onBottomReached, intersectionMargin = props.intersectionMargin, onClick = props.onClick, subComponent = props.subComponent, isDisabled = props.isDisabled, tableHasSubRows = props.tableHasSubRows, tableInstance = props.tableInstance, expanderCell = props.expanderCell, bodyRef = props.bodyRef;
+    var row = props.row, rowProps = props.rowProps, isLast = props.isLast, onRowInViewport = props.onRowInViewport, onBottomReached = props.onBottomReached, intersectionMargin = props.intersectionMargin, onClick = props.onClick, subComponent = props.subComponent, isDisabled = props.isDisabled, tableHasSubRows = props.tableHasSubRows, tableInstance = props.tableInstance, expanderCell = props.expanderCell, bodyRef = props.bodyRef, tableRowRef = props.tableRowRef;
     var onIntersect = React.useCallback(function () {
         var _a, _b;
         (_a = onRowInViewport.current) === null || _a === void 0 ? void 0 : _a.call(onRowInViewport, row.original);
@@ -52,7 +52,7 @@ export var TableRow = function (props) {
             'iui-disabled': isDisabled,
         }, userRowProps === null || userRowProps === void 0 ? void 0 : userRowProps.className),
     });
-    var refs = useMergedRefs(intersectionRef, mergedProps.ref);
+    var refs = useMergedRefs(intersectionRef, mergedProps.ref, tableRowRef);
     return (React.createElement(React.Fragment, null,
         React.createElement("div", __assign({}, mergedProps, { ref: refs, onClick: function (event) {
                 var _a;

package/esm/core/Table/hooks/index.d.ts

@@ -4,4 +4,5 @@ export { useSubRowFiltering } from './useSubRowFiltering';
 export { useSubRowSelection } from './useSubRowSelection';
 export { useResizeColumns } from './useResizeColumns';
 export { useColumnDragAndDrop } from './useColumnDragAndDrop';
+export { useScrollToRow } from './useScrollToRow';
 export { useStickyColumns } from './useStickyColumns';

package/esm/core/Table/hooks/index.js

@@ -8,4 +8,5 @@ export { useSubRowFiltering } from './useSubRowFiltering';
 export { useSubRowSelection } from './useSubRowSelection';
 export { useResizeColumns } from './useResizeColumns';
 export { useColumnDragAndDrop } from './useColumnDragAndDrop';
+export { useScrollToRow } from './useScrollToRow';
 export { useStickyColumns } from './useStickyColumns';

package/esm/core/Table/hooks/useScrollToRow.d.ts

@@ -0,0 +1,11 @@
+import type { Row } from 'react-table';
+import { TableProps } from '../Table';
+declare type ScrollToRow<T extends Record<string, unknown>> = {
+    scrollToIndex: number | undefined;
+    tableRowRef: (row: Row<T>) => (element: HTMLDivElement) => void;
+};
+declare type ScrollToRowProps<T extends Record<string, unknown>> = TableProps<T> & {
+    page: Row<T>[];
+};
+export declare function useScrollToRow<T extends Record<string, unknown>>({ data, enableVirtualization, page, paginatorRenderer, scrollToRow, onBottomReached, }: ScrollToRowProps<T>): ScrollToRow<T>;
+export {};

package/esm/core/Table/hooks/useScrollToRow.js

@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+ * See LICENSE.md in the project root for license terms and full copyright notice.
+ *--------------------------------------------------------------------------------------------*/
+import React from 'react';
+export function useScrollToRow(_a) {
+    var data = _a.data, enableVirtualization = _a.enableVirtualization, page = _a.page, paginatorRenderer = _a.paginatorRenderer, scrollToRow = _a.scrollToRow, onBottomReached = _a.onBottomReached;
+    var rowRefs = React.useRef({});
+    // Refs prevents from having `page` and `data` as dependencies
+    // therefore we avoid unnecessary scroll to row.
+    var pageRef = React.useRef(page);
+    pageRef.current = page;
+    var dataRef = React.useRef(data);
+    dataRef.current = data;
+    // For virtualized tables, all we need to do is pass the index of the item
+    // to the VirtualScroll component
+    var scrollToIndex = React.useMemo(function () {
+        if (!scrollToRow || paginatorRenderer || onBottomReached) {
+            return undefined;
+        }
+        var index = scrollToRow(pageRef.current, dataRef.current);
+        return index < 0 ? undefined : index;
+    }, [onBottomReached, paginatorRenderer, scrollToRow]);
+    // For non-virtualized tables, we need to add a ref to each row
+    // and scroll to the element
+    React.useEffect(function () {
+        var _a;
+        if (enableVirtualization ||
+            scrollToIndex === undefined ||
+            scrollToIndex === null ||
+            scrollToIndex < 0) {
+            return;
+        }
+        (_a = rowRefs.current[pageRef.current[scrollToIndex].id]) === null || _a === void 0 ? void 0 : _a.scrollIntoView();
+    }, [enableVirtualization, scrollToIndex]);
+    var tableRowRef = React.useCallback(function (row) {
+        return function (element) {
+            rowRefs.current[row.id] = element;
+        };
+    }, []);
+    return { scrollToIndex: scrollToIndex, tableRowRef: tableRowRef };
+}

package/esm/core/Tree/Tree.d.ts

@@ -68,6 +68,15 @@ export declare type TreeProps<T> = {
      * }, [expandedNodes]);
      */
     getNode: (node: T) => NodeData<T>;
+    /**
+     * Virtualization is used to have a better performance with a lot of nodes.
+     *
+     * When enabled, Tree DOM structure will change - it will have a wrapper div
+     * to which `className` and `style` will be applied.
+     * @default false
+     * @beta
+     */
+    enableVirtualization?: boolean;
 } & Omit<CommonProps, 'title'>;
 /**
  * Tree component used to display a hierarchical structure of `TreeNodes`.

package/esm/core/Tree/Tree.js

@@ -25,7 +25,7 @@ var __rest = (this && this.__rest) || function (s, e) {
  * See LICENSE.md in the project root for license terms and full copyright notice.
  *--------------------------------------------------------------------------------------------*/
 import React from 'react';
-import { useTheme, getFocusableElements } from '../utils';
+import { useTheme, getFocusableElements, useVirtualization, mergeRefs, } from '../utils';
 import '@itwin/itwinui-css/css/tree.css';
 import cx from 'classnames';
 import { TreeContext } from './TreeContext';
@@ -80,7 +80,7 @@ import { TreeContext } from './TreeContext';
   />
  */
 export var Tree = function (props) {
-    var data = props.data, className = props.className, nodeRenderer = props.nodeRenderer, getNode = props.getNode, rest = __rest(props, ["data", "className", "nodeRenderer", "getNode"]);
+    var data = props.data, className = props.className, nodeRenderer = props.nodeRenderer, getNode = props.getNode, _a = props.enableVirtualization, enableVirtualization = _a === void 0 ? false : _a, style = props.style, rest = __rest(props, ["data", "className", "nodeRenderer", "getNode", "enableVirtualization", "style"]);
     useTheme();
     var treeRef = React.useRef(null);
     var focusedIndex = React.useRef(0);
@@ -118,7 +118,7 @@ export var Tree = function (props) {
                 break;
         }
     };
-    var _a = React.useMemo(function () {
+    var _b = React.useMemo(function () {
         var flatList = [];
         var firstLevelNodes = [];
         var flattenNodes = function (nodes, depth, parentNode) {
@@ -147,24 +147,72 @@ export var Tree = function (props) {
         };
         flattenNodes(data);
         return [flatList, firstLevelNodes];
-    }, [data, getNode]), flatNodesList = _a[0], firstLevelNodesList = _a[1];
-    return (React.createElement("ul", __assign({ className: cx('iui-tree', className), role: 'tree', onKeyDown: handleKeyDown, ref: treeRef, tabIndex: 0, onFocus: function () {
-            var _a;
-            var items = getFocusableNodes();
-            if (items.length > 0) {
-                (_a = items[focusedIndex.current]) === null || _a === void 0 ? void 0 : _a.focus();
-            }
-        } }, rest), flatNodesList.map(function (flatNode) {
+    }, [data, getNode]), flatNodesList = _b[0], firstLevelNodesList = _b[1];
+    var itemRenderer = React.useCallback(function (index) {
         var _a, _b, _c, _d;
-        return (React.createElement(TreeContext.Provider, { key: flatNode.nodeProps.nodeId, value: {
-                nodeDepth: flatNode.depth,
-                subNodeIds: flatNode.subNodeIds,
-                groupSize: flatNode.depth === 0
+        var node = flatNodesList[index];
+        return (React.createElement(TreeContext.Provider, { key: node.nodeProps.nodeId, value: {
+                nodeDepth: node.depth,
+                subNodeIds: node.subNodeIds,
+                groupSize: node.depth === 0
                     ? firstLevelNodesList.length
-                    : (_c = (_b = (_a = flatNode.parentNode) === null || _a === void 0 ? void 0 : _a.subNodeIds) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0,
-                indexInGroup: flatNode.indexInGroup,
-                parentNodeId: (_d = flatNode.parentNode) === null || _d === void 0 ? void 0 : _d.nodeProps.nodeId,
-            } }, nodeRenderer(flatNode.nodeProps)));
-    })));
+                    : (_c = (_b = (_a = node.parentNode) === null || _a === void 0 ? void 0 : _a.subNodeIds) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0,
+                indexInGroup: node.indexInGroup,
+                parentNodeId: (_d = node.parentNode) === null || _d === void 0 ? void 0 : _d.nodeProps.nodeId,
+                scrollToParent: node.parentNode
+                    ? function () {
+                        var _a;
+                        var parentNodeId = (_a = node.parentNode) === null || _a === void 0 ? void 0 : _a.nodeProps.nodeId;
+                        var parentNodeIndex = flatNodesList.findIndex(function (n) { return n.nodeProps.nodeId === parentNodeId; });
+                        setScrollToIndex(parentNodeIndex);
+                    }
+                    : undefined,
+            } }, nodeRenderer(node.nodeProps)));
+    }, [firstLevelNodesList.length, flatNodesList, nodeRenderer]);
+    var _c = React.useState(), scrollToIndex = _c[0], setScrollToIndex = _c[1];
+    var flatNodesListRef = React.useRef(flatNodesList);
+    React.useEffect(function () {
+        flatNodesListRef.current = flatNodesList;
+    }, [flatNodesList]);
+    React.useEffect(function () {
+        setTimeout(function () {
+            var _a;
+            if (scrollToIndex !== undefined) {
+                var nodeId = flatNodesListRef.current[scrollToIndex].nodeProps.nodeId;
+                var nodeElement = (_a = treeRef.current) === null || _a === void 0 ? void 0 : _a.ownerDocument.querySelector("#".concat(nodeId));
+                nodeElement === null || nodeElement === void 0 ? void 0 : nodeElement.focus();
+                // Need to reset that if navigating with mouse and keyboard,
+                // e.g. pressing arrow left to go to parent node and then with mouse
+                // clicking some other child node and then pressing arrow left
+                setScrollToIndex(undefined);
+            }
+        });
+    }, [scrollToIndex]);
+    var handleFocus = function (event) {
+        var _a, _b;
+        if ((_a = treeRef.current) === null || _a === void 0 ? void 0 : _a.contains(event.relatedTarget)) {
+            return;
+        }
+        var items = getFocusableNodes();
+        if (items.length > 0) {
+            (_b = items[focusedIndex.current]) === null || _b === void 0 ? void 0 : _b.focus();
+        }
+    };
+    return (React.createElement(React.Fragment, null, enableVirtualization ? (React.createElement(VirtualizedTree, __assign({ flatNodesList: flatNodesList, itemRenderer: itemRenderer, scrollToIndex: scrollToIndex, onFocus: handleFocus, onKeyDown: handleKeyDown, ref: treeRef, className: className, style: style }, rest))) : (React.createElement(TreeElement, __assign({ onKeyDown: handleKeyDown, onFocus: handleFocus, className: className, style: style, ref: treeRef }, rest), flatNodesList.map(function (_, i) { return itemRenderer(i); })))));
 };
+var TreeElement = React.forwardRef(function (_a, ref) {
+    var children = _a.children, className = _a.className, rest = __rest(_a, ["children", "className"]);
+    return (React.createElement("ul", __assign({ className: cx('iui-tree', className), role: 'tree', ref: ref, tabIndex: 0 }, rest), children));
+});
+// Having virtualized tree separately prevents from running all virtualization logic
+var VirtualizedTree = React.forwardRef(function (_a, ref) {
+    var flatNodesList = _a.flatNodesList, itemRenderer = _a.itemRenderer, scrollToIndex = _a.scrollToIndex, className = _a.className, style = _a.style, rest = __rest(_a, ["flatNodesList", "itemRenderer", "scrollToIndex", "className", "style"]);
+    var _b = useVirtualization({
+        itemsLength: flatNodesList.length,
+        itemRenderer: itemRenderer,
+        scrollToIndex: scrollToIndex,
+    }), outerProps = _b.outerProps, innerProps = _b.innerProps, visibleChildren = _b.visibleChildren;
+    return (React.createElement("div", __assign({}, __assign(__assign({}, outerProps), { className: cx(className, outerProps.className), style: __assign(__assign({}, style), outerProps.style) })),
+        React.createElement(TreeElement, __assign({}, innerProps, rest, { ref: mergeRefs(ref, innerProps.ref) }), visibleChildren)));
+});
 export default Tree;

package/esm/core/Tree/TreeContext.d.ts

@@ -20,6 +20,10 @@ export declare type TreeContextProps = {
      * Node index in the list of nodes under the same parent node or in the root. Used for an accessibility attribute.
      */
     indexInGroup: number;
+    /**
+     * Function that scrolls to the node's parent node.
+     */
+    scrollToParent?: () => void;
 };
 export declare const TreeContext: React.Context<TreeContextProps | undefined>;
 export declare const useTreeContext: () => TreeContextProps;

package/esm/core/Tree/TreeNode.js

@@ -52,7 +52,7 @@ import { useTreeContext } from './TreeContext';
 export var TreeNode = function (props) {
     var nodeId = props.nodeId, label = props.label, sublabel = props.sublabel, children = props.children, className = props.className, icon = props.icon, _a = props.hasSubNodes, hasSubNodes = _a === void 0 ? false : _a, _b = props.isDisabled, isDisabled = _b === void 0 ? false : _b, _c = props.isExpanded, isExpanded = _c === void 0 ? false : _c, _d = props.isSelected, isSelected = _d === void 0 ? false : _d, onSelected = props.onSelected, onExpanded = props.onExpanded, checkbox = props.checkbox, expander = props.expander, rest = __rest(props, ["nodeId", "label", "sublabel", "children", "className", "icon", "hasSubNodes", "isDisabled", "isExpanded", "isSelected", "onSelected", "onExpanded", "checkbox", "expander"]);
     useTheme();
-    var _e = useTreeContext(), nodeDepth = _e.nodeDepth, _f = _e.subNodeIds, subNodeIds = _f === void 0 ? [] : _f, parentNodeId = _e.parentNodeId, groupSize = _e.groupSize, indexInGroup = _e.indexInGroup;
+    var _e = useTreeContext(), nodeDepth = _e.nodeDepth, _f = _e.subNodeIds, subNodeIds = _f === void 0 ? [] : _f, parentNodeId = _e.parentNodeId, scrollToParent = _e.scrollToParent, groupSize = _e.groupSize, indexInGroup = _e.indexInGroup;
     var _g = React.useState(false), isFocused = _g[0], setIsFocused = _g[1];
     var nodeRef = React.useRef(null);
     var styleDepth = React.useMemo(function () {
@@ -62,7 +62,7 @@ export var TreeNode = function (props) {
             : { marginLeft: nodeDepth ? nodeDepth * 28 : 0 };
     }, [nodeDepth]);
     var onKeyDown = function (event) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f;
         var isNodeFocused = nodeRef.current === ((_a = nodeRef.current) === null || _a === void 0 ? void 0 : _a.ownerDocument.activeElement);
         switch (event.key) {
             case 'ArrowLeft': {
@@ -73,20 +73,19 @@ export var TreeNode = function (props) {
                         break;
                     }
                     if (parentNodeId) {
-                        var parentNode = (_b = nodeRef.current) === null || _b === void 0 ? void 0 : _b.ownerDocument.querySelector("#".concat(parentNodeId));
-                        parentNode === null || parentNode === void 0 ? void 0 : parentNode.focus();
+                        scrollToParent === null || scrollToParent === void 0 ? void 0 : scrollToParent();
                         break;
                     }
                     // If it is top level node (doesn't have parent node), then do nothing.
                     break;
                 }
                 var focusableElements = getFocusableElements(nodeRef.current);
-                var currentIndex = focusableElements.indexOf((_c = nodeRef.current) === null || _c === void 0 ? void 0 : _c.ownerDocument.activeElement);
+                var currentIndex = focusableElements.indexOf((_b = nodeRef.current) === null || _b === void 0 ? void 0 : _b.ownerDocument.activeElement);
                 if (currentIndex === 0) {
-                    (_d = nodeRef.current) === null || _d === void 0 ? void 0 : _d.focus();
+                    (_c = nodeRef.current) === null || _c === void 0 ? void 0 : _c.focus();
                 }
                 else {
-                    (_e = focusableElements[currentIndex - 1]) === null || _e === void 0 ? void 0 : _e.focus();
+                    (_d = focusableElements[currentIndex - 1]) === null || _d === void 0 ? void 0 : _d.focus();
                 }
                 break;
             }
@@ -98,10 +97,10 @@ export var TreeNode = function (props) {
                         onExpanded(nodeId, true);
                         break;
                     }
-                    (_f = focusableElements[0]) === null || _f === void 0 ? void 0 : _f.focus();
+                    (_e = focusableElements[0]) === null || _e === void 0 ? void 0 : _e.focus();
                     break;
                 }
-                var currentIndex = focusableElements.indexOf((_g = nodeRef.current) === null || _g === void 0 ? void 0 : _g.ownerDocument.activeElement);
+                var currentIndex = focusableElements.indexOf((_f = nodeRef.current) === null || _f === void 0 ? void 0 : _f.ownerDocument.activeElement);
                 if (currentIndex < focusableElements.length - 1) {
                     focusableElements[currentIndex + 1].focus();
                     break;

package/esm/core/Typography/Small/Small.js

@@ -37,6 +37,6 @@ import '@itwin/itwinui-css/css/text.css';
 export var Small = React.forwardRef(function (props, ref) {
     var className = props.className, _a = props.isMuted, isMuted = _a === void 0 ? false : _a, rest = __rest(props, ["className", "isMuted"]);
     useTheme();
-    return (React.createElement("p", __assign({ ref: ref, className: cx('iui-text-small', { 'iui-text-muted': isMuted }, className) }, rest)));
+    return (React.createElement("small", __assign({ ref: ref, className: cx('iui-text-small', { 'iui-text-muted': isMuted }, className) }, rest)));
 });
 export default Small;

package/esm/core/utils/hooks/index.d.ts

@@ -7,3 +7,4 @@ export * from './useTheme';
 export * from './useIntersection';
 export * from './useMediaQuery';
 export * from './useSafeContext';
+export * from './useLatestRef';

package/esm/core/utils/hooks/index.js

@@ -11,3 +11,4 @@ export * from './useTheme';
 export * from './useIntersection';
 export * from './useMediaQuery';
 export * from './useSafeContext';
+export * from './useLatestRef';

package/esm/core/utils/hooks/useLatestRef.d.ts

@@ -0,0 +1,9 @@
+import React from 'react';
+/**
+ * Hook that keeps track of the latest value in a ref.
+ * @private
+ * @example
+ * const { value } = props;
+ * const valueRef = useLatestRef(value);
+ */
+export declare const useLatestRef: <T>(value: T) => React.MutableRefObject<T>;

package/esm/core/utils/hooks/useLatestRef.js

@@ -0,0 +1,19 @@
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+ * See LICENSE.md in the project root for license terms and full copyright notice.
+ *--------------------------------------------------------------------------------------------*/
+import React from 'react';
+/**
+ * Hook that keeps track of the latest value in a ref.
+ * @private
+ * @example
+ * const { value } = props;
+ * const valueRef = useLatestRef(value);
+ */
+export var useLatestRef = function (value) {
+    var valueRef = React.useRef(value);
+    React.useEffect(function () {
+        valueRef.current = value;
+    }, [value]);
+    return valueRef;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itwin/itwinui-react",
-  "version": "1.41.0",
+  "version": "1.42.0",
   "author": "Bentley Systems",
   "license": "MIT",
   "main": "cjs/index.js",