@itwin/itwinui-react 3.18.0 → 3.18.2

package/cjs/core/Menu/MenuItem.js

@@ -37,19 +37,23 @@ const MenuItem = _react.forwardRef((props, forwardedRef) => {
     ...rest
   } = props;
   let logWarning = (0, _index.useWarningLogger)();
+  let hasSubMenu = _react.useMemo(
+    () => subMenuItems.length > 0,
+    [subMenuItems.length],
+  );
   if (
     'development' === process.env.NODE_ENV &&
     null != onClickProp &&
-    subMenuItems.length > 0
+    hasSubMenu
   )
     logWarning(
       'Passing a non-empty submenuItems array and onClick to MenuItem at the same time is not supported. This is because when a non empty submenuItems array is passed, clicking the MenuItem toggles the submenu visibility.',
     );
   let parentMenu = _react.useContext(_Menu.MenuContext);
   let dropdownMenu = _react.useContext(_DropdownMenu.DropdownMenuContext);
-  let shouldCloseMenuOnClick = _react.useContext(
-    _DropdownMenu.DropdownMenuCloseOnClickContext,
-  );
+  let shouldCloseMenuOnClick =
+    _react.useContext(_DropdownMenu.DropdownMenuCloseOnClickContext) &&
+    !hasSubMenu;
   let menuItemRef = _react.useRef(null);
   let submenuId = (0, _index.useId)();
   let popoverProps = _react.useMemo(
@@ -59,12 +63,12 @@ const MenuItem = _react.forwardRef((props, forwardedRef) => {
         click: true,
         hover: true,
         listNavigation: {
-          nested: subMenuItems.length > 0,
+          nested: hasSubMenu,
           openOnArrowKeyDown: true,
         },
       },
     }),
-    [subMenuItems.length],
+    [hasSubMenu],
   );
   let onClick = () => {
     if (disabled) return;
@@ -91,8 +95,8 @@ const MenuItem = _react.forwardRef((props, forwardedRef) => {
       role: role,
       tabIndex: isSelected ? 0 : -1,
       'aria-selected': isSelected,
-      'aria-haspopup': subMenuItems.length > 0 ? 'true' : void 0,
-      'aria-controls': subMenuItems.length > 0 ? submenuId : void 0,
+      'aria-haspopup': hasSubMenu ? 'true' : void 0,
+      'aria-controls': hasSubMenu ? submenuId : void 0,
       'aria-disabled': disabled,
       ...(parentMenu?.popoverGetItemProps != null
         ? parentMenu.popoverGetItemProps({
@@ -119,7 +123,7 @@ const MenuItem = _react.forwardRef((props, forwardedRef) => {
         _react.createElement(_ListItem.ListItem.Description, null, sublabel),
     ),
     !endIcon &&
-      subMenuItems.length > 0 &&
+      hasSubMenu &&
       _react.createElement(
         _ListItem.ListItem.Icon,
         {
@@ -141,7 +145,7 @@ const MenuItem = _react.forwardRef((props, forwardedRef) => {
   return _react.createElement(
     _react.Fragment,
     null,
-    subMenuItems.length > 0 && !disabled
+    hasSubMenu && !disabled
       ? _react.createElement(
           _Menu.Menu,
           {

package/cjs/core/Popover/Popover.js

@@ -82,7 +82,6 @@ const usePopover = (options) => {
     open,
     onOpenChange,
     strategy: 'fixed',
-    transform: false,
     whileElementsMounted: _react.useMemo(
       () =>
         open
@@ -237,6 +236,7 @@ const Popover = _react.forwardRef((props, forwardedRef) => {
     closeOnOutsideClick,
     role: 'dialog',
     middleware,
+    transform: false,
   });
   let [popoverElement, setPopoverElement] = _react.useState(null);
   let popoverRef = (0, _index.useMergedRefs)(
@@ -303,6 +303,7 @@ const Popover = _react.forwardRef((props, forwardedRef) => {
                     _index.Box,
                     {
                       className: (0, _classnames.default)(
+                        'iui-popover',
                         {
                           'iui-popover-surface': applyBackground,
                         },

package/cjs/core/Table/Table.js

@@ -99,6 +99,7 @@ const Table = (props) => {
     getRowId,
     caption = 'Table',
     role,
+    scrollToRow,
     ..._rest
   } = props;
   let { ariaRestAttributes, nonAriaRestAttributes } = _react.useMemo(
@@ -451,6 +452,7 @@ const Table = (props) => {
   let tableRef = _react.useRef(null);
   let { scrollToIndex, tableRowRef } = (0, _index1.useScrollToRow)({
     ...props,
+    scrollToRow,
     page,
   });
   let columnRefs = _react.useRef({});
@@ -593,7 +595,7 @@ const Table = (props) => {
   _react.useEffect(() => {
     updateStickyState();
   }, []);
-  let captionId = _react.useId();
+  let captionId = (0, _index.useId)();
   return _react.createElement(
     _utils.TableInstanceContext.Provider,
     {
@@ -618,7 +620,6 @@ const Table = (props) => {
           },
         }),
         role: role,
-        'aria-labelledby': captionId,
         onScroll: () => updateStickyState(),
         'data-iui-size': 'default' === density ? void 0 : density,
         ...outerAriaRestAttributes,
@@ -633,10 +634,15 @@ const Table = (props) => {
             role: 'table',
             ...innerAriaRestAttributes,
             ...tableProps,
+            'aria-labelledby': captionId,
           },
-          _react.createElement('slot', {
-            name: 'caption',
-          }),
+          _react.createElement(
+            _VisuallyHidden.VisuallyHidden,
+            {
+              id: captionId,
+            },
+            caption,
+          ),
           _react.createElement('slot', {
             name: 'iui-table-header-wrapper',
           }),
@@ -649,14 +655,6 @@ const Table = (props) => {
         }),
         _react.createElement('slot', null),
       ),
-      _react.createElement(
-        _VisuallyHidden.VisuallyHidden,
-        {
-          slot: 'caption',
-          id: captionId,
-        },
-        caption,
-      ),
       headerGroups.map((headerGroup) => {
         headerGroup.headers = headerGroup.headers.filter(
           (header) =>

package/cjs/core/Table/TableCell.js

@@ -19,6 +19,7 @@ const _SubRowExpander = require('./SubRowExpander.js');
 const _index = require('./columns/index.js');
 const _index1 = require('./cells/index.js');
 const _index2 = require('../../utils/index.js');
+const _DefaultCell = require('./cells/DefaultCell.js');
 const TableCell = (props) => {
   let {
     cell,
@@ -54,63 +55,97 @@ const TableCell = (props) => {
       ...(0, _utils.getStickyStyle)(cell.column, tableInstance.visibleColumns),
     },
   });
-  let cellProps = {
-    ...tableInstance,
-    ...{
+  let cellProps = _react.useMemo(
+    () => ({
+      ...tableInstance,
+      ...{
+        cell,
+        row: cell.row,
+        value: cell.value,
+        column: cell.column,
+      },
+    }),
+    [cell, tableInstance],
+  );
+  let cellContent = _react.useMemo(
+    () =>
+      _react.createElement(
+        _react.Fragment,
+        null,
+        tableHasSubRows &&
+          hasSubRowExpander &&
+          cell.row.canExpand &&
+          _react.createElement(_SubRowExpander.SubRowExpander, {
+            cell: cell,
+            isDisabled: isDisabled,
+            cellProps: cellProps,
+            expanderCell: expanderCell,
+            density: density,
+            slot: 'start',
+          }),
+        cell.render('Cell'),
+      ),
+    [
       cell,
-      row: cell.row,
-      value: cell.value,
-      column: cell.column,
-    },
-  };
-  let cellContent = _react.createElement(
-    _react.Fragment,
-    null,
-    tableHasSubRows &&
-      hasSubRowExpander &&
-      cell.row.canExpand &&
-      _react.createElement(_SubRowExpander.SubRowExpander, {
-        cell: cell,
-        isDisabled: isDisabled,
-        cellProps: cellProps,
-        expanderCell: expanderCell,
-        density: density,
-        slot: 'start',
-      }),
-    cell.render('Cell'),
+      cellProps,
+      density,
+      expanderCell,
+      hasSubRowExpander,
+      isDisabled,
+      tableHasSubRows,
+    ],
   );
-  let cellRendererProps = {
-    cellElementProps,
-    cellProps,
-    children: _react.createElement(
-      _react.Fragment,
-      null,
+  let defaultCellRendererChildren = _react.useMemo(
+    () =>
+      _react.createElement(
+        _react.Fragment,
+        null,
+        cellContent,
+        'left' === cell.column.sticky &&
+          tableInstance.state.sticky.isScrolledToRight &&
+          _react.createElement(_index2.Box, {
+            className: 'iui-table-cell-shadow-right',
+            slot: 'shadows',
+          }),
+        'right' === cell.column.sticky &&
+          tableInstance.state.sticky.isScrolledToLeft &&
+          _react.createElement(_index2.Box, {
+            className: 'iui-table-cell-shadow-left',
+            slot: 'shadows',
+          }),
+      ),
+    [
+      cell.column.sticky,
       cellContent,
-      'left' === cell.column.sticky &&
-        tableInstance.state.sticky.isScrolledToRight &&
-        _react.createElement(_index2.Box, {
-          className: 'iui-table-cell-shadow-right',
-          slot: 'shadows',
-        }),
-      'right' === cell.column.sticky &&
-        tableInstance.state.sticky.isScrolledToLeft &&
-        _react.createElement(_index2.Box, {
-          className: 'iui-table-cell-shadow-left',
-          slot: 'shadows',
-        }),
-    ),
-  };
+      tableInstance.state.sticky.isScrolledToLeft,
+      tableInstance.state.sticky.isScrolledToRight,
+    ],
+  );
+  let cellRendererProps = _react.useMemo(
+    () => ({
+      cellElementProps,
+      cellProps,
+      children: defaultCellRendererChildren,
+    }),
+    [cellElementProps, cellProps, defaultCellRendererChildren],
+  );
   return _react.createElement(
     _react.Fragment,
     null,
-    cell.column.cellRenderer
-      ? cell.column.cellRenderer({
-          ...cellRendererProps,
-          isDisabled: () => isDisabled,
-        })
-      : _react.createElement(_index1.DefaultCell, {
-          ...cellRendererProps,
-          isDisabled: () => isDisabled,
-        }),
+    _react.createElement(
+      _DefaultCell.DefaultCellRendererPropsChildren.Provider,
+      {
+        value: defaultCellRendererChildren,
+      },
+      cell.column.cellRenderer
+        ? cell.column.cellRenderer({
+            ...cellRendererProps,
+            isDisabled: () => isDisabled,
+          })
+        : _react.createElement(_index1.DefaultCell, {
+            ...cellRendererProps,
+            isDisabled: () => isDisabled,
+          }),
+    ),
   );
 };

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

@@ -21,6 +21,7 @@ export type DefaultCellProps<T extends Record<string, unknown>> = {
      */
     clamp?: boolean;
 } & CellRendererProps<T> & React.ComponentPropsWithoutRef<'div'>;
+export declare const DefaultCellRendererPropsChildren: React.Context<React.ReactNode>;
 /**
  * Default cell.
  * It should be passed to `cellRenderer`.

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

@@ -2,11 +2,20 @@
 Object.defineProperty(exports, '__esModule', {
   value: true,
 });
-Object.defineProperty(exports, 'DefaultCell', {
-  enumerable: true,
-  get: function () {
+function _export(target, all) {
+  for (var name in all)
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name],
+    });
+}
+_export(exports, {
+  DefaultCell: function () {
     return DefaultCell;
   },
+  DefaultCellRendererPropsChildren: function () {
+    return DefaultCellRendererPropsChildren;
+  },
 });
 const _interop_require_default = require('@swc/helpers/_/_interop_require_default');
 const _interop_require_wildcard = require('@swc/helpers/_/_interop_require_wildcard');
@@ -17,6 +26,7 @@ const _classnames = /*#__PURE__*/ _interop_require_default._(
 );
 const _index = require('../../../utils/index.js');
 const _utils = require('../utils.js');
+const DefaultCellRendererPropsChildren = _react.createContext(void 0);
 const DefaultCell = (props) => {
   let instance = _react.useContext(_utils.TableInstanceContext);
   let isCustomCell = _react.useMemo(
@@ -25,6 +35,8 @@ const DefaultCell = (props) => {
         ?.Cell !== _reacttable.defaultColumn.Cell,
     [instance, props.cellProps.column.id],
   );
+  let isCellRendererChildrenCustom =
+    _react.useContext(DefaultCellRendererPropsChildren) !== props.children;
   let {
     cellElementProps: {
       className: cellElementClassName,
@@ -39,7 +51,9 @@ const DefaultCell = (props) => {
     className,
     style,
     status,
-    clamp = 'string' == typeof cellProps.value && !isCustomCell,
+    clamp = 'string' == typeof cellProps.value &&
+      !isCustomCell &&
+      !isCellRendererChildrenCustom,
     ...rest
   } = props;
   let { key: cellElementKey, ...cellElementPropsRest } = cellElementProps;
@@ -68,10 +82,9 @@ const DefaultCell = (props) => {
         name: 'start',
       }),
       _react.createElement(
-        'div',
+        TableCellContent,
         {
-          className: '_iui-table-cell-main-content',
-          onClick: (e) => e.stopPropagation(),
+          shouldRenderWrapper: isCellRendererChildrenCustom,
         },
         clamp
           ? _react.createElement(
@@ -113,12 +126,25 @@ const DefaultCell = (props) => {
 };
 if ('development' === process.env.NODE_ENV)
   DefaultCell.displayName = 'DefaultCell';
+const TableCellContent = (props) => {
+  let { children, shouldRenderWrapper } = props;
+  return shouldRenderWrapper
+    ? children
+    : _react.createElement(
+        'div',
+        {
+          className: '_iui-table-cell-default-content',
+          onClick: (e) => e.stopPropagation(),
+        },
+        children,
+      );
+};
 const css = `
-._iui-table-cell-main-content {
+._iui-table-cell-default-content {
   position: relative;
   isolation: isolate;
 }
-._iui-table-cell-main-content::before {
+._iui-table-cell-default-content::before {
   content: '';
   display: block;
   position: absolute;

package/cjs/core/Tooltip/Tooltip.js

@@ -26,7 +26,7 @@ const _classnames = /*#__PURE__*/ _interop_require_default._(
 const _react1 = require('@floating-ui/react');
 const _index = require('../../utils/index.js');
 const defaultTooltipDelay = {
-  open: 100,
+  open: 200,
   close: 200,
 };
 const useTooltip = (options = {}) => {

package/cjs/styles.js

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

package/esm/core/Dialog/Dialog.js

@@ -12,7 +12,7 @@ import {
   Portal,
   PortalContainerContext,
 } from '../../utils/index.js';
-let DialogComponent = React.forwardRef((props, ref) => {
+let DialogComponent = React.forwardRef((props, forwardedRef) => {
   let {
     trapFocus = false,
     setFocus = trapFocus,
@@ -32,7 +32,7 @@ let DialogComponent = React.forwardRef((props, ref) => {
   } = props;
   let dialogRootRef = React.useRef(null);
   let [dialogElement, setDialogElement] = React.useState(null);
-  let mergedRefs = useMergedRefs(ref, dialogRootRef, setDialogElement);
+  let mergedRefs = useMergedRefs(forwardedRef, dialogRootRef);
   return isOpen
     ? React.createElement(
         DialogContext.Provider,
@@ -50,6 +50,8 @@ let DialogComponent = React.forwardRef((props, ref) => {
             isResizable,
             relativeTo,
             placement,
+            dialogRootRef,
+            setDialogElement,
           },
         },
         React.createElement(

package/esm/core/Dialog/DialogBackdrop.js

@@ -8,11 +8,11 @@ export const DialogBackdrop = React.forwardRef((props, ref) => {
   let dialogContext = useDialogContext();
   let dialogMainContext = useDialogMainContext();
   let {
-    isVisible = dialogContext.isOpen,
-    isDismissible = dialogContext.isDismissible,
-    onClose = dialogContext.onClose,
-    closeOnExternalClick = dialogContext.closeOnExternalClick,
-    relativeTo = dialogContext.relativeTo,
+    isVisible = dialogContext?.isOpen,
+    isDismissible = dialogContext?.isDismissible,
+    onClose = dialogContext?.onClose,
+    closeOnExternalClick = dialogContext?.closeOnExternalClick,
+    relativeTo = dialogContext?.relativeTo,
     onMouseDown,
     className,
     style,

package/esm/core/Dialog/DialogContext.d.ts

@@ -80,14 +80,15 @@ export type DialogContextProps = {
      * Defaults to false if using `Dialog` and true if using `Modal`.
      */
     portal?: PortalProps['portal'];
-    /**
-     * Dialog root ref. For internal use.
-     */
-    dialogRootRef?: React.RefObject<HTMLDivElement | null>;
     /**
      * Determines the positioning of Dialog on page.
      */
     placement?: 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right';
 };
-export declare const DialogContext: React.Context<DialogContextProps | undefined>;
-export declare const useDialogContext: () => DialogContextProps;
+type DialogContextInternalProps = {
+    dialogRootRef: React.RefObject<HTMLDivElement | null>;
+    setDialogElement: (dialogElement: HTMLElement | null) => void;
+};
+export declare const DialogContext: React.Context<(DialogContextProps & DialogContextInternalProps) | undefined>;
+export declare const useDialogContext: () => (DialogContextProps & DialogContextInternalProps) | undefined;
+export {};

package/esm/core/Dialog/DialogContext.js

@@ -1,3 +1,3 @@
 import * as React from 'react';
 export const DialogContext = React.createContext(void 0);
-export const useDialogContext = () => React.useContext(DialogContext) || {};
+export const useDialogContext = () => React.useContext(DialogContext);

package/esm/core/Dialog/DialogMain.d.ts

@@ -11,7 +11,7 @@ export type DialogMainProps = {
      * Content of the dialog.
      */
     children: React.ReactNode;
-} & Omit<DialogContextProps, 'closeOnExternalClick' | 'dialogRootRef'>;
+} & Omit<DialogContextProps, 'closeOnExternalClick'>;
 /**
  * Dialog component which can wrap any content.
  * @example

package/esm/core/Dialog/DialogMain.js

@@ -13,27 +13,27 @@ import { useDialogContext } from './DialogContext.js';
 import { DialogDragContext } from './DialogDragContext.js';
 import { useDragAndDrop } from '../../utils/hooks/useDragAndDrop.js';
 import { DialogMainContext } from './DialogMainContext.js';
-export const DialogMain = React.forwardRef((props, ref) => {
+export const DialogMain = React.forwardRef((props, forwardedRef) => {
   let dialogContext = useDialogContext();
   let {
     className,
     children,
     styleType = 'default',
-    isOpen = dialogContext.isOpen,
-    isDismissible = dialogContext.isDismissible,
-    onClose = dialogContext.onClose,
-    closeOnEsc = dialogContext.closeOnEsc,
-    trapFocus = dialogContext.trapFocus,
-    setFocus = dialogContext.setFocus,
-    preventDocumentScroll = dialogContext.preventDocumentScroll,
+    isOpen = dialogContext?.isOpen,
+    isDismissible = dialogContext?.isDismissible,
+    onClose = dialogContext?.onClose,
+    closeOnEsc = dialogContext?.closeOnEsc,
+    trapFocus = dialogContext?.trapFocus,
+    setFocus = dialogContext?.setFocus,
+    preventDocumentScroll = dialogContext?.preventDocumentScroll,
     onKeyDown,
-    isDraggable = dialogContext.isDraggable,
-    isResizable = dialogContext.isResizable,
+    isDraggable = dialogContext?.isDraggable,
+    isResizable = dialogContext?.isResizable,
     style: propStyle,
-    placement = dialogContext.placement,
+    placement = dialogContext?.placement,
     ...rest
   } = props;
-  let { dialogRootRef } = dialogContext;
+  let { dialogRootRef, setDialogElement } = dialogContext || {};
   let dialogRef = React.useRef(null);
   let previousFocusedElement = React.useRef(null);
   let [style, setStyle] = React.useState();
@@ -130,7 +130,7 @@ export const DialogMain = React.forwardRef((props, ref) => {
         className,
       ),
       role: 'dialog',
-      ref: useMergedRefs(dialogRef, mountRef, ref),
+      ref: useMergedRefs(dialogRef, mountRef, setDialogElement, forwardedRef),
       onKeyDown: handleKeyDown,
       tabIndex: -1,
       'data-iui-placement': placement,

package/esm/core/Dialog/DialogTitleBar.js

@@ -13,9 +13,9 @@ export const DialogTitleBar = Object.assign(
     let {
       children,
       titleText,
-      isDismissible = dialogContext.isDismissible,
-      onClose = dialogContext.onClose,
-      isDraggable = dialogContext.isDraggable,
+      isDismissible = dialogContext?.isDismissible,
+      onClose = dialogContext?.onClose,
+      isDraggable = dialogContext?.isDraggable,
       className,
       onPointerDown: onPointerDownProp,
       ...rest

package/esm/core/Menu/MenuItem.js

@@ -31,19 +31,22 @@ export const MenuItem = React.forwardRef((props, forwardedRef) => {
     ...rest
   } = props;
   let logWarning = useWarningLogger();
+  let hasSubMenu = React.useMemo(
+    () => subMenuItems.length > 0,
+    [subMenuItems.length],
+  );
   if (
     'development' === process.env.NODE_ENV &&
     null != onClickProp &&
-    subMenuItems.length > 0
+    hasSubMenu
   )
     logWarning(
       'Passing a non-empty submenuItems array and onClick to MenuItem at the same time is not supported. This is because when a non empty submenuItems array is passed, clicking the MenuItem toggles the submenu visibility.',
     );
   let parentMenu = React.useContext(MenuContext);
   let dropdownMenu = React.useContext(DropdownMenuContext);
-  let shouldCloseMenuOnClick = React.useContext(
-    DropdownMenuCloseOnClickContext,
-  );
+  let shouldCloseMenuOnClick =
+    React.useContext(DropdownMenuCloseOnClickContext) && !hasSubMenu;
   let menuItemRef = React.useRef(null);
   let submenuId = useId();
   let popoverProps = React.useMemo(
@@ -53,12 +56,12 @@ export const MenuItem = React.forwardRef((props, forwardedRef) => {
         click: true,
         hover: true,
         listNavigation: {
-          nested: subMenuItems.length > 0,
+          nested: hasSubMenu,
           openOnArrowKeyDown: true,
         },
       },
     }),
-    [subMenuItems.length],
+    [hasSubMenu],
   );
   let onClick = () => {
     if (disabled) return;
@@ -85,8 +88,8 @@ export const MenuItem = React.forwardRef((props, forwardedRef) => {
       role: role,
       tabIndex: isSelected ? 0 : -1,
       'aria-selected': isSelected,
-      'aria-haspopup': subMenuItems.length > 0 ? 'true' : void 0,
-      'aria-controls': subMenuItems.length > 0 ? submenuId : void 0,
+      'aria-haspopup': hasSubMenu ? 'true' : void 0,
+      'aria-controls': hasSubMenu ? submenuId : void 0,
       'aria-disabled': disabled,
       ...(parentMenu?.popoverGetItemProps != null
         ? parentMenu.popoverGetItemProps({
@@ -112,7 +115,7 @@ export const MenuItem = React.forwardRef((props, forwardedRef) => {
       sublabel && React.createElement(ListItem.Description, null, sublabel),
     ),
     !endIcon &&
-      subMenuItems.length > 0 &&
+      hasSubMenu &&
       React.createElement(
         ListItem.Icon,
         {
@@ -134,7 +137,7 @@ export const MenuItem = React.forwardRef((props, forwardedRef) => {
   return React.createElement(
     React.Fragment,
     null,
-    subMenuItems.length > 0 && !disabled
+    hasSubMenu && !disabled
       ? React.createElement(
           Menu,
           {