@itwin/itwinui-react 3.17.1 → 3.17.3

package/esm/core/DropdownMenu/DropdownMenu.js

@@ -30,34 +30,50 @@ let DropdownMenuContent = React.forwardRef((props, forwardedRef) => {
     visibleProp,
     onVisibleChange,
   );
+  let close = React.useCallback(() => {
+    setVisible(false);
+  }, [setVisible]);
   let menuContent = React.useMemo(() => {
-    if ('function' == typeof menuItems)
-      return menuItems(() => setVisible(false));
+    if ('function' == typeof menuItems) return menuItems(close);
     return menuItems;
-  }, [menuItems, setVisible]);
+  }, [close, menuItems]);
+  let dropdownMenuContextValue = React.useMemo(
+    () => ({
+      close,
+    }),
+    [close],
+  );
   return React.createElement(
-    Menu,
+    DropdownMenuContext.Provider,
     {
-      trigger: children,
-      onKeyDown: mergeEventHandlers(props.onKeyDown, (e) => {
-        if (e.defaultPrevented) return;
-        if ('Tab' === e.key) setVisible(false);
-      }),
-      role: role,
-      ref: forwardedRef,
-      portal: portal,
-      popoverProps: React.useMemo(
-        () => ({
-          placement,
-          matchWidth,
-          visible,
-          onVisibleChange: setVisible,
-          middleware,
-        }),
-        [matchWidth, middleware, placement, setVisible, visible],
-      ),
-      ...rest,
+      value: dropdownMenuContextValue,
     },
-    menuContent,
+    React.createElement(
+      Menu,
+      {
+        trigger: children,
+        onKeyDown: mergeEventHandlers(props.onKeyDown, (e) => {
+          if (e.defaultPrevented) return;
+          if ('Tab' === e.key) setVisible(false);
+        }),
+        role: role,
+        ref: forwardedRef,
+        portal: portal,
+        popoverProps: React.useMemo(
+          () => ({
+            placement,
+            matchWidth,
+            visible,
+            onVisibleChange: setVisible,
+            middleware,
+          }),
+          [matchWidth, middleware, placement, setVisible, visible],
+        ),
+        ...rest,
+      },
+      menuContent,
+    ),
   );
 });
+export const DropdownMenuContext = React.createContext(void 0);
+export const DropdownMenuCloseOnClickContext = React.createContext(void 0);

package/esm/core/Menu/Menu.d.ts

@@ -28,7 +28,12 @@ type MenuProps = {
             listNavigation?: Partial<UseListNavigationProps>;
         };
     };
