@itwin/itwinui-react 3.18.0 → 3.18.2

package/DEV-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/DEV-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/DEV-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,
           {

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

@@ -86,7 +86,6 @@ export const usePopover = (options) => {
     open,
     onOpenChange,
     strategy: 'fixed',
-    transform: false,
     whileElementsMounted: React.useMemo(
       () =>
         open ? (...args) => autoUpdate(...args, autoUpdateOptions) : void 0,
@@ -238,6 +237,7 @@ export const Popover = React.forwardRef((props, forwardedRef) => {
     closeOnOutsideClick,
     role: 'dialog',
     middleware,
+    transform: false,
   });
   let [popoverElement, setPopoverElement] = React.useState(null);
   let popoverRef = useMergedRefs(
@@ -304,6 +304,7 @@ export const Popover = React.forwardRef((props, forwardedRef) => {
                     Box,
                     {
                       className: cx(
+                        'iui-popover',
                         {
                           'iui-popover-surface': applyBackground,
                         },

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';
@@ -111,6 +112,7 @@ export const Table = (props) => {
     getRowId,
     caption = 'Table',
     role,
+    scrollToRow,
     ..._rest
   } = props;
   let { ariaRestAttributes, nonAriaRestAttributes } = React.useMemo(
@@ -456,6 +458,7 @@ export const Table = (props) => {
   let tableRef = React.useRef(null);
   let { scrollToIndex, tableRowRef } = useScrollToRow({
     ...props,
+    scrollToRow,
     page,
   });
   let columnRefs = React.useRef({});
@@ -598,7 +601,7 @@ export const Table = (props) => {
   React.useEffect(() => {
     updateStickyState();
   }, []);
-  let captionId = React.useId();
+  let captionId = useId();
   return React.createElement(
     TableInstanceContext.Provider,
     {
@@ -623,7 +626,6 @@ export const Table = (props) => {
           },
         }),
         role: role,
-        'aria-labelledby': captionId,
         onScroll: () => updateStickyState(),
         'data-iui-size': 'default' === density ? void 0 : density,
         ...outerAriaRestAttributes,
@@ -638,10 +640,15 @@ export const Table = (props) => {
             role: 'table',
             ...innerAriaRestAttributes,
             ...tableProps,
+            'aria-labelledby': captionId,
           },
-          React.createElement('slot', {
-            name: 'caption',
-          }),
+          React.createElement(
+            VisuallyHidden,
+            {
+              id: captionId,
+            },
+            caption,
+          ),
           React.createElement('slot', {
             name: 'iui-table-header-wrapper',
           }),
@@ -654,14 +661,6 @@ export const Table = (props) => {
         }),
         React.createElement('slot', null),
       ),
-      React.createElement(
-        VisuallyHidden,
-        {
-          slot: 'caption',
-          id: captionId,
-        },
-        caption,
-      ),
       headerGroups.map((headerGroup) => {
         headerGroup.headers = headerGroup.headers.filter(
           (header) =>

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

@@ -5,6 +5,7 @@ import { SubRowExpander } from './SubRowExpander.js';
 import { SELECTION_CELL_ID } from './columns/index.js';
 import { DefaultCell } from './cells/index.js';
 import { Box } from '../../utils/index.js';
+import { DefaultCellRendererPropsChildren } from './cells/DefaultCell.js';
 export const TableCell = (props) => {
   let {
     cell,
@@ -33,63 +34,97 @@ export const TableCell = (props) => {
       ...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, {
+            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, {
-        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(Box, {
+            className: 'iui-table-cell-shadow-right',
+            slot: 'shadows',
+          }),
+        'right' === cell.column.sticky &&
+          tableInstance.state.sticky.isScrolledToLeft &&
+          React.createElement(Box, {
+            className: 'iui-table-cell-shadow-left',
+            slot: 'shadows',
+          }),
+      ),
+    [
+      cell.column.sticky,
       cellContent,
-      'left' === cell.column.sticky &&
-        tableInstance.state.sticky.isScrolledToRight &&
-        React.createElement(Box, {
-          className: 'iui-table-cell-shadow-right',
-          slot: 'shadows',
-        }),
-      'right' === cell.column.sticky &&
-        tableInstance.state.sticky.isScrolledToLeft &&
-        React.createElement(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(DefaultCell, {
-          ...cellRendererProps,
-          isDisabled: () => isDisabled,
-        }),
+    React.createElement(
+      DefaultCellRendererPropsChildren.Provider,
+      {
+        value: defaultCellRendererChildren,
+      },
+      cell.column.cellRenderer
+        ? cell.column.cellRenderer({
+            ...cellRendererProps,
+            isDisabled: () => isDisabled,
+          })
+        : React.createElement(DefaultCell, {
+            ...cellRendererProps,
+            isDisabled: () => isDisabled,
+          }),
+    ),
   );
 };

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

@@ -3,6 +3,7 @@ import { defaultColumn } from 'react-table';
 import cx from 'classnames';
 import { Box, LineClamp, ShadowRoot } from '../../../utils/index.js';
 import { TableInstanceContext } from '../utils.js';
+export const DefaultCellRendererPropsChildren = React.createContext(void 0);
 export const DefaultCell = (props) => {
   let instance = React.useContext(TableInstanceContext);
   let isCustomCell = React.useMemo(
@@ -11,6 +12,8 @@ export const DefaultCell = (props) => {
         ?.Cell !== defaultColumn.Cell,
     [instance, props.cellProps.column.id],
   );
+  let isCellRendererChildrenCustom =
+    React.useContext(DefaultCellRendererPropsChildren) !== props.children;
   let {
     cellElementProps: {
       className: cellElementClassName,
@@ -25,7 +28,9 @@ export 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;
@@ -54,10 +59,9 @@ export const DefaultCell = (props) => {
         name: 'start',
       }),
       React.createElement(
-        'div',
+        TableCellContent,
         {
-          className: '_iui-table-cell-main-content',
-          onClick: (e) => e.stopPropagation(),
+          shouldRenderWrapper: isCellRendererChildrenCustom,
         },
         clamp
           ? React.createElement(
@@ -99,12 +103,25 @@ export const DefaultCell = (props) => {
 };
 if ('development' === process.env.NODE_ENV)
   DefaultCell.displayName = 'DefaultCell';
+let TableCellContent = (props) => {
+  let { children, shouldRenderWrapper } = props;
+  return shouldRenderWrapper
+    ? children
+    : React.createElement(
+        'div',
+        {
+          className: '_iui-table-cell-default-content',
+          onClick: (e) => e.stopPropagation(),
+        },
+        children,
+      );
+};
 let 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/DEV-esm/core/Tooltip/Tooltip.js

@@ -26,7 +26,7 @@ import {
   useMergedRefs,
 } from '../../utils/index.js';
 export const defaultTooltipDelay = {
-  open: 100,
+  open: 200,
   close: 200,
 };
 let useTooltip = (options = {}) => {

package/DEV-esm/styles.js

@@ -1,4 +1,4 @@
-const t = '3.18.0';
+const t = '3.18.2';
 const u = new Proxy(
   {},
   {

package/cjs/core/Dialog/Dialog.js

@@ -21,7 +21,7 @@ const _DialogContext = require('./DialogContext.js');
 const _DialogButtonBar = require('./DialogButtonBar.js');
 const _DialogMain = require('./DialogMain.js');
 const _index = require('../../utils/index.js');
-const DialogComponent = _react.forwardRef((props, ref) => {
+const DialogComponent = _react.forwardRef((props, forwardedRef) => {
   let {
     trapFocus = false,
     setFocus = trapFocus,
@@ -41,11 +41,7 @@ const DialogComponent = _react.forwardRef((props, ref) => {
   } = props;
   let dialogRootRef = _react.useRef(null);
   let [dialogElement, setDialogElement] = _react.useState(null);
-  let mergedRefs = (0, _index.useMergedRefs)(
-    ref,
-    dialogRootRef,
-    setDialogElement,
-  );
+  let mergedRefs = (0, _index.useMergedRefs)(forwardedRef, dialogRootRef);
   return isOpen
     ? _react.createElement(
         _DialogContext.DialogContext.Provider,
@@ -63,6 +59,8 @@ const DialogComponent = _react.forwardRef((props, ref) => {
             isResizable,
             relativeTo,
             placement,
+            dialogRootRef,
+            setDialogElement,
           },
         },
         _react.createElement(

package/cjs/core/Dialog/DialogBackdrop.js

@@ -22,11 +22,11 @@ const DialogBackdrop = _react.forwardRef((props, ref) => {
   let dialogContext = (0, _DialogContext.useDialogContext)();
   let dialogMainContext = (0, _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/cjs/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/cjs/core/Dialog/DialogContext.js

@@ -20,4 +20,4 @@ _export(exports, {
 const _interop_require_wildcard = require('@swc/helpers/_/_interop_require_wildcard');
 const _react = /*#__PURE__*/ _interop_require_wildcard._(require('react'));
 const DialogContext = _react.createContext(void 0);
-const useDialogContext = () => _react.useContext(DialogContext) || {};
+const useDialogContext = () => _react.useContext(DialogContext);

package/cjs/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/cjs/core/Dialog/DialogMain.js

@@ -19,27 +19,27 @@ const _DialogContext = require('./DialogContext.js');
 const _DialogDragContext = require('./DialogDragContext.js');
 const _useDragAndDrop = require('../../utils/hooks/useDragAndDrop.js');
 const _DialogMainContext = require('./DialogMainContext.js');
-const DialogMain = _react.forwardRef((props, ref) => {
+const DialogMain = _react.forwardRef((props, forwardedRef) => {
   let dialogContext = (0, _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();
@@ -136,7 +136,12 @@ const DialogMain = _react.forwardRef((props, ref) => {
         className,
       ),
       role: 'dialog',
-      ref: (0, _index.useMergedRefs)(dialogRef, mountRef, ref),
+      ref: (0, _index.useMergedRefs)(
+        dialogRef,
+        mountRef,
+        setDialogElement,
+        forwardedRef,
+      ),
       onKeyDown: handleKeyDown,
       tabIndex: -1,
       'data-iui-placement': placement,

package/cjs/core/Dialog/DialogTitleBar.js

@@ -27,9 +27,9 @@ 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