fix(ui-popover,ui-tooltip): tooltips should close when esc is pressed

instructure · Nov 22, 2024 · d91de1c · d91de1c
1 parent 0c00612
commit d91de1c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/packages/ui-popover/src/Popover/index.tsx b/packages/ui-popover/src/Popover/index.tsx
@@ -181,7 +181,7 @@ class Popover extends Component<PopoverProps, PopoverState> {
       // manage its FocusRegion internally rather than registering it with
       // the FocusRegionManager via Dialog
       this._focusRegion = new FocusRegion(this._contentElement, {
-        shouldCloseOnEscape: false,
+        shouldCloseOnEscape: this.props.shouldCloseOnEscape,
         shouldCloseOnDocumentClick: false,
         onDismiss: this.hide
       })

diff --git a/packages/ui-tooltip/src/Tooltip/index.tsx b/packages/ui-tooltip/src/Tooltip/index.tsx
@@ -175,6 +175,7 @@ class Tooltip extends Component<TooltipProps, TooltipState> {
         onBlur={this.handleBlur}
         elementRef={this.handleRef}
         shouldCloseOnDocumentClick={false}
+        shouldCloseOnEscape
       >
         <span id={this._id} css={styles?.tooltip} role="tooltip">
           {/* TODO: figure out how to add a ref to this */}