@carbon/react 1.89.0-rc.1 → 1.90.0-rc.0

package/lib/components/FileUploader/FileUploader.d.ts

@@ -5,6 +5,21 @@
  * LICENSE file in the root directory of this source tree.
  */
 import React, { type HTMLAttributes } from 'react';
+interface FileItem {
+    name: string;
+    uuid: string;
+    file: File;
+}
+export interface FileChangeData {
+    addedFiles: FileItem[];
+    removedFiles: FileItem[];
+    currentFiles: FileItem[];
+    action: 'add' | 'remove' | 'clear';
+}
+export interface FileDeleteData {
+    deletedFile: FileItem;
+    remainingFiles: FileItem[];
+}
 export interface FileUploaderProps extends HTMLAttributes<HTMLSpanElement> {
     /**
      * Specify the types of files that this input should be able to receive
@@ -52,20 +67,23 @@ export interface FileUploaderProps extends HTMLAttributes<HTMLSpanElement> {
      */
     name?: string;
     /**
-     * Provide an optional `onChange` hook that is called each time the input is
-     * changed
+     * Provide an optional `onChange` hook that is called each time the input is changed.
+     * When 'enable-enhanced-file-uploader' feature flag is enabled:
+     * - Also fires for file deletions and clearFiles operations
+     * - Event includes enhanced file information in event.target
      */
-    onChange?: (event: any) => void;
+    onChange?: (event: any, data?: FileChangeData) => void;
     /**
      * Provide an optional `onClick` hook that is called each time the
      * FileUploader is clicked
      */
     onClick?: (event: any) => void;
     /**
-     * Provide an optional `onDelete` hook that is called when an uploaded item
-     * is removed
+     * Provide an optional `onDelete` hook that is called when an uploaded item is removed.
+     * When 'enable-enhanced-file-uploader' feature flag is enabled:
+     * - Event includes deleted file information in event.target
      */
-    onDelete?: (event: any) => void;
+    onDelete?: (event: any, data?: FileDeleteData) => void;
     /**
      * Specify the size of the FileUploaderButton, from a list of available
      * sizes.
@@ -77,6 +95,10 @@ export interface FileUploaderHandle {
      * Clear internal state
      */
     clearFiles: () => void;
+    /**
+     * Get current files (only available when 'enable-enhanced-file-uploader' feature flag is enabled)
+     */
+    getCurrentFiles?: () => FileItem[];
 }
 declare const FileUploader: {
     <ItemType>(props: FileUploaderProps): React.ReactElement<any>;

package/lib/components/FileUploader/FileUploader.js

@@ -21,6 +21,7 @@ var match = require('../../internal/keyboard/match.js');
 var usePrefix = require('../../internal/usePrefix.js');
 require('../Text/index.js');
 var useId = require('../../internal/useId.js');
+var index = require('../FeatureFlags/index.js');
 var Text = require('../Text/Text.js');
 
 const FileUploader = /*#__PURE__*/React.forwardRef(({
@@ -42,45 +43,149 @@ const FileUploader = /*#__PURE__*/React.forwardRef(({
   ...other
 }, ref) => {
   const fileUploaderInstanceId = useId.useId('file-uploader');
-  const [state, updateState] = React.useState({
-    fileNames: []
-  });
-  const nodes = [];
   const prefix = usePrefix.usePrefix();
-  const handleChange = evt => {
+  const enhancedFileUploaderEnabled = index.useFeatureFlag('enable-enhanced-file-uploader');
+  const [fileItems, setFileItems] = React.useState([]);
+  const [legacyFileNames, setLegacyFileNames] = React.useState([]);
+  const [fileObjects, setFileObjects] = React.useState(new Map());
+  const nodes = [];
+  const createFileItem = file => ({
+    name: file.name,
+    uuid: `${fileUploaderInstanceId}-${Date.now()}-${Array.from(crypto.getRandomValues(new Uint8Array(8))).map(b => b.toString(36)).join('')}`,
+    file
+  });
+  const handleChange = React.useCallback(evt => {
     evt.stopPropagation();
-    const filenames = Array.prototype.map.call(evt.target.files, file => file.name);
-    updateState(prevState => ({
-      fileNames: multiple ? [...new Set([...prevState.fileNames, ...filenames])] : filenames
-    }));
-    if (onChange) {
-      onChange(evt);
+    const newFiles = Array.from(evt.target.files);
+    if (enhancedFileUploaderEnabled) {
+      const newFileItems = newFiles.map(createFileItem);
+      let updatedFileItems;
+      if (multiple) {
+        const existingNames = new Set(fileItems.map(item => item.name));
+        const uniqueNewItems = newFileItems.filter(item => !existingNames.has(item.name));
+        updatedFileItems = [...fileItems, ...uniqueNewItems];
+      } else {
+        updatedFileItems = newFileItems;
+      }
+      setFileItems(updatedFileItems);
+      if (onChange) {
+        const allFiles = updatedFileItems.map(item => item.file);
+        const enhancedEvent = {
+          ...evt,
+          target: {
+            ...evt.target,
+            files: Object.assign(allFiles, {
+              item: index => allFiles[index] || null
+            }),
+            addedFiles: newFileItems,
+            currentFiles: updatedFileItems,
+            action: 'add'
+          }
+        };
+        onChange(enhancedEvent);
+      }
+    } else {
+      const filenames = newFiles.map(file => file.name);
+      const updatedFileNames = multiple ? [...new Set([...legacyFileNames, ...filenames])] : filenames;
+      setLegacyFileNames(updatedFileNames);
+      setFileObjects(prevMap => {
+        const newMap = multiple ? new Map(prevMap) : new Map();
+        newFiles.forEach(file => {
+          newMap.set(file.name, file);
+        });
+        return newMap;
+      });
+      if (onChange) {
+        onChange(evt);
+      }
     }
-  };
-  const handleClick = (evt, {
+  }, [enhancedFileUploaderEnabled, fileItems, legacyFileNames, multiple, onChange]);
+  const handleClick = React.useCallback((evt, {
     index,
     filenameStatus
   }) => {
     if (filenameStatus === 'edit') {
       evt.stopPropagation();
-      const filteredArray = state.fileNames.filter(filename => filename !== nodes[index]?.innerText?.trim());
-      updateState({
-        fileNames: filteredArray
-      });
-      if (onDelete) {
-        onDelete(evt);
-        uploaderButton.current?.focus?.();
+      if (enhancedFileUploaderEnabled) {
+        const deletedItem = fileItems[index];
+        if (!deletedItem) return;
+        const remainingItems = fileItems.filter((_, i) => i !== index);
+        setFileItems(remainingItems);
+        const remainingFiles = remainingItems.map(item => item.file);
+        const enhancedEvent = {
+          ...evt,
+          target: {
+            ...evt.target,
+            files: Object.assign(remainingFiles, {
+              item: index => remainingFiles[index] || null
+            }),
+            deletedFile: deletedItem,
+            deletedFileName: deletedItem.name,
+            remainingFiles: remainingItems,
+            currentFiles: remainingItems,
+            action: 'remove'
+          }
+        };
+        if (onDelete) {
+          onDelete(enhancedEvent);
+        }
+        if (onChange) {
+          onChange(enhancedEvent);
+        }
+      } else {
+        const deletedFileName = legacyFileNames[index];
+        const filteredArray = legacyFileNames.filter(filename => filename !== deletedFileName);
+        setLegacyFileNames(filteredArray);
+
+        // Update File objects
+        setFileObjects(prevMap => {
+          const newMap = new Map(prevMap);
+          if (deletedFileName) {
+            newMap.delete(deletedFileName);
+          }
+          return newMap;
+        });
+        if (onDelete) {
+          onDelete(evt);
+        }
+      }
+      if (onClick) {
+        onClick(evt);
       }
-      onClick?.(evt);
+      uploaderButton.current?.focus?.();
     }
-  };
+  }, [enhancedFileUploaderEnabled, fileItems, legacyFileNames, onDelete, onChange, onClick]);
   React.useImperativeHandle(ref, () => ({
     clearFiles() {
-      updateState({
-        fileNames: []
-      });
-    }
-  }));
+      if (enhancedFileUploaderEnabled) {
+        const previousItems = [...fileItems];
+        setFileItems([]);
+        if (onChange && previousItems.length > 0) {
+          const enhancedEvent = {
+            target: {
+              files: Object.assign([], {
+                item: () => null
+              }),
+              clearedFiles: previousItems,
+              currentFiles: [],
+              action: 'clear'
+            },
+            preventDefault: () => {},
+            stopPropagation: () => {}
+          };
+          onChange(enhancedEvent);
+        }
+      } else {
+        setLegacyFileNames([]);
+        setFileObjects(new Map());
+      }
+    },
+    ...(enhancedFileUploaderEnabled && {
+      getCurrentFiles() {
+        return [...fileItems];
+      }
+    })
+  }), [enhancedFileUploaderEnabled, fileItems, onChange]);
   const uploaderButton = /*#__PURE__*/React.createRef();
   const classes = cx({
     [`${prefix}--form-item`]: true,
@@ -93,6 +198,15 @@ const FileUploader = /*#__PURE__*/React.forwardRef(({
     [`${prefix}--file__selected-file--md`]: size === 'field' || size === 'md',
     [`${prefix}--file__selected-file--sm`]: size === 'small' || size === 'sm'
   });
+  const displayFiles = enhancedFileUploaderEnabled ? fileItems.map((item, index) => ({
+    name: item.name,
+    key: item.uuid,
+    index
+  })) : legacyFileNames.map((name, index) => ({
+    name,
+    key: index,
+    index
+  }));
   return /*#__PURE__*/React.createElement("div", _rollupPluginBabelHelpers.extends({
     className: classes
   }, other), !labelTitle ? null : /*#__PURE__*/React.createElement(Text.Text, {
@@ -116,32 +230,32 @@ const FileUploader = /*#__PURE__*/React.forwardRef(({
     "aria-describedby": fileUploaderInstanceId
   }), /*#__PURE__*/React.createElement("div", {
     className: `${prefix}--file-container`
-  }, state.fileNames.length === 0 ? null : state.fileNames.map((name, index) => /*#__PURE__*/React.createElement("span", _rollupPluginBabelHelpers.extends({
-    key: index,
+  }, displayFiles.length === 0 ? null : displayFiles.map(file => /*#__PURE__*/React.createElement("span", _rollupPluginBabelHelpers.extends({
+    key: file.key,
     className: selectedFileClasses,
     ref: node => {
-      nodes[index] = node;
-    } // eslint-disable-line
+      nodes[file.index] = node;
+    }
   }, other), /*#__PURE__*/React.createElement(Text.Text, {
     as: "p",
     className: `${prefix}--file-filename`,
-    id: name
-  }, name), /*#__PURE__*/React.createElement("span", {
+    id: enhancedFileUploaderEnabled ? `${fileUploaderInstanceId}-file-${fileItems[file.index]?.uuid || file.index}` : `${fileUploaderInstanceId}-file-${file.index}`
+  }, file.name), /*#__PURE__*/React.createElement("span", {
     className: `${prefix}--file__state-container`
   }, /*#__PURE__*/React.createElement(Filename.default, {
-    name: name,
+    name: file.name,
     iconDescription: iconDescription,
     status: filenameStatus,
     onKeyDown: evt => {
       if (match.matches(evt, [keys.Enter, keys.Space])) {
         handleClick(evt, {
-          index,
+          index: file.index,
           filenameStatus
         });
       }
     },
     onClick: evt => handleClick(evt, {
-      index,
+      index: file.index,
       filenameStatus
     })
   }))))));
@@ -211,7 +325,7 @@ FileUploader.propTypes = {
    * Specify the size of the FileUploaderButton, from a list of available
    * sizes.
    */
-  size: PropTypes.oneOf(['sm', 'md', 'lg'])
+  size: PropTypes.oneOf(['sm', 'small', 'md', 'field', 'lg'])
 };
 
 exports.default = FileUploader;

package/lib/components/Menu/MenuItem.js

@@ -51,7 +51,8 @@ const MenuItem = /*#__PURE__*/React.forwardRef(function MenuItem({
     middleware: [react.offset({
       mainAxis: -6,
       crossAxis: -6
-    })]
+    })],
+    strategy: 'fixed'
   });
   const {
     getReferenceProps,

package/lib/components/Modal/Modal.js

@@ -19,7 +19,7 @@ var Button = require('../Button/Button.js');
 require('../Button/Button.Skeleton.js');
 var ButtonSet = require('../ButtonSet/ButtonSet.js');
 var InlineLoading = require('../InlineLoading/InlineLoading.js');
-var index$4 = require('../Layer/index.js');
+var index$3 = require('../Layer/index.js');
 var requiredIfGivenPropIsTruthy = require('../../prop-types/requiredIfGivenPropIsTruthy.js');
 var wrapFocus = require('../../internal/wrapFocus.js');
 var useIsomorphicEffect = require('../../internal/useIsomorphicEffect.js');
@@ -28,13 +28,13 @@ var usePrefix = require('../../internal/usePrefix.js');
 var usePreviousValue = require('../../internal/usePreviousValue.js');
 var keys = require('../../internal/keyboard/keys.js');
 var match = require('../../internal/keyboard/match.js');
-var index$3 = require('../IconButton/index.js');
+var index$2 = require('../IconButton/index.js');
 var noopFn = require('../../internal/noopFn.js');
 require('../Text/index.js');
 var index = require('../FeatureFlags/index.js');
 var events = require('../../tools/events.js');
 var deprecate = require('../../prop-types/deprecate.js');
-var index$2 = require('../Dialog/index.js');
+var Dialog = require('../Dialog/Dialog.js');
 var index$1 = require('../AILabel/index.js');
 var utils = require('../../internal/utils.js');
 var warning = require('../../internal/warning.js');
@@ -42,7 +42,7 @@ var debounce = require('../../node_modules/es-toolkit/dist/compat/function/debou
 var Text = require('../Text/Text.js');
 
 const ModalSizes = ['xs', 'sm', 'md', 'lg'];
-const invalidOutsideClickMessage = '`Modal`: `preventCloseOnClickOutside` should not be `false` when `passiveModal` is `false`. Non-passive `Modal`s should not be dismissible by clicking outside.';
+const invalidOutsideClickMessage = '`<Modal>` prop `preventCloseOnClickOutside` should not be `false` when ' + '`passiveModal` is `false`. Transactional, non-passive Modals should ' + 'not be dissmissable by clicking outside. ' + 'See: https://carbondesignsystem.com/components/modal/usage/#transactional-modal';
 const Modal = /*#__PURE__*/React.forwardRef(function Modal({
   'aria-label': ariaLabelProp,
   children,
@@ -68,7 +68,7 @@ const Modal = /*#__PURE__*/React.forwardRef(function Modal({
   size,
   hasScrollingContent = false,
   closeButtonLabel = 'Close',
-  preventCloseOnClickOutside = !passiveModal,
+  preventCloseOnClickOutside,
   isFullWidth,
   launcherButtonRef,
   loadingStatus = 'inactive',
@@ -100,9 +100,7 @@ const Modal = /*#__PURE__*/React.forwardRef(function Modal({
   const focusTrapWithoutSentinels = index.useFeatureFlag('enable-experimental-focus-wrap-without-sentinels');
   const enableDialogElement = index.useFeatureFlag('enable-dialog-element');
   process.env.NODE_ENV !== "production" ? warning.warning(!(focusTrapWithoutSentinels && enableDialogElement), '`<Modal>` detected both `focusTrapWithoutSentinels` and ' + '`enableDialogElement` feature flags are enabled. The native dialog ' + 'element handles focus, so `enableDialogElement` must be off for ' + '`focusTrapWithoutSentinels` to have any effect.') : void 0;
-  if (!passiveModal && preventCloseOnClickOutside === false) {
-    console.error(invalidOutsideClickMessage);
-  }
+  process.env.NODE_ENV !== "production" ? warning.warning(!(!passiveModal && preventCloseOnClickOutside === false), invalidOutsideClickMessage) : void 0;
   function isCloseButton(element) {
     return !onSecondarySubmit && element === secondaryButton.current || element.classList.contains(modalCloseButtonClass);
   }
@@ -129,7 +127,15 @@ const Modal = /*#__PURE__*/React.forwardRef(function Modal({
       target
     } = evt;
     evt.stopPropagation();
-    if (!preventCloseOnClickOutside && target instanceof Node && !wrapFocus.elementOrParentIsFloatingMenu(target, selectorsFloatingMenus) && innerModal.current && !innerModal.current.contains(target)) {
+    const shouldCloseOnOutsideClick =
+    // Passive modals can close on clicks outside the modal when
+    // preventCloseOnClickOutside is undefined or explicitly set to false.
+    passiveModal && !preventCloseOnClickOutside ||
+    // Non-passive modals have to explicitly opt-in for close on outside
+    // behavior by explicitly setting preventCloseOnClickOutside to false,
+    // rather than just leaving it undefined.
+    !passiveModal && preventCloseOnClickOutside === false;
+    if (shouldCloseOnOutsideClick && target instanceof Node && !wrapFocus.elementOrParentIsFloatingMenu(target, selectorsFloatingMenus) && innerModal.current && !innerModal.current.contains(target)) {
       onRequestClose(evt);
     }
   }
@@ -301,7 +307,7 @@ const Modal = /*#__PURE__*/React.forwardRef(function Modal({
   }) : null;
   const modalButton = /*#__PURE__*/React.createElement("div", {
     className: `${prefix}--modal-close-button`
-  }, /*#__PURE__*/React.createElement(index$3.IconButton, {
+  }, /*#__PURE__*/React.createElement(index$2.IconButton, {
     className: modalCloseButtonClass,
     label: closeButtonLabel,
     onClick: onRequestClose,
@@ -318,7 +324,7 @@ const Modal = /*#__PURE__*/React.forwardRef(function Modal({
   // alertdialog is the only permitted aria role for a native dialog element
   // https://www.w3.org/TR/html-aria/#docconformance:~:text=Role%3A-,alertdialog,-.%20(dialog%20is
   const isAlertDialog = alert && !passiveModal;
-  const modalBody = enableDialogElement ? /*#__PURE__*/React.createElement(index$2.unstable__Dialog, {
+  const modalBody = enableDialogElement ? /*#__PURE__*/React.createElement(Dialog.Dialog, {
     open: open,
     focusAfterCloseRef: launcherButtonRef,
     modal: true,
@@ -341,7 +347,7 @@ const Modal = /*#__PURE__*/React.forwardRef(function Modal({
     className: `${prefix}--modal--inner__decorator`
   }, normalizedDecorator) : '', /*#__PURE__*/React.createElement("div", {
     className: `${prefix}--modal-close-button`
-  }, /*#__PURE__*/React.createElement(index$3.IconButton, {
+  }, /*#__PURE__*/React.createElement(index$2.IconButton, {
     className: modalCloseButtonClass,
     label: closeButtonLabel,
     onClick: onRequestClose,
@@ -353,7 +359,7 @@ const Modal = /*#__PURE__*/React.forwardRef(function Modal({
     "aria-hidden": "true",
     tabIndex: "-1",
     className: `${modalCloseButtonClass}__icon`
-  })))), /*#__PURE__*/React.createElement(index$4.Layer, _rollupPluginBabelHelpers.extends({
+  })))), /*#__PURE__*/React.createElement(index$3.Layer, _rollupPluginBabelHelpers.extends({
     ref: contentRef,
     id: modalBodyId,
     className: contentClasses
@@ -409,7 +415,7 @@ const Modal = /*#__PURE__*/React.forwardRef(function Modal({
     className: `${prefix}--modal-header__heading`
   }, modalHeading), slug ? normalizedDecorator : decorator ? /*#__PURE__*/React.createElement("div", {
     className: `${prefix}--modal--inner__decorator`
-  }, normalizedDecorator) : '', !passiveModal && modalButton), /*#__PURE__*/React.createElement(index$4.Layer, _rollupPluginBabelHelpers.extends({
+  }, normalizedDecorator) : '', !passiveModal && modalButton), /*#__PURE__*/React.createElement(index$3.Layer, _rollupPluginBabelHelpers.extends({
     ref: contentRef,
     id: modalBodyId,
     className: contentClasses
@@ -446,7 +452,7 @@ const Modal = /*#__PURE__*/React.forwardRef(function Modal({
     role: "link",
     className: `${prefix}--visually-hidden`
   }, "Focus sentinel"));
-  return /*#__PURE__*/React.createElement(index$4.Layer, _rollupPluginBabelHelpers.extends({}, rest, {
+  return /*#__PURE__*/React.createElement(index$3.Layer, _rollupPluginBabelHelpers.extends({}, rest, {
     level: 0,
     onKeyDown: handleKeyDown,
     onClick: events.composeEventHandlers([rest?.onClick, handleOnClick]),

package/lib/components/NumberInput/NumberInput.js

@@ -175,11 +175,16 @@ const NumberInput = /*#__PURE__*/React.forwardRef(function NumberInput(props, fo
     [`${prefix}--number__invalid`]: normalizedProps.invalid || normalizedProps.warn,
     [`${prefix}--number__invalid--warning`]: normalizedProps.warn
   });
-  if (controlledValue !== prevControlledValue && !(isNaN(Number(controlledValue)) === isNaN(Number(prevControlledValue)))) {
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    setValue(controlledValue);
-    setPrevControlledValue(controlledValue);
-  }
+  React.useEffect(() => {
+    if (type === 'number' && controlledValue !== undefined) {
+      if (allowEmpty && controlledValue === '') {
+        setValue('');
+      } else {
+        setValue(controlledValue);
+      }
+      setPrevControlledValue(controlledValue);
+    }
+  }, [controlledValue, type, allowEmpty]);
   let ariaDescribedBy = undefined;
   if (normalizedProps.invalid) {
     ariaDescribedBy = normalizedProps.invalidId;

package/lib/components/Popover/index.js

@@ -63,8 +63,12 @@ forwardRef) {
   // The `Popover` should close whenever it and its children loses focus
   useEvent.useEvent(popover, 'focusout', event => {
     const relatedTarget = event.relatedTarget;
-
-    // No relatedTarget, focus moved to nowhere, so close the popover
+    if (isTabTip) {
+      if (relatedTarget && !popover.current?.contains(relatedTarget)) {
+        onRequestClose?.();
+      }
+      return;
+    }
     if (!relatedTarget) {
       onRequestClose?.();
       return;

package/lib/components/StructuredList/StructuredList.js

@@ -191,8 +191,10 @@ function StructuredListRow(props) {
         setHasFocusWithin(true);
       }
     },
-    onFocus: () => {
-      setHasFocusWithin(true);
+    onFocus: event => {
+      if (selection || event.currentTarget === event.target) {
+        setHasFocusWithin(true);
+      }
     },
     onBlur: () => {
       setHasFocusWithin(false);

package/lib/components/Tag/DismissibleTag.d.ts

@@ -7,6 +7,7 @@
 import React, { type ReactNode } from 'react';
 import { PolymorphicProps } from '../../types/common';
 import { SIZES, TYPES } from './Tag';
+import { PopoverAlignment } from '../Popover';
 export interface DismissibleTagBaseProps {
     /**
      * Provide a custom className that is applied to the containing <span>
@@ -20,6 +21,10 @@ export interface DismissibleTagBaseProps {
      * Specify if the `DismissibleTag` is disabled
      */
     disabled?: boolean;
+    /**
+     * Specify the tooltip alignment for the dismiss button
+     */
+    dismissTooltipAlignment?: PopoverAlignment;
     /**
      * Provide a custom tooltip label for the dismiss button
      */

package/lib/components/Tag/DismissibleTag.js

@@ -41,6 +41,7 @@ const DismissibleTag = /*#__PURE__*/React.forwardRef(({
   text,
   tagTitle,
   type,
+  dismissTooltipAlignment = 'bottom',
   dismissTooltipLabel = 'Dismiss tag',
   ...other
 }, forwardRef) => {
@@ -92,7 +93,7 @@ const DismissibleTag = /*#__PURE__*/React.forwardRef(({
     className: `${prefix}--tag__decorator`
   }, normalizedDecorator) : '', /*#__PURE__*/React.createElement(Tooltip.Tooltip, {
     label: dismissActionLabel,
-    align: "bottom",
+    align: dismissTooltipAlignment,
     className: tooltipClasses,
     leaveDelayMs: 0,
     closeOnActivation: true
@@ -117,6 +118,10 @@ DismissibleTag.propTypes = {
    * Specify if the `DismissibleTag` is disabled
    */
   disabled: PropTypes.bool,
+  /**
+   * Specify the tooltip alignment for the dismiss button
+   */
+  dismissTooltipAlignment: PropTypes.oneOf(['top', 'bottom', 'left', 'right', 'top-start', 'top-end', 'bottom-start', 'bottom-end', 'left-end', 'left-start', 'right-end', 'right-start']),
   /**
    * Provide a custom tooltip label for the dismiss button
    */

package/lib/components/Toggletip/index.js

@@ -102,6 +102,7 @@ function Toggletip({
   };
   const onKeyDown = event => {
     if (open && match.match(event, keys.Escape)) {
+      event.stopPropagation();
       actions.close();
 
       // If the menu is closed while focus is still inside the menu, it should return to the trigger button  (#12922)
@@ -128,13 +129,24 @@ function Toggletip({
       actions.close();
     }
   });
-  useEvent.useWindowEvent('click', ({
-    target
-  }) => {
-    if (open && target instanceof Node && !ref.current?.contains(target)) {
-      actions.close();
-    }
-  });
+  React.useEffect(() => {
+    if (!ref.current) return;
+    const targetDocument = ref.current.ownerDocument || document;
+    const eventType = 'PointerEvent' in window ? 'pointerdown' : 'mousedown';
+    const handleOutsideClick = event => {
+      const node = event.target;
+      if (open && node && !ref.current.contains(node)) {
+        setOpen(false);
+      }
+    };
+    const options = {
+      capture: true
+    };
+    targetDocument.addEventListener(eventType, handleOutsideClick, options);
+    return () => {
+      targetDocument.removeEventListener(eventType, handleOutsideClick, options);
+    };
+  }, [open]);
   return /*#__PURE__*/React.createElement(ToggletipContext.Provider, {
     value: value
   }, /*#__PURE__*/React.createElement(index.Popover, _rollupPluginBabelHelpers.extends({