@itwin/itwinui-react 3.0.0-dev.8 → 3.0.0-dev.9

package/esm/core/Menu/Menu.js

@@ -4,7 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 import * as React from 'react';
 import cx from 'classnames';
-import { useMergedRefs, getFocusableElements, Box } from '../utils/index.js';
+import {
+  useMergedRefs,
+  getFocusableElements,
+  Box,
+  mergeEventHandlers,
+} from '../utils/index.js';
 /**
  * Basic menu component. Can be used for select or dropdown components.
  */
@@ -63,9 +68,9 @@ export const Menu = React.forwardRef((props, ref) => {
     as: 'div',
     className: cx('iui-menu', className),
     role: 'menu',
-    onKeyDown: onKeyDown,
     ref: refs,
     ...rest,
+    onKeyDown: mergeEventHandlers(props.onKeyDown, onKeyDown),
   });
 });
 export default Menu;

package/esm/core/Menu/MenuItem.js

@@ -3,17 +3,27 @@
  * See LICENSE.md in the project root for license terms and full copyright notice.
  *--------------------------------------------------------------------------------------------*/
 import * as React from 'react';
-import { Popover, useMergedRefs, SvgCaretRightSmall } from '../utils/index.js';
+import {
+  SvgCaretRightSmall,
+  usePopover,
+  Portal,
+  useMergedRefs,
+  useId,
+} from '../utils/index.js';
 import { Menu } from './Menu.js';
 import { ListItem } from '../List/ListItem.js';
+import { flushSync } from 'react-dom';
 /**
  * Context used to provide menu item ref to sub-menu items.
  */
-const MenuItemContext = React.createContext({ ref: undefined });
+const MenuItemContext = React.createContext({
+  ref: undefined,
+  setIsNestedSubmenuVisible: () => {},
+});
 /**
  * Basic menu item component. Should be used inside `Menu` component for each item.
  */
