@itwin/itwinui-react 3.15.3 → 3.15.4

package/esm/core/Breadcrumbs/Breadcrumbs.js

@@ -1,104 +1,123 @@
 import * as React from 'react';
 import cx from 'classnames';
 import {
-  useMergedRefs,
-  useOverflow,
   SvgChevronRight,
   Box,
+  OverflowContainer,
   useWarningLogger,
 } from '../../utils/index.js';
 import { Button } from '../Buttons/Button.js';
 import { Anchor } from '../Typography/Anchor.js';
 let BreadcrumbsComponent = React.forwardRef((props, ref) => {
   let {
-    children: items,
-    currentIndex = items.length - 1,
+    children: childrenProp,
+    currentIndex = React.Children.count(childrenProp) - 1,
     separator,
     overflowButton,
     className,
     ...rest
   } = props;
-  let [overflowRef, visibleCount] = useOverflow(items);
-  let refs = useMergedRefs(overflowRef, ref);
+  let items = React.useMemo(
+    () => React.Children.toArray(childrenProp),
+    [childrenProp],
+  );
   return React.createElement(
     Box,
     {
       as: 'nav',
       className: cx('iui-breadcrumbs', className),
-      ref: refs,
+      ref: ref,
       'aria-label': 'Breadcrumb',
       ...rest,
     },
     React.createElement(
-      Box,
+      OverflowContainer,
       {
         as: 'ol',
+        itemsCount: items.length,
         className: 'iui-breadcrumbs-list',
       },
-      visibleCount > 1 &&
+      React.createElement(
+        BreadcrumbContent,
+        {
+          currentIndex: currentIndex,
+          overflowButton: overflowButton,
+          separator: separator,
+        },
+        items,
+      ),
+    ),
+  );
+});
+let BreadcrumbContent = (props) => {
+  let { children: items, currentIndex, overflowButton, separator } = props;
+  let { visibleCount } = OverflowContainer.useContext();
+  return React.createElement(
+    React.Fragment,
+    null,
+    visibleCount > 1 &&
+      React.createElement(
+        React.Fragment,
+        null,
+        React.createElement(ListItem, {
+          item: items[0],
+          isActive: 0 === currentIndex,
+        }),
+        React.createElement(Separator, {
+          separator: separator,
+        }),
+      ),
+    items.length - visibleCount > 0 &&
+      React.createElement(
+        React.Fragment,
+        null,
         React.createElement(
-          React.Fragment,
-          null,
-          React.createElement(ListItem, {
-            item: items[0],
-            isActive: 0 === currentIndex,
-          }),
-          React.createElement(Separator, {
-            separator: separator,
-          }),
+          Box,
+          {
+            as: 'li',
+            className: 'iui-breadcrumbs-item',
+          },
+          overflowButton
+            ? overflowButton(visibleCount)
+            : React.createElement(
+                Box,
+                {
+                  as: 'span',
+                  className: 'iui-breadcrumbs-content',
+                },
+                '…',
+              ),
         ),
-      items.length - visibleCount > 0 &&
-        React.createElement(
+        React.createElement(Separator, {
+          separator: separator,
+        }),
+      ),
+    items
+      .slice(
+        visibleCount > 1 ? items.length - visibleCount + 1 : items.length - 1,
+      )
+      .map((_, _index) => {
+        let index =
+          visibleCount > 1
+            ? 1 + (items.length - visibleCount) + _index
+            : items.length - 1;
+        return React.createElement(
           React.Fragment,
-          null,
-          React.createElement(
-            Box,
-            {
-              as: 'li',
-              className: 'iui-breadcrumbs-item',
-            },
-            overflowButton
-              ? overflowButton(visibleCount)
-              : React.createElement(
-                  Box,
-                  {
-                    as: 'span',
-                    className: 'iui-breadcrumbs-content',
-                  },
-                  '…',
-                ),
-          ),
-          React.createElement(Separator, {
-            separator: separator,
+          {
+            key: index,
+          },
+          React.createElement(ListItem, {
+            item: items[index],
+            isActive: currentIndex === index,
           }),
-        ),
-      items
-        .slice(
-          visibleCount > 1 ? items.length - visibleCount + 1 : items.length - 1,
-        )
-        .map((_, _index) => {
-          let index =
-            visibleCount > 1
-              ? 1 + (items.length - visibleCount) + _index
-              : items.length - 1;
-          return React.createElement(
-            React.Fragment,
-            {
-              key: index,
-            },
-            React.createElement(ListItem, {
-              item: items[index],
-              isActive: currentIndex === index,
+          index < items.length - 1 &&
+            React.createElement(Separator, {
+              separator: separator,
             }),
-            index < items.length - 1 &&
-              React.createElement(Separator, {
-                separator: separator,
-              }),
-          );
-        }),
-    ),
+        );
+      }),
   );
-});
+};
 let ListItem = ({ item, isActive }) => {
   let children = item;
   let logWarning = useWarningLogger();

package/esm/core/ButtonGroup/ButtonGroup.js

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import cx from 'classnames';
-import { useOverflow, useMergedRefs, Box } from '../../utils/index.js';
+import { Box, OverflowContainer } from '../../utils/index.js';
 import {
   Composite,
   CompositeItem,
@@ -91,14 +91,12 @@ let OverflowGroup = React.forwardRef((props, forwardedRef) => {
     () => React.Children.toArray(childrenProp).filter(Boolean),
     [childrenProp],
   );
-  let [overflowRef, visibleCount] = useOverflow(
-    items,
-    !overflowButton,
-    orientation,
-  );
   return React.createElement(
-    BaseGroup,
+    OverflowContainer,
     {
+      as: BaseGroup,
+      itemsCount: items.length,
+      overflowOrientation: orientation,
       orientation: orientation,
       ...rest,
       className: cx(
@@ -108,27 +106,34 @@ let OverflowGroup = React.forwardRef((props, forwardedRef) => {
         },
         props.className,
       ),
-      ref: useMergedRefs(forwardedRef, overflowRef),
+      ref: forwardedRef,
     },
-    (() => {
-      if (!(visibleCount < items.length)) return items;
-      let overflowStart =
-        'start' === overflowPlacement
-          ? items.length - visibleCount
-          : visibleCount - 1;
-      return React.createElement(
-        React.Fragment,
-        null,
-        overflowButton &&
-          'start' === overflowPlacement &&
-          overflowButton(overflowStart),
-        'start' === overflowPlacement
-          ? items.slice(overflowStart + 1)
-          : items.slice(0, Math.max(0, overflowStart)),
-        overflowButton &&
-          'end' === overflowPlacement &&
-          overflowButton(overflowStart),
-      );
-    })(),
+    React.createElement(OverflowGroupContent, {
+      overflowButton: overflowButton,
+      overflowPlacement: overflowPlacement,
+      items: items,
+    }),
   );
 });
+let OverflowGroupContent = (props) => {
+  let { overflowButton, overflowPlacement, items } = props;
+  let { visibleCount } = OverflowContainer.useContext();
+  let overflowStart =
+    'start' === overflowPlacement
+      ? items.length - visibleCount
+      : visibleCount - 1;
+  if (!(visibleCount < items.length)) return items;
+  return React.createElement(
+    React.Fragment,
+    null,
+    overflowButton &&
+      'start' === overflowPlacement &&
+      overflowButton(overflowStart),
+    'start' === overflowPlacement
+      ? items.slice(overflowStart + 1)
+      : items.slice(0, Math.max(0, overflowStart)),
+    overflowButton &&
+      'end' === overflowPlacement &&
+      overflowButton(overflowStart),
+  );
+};

package/esm/core/ComboBox/ComboBox.js

@@ -113,12 +113,14 @@ export const ComboBox = React.forwardRef((props, forwardedRef) => {
         setFocusedIndex(selectedIndexes ?? -1);
     } else {
       setFocusedIndex(-1);
-      if (!isMultipleEnabled(selectedIndexes, multiple))
-        setInputValue(
-          selectedIndexes >= 0
-            ? optionsRef.current[selectedIndexes]?.label ?? ''
-            : '',
-        );
+      isMultipleEnabled(selectedIndexes, multiple)
+        ? setInputValue('')
+        : setInputValue(
+            selectedIndexes >= 0
+              ? optionsRef.current[selectedIndexes]?.label ?? ''
+              : '',
+          );
+      setIsInputDirty(false);
     }
   }, [isOpen, multiple, optionsRef, selectedIndexes]);
   let previousOptions = React.useRef(options);
@@ -216,6 +218,7 @@ export const ComboBox = React.forwardRef((props, forwardedRef) => {
             .filter(Boolean)
             .join(', '),
         );
+        setInputValue('');
       } else {
         setSelectedIndexes(__originalIndex);
         hide();

package/esm/core/DatePicker/DatePicker.js

@@ -11,6 +11,7 @@ import {
 } from '../../utils/index.js';
 import { IconButton } from '../Buttons/IconButton.js';
 import { TimePicker } from '../TimePicker/TimePicker.js';
+import { PopoverInitialFocusContext } from '../Popover/Popover.js';
 let isSameDay = (a, b) =>
   a &&
   b &&
@@ -175,6 +176,11 @@ export const DatePicker = React.forwardRef((props, forwardedRef) => {
         currentDate.getFullYear(),
     );
   }, [date, setMonthAndYear, startDate, endDate, enableRangeSelect]);
+  let popoverInitialFocusContext = React.useContext(PopoverInitialFocusContext);
+  React.useLayoutEffect(() => {
+    if (setFocus && popoverInitialFocusContext)
+      popoverInitialFocusContext.setInitialFocus(-1);
+  }, [popoverInitialFocusContext, setFocus]);
   let days = React.useMemo(() => {
     let offsetToFirst = new Date(
       displayedYear,
@@ -499,10 +505,12 @@ export const DatePicker = React.forwardRef((props, forwardedRef) => {
                   role: 'option',
                   tabIndex: isSameDay(weekDay, focusedDay) ? 0 : -1,
                   'aria-disabled': isDisabled ? 'true' : void 0,
-                  ref: (element) =>
-                    isSameDay(weekDay, focusedDay) &&
-                    needFocus.current &&
-                    element?.focus(),
+                  ref: (element) => {
+                    if (isSameDay(weekDay, focusedDay) && needFocus.current)
+                      setTimeout(() => {
+                        element?.focus();
+                      });
+                  },
                   ...dayProps,
                   className: cx(getDayClass(weekDay), dayProps?.className),
                 },

package/esm/core/Popover/Popover.d.ts

@@ -1,4 +1,5 @@
 import * as React from 'react';
+import { FloatingFocusManager } from '@floating-ui/react';
 import type { Placement, UseFloatingOptions, UseHoverProps, UseClickProps, UseFocusProps, UseDismissProps } from '@floating-ui/react';
 import type { PolymorphicForwardRefComponent } from '../../utils/index.js';
 import type { PortalProps } from '../../utils/components/Portal.js';
@@ -97,8 +98,17 @@ type PopoverInternalProps = {
      */
     matchWidth?: boolean;
 } & Omit<UseFloatingOptions, 'middleware' | 'placement'>;
+type InitialFocus = React.ComponentPropsWithoutRef<typeof FloatingFocusManager>['initialFocus'];
 /** Stores the current open/closed state of the popover. */
 export declare const PopoverOpenContext: React.Context<boolean | undefined>;
+/**
+ * Stores the initialFocus of the popover.
+ *
+ * E.g. Popover's descendants can disable the popover's initialFocus to prevent conflicts with its own focus management.
+ */
+export declare const PopoverInitialFocusContext: React.Context<{
+    setInitialFocus: React.Dispatch<React.SetStateAction<InitialFocus>>;
+} | undefined>;
 export declare const usePopover: (options: PopoverOptions & PopoverInternalProps) => {
     placement: Placement;
     strategy: import("@floating-ui/utils").Strategy;

package/esm/core/Popover/Popover.js

@@ -33,7 +33,9 @@ import {
   useMergedRefs,
 } from '../../utils/index.js';
 import { usePortalTo } from '../../utils/components/Portal.js';
+import { ThemeProvider } from '../ThemeProvider/ThemeProvider.js';
 export const PopoverOpenContext = React.createContext(void 0);
+export const PopoverInitialFocusContext = React.createContext(void 0);
 export const usePopover = (options) => {
   let {
     placement = 'bottom-start',
@@ -231,7 +233,12 @@ export const Popover = React.forwardRef((props, forwardedRef) => {
     role: 'dialog',
     middleware,
   });
-  let popoverRef = useMergedRefs(popover.refs.setFloating, forwardedRef);
+  let [popoverElement, setPopoverElement] = React.useState();
+  let popoverRef = useMergedRefs(
+    popover.refs.setFloating,
+    forwardedRef,
+    setPopoverElement,
+  );
   let triggerId = `${useId()}-trigger`;
   let hasAriaLabel = !!props['aria-labelledby'] || !!props['aria-label'];
   useLayoutEffect(() => {
@@ -239,6 +246,13 @@ export const Popover = React.forwardRef((props, forwardedRef) => {
     popover.refs.setPositionReference(positionReference);
     return () => void popover.refs.setPositionReference(null);
   }, [popover.refs, positionReference]);
+  let [initialFocus, setInitialFocus] = React.useState();
+  let initialFocusContextValue = React.useMemo(
+    () => ({
+      setInitialFocus,
+    }),
+    [],
+  );
   return React.createElement(
     React.Fragment,
     null,
@@ -255,32 +269,46 @@ export const Popover = React.forwardRef((props, forwardedRef) => {
     ),
     popover.open
       ? React.createElement(
-          PopoverPortal,
+          PopoverInitialFocusContext.Provider,
           {
-            portal: portal,
+            value: initialFocusContextValue,
           },
           React.createElement(
-            FloatingFocusManager,
+            PopoverPortal,
             {
-              context: popover.context,
-              modal: false,
+              portal: portal,
             },
             React.createElement(
-              Box,
+              ThemeProvider,
               {
-                className: cx(
+                portalContainer: popoverElement,
+              },
+              React.createElement(DisplayContents, null),
+              React.createElement(
+                FloatingFocusManager,
+                {
+                  context: popover.context,
+                  modal: false,
+                  initialFocus: initialFocus,
+                },
+                React.createElement(
+                  Box,
                   {
-                    'iui-popover-surface': applyBackground,
+                    className: cx(
+                      {
+                        'iui-popover-surface': applyBackground,
+                      },
+                      className,
+                    ),
+                    'aria-labelledby': hasAriaLabel
+                      ? void 0
+                      : popover.refs.domReference.current?.id,
+                    ...popover.getFloatingProps(rest),
+                    ref: popoverRef,
                   },
-                  className,
+                  content,
                 ),
-                'aria-labelledby': hasAriaLabel
-                  ? void 0
-                  : popover.refs.domReference.current?.id,
-                ...popover.getFloatingProps(rest),
-                ref: popoverRef,
-              },
-              content,
+              ),
             ),
           ),
         )

package/esm/core/Select/SelectTagContainer.js

@@ -1,26 +1,37 @@
 import * as React from 'react';
 import cx from 'classnames';
-import { useOverflow, useMergedRefs, Box } from '../../utils/index.js';
 import { SelectTag } from './SelectTag.js';
+import { OverflowContainer } from '../../utils/index.js';
 export const SelectTagContainer = React.forwardRef((props, ref) => {
-  let { tags, className, ...rest } = props;
-  let [containerRef, visibleCount] = useOverflow(tags);
-  let refs = useMergedRefs(ref, containerRef);
+  let { tags: tagsProp, className, ...rest } = props;
+  let tags = React.useMemo(() => React.Children.toArray(tagsProp), [tagsProp]);
   return React.createElement(
-    Box,
+    OverflowContainer,
     {
+      itemsCount: tags.length,
       className: cx('iui-select-tag-container', className),
-      ref: refs,
+      ref: ref,
       ...rest,
     },
+    React.createElement(SelectTagContainerContent, {
+      ...props,
+      tags: tags,
+    }),
+  );
+});
+let SelectTagContainerContent = (props) => {
+  let { tags } = props;
+  let { visibleCount } = OverflowContainer.useContext();
+  return React.createElement(
+    React.Fragment,
+    null,
+    visibleCount < tags.length ? tags.slice(0, visibleCount - 1) : tags,
     React.createElement(
-      React.Fragment,
+      OverflowContainer.OverflowNode,
       null,
-      visibleCount < tags.length ? tags.slice(0, visibleCount - 1) : tags,
-      visibleCount < tags.length &&
-        React.createElement(SelectTag, {
-          label: `+${tags.length - visibleCount + 1} item(s)`,
-        }),
+      React.createElement(SelectTag, {
+        label: `+${tags.length - visibleCount + 1} item(s)`,
+      }),
     ),
   );
-});
+};

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

@@ -1,19 +1,15 @@
-import * as React from 'react';
-import type { ColumnInstance, HeaderGroup, TableKeyedProps, TableState } from '../../react-table/react-table.js';
-type ColumnHeaderProps<T extends Record<string, unknown> = Record<string, unknown>> = TableKeyedProps & {
-    columnRefs: React.MutableRefObject<Record<string, HTMLDivElement>>;
-    column: HeaderGroup<T>;
-    index: number;
+import { type PolymorphicForwardRefComponent } from '../../utils/index.js';
+import type { HeaderGroup, TableKeyedProps } from '../../react-table/react-table.js';
+type ColumnHeaderProps = TableKeyedProps & {
+    column: HeaderGroup<Record<string, unknown>>;
     areFiltersSet: boolean;
-    hasAnySubRows: boolean;
-    headers: HeaderGroup<T>[];
-    state: TableState<T>;
-    data: T[];
     isResizable: boolean;
     columnResizeMode: 'fit' | 'expand';
     enableColumnReordering: boolean;
     density: string | undefined;
-    visibleColumns: ColumnInstance<T>[];
+    columnHasExpanders: boolean;
+    isLast: boolean;
+    isTableEmpty: boolean;
 };
-export declare const ColumnHeader: <T extends Record<string, unknown> = Record<string, unknown>>(props: ColumnHeaderProps<T>) => JSX.Element;
+export declare const ColumnHeader: PolymorphicForwardRefComponent<"div", ColumnHeaderProps>;
 export {};

package/esm/core/Table/ColumnHeader.js

@@ -5,40 +5,39 @@ import {
   LineClamp,
   SvgSortDown,
   SvgSortUp,
+  useMergedRefs,
 } from '../../utils/index.js';
-import { SELECTION_CELL_ID } from './columns/index.js';
 import { FilterToggle } from './filters/FilterToggle.js';
-import { getCellStyle, getSubRowStyle, getStickyStyle } from './utils.js';
+import {
+  getCellStyle,
+  getSubRowStyle,
+  getStickyStyle,
+  TableInstanceContext,
+} from './utils.js';
 import cx from 'classnames';
-export const ColumnHeader = (props) => {
+export const ColumnHeader = React.forwardRef((props, forwardedRef) => {
   let {
-    columnRefs,
     column,
-    index,
     areFiltersSet,
-    hasAnySubRows,
-    headers,
-    state,
-    data,
     isResizable,
     columnResizeMode,
     enableColumnReordering,
     density,
-    visibleColumns,
+    columnHasExpanders,
+    isLast,
+    isTableEmpty,
     ...rest
   } = props;
   let isHeaderDirectClick = React.useRef(false);
+  let instance = React.useContext(TableInstanceContext);
   let COLUMN_MIN_WIDTHS = {
     default: 72,
     withExpander: 108,
   };
   let showFilterButton = (column) =>
-    (0 !== data.length || areFiltersSet) && column.canFilter && !!column.Filter;
-  let showSortButton = (column) => 0 !== data.length && column.canSort;
+    (!isTableEmpty || areFiltersSet) && column.canFilter && !!column.Filter;
+  let showSortButton = (column) => !isTableEmpty && column.canSort;
   let { onClick, ...restSortProps } = column.getSortByToggleProps();
-  let columnHasExpanders =
-    hasAnySubRows &&
-    index === headers.findIndex((c) => c.id !== SELECTION_CELL_ID);
   if ([void 0, 0].includes(column.minWidth)) {
     column.minWidth = columnHasExpanders
       ? COLUMN_MIN_WIDTHS.withExpander
@@ -58,12 +57,12 @@ export const ColumnHeader = (props) => {
       column.columnClassName,
     ),
     style: {
-      ...getCellStyle(column, !!state.isTableResizing),
+      ...getCellStyle(column, !!instance?.state.isTableResizing),
       ...(columnHasExpanders &&
         getSubRowStyle({
           density,
         })),
-      ...getStickyStyle(column, visibleColumns),
+      ...getStickyStyle(column, instance?.visibleColumns ?? []),
       flexWrap: 'wrap',
       columnGap: 'var(--iui-size-xs)',
     },
@@ -75,14 +74,14 @@ export const ColumnHeader = (props) => {
       ...rest,
       key: columnProps.key,
       title: void 0,
-      ref: React.useCallback(
-        (el) => {
-          if (el) {
-            columnRefs.current[column.id] = el;
-            column.resizeWidth = el.getBoundingClientRect().width;
-          }
-        },
-        [column, columnRefs],
+      ref: useMergedRefs(
+        React.useCallback(
+          (el) => {
+            if (el) column.resizeWidth = el.getBoundingClientRect().width;
+          },
+          [column],
+        ),
+        forwardedRef,
       ),
       onMouseDown: () => {
         isHeaderDirectClick.current = true;
@@ -153,7 +152,7 @@ export const ColumnHeader = (props) => {
         ),
       isResizable &&
         column.isResizerVisible &&
-        (index !== headers.length - 1 || 'expand' === columnResizeMode) &&
+        (!isLast || 'expand' === columnResizeMode) &&
         React.createElement(
           Box,
           {
@@ -172,17 +171,17 @@ export const ColumnHeader = (props) => {
           slot: 'resizers',
         }),
       'left' === column.sticky &&
-        state.sticky.isScrolledToRight &&
+        instance?.state.sticky.isScrolledToRight &&
         React.createElement(Box, {
           className: 'iui-table-cell-shadow-right',
           slot: 'shadows',
         }),
       'right' === column.sticky &&
-        state.sticky.isScrolledToLeft &&
+        instance?.state.sticky.isScrolledToLeft &&
         React.createElement(Box, {
           className: 'iui-table-cell-shadow-left',
           slot: 'shadows',
         }),
     ),
   );
-};
+});