@itwin/itwinui-react 3.15.3 → 3.15.4

package/DEV-cjs/core/Table/Table.js

@@ -289,7 +289,6 @@ const Table = (props) => {
     gotoPage,
     setPageSize,
     flatHeaders,
-    visibleColumns,
     setGlobalFilter,
   } = instance;
   let headerGroups = _headerGroups;
@@ -300,6 +299,10 @@ const Table = (props) => {
       "Table's `columns` prop should not have a top-level `Header` or sub-columns. They are only allowed to be passed for backwards compatibility.\n See https://github.com/iTwin/iTwinUI/wiki/iTwinUI-react-v2-migration-guide#breaking-changes",
     );
   }
+  if (subComponent && data.some((item) => !!item.subRows?.length))
+    logWarning(
+      'Passing both `subComponent` and `data` with `subRows` is not supported. There are features designed for `subRows` that are not compatible with `subComponent` and vice versa.',
+    );
   let ariaDataAttributes = Object.entries(rest).reduce(
     (result, [key, value]) => {
       if (key.startsWith('data-') || key.startsWith('aria-'))
@@ -537,9 +540,9 @@ const Table = (props) => {
     updateStickyState();
   }, []);
   return _react.createElement(
-    _utils.TableColumnsContext.Provider,
+    _utils.TableInstanceContext.Provider,
     {
-      value: instance.columns,
+      value: instance,
     },
     _react.createElement(
       _index.Box,
@@ -601,19 +604,23 @@ const Table = (props) => {
                 return _react.createElement(_ColumnHeader.ColumnHeader, {
                   ...dragAndDropProps,
                   key: dragAndDropProps.key || column.id || index,
-                  columnRefs: columnRefs,
                   column: column,
-                  index: index,
                   areFiltersSet: areFiltersSet,
-                  hasAnySubRows: hasAnySubRows,
-                  headers: headerGroup.headers,
-                  state: state,
-                  data: data,
+                  columnHasExpanders:
+                    hasAnySubRows &&
+                    index ===
+                      headerGroup.headers.findIndex(
+                        (c) => c.id !== _index3.SELECTION_CELL_ID,
+                      ),
+                  isLast: index === headerGroup.headers.length - 1,
+                  isTableEmpty: 0 === data.length,
                   isResizable: isResizable,
                   columnResizeMode: columnResizeMode,
                   enableColumnReordering: enableColumnReordering,
                   density: density,
-                  visibleColumns: visibleColumns,
+                  ref: (el) => {
+                    if (el) columnRefs.current[column.id] = el;
+                  },
                 });
               }),
             ),

package/DEV-cjs/core/Table/TablePaginator.js

@@ -18,6 +18,7 @@ const _DropdownButton = require('../Buttons/DropdownButton.js');
 const _ProgressRadial = require('../ProgressIndicators/ProgressRadial.js');
 const _MenuItem = require('../Menu/MenuItem.js');
 const _index = require('../../utils/index.js');
+const _styles = require('../../styles.js');
 const defaultLocalization = {
   pageSizeLabel: (size) => `${size} per page`,
   rangeLabel: (startIndex, endIndex, totalRows, isLoading) =>
@@ -59,7 +60,7 @@ const TablePaginator = (props) => {
   );
   let pageListRef = _react.useRef(null);
   let [focusedIndex, setFocusedIndex] = _react.useState(currentPage);
-  _react.useEffect(() => {
+  _react.useLayoutEffect(() => {
     setFocusedIndex(currentPage);
   }, [currentPage]);
   let needFocus = _react.useRef(false);
@@ -68,7 +69,7 @@ const TablePaginator = (props) => {
     if (isMounted.current && needFocus.current) {
       let buttonToFocus = Array.from(
         pageListRef.current?.querySelectorAll(
-          '.iui-table-paginator-page-button',
+          `.${_styles.styles['iui-table-paginator-page-button']}`,
         ) ?? [],
       ).find((el) => el.textContent?.trim() === (focusedIndex + 1).toString());
       buttonToFocus?.focus();
@@ -77,35 +78,7 @@ const TablePaginator = (props) => {
     isMounted.current = true;
   }, [focusedIndex]);
   let buttonSize = 'default' != size ? 'small' : void 0;
-  let pageButton = _react.useCallback(
-    (index, tabIndex = index === focusedIndex ? 0 : -1) =>
-      _react.createElement(
-        _Button.Button,
-        {
-          key: index,
-          className: 'iui-table-paginator-page-button',
-          styleType: 'borderless',
-          size: buttonSize,
-          'data-iui-active': index === currentPage,
-          onClick: () => onPageChange(index),
-          'aria-current': index === currentPage,
-          'aria-label': localization.goToPageLabel(index + 1),
-          tabIndex: tabIndex,
-        },
-        index + 1,
-      ),
-    [focusedIndex, currentPage, localization, buttonSize, onPageChange],
-  );
   let totalPagesCount = Math.ceil(totalRowsCount / pageSize);
-  let pageList = _react.useMemo(
-    () =>
-      new Array(totalPagesCount)
-        .fill(null)
-        .map((_, index) => pageButton(index)),
-    [pageButton, totalPagesCount],
-  );
-  let [overflowRef, visibleCount] = (0, _index.useOverflow)(pageList);
-  let [paginatorResizeRef, paginatorWidth] = (0, _index.useContainerWidth)();
   let onKeyDown = (event) => {
     if (event.altKey) return;
     let focusPage = (delta) => {
@@ -136,30 +109,10 @@ const TablePaginator = (props) => {
         break;
     }
   };
-  let halfVisibleCount = Math.floor(visibleCount / 2);
-  let startPage = focusedIndex - halfVisibleCount;
-  let endPage = focusedIndex + halfVisibleCount + 1;
-  if (startPage < 0) {
-    endPage = Math.min(totalPagesCount, endPage + Math.abs(startPage));
-    startPage = 0;
-  }
-  if (endPage > totalPagesCount) {
-    startPage = Math.max(0, startPage - (endPage - totalPagesCount));
-    endPage = totalPagesCount;
-  }
-  let hasNoRows = 0 === totalPagesCount;
+  let [paginatorResizeRef, paginatorWidth] = (0, _index.useContainerWidth)();
   let showPagesList = totalPagesCount > 1 || isLoading;
   let showPageSizeList = pageSizeList && !!onPageSizeChange && !!totalRowsCount;
-  let ellipsis = _react.createElement(
-    _index.Box,
-    {
-      as: 'span',
-      className: (0, _classnames.default)('iui-table-paginator-ellipsis', {
-        'iui-table-paginator-ellipsis-small': 'small' === size,
-      }),
-    },
-    '…',
-  );
+  let hasNoRows = 0 === totalPagesCount;
   let noRowsContent = _react.createElement(
     _react.Fragment,
     null,
@@ -200,10 +153,10 @@ const TablePaginator = (props) => {
     ),
     showPagesList &&
       _react.createElement(
-        _index.Box,
+        _index.OverflowContainer,
         {
           className: 'iui-center',
-          ref: overflowRef,
+          itemsCount: totalPagesCount,
         },
         _react.createElement(
           _IconButton.IconButton,
@@ -224,40 +177,17 @@ const TablePaginator = (props) => {
             onKeyDown: onKeyDown,
             ref: pageListRef,
           },
-          (() => {
-            if (hasNoRows) return noRowsContent;
-            if (1 === visibleCount) return pageButton(focusedIndex);
-            return _react.createElement(
-              _react.Fragment,
-              null,
-              0 !== startPage &&
-                _react.createElement(
-                  _react.Fragment,
-                  null,
-                  pageButton(0, 0),
-                  ellipsis,
-                ),
-              pageList.slice(startPage, endPage),
-              endPage !== totalPagesCount &&
-                !isLoading &&
-                _react.createElement(
-                  _react.Fragment,
-                  null,
-                  ellipsis,
-                  pageButton(totalPagesCount - 1, 0),
-                ),
-              isLoading &&
-                _react.createElement(
-                  _react.Fragment,
-                  null,
-                  ellipsis,
-                  _react.createElement(_ProgressRadial.ProgressRadial, {
-                    indeterminate: true,
-                    size: 'small',
-                  }),
-                ),
-            );
-          })(),
+          hasNoRows
+            ? noRowsContent
+            : _react.createElement(TablePaginatorPageButtons, {
+                size: size,
+                focusedIndex: focusedIndex,
+                totalPagesCount: totalPagesCount,
+                onPageChange: onPageChange,
+                currentPage: currentPage,
+                localization: localization,
+                isLoading: isLoading,
+              }),
         ),
         _react.createElement(
           _IconButton.IconButton,
@@ -322,3 +252,96 @@ const TablePaginator = (props) => {
     ),
   );
 };
+const TablePaginatorPageButtons = (props) => {
+  let {
+    focusedIndex,
+    totalPagesCount,
+    onPageChange,
+    currentPage,
+    localization,
+    isLoading,
+    size,
+  } = props;
+  let { visibleCount } = _index.OverflowContainer.useContext();
+  let buttonSize = 'default' != size ? 'small' : void 0;
+  let pageButton = _react.useCallback(
+    (index, tabIndex = index === focusedIndex ? 0 : -1) =>
+      _react.createElement(
+        _Button.Button,
+        {
+          key: index,
+          className: 'iui-table-paginator-page-button',
+          styleType: 'borderless',
+          size: buttonSize,
+          'data-iui-active': index === currentPage,
+          onClick: () => onPageChange(index),
+          'aria-current': index === currentPage,
+          'aria-label': localization.goToPageLabel?.(index + 1),
+          tabIndex: tabIndex,
+        },
+        index + 1,
+      ),
+    [focusedIndex, currentPage, localization, buttonSize, onPageChange],
+  );
+  let pageList = _react.useMemo(
+    () =>
+      new Array(totalPagesCount)
+        .fill(null)
+        .map((_, index) => pageButton(index)),
+    [pageButton, totalPagesCount],
+  );
+  let halfVisibleCount = Math.floor(visibleCount / 2);
+  let startPage = focusedIndex - halfVisibleCount;
+  let endPage = focusedIndex + halfVisibleCount + 1;
+  if (startPage < 0) {
+    endPage = Math.min(totalPagesCount, endPage + Math.abs(startPage));
+    startPage = 0;
+  }
+  if (endPage > totalPagesCount) {
+    startPage = Math.max(0, startPage - (endPage - totalPagesCount));
+    endPage = totalPagesCount;
+  }
+  let ellipsis = _react.createElement(
+    _index.Box,
+    {
+      as: 'span',
+      className: (0, _classnames.default)('iui-table-paginator-ellipsis', {
+        'iui-table-paginator-ellipsis-small': 'small' === size,
+      }),
+    },
+    '…',
+  );
+  if (1 === visibleCount) return pageButton(focusedIndex);
+  let showStartEllipsis = startPage > 1;
+  let showEndEllipsis = endPage < totalPagesCount - 1;
+  return _react.createElement(
+    _react.Fragment,
+    null,
+    0 !== startPage &&
+      _react.createElement(
+        _react.Fragment,
+        null,
+        pageButton(0, 0),
+        showStartEllipsis ? ellipsis : null,
+      ),
+    pageList.slice(startPage, endPage),
+    endPage !== totalPagesCount &&
+      !isLoading &&
+      _react.createElement(
+        _react.Fragment,
+        null,
+        showEndEllipsis ? ellipsis : null,
+        pageButton(totalPagesCount - 1, 0),
+      ),
+    isLoading &&
+      _react.createElement(
+        _react.Fragment,
+        null,
+        ellipsis,
+        _react.createElement(_ProgressRadial.ProgressRadial, {
+          indeterminate: true,
+          size: 'small',
+        }),
+      ),
+  );
+};

package/DEV-cjs/core/Table/cells/DefaultCell.js

@@ -16,12 +16,12 @@ const _classnames = _interop_require_default._(require('classnames'));
 const _index = require('../../../utils/index.js');
 const _utils = require('../utils.js');
 const DefaultCell = (props) => {
-  let instanceColumns = _react.useContext(_utils.TableColumnsContext);
+  let instance = _react.useContext(_utils.TableInstanceContext);
   let isCustomCell = _react.useMemo(
     () =>
-      instanceColumns.find(({ id }) => props.cellProps.column.id === id)
+      instance?.columns.find(({ id }) => props.cellProps.column.id === id)
         ?.Cell !== _reacttable.defaultColumn.Cell,
-    [instanceColumns, props.cellProps.column.id],
+    [instance, props.cellProps.column.id],
   );
   let {
     cellElementProps: {

package/DEV-cjs/core/Table/utils.js

@@ -10,8 +10,8 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  TableColumnsContext: function () {
-    return TableColumnsContext;
+  TableInstanceContext: function () {
+    return TableInstanceContext;
   },
   getCellStyle: function () {
     return getCellStyle;
@@ -73,4 +73,4 @@ const getSubRowStyle = ({ density = 'default', depth = 1 }) => {
     paddingInlineStart: cellPadding + depth * multiplier,
   };
 };
-const TableColumnsContext = _react.createContext([]);
+const TableInstanceContext = _react.createContext(void 0);

package/DEV-cjs/styles.js

@@ -1,6 +1,6 @@
 'use strict';
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const e = '3.15.3';
+const e = '3.15.4';
 const u = new Proxy(
   {},
   {

package/DEV-cjs/utils/components/MiddleTextTruncation.js

@@ -10,22 +10,14 @@ Object.defineProperty(exports, 'MiddleTextTruncation', {
 });
 const _interop_require_wildcard = require('@swc/helpers/_/_interop_require_wildcard');
 const _react = _interop_require_wildcard._(require('react'));
-const _useOverflow = require('../hooks/useOverflow.js');
+const _OverflowContainer = require('./OverflowContainer.js');
 const ELLIPSIS_CHAR = '…';
 const MiddleTextTruncation = (props) => {
-  let { text, endCharsCount = 6, textRenderer, style, ...rest } = props;
-  let [ref, visibleCount] = (0, _useOverflow.useOverflow)(text);
-  let truncatedText = _react.useMemo(() => {
-    if (visibleCount < text.length)
-      return `${text.substring(
-        0,
-        visibleCount - endCharsCount - ELLIPSIS_CHAR.length,
-      )}${ELLIPSIS_CHAR}${text.substring(text.length - endCharsCount)}`;
-    return text;
-  }, [endCharsCount, text, visibleCount]);
+  let { text, style, ...rest } = props;
   return _react.createElement(
-    'span',
+    _OverflowContainer.OverflowContainer,
     {
+      as: 'span',
       style: {
         display: 'flex',
         minWidth: 0,
@@ -33,10 +25,23 @@ const MiddleTextTruncation = (props) => {
         whiteSpace: 'nowrap',
         ...style,
       },
-      ref: ref,
+      itemsCount: text.length,
       ...rest,
     },
-    textRenderer?.(truncatedText, text) ?? truncatedText,
+    _react.createElement(MiddleTextTruncationContent, props),
   );
 };
 MiddleTextTruncation.displayName = 'MiddleTextTruncation';
+const MiddleTextTruncationContent = (props) => {
+  let { text, endCharsCount = 6, textRenderer } = props;
+  let { visibleCount } = _OverflowContainer.OverflowContainer.useContext();
+  let truncatedText = _react.useMemo(() => {
+    if (visibleCount < text.length)
+      return `${text.substring(
+        0,
+        visibleCount - endCharsCount - ELLIPSIS_CHAR.length,
+      )}${ELLIPSIS_CHAR}${text.substring(text.length - endCharsCount)}`;
+    return text;
+  }, [endCharsCount, text, visibleCount]);
+  return textRenderer?.(truncatedText, text) ?? truncatedText;
+};

package/DEV-cjs/utils/components/OverflowContainer.js

@@ -0,0 +1,63 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', {
+  value: true,
+});
+Object.defineProperty(exports, 'OverflowContainer', {
+  enumerable: true,
+  get: function () {
+    return OverflowContainer;
+  },
+});
+const _interop_require_default = require('@swc/helpers/_/_interop_require_default');
+const _react = _interop_require_default._(require('react'));
+const _useMergedRefs = require('../hooks/useMergedRefs.js');
+const _Box = require('./Box.js');
+const _useOverflow = require('../hooks/useOverflow.js');
+const _useSafeContext = require('../hooks/useSafeContext.js');
+const OverflowContainerComponent = _react.default.forwardRef((props, ref) => {
+  let { itemsCount, children, overflowOrientation, ...rest } = props;
+  let [containerRef, visibleCount] = (0, _useOverflow.useOverflow)(
+    itemsCount,
+    false,
+    overflowOrientation,
+  );
+  let overflowContainerContextValue = _react.default.useMemo(
+    () => ({
+      visibleCount,
+      itemsCount,
+    }),
+    [itemsCount, visibleCount],
+  );
+  return _react.default.createElement(
+    OverflowContainerContext.Provider,
+    {
+      value: overflowContainerContextValue,
+    },
+    _react.default.createElement(
+      _Box.Box,
+      {
+        ref: (0, _useMergedRefs.useMergedRefs)(ref, containerRef),
+        ...rest,
+      },
+      children,
+    ),
+  );
+});
+const OverflowContainerOverflowNode = (props) => {
+  let { children } = props;
+  let { visibleCount, itemsCount } = useOverflowContainerContext();
+  let isOverflowing = visibleCount < itemsCount;
+  return isOverflowing ? children : null;
+};
+const OverflowContainer = Object.assign(OverflowContainerComponent, {
+  OverflowNode: OverflowContainerOverflowNode,
+  useContext: useOverflowContainerContext,
+});
+const OverflowContainerContext = _react.default.createContext(void 0);
+OverflowContainerContext.displayName = 'OverflowContainerContext';
+function useOverflowContainerContext() {
+  let overflowContainerContext = (0, _useSafeContext.useSafeContext)(
+    OverflowContainerContext,
+  );
+  return overflowContainerContext;
+}

package/DEV-cjs/utils/components/index.js

@@ -17,3 +17,4 @@ _export_star._(require('./Portal.js'), exports);
 _export_star._(require('./ShadowRoot.js'), exports);
 _export_star._(require('./LineClamp.js'), exports);
 _export_star._(require('./FieldsetBase.js'), exports);
+_export_star._(require('./OverflowContainer.js'), exports);

package/DEV-cjs/utils/hooks/useOverflow.js

@@ -14,10 +14,14 @@ const _useMergedRefs = require('./useMergedRefs.js');
 const _useResizeObserver = require('./useResizeObserver.js');
 const _useIsomorphicLayoutEffect = require('./useIsomorphicLayoutEffect.js');
 const STARTING_MAX_ITEMS_COUNT = 20;
-const useOverflow = (items, disabled = false, orientation = 'horizontal') => {
+const useOverflow = (
+  itemsCount,
+  disabled = false,
+  orientation = 'horizontal',
+) => {
   let containerRef = _react.useRef(null);
   let [visibleCount, setVisibleCount] = _react.useState(() =>
-    disabled ? items.length : Math.min(items.length, STARTING_MAX_ITEMS_COUNT),
+    disabled ? itemsCount : Math.min(itemsCount, STARTING_MAX_ITEMS_COUNT),
   );
   let needsFullRerender = _react.useRef(true);
   let [containerSize, setContainerSize] = _react.useState(0);
@@ -32,12 +36,12 @@ const useOverflow = (items, disabled = false, orientation = 'horizontal') => {
   );
   let resizeObserverRef = _react.useRef(observer);
   (0, _useIsomorphicLayoutEffect.useLayoutEffect)(() => {
-    if (disabled) setVisibleCount(items.length);
+    if (disabled) setVisibleCount(itemsCount);
     else {
-      setVisibleCount(Math.min(items.length, STARTING_MAX_ITEMS_COUNT));
+      setVisibleCount(Math.min(itemsCount, STARTING_MAX_ITEMS_COUNT));
       needsFullRerender.current = true;
     }
-  }, [containerSize, disabled, items]);
+  }, [containerSize, disabled, itemsCount]);
   let mergedRefs = (0, _useMergedRefs.useMergedRefs)(containerRef, resizeRef);
   (0, _useIsomorphicLayoutEffect.useLayoutEffect)(() => {
     if (!containerRef.current || disabled) {
@@ -57,14 +61,14 @@ const useOverflow = (items, disabled = false, orientation = 'horizontal') => {
         0,
       );
       let currentVisibleCount =
-        visibleCount || Math.min(items.length, STARTING_MAX_ITEMS_COUNT);
+        visibleCount || Math.min(itemsCount, STARTING_MAX_ITEMS_COUNT);
       let avgItemSize = childrenSize / currentVisibleCount;
       let visibleItems = Math.floor(availableSize / avgItemSize);
       if (!isNaN(visibleItems))
-        setVisibleCount(Math.min(items.length, 2 * visibleItems));
+        setVisibleCount(Math.min(itemsCount, 2 * visibleItems));
     }
     needsFullRerender.current = false;
-  }, [containerSize, visibleCount, disabled, items.length, orientation]);
+  }, [containerSize, visibleCount, disabled, itemsCount, orientation]);
   (0, _useIsomorphicLayoutEffect.useLayoutEffect)(() => {
     previousContainerSize.current = containerSize;
   }, [containerSize]);