@itwin/itwinui-react 3.17.4 → 3.18.1

package/DEV-esm/core/Select/Select.js

@@ -27,7 +27,7 @@ export const Select = React.forwardRef((props, forwardedRef) => {
     ref: forwardedRef,
   });
 });
-Select.displayName = 'Select';
+if ('development' === process.env.NODE_ENV) Select.displayName = 'Select';
 let NativeSelect = React.forwardRef((props, forwardedRef) => {
   let {
     triggerProps,
@@ -132,6 +132,36 @@ let CustomSelect = React.forwardRef((props, forwardedRef) => {
     });
     popoverProps?.onVisibleChange?.(false);
   }, [popoverProps]);
+  let handleOptionSelection = React.useCallback(
+    (option, { isSelected = false } = {}) => {
+      if (isSingleOnChange(onChangeRef.current, multiple)) {
+        setUncontrolledValue(option.value);
+        onChangeRef.current?.(option.value);
+        hide();
+      } else {
+        setUncontrolledValue((prev) =>
+          isSelected
+            ? prev?.filter((i) => option.value !== i)
+            : [...(prev ?? []), option.value],
+        );
+        onChangeRef.current?.(option.value, isSelected ? 'removed' : 'added');
+      }
+      if (isMultipleEnabled(value, multiple)) {
+        let prevSelectedValue = value || [];
+        let newSelectedValue = isSelected
+          ? prevSelectedValue.filter((i) => option.value !== i)
+          : [...prevSelectedValue, option.value];
+        setLiveRegionSelection(
+          options
+            .filter((i) => newSelectedValue.includes(i.value))
+            .map((item) => item.label)
+            .filter(Boolean)
+            .join(', '),
+        );
+      }
+    },
+    [hide, multiple, onChangeRef, options, value],
+  );
   let menuItems = React.useMemo(
     () =>
       options.map((option, index) => {
@@ -157,34 +187,9 @@ let CustomSelect = React.forwardRef((props, forwardedRef) => {
             : null,
           onClick: () => {
             if (option.disabled) return;
-            if (isSingleOnChange(onChangeRef.current, multiple)) {
-              setUncontrolledValue(option.value);
-              onChangeRef.current?.(option.value);
-              hide();
-            } else {
-              setUncontrolledValue((prev) =>
-                isSelected
-                  ? prev?.filter((i) => option.value !== i)
-                  : [...(prev ?? []), option.value],
-              );
-              onChangeRef.current?.(
-                option.value,
-                isSelected ? 'removed' : 'added',
-              );
-            }
-            if (isMultipleEnabled(value, multiple)) {
-              let prevSelectedValue = value || [];
-              let newSelectedValue = isSelected
-                ? prevSelectedValue.filter((i) => option.value !== i)
-                : [...prevSelectedValue, option.value];
-              setLiveRegionSelection(
-                options
-                  .filter((i) => newSelectedValue.includes(i.value))
-                  .map((item) => item.label)
-                  .filter(Boolean)
-                  .join(', '),
-              );
-            }
+            handleOptionSelection(option, {
+              isSelected,
+            });
           },
           ref: (el) => {
             if (isSelected && !multiple)
@@ -197,7 +202,7 @@ let CustomSelect = React.forwardRef((props, forwardedRef) => {
           ...menuItem.props,
         });
       }),
-    [hide, itemRenderer, multiple, onChangeRef, options, value],
+    [handleOptionSelection, itemRenderer, multiple, options, value],
   );
   let selectedItems = React.useMemo(() => {
     if (null == value) return;
@@ -214,12 +219,18 @@ let CustomSelect = React.forwardRef((props, forwardedRef) => {
     return index >= 0 ? index : 0;
   }, [options, value]);
   let tagRenderer = React.useCallback(
-    (item) =>
+    (option) =>
       React.createElement(SelectTag, {
-        key: item.label,
-        label: item.label,
+        key: option.label,
+        label: option.label,
+        onRemove: () => {
+          handleOptionSelection(option, {
+            isSelected: true,
+          });
+          selectRef.current?.focus();
+        },
       }),
-    [],
+    [handleOptionSelection],
   );
   let popover = usePopover({
     visible: isOpen,
@@ -270,6 +281,7 @@ let CustomSelect = React.forwardRef((props, forwardedRef) => {
             },
             triggerProps?.className,
           ),
+          'data-iui-multi': multiple,
         },
         (!selectedItems || 0 === selectedItems.length) &&
           React.createElement(
@@ -281,10 +293,8 @@ let CustomSelect = React.forwardRef((props, forwardedRef) => {
             placeholder,
           ),
         isMultipleEnabled(selectedItems, multiple)
-          ? React.createElement(MultipleSelectButton, {
-              selectedItems: selectedItems,
-              selectedItemsRenderer: selectedItemRenderer,
-              tagRenderer: tagRenderer,
+          ? React.createElement(AutoclearingHiddenLiveRegion, {
+              text: liveRegionSelection,
             })
           : React.createElement(SingleSelectButton, {
               selectedItem: selectedItems,
@@ -295,9 +305,12 @@ let CustomSelect = React.forwardRef((props, forwardedRef) => {
         disabled: disabled,
         isOpen: isOpen,
       }),
-      multiple
-        ? React.createElement(AutoclearingHiddenLiveRegion, {
-            text: liveRegionSelection,
+      isMultipleEnabled(selectedItems, multiple)
+        ? React.createElement(MultipleSelectButton, {
+            selectedItems: selectedItems,
+            selectedItemsRenderer: selectedItemRenderer,
+            tagRenderer: tagRenderer,
+            size: 'small' === size ? 'small' : void 0,
           })
         : null,
     ),
@@ -396,6 +409,7 @@ let MultipleSelectButton = ({
   selectedItems,
   selectedItemsRenderer,
   tagRenderer,
+  size,
 }) => {
   let selectedItemsElements = React.useMemo(() => {
     if (!selectedItems) return [];
@@ -405,19 +419,18 @@ let MultipleSelectButton = ({
     React.Fragment,
     null,
     selectedItems &&
-      selectedItemsRenderer &&
-      selectedItemsRenderer(selectedItems),
-    selectedItems &&
-      !selectedItemsRenderer &&
       React.createElement(
         Box,
         {
           as: 'span',
           className: 'iui-content',
         },
-        React.createElement(SelectTagContainer, {
-          tags: selectedItemsElements,
-        }),
+        selectedItemsRenderer
+          ? selectedItemsRenderer(selectedItems)
+          : React.createElement(SelectTagContainer, {
+              tags: selectedItemsElements,
+              'data-iui-size': size,
+            }),
       ),
   );
 };

package/DEV-esm/core/Select/SelectTag.js

@@ -12,6 +12,7 @@ export const SelectTag = React.forwardRef((props, forwardedRef) => {
       },
       removeButtonProps: {
         className: 'iui-select-tag-button',
+        'aria-label': `Deselect ${label}`,
       },
       ref: forwardedRef,
       ...rest,

package/DEV-esm/core/SideNavigation/SideNavigation.js

@@ -44,6 +44,7 @@ export const SideNavigation = React.forwardRef((props, forwardedRef) => {
     React.createElement(
       Box,
       {
+        as: 'nav',
         ...wrapperProps,
         className: cx('iui-side-navigation-wrapper', wrapperProps?.className),
         ref: forwardedRef,
@@ -56,7 +57,6 @@ export const SideNavigation = React.forwardRef((props, forwardedRef) => {
         React.createElement(
           Box,
           {
-            as: 'div',
             className: cx(
               'iui-side-navigation',
               {
@@ -101,4 +101,5 @@ export const SideNavigation = React.forwardRef((props, forwardedRef) => {
     ),
   );
 });
-SideNavigation.displayName = 'SideNavigation';
+if ('development' === process.env.NODE_ENV)
+  SideNavigation.displayName = 'SideNavigation';

package/DEV-esm/core/SideNavigation/SidenavButton.js

@@ -43,4 +43,5 @@ export const SidenavButton = React.forwardRef((props, ref) => {
         sidenavButton,
       );
 });
-SidenavButton.displayName = 'SidenavButton';
+if ('development' === process.env.NODE_ENV)
+  SidenavButton.displayName = 'SidenavButton';

package/DEV-esm/core/SideNavigation/SidenavSubmenu.js

@@ -19,4 +19,5 @@ export const SidenavSubmenu = React.forwardRef((props, ref) => {
     ),
   );
 });
-SidenavSubmenu.displayName = 'SidenavSubmenu';
+if ('development' === process.env.NODE_ENV)
+  SidenavSubmenu.displayName = 'SidenavSubmenu';

package/DEV-esm/core/SideNavigation/SidenavSubmenuHeader.js

@@ -27,4 +27,5 @@ export const SidenavSubmenuHeader = React.forwardRef((props, forwardedRef) => {
       ),
   );
 });
-SidenavSubmenuHeader.displayName = 'SidenavSubmenuHeader';
+if ('development' === process.env.NODE_ENV)
+  SidenavSubmenuHeader.displayName = 'SidenavSubmenuHeader';

package/DEV-esm/core/SkipToContentLink/SkipToContentLink.js

@@ -14,4 +14,5 @@ export const SkipToContentLink = React.forwardRef((props, ref) => {
     children,
   );
 });
-SkipToContentLink.displayName = 'SkipToContentLink';
+if ('development' === process.env.NODE_ENV)
+  SkipToContentLink.displayName = 'SkipToContentLink';

package/DEV-esm/core/Slider/Slider.js

@@ -347,4 +347,4 @@ export const Slider = React.forwardRef((props, ref) => {
       ),
   );
 });
-Slider.displayName = 'Slider';
+if ('development' === process.env.NODE_ENV) Slider.displayName = 'Slider';

package/DEV-esm/core/StatusMessage/StatusMessage.js

@@ -35,4 +35,5 @@ export const StatusMessage = React.forwardRef((props, ref) => {
     React.createElement(Box, contentProps, children),
   );
 });
-StatusMessage.displayName = 'StatusMessage';
+if ('development' === process.env.NODE_ENV)
+  StatusMessage.displayName = 'StatusMessage';

package/DEV-esm/core/Stepper/Stepper.js

@@ -89,4 +89,4 @@ export const Stepper = React.forwardRef((props, ref) => {
       ),
   );
 });
-Stepper.displayName = 'Stepper';
+if ('development' === process.env.NODE_ENV) Stepper.displayName = 'Stepper';

package/DEV-esm/core/Stepper/WorkflowDiagram.js

@@ -30,4 +30,5 @@ export const WorkflowDiagram = React.forwardRef((props, ref) => {
     ),
   );
 });
-WorkflowDiagram.displayName = 'WorkflowDiagram';
+if ('development' === process.env.NODE_ENV)
+  WorkflowDiagram.displayName = 'WorkflowDiagram';

package/DEV-esm/core/Surface/Surface.js

@@ -39,7 +39,8 @@ let SurfaceHeader = React.forwardRef((props, ref) => {
     children,
   );
 });
-SurfaceHeader.displayName = 'Surface.Header';
+if ('development' === process.env.NODE_ENV)
+  SurfaceHeader.displayName = 'Surface.Header';
 let SurfaceBody = React.forwardRef((props, ref) => {
   let { children, className, isPadded = false, ...rest } = props;
   let { setHasLayout } = useSafeContext(SurfaceContext);
@@ -57,7 +58,8 @@ let SurfaceBody = React.forwardRef((props, ref) => {
     children,
   );
 });
-SurfaceBody.displayName = 'Surface.Body';
+if ('development' === process.env.NODE_ENV)
+  SurfaceBody.displayName = 'Surface.Body';
 export const Surface = Object.assign(
   React.forwardRef((props, ref) => {
     let {
@@ -99,6 +101,7 @@ export const Surface = Object.assign(
     Body: SurfaceBody,
   },
 );
-Surface.displayName = 'Surface';
+if ('development' === process.env.NODE_ENV) Surface.displayName = 'Surface';
 let SurfaceContext = React.createContext(void 0);
-SurfaceContext.displayName = 'SurfaceContext';
+if ('development' === process.env.NODE_ENV)
+  SurfaceContext.displayName = 'SurfaceContext';

package/DEV-esm/core/Table/ColumnHeader.js

@@ -100,26 +100,26 @@ export const ColumnHeader = React.forwardRef((props, forwardedRef) => {
     React.createElement(
       React.Fragment,
       null,
-      React.createElement(
-        ShadowRoot,
-        null,
-        'string' == typeof column.Header
-          ? React.createElement(
+      'string' == typeof column.Header
+        ? React.createElement(
+            ShadowRoot,
+            null,
+            React.createElement(
               LineClamp,
               null,
               React.createElement('slot', null),
-            )
-          : React.createElement('slot', null),
-        React.createElement('slot', {
-          name: 'actions',
-        }),
-        React.createElement('slot', {
-          name: 'resizers',
-        }),
-        React.createElement('slot', {
-          name: 'shadows',
-        }),
-      ),
+            ),
+            React.createElement('slot', {
+              name: 'actions',
+            }),
+            React.createElement('slot', {
+              name: 'resizers',
+            }),
+            React.createElement('slot', {
+              name: 'shadows',
+            }),
+          )
+        : null,
       column.render('Header'),
       (showFilterButton(column) || showSortButton(column)) &&
         React.createElement(

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

@@ -23,6 +23,7 @@ import {
   useMergedRefs,
   useLatestRef,
   useVirtualScroll,
+  useId,
 } from '../../utils/index.js';
 import { TableInstanceContext } from './utils.js';
 import { TableRowMemoized } from './TableRowMemoized.js';
@@ -49,6 +50,7 @@ import {
 import { SELECTION_CELL_ID } from './columns/index.js';
 import { ColumnHeader } from './ColumnHeader.js';
 import { TableExpandableContentMemoized } from './TableExpandableContentMemoized.js';
+import { VisuallyHidden } from '../VisuallyHidden/VisuallyHidden.js';
 let singleRowSelectedAction = 'singleRowSelected';
 let shiftRowSelectedAction = 'shiftRowSelected';
 export const tableResizeStartAction = 'tableResizeStart';
@@ -105,10 +107,45 @@ export const Table = (props) => {
     headerWrapperProps,
     headerProps,
     bodyProps,
+    tableProps,
     emptyTableContentProps,
     getRowId,
-    ...rest
+    caption = 'Table',
+    role,
+    scrollToRow,
+    ..._rest
   } = props;
+  let { ariaRestAttributes, nonAriaRestAttributes } = React.useMemo(
+    () =>
+      Object.entries(_rest).reduce(
+        (result, [key, value]) => {
+          if (key.startsWith('aria-')) result.ariaRestAttributes[key] = value;
+          else result.nonAriaRestAttributes[key] = value;
+          return result;
+        },
+        {
+          ariaRestAttributes: {},
+          nonAriaRestAttributes: {},
+        },
+      ),
+    [_rest],
+  );
+  let { outerAriaRestAttributes, innerAriaRestAttributes } =
+    React.useMemo(() => {
+      if (tableProps || role)
+        return {
+          outerAriaRestAttributes: {
+            ...ariaRestAttributes,
+          },
+          innerAriaRestAttributes: {},
+        };
+      return {
+        outerAriaRestAttributes: {},
+        innerAriaRestAttributes: {
+          ...ariaRestAttributes,
+        },
+      };
+    }, [ariaRestAttributes, role, tableProps]);
   useGlobals();
   let ownerDocument = React.useRef(void 0);
   let defaultColumn = React.useMemo(
@@ -322,22 +359,19 @@ export const Table = (props) => {
   let logWarning = useWarningLogger();
   if (1 === columns.length && 'columns' in columns[0]) {
     headerGroups = _headerGroups.slice(1);
-    logWarning(
-      "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 ('development' === process.env.NODE_ENV)
+      logWarning(
+        "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))
+  if (
+    'development' === process.env.NODE_ENV &&
+    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-'))
-        result[key] = value;
-      return result;
-    },
-    {},
-  );
   let areFiltersSet =
     allColumns.some(
       (column) => null != column.filterValue && '' !== column.filterValue,
@@ -352,7 +386,7 @@ export const Table = (props) => {
         !isDisabled &&
         selectRowOnClick &&
         !event.isDefaultPrevented()
-      ) {
+      )
         if ('multi' === selectionMode && event.shiftKey)
           dispatch({
             type: shiftRowSelectedAction,
@@ -366,7 +400,6 @@ export const Table = (props) => {
             type: singleRowSelectedAction,
             id: row.id,
           });
-      }
     },
     [
       isRowDisabled,
@@ -425,6 +458,7 @@ export const Table = (props) => {
   let tableRef = React.useRef(null);
   let { scrollToIndex, tableRowRef } = useScrollToRow({
     ...props,
+    scrollToRow,
     page,
   });
   let columnRefs = React.useRef({});
@@ -567,6 +601,7 @@ export const Table = (props) => {
   React.useEffect(() => {
     updateStickyState();
   }, []);
+  let captionId = useId();
   return React.createElement(
     TableInstanceContext.Provider,
     {
@@ -590,10 +625,46 @@ export const Table = (props) => {
             ...style,
           },
         }),
+        role: role,
+        'aria-labelledby': captionId,
         onScroll: () => updateStickyState(),
         'data-iui-size': 'default' === density ? void 0 : density,
-        ...ariaDataAttributes,
+        ...outerAriaRestAttributes,
+        ...nonAriaRestAttributes,
       },
+      React.createElement(
+        ShadowRoot,
+        null,
+        React.createElement(
+          'div',
+          {
+            role: 'table',
+            ...innerAriaRestAttributes,
+            ...tableProps,
+          },
+          React.createElement('slot', {
+            name: 'caption',
+          }),
+          React.createElement('slot', {
+            name: 'iui-table-header-wrapper',
+          }),
+          React.createElement('slot', {
+            name: 'iui-table-body',
+          }),
+        ),
+        React.createElement('slot', {
+          name: 'iui-table-body-extra',
+        }),
+        React.createElement('slot', null),
+      ),
+      React.createElement(
+        VisuallyHidden,
+        {
+          slot: 'caption',
+          id: captionId,
+        },
+        caption,
+      ),
       headerGroups.map((headerGroup) => {
         headerGroup.headers = headerGroup.headers.filter(
           (header) =>
@@ -606,6 +677,7 @@ export const Table = (props) => {
         return React.createElement(
           Box,
           {
+            slot: 'iui-table-header-wrapper',
             as: 'div',
             key: headerGroupProps.key,
             ...headerWrapperProps,
@@ -658,6 +730,7 @@ export const Table = (props) => {
       React.createElement(
         Box,
         {
+          slot: 'iui-table-body',
           as: 'div',
           ...bodyProps,
           ...getTableBodyProps({
@@ -669,13 +742,13 @@ export const Table = (props) => {
               bodyProps?.className,
             ),
           }),
-          'aria-multiselectable':
-            (isSelectable && 'multi' === selectionMode) || void 0,
+          role: void 0,
         },
         React.createElement(
           ShadowRoot,
           {
             css: virtualizerCss,
+            flush: false,
           },
           enableVirtualization && 0 !== data.length
             ? React.createElement(
@@ -702,59 +775,49 @@ export const Table = (props) => {
                   )
               : page.map((_, index) => getPreparedRow(index)),
           ),
-        isLoading &&
-          0 === data.length &&
+      ),
+      isLoading &&
+        0 === data.length &&
+        React.createElement(
+          TableBodyExtraWrapper,
+          null,
           React.createElement(
-            Box,
-            {
-              as: 'div',
-              ...emptyTableContentProps,
-              className: cx(
-                'iui-table-empty',
-                emptyTableContentProps?.className,
-              ),
-            },
+            TableEmptyWrapper,
+            emptyTableContentProps,
             React.createElement(ProgressRadial, {
               indeterminate: true,
             }),
           ),
-        !isLoading &&
-          0 === data.length &&
-          !areFiltersSet &&
+        ),
+      !isLoading &&
+        0 === data.length &&
+        !areFiltersSet &&
+        React.createElement(
+          TableBodyExtraWrapper,
+          null,
           React.createElement(
-            Box,
-            {
-              as: 'div',
-              ...emptyTableContentProps,
-              className: cx(
-                'iui-table-empty',
-                emptyTableContentProps?.className,
-              ),
-            },
+            TableEmptyWrapper,
+            emptyTableContentProps,
             React.createElement('div', null, emptyTableContent),
           ),
-        !isLoading &&
-          (0 === data.length || 0 === rows.length) &&
-          areFiltersSet &&
+        ),
+      !isLoading &&
+        (0 === data.length || 0 === rows.length) &&
+        areFiltersSet &&
+        React.createElement(
+          TableBodyExtraWrapper,
+          null,
           React.createElement(
-            Box,
-            {
-              as: 'div',
-              ...emptyTableContentProps,
-              className: cx(
-                'iui-table-empty',
-                emptyTableContentProps?.className,
-              ),
-            },
+            TableEmptyWrapper,
+            emptyTableContentProps,
             React.createElement('div', null, emptyFilteredTableContent),
           ),
-      ),
+        ),
       isLoading &&
         0 !== data.length &&
         React.createElement(
-          Box,
+          TableBodyExtraWrapper,
           {
-            className: 'iui-table-body-extra',
             'data-iui-loading': 'true',
           },
           React.createElement(ProgressRadial, {
@@ -766,4 +829,31 @@ export const Table = (props) => {
     ),
   );
 };
-Table.displayName = 'Table';
+if ('development' === process.env.NODE_ENV) Table.displayName = 'Table';
+let TableBodyExtraWrapper = React.forwardRef((props, ref) => {
+  let { children, ...rest } = props;
+  return React.createElement(
+    Box,
+    {
+      as: 'div',
+      ref: ref,
+      slot: 'iui-table-body-extra',
+      ...rest,
+      className: cx('iui-table-body-extra', rest.className),
+    },
+    children,
+  );
+});
+let TableEmptyWrapper = React.forwardRef((props, ref) => {
+  let { children, ...rest } = props;
+  return React.createElement(
+    Box,
+    {
+      as: 'div',
+      ref: ref,
+      ...rest,
+      className: cx('iui-table-empty', rest.className),
+    },
+    children,
+  );
+});