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. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.1.70](https://github.com/standardnotes/app/compare/@standardnotes/clipper@1.1.69...@standardnotes/clipper@1.1.70) (2023-07-05)
**Note:** Version bump only for package @standardnotes/clipper
## [1.1.69](https://github.com/standardnotes/app/compare/@standardnotes/clipper@1.1.68...@standardnotes/clipper@1.1.69) (2023-07-04) ## [1.1.69](https://github.com/standardnotes/app/compare/@standardnotes/clipper@1.1.68...@standardnotes/clipper@1.1.69) (2023-07-04)
**Note:** Version bump only for package @standardnotes/clipper **Note:** Version bump only for package @standardnotes/clipper

View File

@@ -1,7 +1,7 @@
{ {
"name": "@standardnotes/clipper", "name": "@standardnotes/clipper",
"description": "Web clipper browser extension for Standard Notes", "description": "Web clipper browser extension for Standard Notes",
"version": "1.1.69", "version": "1.1.70",
"private": true, "private": true,
"scripts": { "scripts": {
"build-mv2": "yarn clean && webpack --config ./webpack.config.prod.js", "build-mv2": "yarn clean && webpack --config ./webpack.config.prod.js",

View File

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

View File

@@ -128,7 +128,7 @@ async function configureWindow(remoteBridge: CrossProcessBridge) {
/* Use custom title bar. Take the sn-titlebar-height off of /* Use custom title bar. Take the sn-titlebar-height off of
the app content height so its not overflowing */ the app content height so its not overflowing */
sheet.insertRule( sheet.insertRule(
'[role="dialog"] { position: relative; height: calc(100vh - var(--sn-desktop-titlebar-height)) !important; margin-top: var(--sn-desktop-titlebar-height) !important; }', '[role="dialog"] { height: calc(100vh - var(--sn-desktop-titlebar-height)) !important; top: var(--sn-desktop-titlebar-height); }',
sheet.cssRules.length, sheet.cssRules.length,
) )
sheet.insertRule( sheet.insertRule(

View File

@@ -1,7 +1,7 @@
{ {
"name": "@standardnotes/desktop", "name": "@standardnotes/desktop",
"main": "./app/dist/index.js", "main": "./app/dist/index.js",
"version": "3.108.0", "version": "3.108.1",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"author": "Standard Notes.", "author": "Standard Notes.",
"private": true, "private": true,

View File

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

View File

@@ -1,6 +1,6 @@
{ {
"name": "@standardnotes/mobile", "name": "@standardnotes/mobile",
"version": "3.54.4", "version": "3.54.5",
"author": "Standard Notes.", "author": "Standard Notes.",
"private": true, "private": true,
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",

View File

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

View File

@@ -1,6 +1,6 @@
{ {
"name": "@standardnotes/releases", "name": "@standardnotes/releases",
"version": "1.4.346", "version": "1.4.347",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"main": "dist/releases.json", "main": "dist/releases.json",
"types": "dist/index.d.ts", "types": "dist/index.d.ts",

View File

@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. 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) # [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 **Note:** Version bump only for package @standardnotes/web

View File

@@ -1,5 +1,16 @@
{ {
"versions": [ "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", "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)", "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", "name": "@standardnotes/web",
"version": "3.165.0", "version": "3.165.1",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"main": "dist/app.js", "main": "dist/app.js",
"author": "Standard Notes", "author": "Standard Notes",

View File

@@ -27,11 +27,13 @@ export const usePopoverCloseOnClickOutside = ({
const isDescendantOfChildPopover = closestPopoverId && childPopovers.has(closestPopoverId) const isDescendantOfChildPopover = closestPopoverId && childPopovers.has(closestPopoverId)
const isPopoverInModal = popoverElement?.closest('[data-dialog], .sk-modal') const isPopoverInModal = popoverElement?.closest('[data-dialog], .sk-modal')
const isDescendantOfModal = isPopoverInModal ? false : !!target.closest('[data-dialog], .sk-modal') const isDescendantOfModal = isPopoverInModal ? false : !!target.closest('[data-dialog], .sk-modal')
const isDescendantOfDesktopTitlebar = !!target.closest('#desktop-title-bar')
if ( if (
!isDescendantOfMenu && !isDescendantOfMenu &&
!isAnchorElement && !isAnchorElement &&
!isDescendantOfChildPopover && !isDescendantOfChildPopover &&
!isDescendantOfDesktopTitlebar &&
(!isDescendantOfModal || (isDescendantOfModal && hideOnClickInModal)) (!isDescendantOfModal || (isDescendantOfModal && hideOnClickInModal))
) { ) {
if (!disabled) { if (!disabled) {