-export const MenuItem = React.forwardRef((props, ref) => {
+export const MenuItem = React.forwardRef((props, forwardedRef) => {
   const {
     children,
     isSelected,
@@ -22,21 +32,33 @@ export const MenuItem = React.forwardRef((props, ref) => {
     onClick,
     sublabel,
     size = !!sublabel ? 'large' : 'default',
-    startIcon: startIconProp,
     icon,
-    endIcon: endIconProp,
+    startIcon = icon,
     badge,
+    endIcon = badge,
     role = 'menuitem',
     subMenuItems = [],
     ...rest
   } = props;
   const menuItemRef = React.useRef(null);
-  const refs = useMergedRefs(menuItemRef, ref);
-  const { ref: parentMenuItemRef } = React.useContext(MenuItemContext);
-  const subMenuRef = React.useRef(null);
+  const [focusOnSubmenu, setFocusOnSubmenu] = React.useState(false);
+  const submenuId = useId();
   const [isSubmenuVisible, setIsSubmenuVisible] = React.useState(false);
-  const startIcon = startIconProp ?? icon;
-  const endIcon = endIconProp ?? badge;
+  const [isNestedSubmenuVisible, setIsNestedSubmenuVisible] =
+    React.useState(false);
+  const parent = React.useContext(MenuItemContext);
+  const onVisibleChange = (open) => {
+    setIsSubmenuVisible(open);
+    // we don't want parent to close when mouse goes into a nested submenu,
+    // so we need to let the parent know whether the submenu is still open.
+    parent.setIsNestedSubmenuVisible(open);
+  };
+  const popover = usePopover({
+    visible: isSubmenuVisible || isNestedSubmenuVisible,
+    onVisibleChange,
+    placement: 'right-start',
+    trigger: { hover: true, focus: true },
+  });
   const onKeyDown = (event) => {
     if (event.altKey) {
       return;
@@ -52,22 +74,37 @@ export const MenuItem = React.forwardRef((props, ref) => {
       case 'ArrowRight': {
         if (subMenuItems.length > 0) {
           setIsSubmenuVisible(true);
+          // flush and reset state so we are ready to focus again next time
+          flushSync(() => setFocusOnSubmenu(true));
+          setFocusOnSubmenu(false);
           event.preventDefault();
           event.stopPropagation();
         }
         break;
       }
       case 'ArrowLeft': {
-        parentMenuItemRef?.current?.focus();
+        if (parent.ref) {
+          parent.ref.current?.focus();
+          parent.setIsNestedSubmenuVisible(false);
+        }
         event.stopPropagation();
         event.preventDefault();
         break;
       }
+      case 'Escape': {
+        // focus might get lost if submenu closes so move it back to parent
+        parent.ref?.current?.focus();
+        break;
+      }
       default:
         break;
     }
   };
-  const listItem = React.createElement(
+  const handlers = {
+    onClick: () => !disabled && onClick?.(value),
+    onKeyDown,
+  };
+  return React.createElement(
     ListItem,
     {
       as: 'div',
@@ -75,24 +112,21 @@ export const MenuItem = React.forwardRef((props, ref) => {
       size: size,
       active: isSelected,
       disabled: disabled,
-      onClick: () => !disabled && onClick?.(value),
-      ref: refs,
+      ref: useMergedRefs(
+        menuItemRef,
+        forwardedRef,
+        subMenuItems.length > 0 ? popover.refs.setReference : null,
+      ),
       role: role,
       tabIndex: disabled || role === 'presentation' ? undefined : -1,
       'aria-selected': isSelected,
-      'aria-haspopup': subMenuItems.length > 0,
+      'aria-haspopup': subMenuItems.length > 0 ? 'true' : undefined,
+      'aria-controls': subMenuItems.length > 0 ? submenuId : undefined,
+      'aria-expanded': subMenuItems.length > 0 ? popover.open : undefined,
       'aria-disabled': disabled,
-      onKeyDown: onKeyDown,
-      onMouseEnter: () => setIsSubmenuVisible(true),
-      onMouseLeave: (e) => {
-        if (
-          !(e.relatedTarget instanceof Node) ||
-          !subMenuRef.current?.contains(e.relatedTarget)
-        ) {
-          setIsSubmenuVisible(false);
-        }
-      },
-      ...rest,
+      ...(subMenuItems.length === 0
+        ? { ...handlers, ...rest }
+        : popover.getReferenceProps({ ...handlers, ...rest })),
     },
     startIcon &&
       React.createElement(
@@ -119,34 +153,32 @@ export const MenuItem = React.forwardRef((props, ref) => {
         { as: 'span', 'aria-hidden': true },
         endIcon,
       ),
-  );
-  return subMenuItems.length === 0
-    ? listItem
-    : React.createElement(
-        MenuItemContext.Provider,
-        { value: { ref: menuItemRef } },
+    subMenuItems.length > 0 &&
+      popover.open &&
+      React.createElement(
+        Portal,
+        null,
         React.createElement(
-          Popover,
-          {
-            placement: 'right-start',
-            visible: isSubmenuVisible,
-            appendTo: 'parent',
-            content: React.createElement(
-              'div',
-              {
-                onMouseLeave: () => setIsSubmenuVisible(false),
-                onBlur: (e) => {
-                  !!(e.relatedTarget instanceof Node) &&
-                    !subMenuRef.current?.contains(e.relatedTarget) &&
-                    !subMenuRef.current?.isEqualNode(e.relatedTarget) &&
-                    setIsSubmenuVisible(false);
+          MenuItemContext.Provider,
+          { value: { ref: menuItemRef, setIsNestedSubmenuVisible } },
+          React.createElement(
+            Menu,
+            {
+              setFocus: focusOnSubmenu,
+              ref: popover.refs.setFloating,
+              ...popover.getFloatingProps({
+                id: submenuId,
+                onPointerMove: () => {
+                  // pointer might move into a nested submenu and set isSubmenuVisible to false,
+                  // so we need to flip it back to true when pointer re-enters this submenu.
+                  setIsSubmenuVisible(true);
                 },
-              },
-              React.createElement(Menu, { ref: subMenuRef }, subMenuItems),
-            ),
-          },
-          listItem,
+              }),
+            },
+            subMenuItems,
+          ),
         ),
-      );
+      ),
+  );
 });
 export default MenuItem;

package/esm/core/Select/Select.d.ts

@@ -1,5 +1,6 @@
 import * as React from 'react';
-import type { PopoverProps, CommonProps } from '../utils/index.js';
+import { usePopover } from '../utils/index.js';
+import type { CommonProps } from '../utils/index.js';
 export type ItemRendererProps = {
     /**
      * Close handler that closes the dropdown.
@@ -110,15 +111,14 @@ export type SelectProps<T> = {
      */
     menuStyle?: React.CSSProperties;
     /**
-     * Props to customize {@link Popover} behavior.
-     * @see [tippy.js props](https://atomiks.github.io/tippyjs/v6/all-props/)
+     * Props to customize Popover behavior.
      */
-    popoverProps?: Omit<PopoverProps, 'onShow' | 'onHide' | 'disabled'>;
+    popoverProps?: Pick<Parameters<typeof usePopover>[0], 'visible' | 'onVisibleChange' | 'placement' | 'matchWidth' | 'closeOnOutsideClick'>;
     /**
      * Props to pass to the select button (trigger) element.
      */
     triggerProps?: React.ComponentPropsWithoutRef<'div'>;
-} & SelectMultipleTypeProps<T> & Pick<PopoverProps, 'onShow' | 'onHide'> & Omit<React.ComponentPropsWithoutRef<'div'>, 'size' | 'disabled' | 'placeholder' | 'onChange'>;
+} & SelectMultipleTypeProps<T> & Omit<React.ComponentPropsWithoutRef<'div'>, 'size' | 'disabled' | 'placeholder' | 'onChange'>;
 /**
  * Select component to select value from options.
  * Generic type is used for value. It prevents you from mistakenly using other types in `options`, `value` and `onChange`.

package/esm/core/Select/Select.js

@@ -7,10 +7,12 @@ import cx from 'classnames';
 import { Menu, MenuItem } from '../Menu/index.js';
 import {
   SvgCaretDownSmall,
-  Popover,
   useId,
   AutoclearingHiddenLiveRegion,
   Box,
+  usePopover,
+  Portal,
+  useMergedRefs,
   SvgCheckmark,
   Icon,
 } from '../utils/index.js';
@@ -87,55 +89,27 @@ export const Select = (props) => {
     style,
     menuClassName,
     menuStyle,
-    onShow,
-    onHide,
-    popoverProps,
     multiple = false,
     triggerProps,
     status,
+    popoverProps,
     ...rest
   } = props;
-  const [isOpenState, setIsOpen] = React.useState(false);
-  const isOpen = popoverProps?.visible ?? isOpenState;
-  const [minWidth, setMinWidth] = React.useState(0);
+  const [isOpen, setIsOpen] = React.useState(false);
   const [liveRegionSelection, setLiveRegionSelection] = React.useState('');
   const selectRef = React.useRef(null);
-  const onShowHandler = React.useCallback(
-    (instance) => {
-      setIsOpen(true);
-      onShow?.(instance);
-    },
-    [onShow],
-  );
-  const onHideHandler = React.useCallback(
-    (instance) => {
-      setIsOpen(false);
-      selectRef.current?.focus({ preventScroll: true }); // move focus back to select button
-      onHide?.(instance);
-    },
-    [onHide],
-  );
-  React.useEffect(() => {
-    if (selectRef.current) {
-      setMinWidth(selectRef.current.offsetWidth);
-    }
-  }, [isOpen]);
-  const onKeyDown = (event) => {
-    if (event.altKey) {
+  const show = React.useCallback(() => {
+    if (disabled) {
       return;
     }
-    switch (event.key) {
-      case 'Enter':
-      case ' ':
-      case 'Spacebar': {
-        setIsOpen((o) => !o);
-        event.preventDefault();
-        break;
-      }
-      default:
-        break;
-    }
-  };
+    setIsOpen(true);
+    popoverProps?.onVisibleChange?.(true);
+  }, [disabled, popoverProps]);
+  const hide = React.useCallback(() => {
+    setIsOpen(false);
+    selectRef.current?.focus({ preventScroll: true }); // move focus back to select button
+    popoverProps?.onVisibleChange?.(false);
+  }, [popoverProps]);
   const menuItems = React.useMemo(() => {
     return options.map((option, index) => {
       const isSelected = isMultipleEnabled(value, multiple)
@@ -159,7 +133,7 @@ export const Select = (props) => {
           }
           if (isSingleOnChange(onChange, multiple)) {
             onChange?.(option.value);
-            setIsOpen(false);
+            hide();
           } else {
             onChange?.(option.value, isSelected ? 'removed' : 'added');
           }
@@ -188,7 +162,7 @@ export const Select = (props) => {
         ...menuItem.props,
       });
     });
-  }, [itemRenderer, multiple, onChange, options, value]);
+  }, [hide, itemRenderer, multiple, onChange, options, value]);
   const selectedItems = React.useMemo(() => {
     if (value == null) {
       return undefined;
@@ -203,53 +177,39 @@ export const Select = (props) => {
       label: item.label,
     });
   }, []);
+  const popover = usePopover({
+    visible: isOpen,
+    matchWidth: true,
+    closeOnOutsideClick: true,
+    ...popoverProps,
+    onVisibleChange: (open) => (open ? show() : hide()),
+  });
   return React.createElement(
-    Box,
-    { className: cx('iui-input-with-icon', className), style: style, ...rest },
+    React.Fragment,
+    null,
     React.createElement(
-      Popover,
+      Box,
       {
-        content: React.createElement(
-          Menu,
-          {
-            role: 'listbox',
-            className: cx('iui-scroll', menuClassName),
-            style: {
-              minInlineSize: minWidth,
-              maxInlineSize: `min(${minWidth * 2}px, 90vw)`,
-              ...menuStyle,
-            },
-            id: `${uid}-menu`,
-            key: `${uid}-menu`,
-          },
-          menuItems,
-        ),
-        placement: 'bottom-start',
-        aria: { content: null },
-        onShow: onShowHandler,
-        onHide: onHideHandler,
-        ...popoverProps,
-        visible: isOpen,
-        onClickOutside: () => {
-          setIsOpen(false);
-        },
+        className: cx('iui-input-with-icon', className),
+        style: style,
+        ...rest,
+        ref: popover.refs.setPositionReference,
       },
       React.createElement(
         Box,
         {
+          ...popover.getReferenceProps(),
           tabIndex: 0,
           role: 'combobox',
-          ref: selectRef,
           'data-iui-size': size,
           'data-iui-status': status,
-          onClick: () => !disabled && setIsOpen((o) => !o),
-          onKeyDown: (e) => !disabled && onKeyDown(e),
           'aria-disabled': disabled,
           'aria-autocomplete': 'none',
           'aria-expanded': isOpen,
           'aria-haspopup': 'listbox',
           'aria-controls': `${uid}-menu`,
           ...triggerProps,
+          ref: useMergedRefs(selectRef, popover.refs.setReference),
           className: cx(
             'iui-select-button',
             {
@@ -277,24 +237,48 @@ export const Select = (props) => {
               selectedItemRenderer: selectedItemRenderer,
             }),
       ),
+      React.createElement(
+        Icon,
+        {
+          as: 'span',
+          'aria-hidden': true,
+          className: cx('iui-end-icon', {
+            'iui-disabled': disabled,
+            'iui-open': isOpen,
+          }),
+        },
+        React.createElement(SvgCaretDownSmall, null),
+      ),
+      multiple
+        ? React.createElement(AutoclearingHiddenLiveRegion, {
+            text: liveRegionSelection,
+          })
+        : null,
     ),
-    React.createElement(
-      Icon,
-      {
-        as: 'span',
-        'aria-hidden': true,
-        className: cx('iui-end-icon', {
-          'iui-disabled': disabled,
-          'iui-open': isOpen,
-        }),
-      },
-      React.createElement(SvgCaretDownSmall, null),
-    ),
-    multiple
-      ? React.createElement(AutoclearingHiddenLiveRegion, {
-          text: liveRegionSelection,
-        })
-      : null,
+    popover.open &&
+      React.createElement(
+        Portal,
+        null,
+        React.createElement(
+          Menu,
+          {
+            role: 'listbox',
+            className: cx('iui-scroll', menuClassName),
+            id: `${uid}-menu`,
+            key: `${uid}-menu`,
+            ...popover.getFloatingProps({
+              style: menuStyle,
+              onKeyDown: ({ key }) => {
+                if (key === 'Tab') {
+                  hide();
+                }
+              },
+            }),
+            ref: popover.refs.setFloating,
+          },
+          menuItems,
+        ),
+      ),
   );
 };
 const SingleSelectButton = ({ selectedItem, selectedItemRenderer }) => {

package/esm/core/Table/columns/actionColumn.js

@@ -105,13 +105,9 @@ export const ActionColumn = ({ columnManager = false } = {}) => {
         {
           ...dropdownMenuProps,
           menuItems: headerCheckBoxes,
-          onHide: (i) => {
-            setIsOpen(false);
-            dropdownMenuProps.onHide?.(i);
-          },
-          onShow: (i) => {
-            setIsOpen(true);
-            dropdownMenuProps.onShow?.(i);
+          onVisibleChange: (open) => {
+            setIsOpen(open);
+            dropdownMenuProps?.onVisibleChange?.(open);
           },
           className: cx('iui-scroll', dropdownMenuProps.className),
         },

package/esm/core/Table/filters/DateRangeFilter/DatePickerInput.js

@@ -66,54 +66,49 @@ const DatePickerInput = React.forwardRef((props, forwardedRef) => {
     [onChange, parseInput],
   );
   return React.createElement(
-    Popover,
-    {
-      content: React.createElement(DatePicker, {
-        date: date,
-        onChange: onDateSelected,
-        setFocus: true,
-        isDateDisabled: isDateDisabled,
-        localizedNames: localizedNames,
-      }),
-      placement: 'bottom',
-      visible: isVisible,
-      onClickOutside: (_, e) => {
-        if (!buttonRef.current?.contains(e.target)) {
-          close();
-        }
+    InputGrid,
+    { labelPlacement: 'inline', ...wrapperProps },
+    React.createElement(
+      Label,
+      {
+        as: 'label',
+        required: required,
+        disabled: disabled,
+        htmlFor: id,
+        ...labelProps,
       },
-      appendTo: 'parent',
-    },
+      label,
+    ),
     React.createElement(
-      InputGrid,
-      { labelPlacement: 'inline', ...wrapperProps },
+      InputWithDecorations,
+      { ...inputWrapperProps },
+      React.createElement(InputWithDecorations.Input, {
+        id: id,
+        value: inputValue,
+        onChange: onInputChange,
+        required: required,
+        disabled: disabled,
+        ref: forwardedRef,
+        ...rest,
+      }),
       React.createElement(
-        Label,
+        Popover,
         {
-          as: 'label',
-          required: required,
-          disabled: disabled,
-          htmlFor: id,
-          ...labelProps,
+          content: React.createElement(DatePicker, {
+            date: date,
+            onChange: onDateSelected,
+            setFocus: true,
+            isDateDisabled: isDateDisabled,
+            localizedNames: localizedNames,
+          }),
+          placement: 'bottom-end',
+          visible: isVisible,
+          onVisibleChange: setIsVisible,
+          closeOnOutsideClick: true,
         },
-        label,
-      ),
-      React.createElement(
-        InputWithDecorations,
-        { ...inputWrapperProps },
-        React.createElement(InputWithDecorations.Input, {
-          id: id,
-          value: inputValue,
-          onChange: onInputChange,
-          onClick: close,
-          required: required,
-          disabled: disabled,
-          ref: forwardedRef,
-          ...rest,
-        }),
         React.createElement(
           InputWithDecorations.Button,
-          { onClick: () => setIsVisible((v) => !v), ref: buttonRef },
+          { 'aria-label': 'Date picker', ref: buttonRef },
           React.createElement(SvgCalendar, null),
         ),
       ),

package/esm/core/Table/filters/FilterToggle.js

@@ -43,7 +43,8 @@ export const FilterToggle = (props) => {
           content: column.render('Filter', { close, setFilter, clearFilter }),
           placement: 'bottom-start',
           visible: isVisible,
-          onClickOutside: close,
+          onVisibleChange: setIsVisible,
+          closeOnOutsideClick: true,
         },
         React.createElement(
           IconButton,
@@ -51,8 +52,8 @@ export const FilterToggle = (props) => {
             styleType: 'borderless',
             isActive: isVisible || isColumnFiltered,
             className: cx('iui-table-filter-button', className),
+            'aria-label': 'Filter',
             onClick: (e) => {
-              setIsVisible((v) => !v);
               // Prevents from triggering sort
               e.stopPropagation();
             },

package/esm/core/Tile/Tile.js

@@ -212,32 +212,31 @@ const TileMoreOptions = React.forwardRef((props, forwardedRef) => {
   const { className, children = [], buttonProps, ...rest } = props;
   const [isMenuVisible, setIsMenuVisible] = React.useState(false);
   return React.createElement(
-    DropdownMenu,
+    Box,
     {
-      onShow: React.useCallback(() => setIsMenuVisible(true), []),
-      onHide: React.useCallback(() => setIsMenuVisible(false), []),
-      menuItems: (close) =>
-        children?.map((option) =>
-          React.cloneElement(option, {
-            onClick: (value) => {
-              close();
-              option.props.onClick?.(value);
-            },
-          }),
-        ),
+      className: cx(
+        'iui-tile-more-options',
+        {
+          'iui-visible': isMenuVisible,
+        },
+        className,
+      ),
+      ref: forwardedRef,
+      ...rest,
     },
     React.createElement(
-      Box,
+      DropdownMenu,
       {
-        className: cx(
-          'iui-tile-more-options',
-          {
-            'iui-visible': isMenuVisible,
-          },
-          className,
-        ),
-        ref: forwardedRef,
-        ...rest,
+        onVisibleChange: setIsMenuVisible,
+        menuItems: (close) =>
+          children?.map((option) =>
+            React.cloneElement(option, {
+              onClick: (value) => {
+                close();
+                option.props.onClick?.(value);
+              },
+            }),
+          ),
       },
       React.createElement(
         IconButton,