-} & Pick<PortalProps, 'portal'>;
+    /**
+     * If not passed, uses the `portal` from its parent `Menu`.
+     * @see {@link PortalProps.portal} for docs on the prop.
+     */
+    portal?: PortalProps['portal'];
+};
 /**
  * @private
  *
@@ -92,4 +97,7 @@ export declare const MenuContext: React.Context<{
     popoverGetItemProps: PopoverGetItemProps;
     focusableElements: HTMLElement[];
 } | undefined>;
+export declare const MenuPortalContext: React.Context<boolean | {
+    to: HTMLElement | null | undefined | (() => HTMLElement | null | undefined);
+} | undefined>;
 export {};

package/esm/core/Menu/Menu.js

@@ -25,11 +25,13 @@ export const Menu = React.forwardRef((props, ref) => {
     className,
     trigger,
     positionReference,
-    portal = true,
+    portal: portalProp,
     popoverProps: popoverPropsProp,
     children,
     ...rest
   } = props;
+  let menuPortalContext = React.useContext(MenuPortalContext);
+  let portal = portalProp ?? menuPortalContext;
   let tree = useFloatingTree();
   let nodeId = useFloatingNodeId();
   let parentId = useFloatingParentNodeId();
@@ -125,32 +127,35 @@ export const Menu = React.forwardRef((props, ref) => {
     () => void 0,
     () => void 0,
   );
-  let popoverGetItemProps = ({ focusableItemIndex, userProps }) =>
-    getItemProps({
-      ...userProps,
-      tabIndex:
-        null != activeIndex &&
-        activeIndex >= 0 &&
-        null != focusableItemIndex &&
-        focusableItemIndex >= 0 &&
-        activeIndex === focusableItemIndex
-          ? 0
-          : -1,
-      onFocus: mergeEventHandlers(userProps?.onFocus, () => {
-        queueMicrotask(() => {
-          setHasFocusedNodeInSubmenu(true);
-        });
-        tree?.events.emit('onNodeFocused', {
-          nodeId: nodeId,
-          parentId: parentId,
-        });
+  let popoverGetItemProps = React.useCallback(
+    ({ focusableItemIndex, userProps }) =>
+      getItemProps({
+        ...userProps,
+        tabIndex:
+          null != activeIndex &&
+          activeIndex >= 0 &&
+          null != focusableItemIndex &&
+          focusableItemIndex >= 0 &&
+          activeIndex === focusableItemIndex
+            ? 0
+            : -1,
+        onFocus: mergeEventHandlers(userProps?.onFocus, () => {
+          queueMicrotask(() => {
+            setHasFocusedNodeInSubmenu(true);
+          });
+          tree?.events.emit('onNodeFocused', {
+            nodeId: nodeId,
+            parentId: parentId,
+          });
+        }),
+        onMouseEnter: mergeEventHandlers(userProps?.onMouseEnter, (event) => {
+          if (null != focusableItemIndex && focusableItemIndex >= 0)
+            setActiveIndex(focusableItemIndex);
+          if (event.target === event.currentTarget) event.currentTarget.focus();
+        }),
       }),
-      onMouseEnter: mergeEventHandlers(userProps?.onMouseEnter, (event) => {
-        if (null != focusableItemIndex && focusableItemIndex >= 0)
-          setActiveIndex(focusableItemIndex);
-        if (event.target === event.currentTarget) event.currentTarget.focus();
-      }),
-    });
+    [activeIndex, getItemProps, nodeId, parentId, tree?.events],
+  );
   let reference = cloneElementWithRef(trigger, (triggerChild) =>
     getReferenceProps(
       popover.getReferenceProps({
@@ -189,28 +194,38 @@ export const Menu = React.forwardRef((props, ref) => {
     React.createElement(
       MenuContext.Provider,
       {
-        value: {
-          popoverGetItemProps,
-          focusableElements,
-        },
+        value: React.useMemo(
+          () => ({
+            popoverGetItemProps,
+            focusableElements,
+          }),
+          [focusableElements, popoverGetItemProps],
+        ),
       },
       React.createElement(
-        PopoverOpenContext.Provider,
+        MenuPortalContext.Provider,
         {
-          value: popover.open,
+          value: portal,
         },
-        reference,
+        React.createElement(
+          PopoverOpenContext.Provider,
+          {
+            value: popover.open,
+          },
+          reference,
+        ),
+        null != tree
+          ? React.createElement(
+              FloatingNode,
+              {
+                id: nodeId,
+              },
+              floating,
+            )
+          : floating,
       ),
-      null != tree
-        ? React.createElement(
-            FloatingNode,
-            {
-              id: nodeId,
-            },
-            floating,
-          )
-        : floating,
     ),
   );
 });
 export const MenuContext = React.createContext(void 0);
+export const MenuPortalContext = React.createContext(void 0);

package/esm/core/Menu/MenuItem.js

@@ -8,6 +8,10 @@ import {
 import { Menu, MenuContext } from './Menu.js';
 import { ListItem } from '../List/ListItem.js';
 import cx from 'classnames';
+import {
+  DropdownMenuCloseOnClickContext,
+  DropdownMenuContext,
+} from '../DropdownMenu/DropdownMenu.js';
 export const MenuItem = React.forwardRef((props, forwardedRef) => {
   let {
     className,
@@ -28,6 +32,10 @@ export const MenuItem = React.forwardRef((props, forwardedRef) => {
   } = props;
   let logWarning = useWarningLogger();
   let parentMenu = React.useContext(MenuContext);
+  let dropdownMenu = React.useContext(DropdownMenuContext);
+  let shouldCloseMenuOnClick = React.useContext(
+    DropdownMenuCloseOnClickContext,
+  );
   let menuItemRef = React.useRef(null);
   let submenuId = useId();
   let popoverProps = React.useMemo(
@@ -46,6 +54,7 @@ export const MenuItem = React.forwardRef((props, forwardedRef) => {
   );
   let onClick = () => {
     if (disabled) return;
+    if (shouldCloseMenuOnClick) dropdownMenu?.close();
     onClickProp?.(value);
   };
   let handlers = {

package/esm/core/Tile/Tile.js

@@ -10,7 +10,10 @@ import {
   polymorphic,
   Box,
 } from '../../utils/index.js';
-import { DropdownMenu } from '../DropdownMenu/DropdownMenu.js';
+import {
+  DropdownMenu,
+  DropdownMenuCloseOnClickContext,
+} from '../DropdownMenu/DropdownMenu.js';
 import { IconButton } from '../Buttons/IconButton.js';
 import { ProgressRadial } from '../ProgressIndicators/ProgressRadial.js';
 import { LinkAction } from '../LinkAction/LinkAction.js';
@@ -174,41 +177,39 @@ let TileMoreOptions = React.forwardRef((props, forwardedRef) => {
   let { className, children = [], buttonProps, ...rest } = props;
   let [isMenuVisible, setIsMenuVisible] = React.useState(false);
   return React.createElement(
-    Box,
+    DropdownMenuCloseOnClickContext.Provider,
     {
-      className: cx(
-        'iui-tile-more-options',
-        {
-          'iui-visible': isMenuVisible,
-        },
-        className,
-      ),
-      ref: forwardedRef,
-      ...rest,
+      value: true,
     },
     React.createElement(
-      DropdownMenu,
+      Box,
       {
-        onVisibleChange: setIsMenuVisible,
-        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(
-        IconButton,
+        DropdownMenu,
         {
-          styleType: 'borderless',
-          size: 'small',
-          'aria-label': 'More options',
-          ...buttonProps,
+          onVisibleChange: setIsMenuVisible,
+          menuItems: children,
         },
-        React.createElement(SvgMore, null),
+        React.createElement(
+          IconButton,
+          {
+            styleType: 'borderless',
+            size: 'small',
+            'aria-label': 'More options',
+            ...buttonProps,
+          },
+          React.createElement(SvgMore, null),
+        ),
       ),
     ),
   );

package/esm/styles.js

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

package/esm/utils/components/FocusTrap.js

@@ -1,36 +1,41 @@
 import * as React from 'react';
 import { getTabbableElements } from '../functions/focusable.js';
-import { cloneElementWithRef } from '../functions/react.js';
 export const FocusTrap = (props) => {
   let { children } = props;
-  let childRef = React.useRef(void 0);
-  let getFirstLastFocusables = () => {
-    let elements = getTabbableElements(childRef.current);
+  let firstFocusTrapRef = React.useRef(null);
+  let getFirstLastFocusables = React.useCallback(() => {
+    let childrenElement = firstFocusTrapRef.current?.nextElementSibling;
+    let elements = getTabbableElements(childrenElement);
     let firstElement = elements[0];
     let lastElement = elements[(elements.length || 1) - 1];
     return [firstElement, lastElement];
-  };
-  let onFirstFocus = (event) => {
-    let [firstElement, lastElement] = getFirstLastFocusables();
-    if (event.relatedTarget === firstElement) lastElement?.focus();
-    else firstElement?.focus();
-  };
-  let onLastFocus = (event) => {
-    let [firstElement, lastElement] = getFirstLastFocusables();
-    if (event.relatedTarget === lastElement) firstElement?.focus();
-    else lastElement?.focus();
-  };
+  }, []);
+  let onFirstFocus = React.useCallback(
+    (event) => {
+      let [firstElement, lastElement] = getFirstLastFocusables();
+      if (event.relatedTarget === firstElement) lastElement?.focus();
+      else firstElement?.focus();
+    },
+    [getFirstLastFocusables],
+  );
+  let onLastFocus = React.useCallback(
+    (event) => {
+      let [firstElement, lastElement] = getFirstLastFocusables();
+      if (event.relatedTarget === lastElement) firstElement?.focus();
+      else lastElement?.focus();
+    },
+    [getFirstLastFocusables],
+  );
   return React.createElement(
     React.Fragment,
     null,
     React.createElement('div', {
+      ref: firstFocusTrapRef,
       tabIndex: 0,
       onFocus: onFirstFocus,
       'aria-hidden': true,
     }),
-    cloneElementWithRef(children, () => ({
-      ref: childRef,
-    })),
+    children,
     React.createElement('div', {
       tabIndex: 0,
       onFocus: onLastFocus,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itwin/itwinui-react",
-  "version": "3.17.1",
+  "version": "3.17.3",
   "author": "Bentley Systems",
   "license": "MIT",
   "type": "module",