chore: merge

2023-07-05 10:54:16 -05:00
parent c9c93d143a a52828cd45
commit 40f0d3d5bf
13 changed files with 39 additions and 6 deletions
--- a/packages/web/src/javascripts/Components/Popover/Utils/usePopoverCloseOnClickOutside.ts
+++ b/packages/web/src/javascripts/Components/Popover/Utils/usePopoverCloseOnClickOutside.ts
@@ -27,11 +27,13 @@ export const usePopoverCloseOnClickOutside = ({
      const isDescendantOfChildPopover = closestPopoverId && childPopovers.has(closestPopoverId)
      const isPopoverInModal = popoverElement?.closest('[data-dialog], .sk-modal')
      const isDescendantOfModal = isPopoverInModal ? false : !!target.closest('[data-dialog], .sk-modal')
+      const isDescendantOfDesktopTitlebar = !!target.closest('#desktop-title-bar')

      if (
        !isDescendantOfMenu &&
        !isAnchorElement &&
        !isDescendantOfChildPopover &&
+        !isDescendantOfDesktopTitlebar &&
        (!isDescendantOfModal || (isDescendantOfModal && hideOnClickInModal))
      ) {
        if (!disabled) {