chore: merge

This commit is contained in:
Mo
2023-07-05 10:54:16 -05:00
13 changed files with 39 additions and 6 deletions

View File

@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [3.165.1](https://github.com/standardnotes/app/compare/@standardnotes/web@3.165.0...@standardnotes/web@3.165.1) (2023-07-05)
**Note:** Version bump only for package @standardnotes/web
# [3.165.0](https://github.com/standardnotes/app/compare/@standardnotes/web@3.164.3...@standardnotes/web@3.165.0) (2023-07-04)
**Note:** Version bump only for package @standardnotes/web

View File

@@ -1,5 +1,16 @@
{
"versions": [
{
"version": "3.165.1",
"title": "[3.165.1](https://github.com/standardnotes/app/compare/@standardnotes/web@3.165.0...@standardnotes/web@3.165.1) (2023-07-05)",
"date": null,
"body": "**Note:** Version bump only for package @standardnotes/web",
"parsed": {
"_": [
"Note: Version bump only for package @standardnotes/web"
]
}
},
{
"version": "3.164.3",
"title": "[3.164.3](https://github.com/standardnotes/app/compare/@standardnotes/web@3.164.2...@standardnotes/web@3.164.3) (2023-07-04)",

View File

@@ -1,6 +1,6 @@
{
"name": "@standardnotes/web",
"version": "3.165.0",
"version": "3.165.1",
"license": "AGPL-3.0-or-later",
"main": "dist/app.js",
"author": "Standard Notes",

View File

@@ -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) {