Merge pull request desktop#19106 from desktop/fix-clear-button-in-pre…

…view-pull-request Stop Popover from closing if mouse event is prevented
shiftkey · Aug 14, 2024 · cbb650a · cbb650a
2 parents c6543c8 + 036d074
commit cbb650a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/app/src/ui/lib/popover.tsx b/app/src/ui/lib/popover.tsx
@@ -200,6 +200,7 @@ export class Popover extends React.Component<IPopoverProps, IPopoverState> {
     const { target } = event
 
     if (
+      !event.defaultPrevented &&
       ref !== null &&
       ref.parentElement !== null &&
       target instanceof Node &&
@@ -215,6 +216,7 @@ export class Popover extends React.Component<IPopoverProps, IPopoverState> {
     const { target } = event
 
     if (
+      !event.defaultPrevented &&
       ref !== null &&
       ref.parentElement !== null &&
       target instanceof Node &&

diff --git a/app/src/ui/lib/text-box.tsx b/app/src/ui/lib/text-box.tsx
@@ -206,7 +206,9 @@ export class TextBox extends React.Component<ITextBoxProps, ITextBoxState> {
     this.props.onSearchCleared?.()
   }
 
-  private clearSearchText = () => {
+  private clearSearchText = (e: React.MouseEvent) => {
+    e.preventDefault()
+
     if (this.inputElement === null) {
       return
     }