From 2611c88cee89d54a567248a8da1a3831cc6433d6 Mon Sep 17 00:00:00 2001 From: Aman Harwara Date: Wed, 5 Jul 2023 20:43:55 +0530 Subject: [PATCH 1/2] chore: fix modal positioning when using themed desktop titlebar --- packages/desktop/app/javascripts/Renderer/Renderer.ts | 2 +- .../Components/Popover/Utils/usePopoverCloseOnClickOutside.ts | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/desktop/app/javascripts/Renderer/Renderer.ts b/packages/desktop/app/javascripts/Renderer/Renderer.ts index a0b37f6bd..f3f1a2614 100644 --- a/packages/desktop/app/javascripts/Renderer/Renderer.ts +++ b/packages/desktop/app/javascripts/Renderer/Renderer.ts @@ -128,7 +128,7 @@ async function configureWindow(remoteBridge: CrossProcessBridge) { /* Use custom title bar. Take the sn-titlebar-height off of the app content height so its not overflowing */ 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.insertRule( diff --git a/packages/web/src/javascripts/Components/Popover/Utils/usePopoverCloseOnClickOutside.ts b/packages/web/src/javascripts/Components/Popover/Utils/usePopoverCloseOnClickOutside.ts index 5010f101a..efed1f2e8 100644 --- 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) { From a52828cd450b7c617e103fbbea0cd761ff8dda21 Mon Sep 17 00:00:00 2001 From: StandardNotes CI Date: Wed, 5 Jul 2023 15:50:04 +0000 Subject: [PATCH 2/2] chore(release): publish - @standardnotes/clipper@1.1.70 - @standardnotes/desktop@3.108.1 - @standardnotes/mobile@3.54.5 - @standardnotes/releases@1.4.347 - @standardnotes/web@3.165.1 --- packages/clipper/CHANGELOG.md | 4 ++++ packages/clipper/package.json | 2 +- packages/desktop/CHANGELOG.md | 4 ++++ packages/desktop/package.json | 2 +- packages/mobile/CHANGELOG.md | 4 ++++ packages/mobile/package.json | 2 +- packages/releases/CHANGELOG.md | 4 ++++ packages/releases/package.json | 2 +- packages/web/CHANGELOG.md | 4 ++++ packages/web/CHANGELOG.md.json | 11 +++++++++++ packages/web/package.json | 2 +- 11 files changed, 36 insertions(+), 5 deletions(-) diff --git a/packages/clipper/CHANGELOG.md b/packages/clipper/CHANGELOG.md index adc0a3e37..5466a4d8f 100644 --- a/packages/clipper/CHANGELOG.md +++ b/packages/clipper/CHANGELOG.md @@ -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. +## [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) **Note:** Version bump only for package @standardnotes/clipper diff --git a/packages/clipper/package.json b/packages/clipper/package.json index dce554616..adceaae40 100644 --- a/packages/clipper/package.json +++ b/packages/clipper/package.json @@ -1,7 +1,7 @@ { "name": "@standardnotes/clipper", "description": "Web clipper browser extension for Standard Notes", - "version": "1.1.69", + "version": "1.1.70", "private": true, "scripts": { "build-mv2": "yarn clean && webpack --config ./webpack.config.prod.js", diff --git a/packages/desktop/CHANGELOG.md b/packages/desktop/CHANGELOG.md index f972587eb..534300555 100644 --- a/packages/desktop/CHANGELOG.md +++ b/packages/desktop/CHANGELOG.md @@ -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.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) ### Features diff --git a/packages/desktop/package.json b/packages/desktop/package.json index ed979c8ec..ff7cd985e 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "@standardnotes/desktop", "main": "./app/dist/index.js", - "version": "3.108.0", + "version": "3.108.1", "license": "AGPL-3.0-or-later", "author": "Standard Notes.", "private": true, diff --git a/packages/mobile/CHANGELOG.md b/packages/mobile/CHANGELOG.md index 8ba4b050f..8834021ca 100644 --- a/packages/mobile/CHANGELOG.md +++ b/packages/mobile/CHANGELOG.md @@ -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.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) **Note:** Version bump only for package @standardnotes/mobile diff --git a/packages/mobile/package.json b/packages/mobile/package.json index bf15cf173..a336a2f2a 100644 --- a/packages/mobile/package.json +++ b/packages/mobile/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/mobile", - "version": "3.54.4", + "version": "3.54.5", "author": "Standard Notes.", "private": true, "license": "AGPL-3.0-or-later", diff --git a/packages/releases/CHANGELOG.md b/packages/releases/CHANGELOG.md index c380fe17d..2081de978 100644 --- a/packages/releases/CHANGELOG.md +++ b/packages/releases/CHANGELOG.md @@ -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. +## [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) **Note:** Version bump only for package @standardnotes/releases diff --git a/packages/releases/package.json b/packages/releases/package.json index bd5250b48..3f5c0e4f8 100644 --- a/packages/releases/package.json +++ b/packages/releases/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/releases", - "version": "1.4.346", + "version": "1.4.347", "license": "AGPL-3.0-or-later", "main": "dist/releases.json", "types": "dist/index.d.ts", diff --git a/packages/web/CHANGELOG.md b/packages/web/CHANGELOG.md index 292336e66..d6da3a7e5 100644 --- a/packages/web/CHANGELOG.md +++ b/packages/web/CHANGELOG.md @@ -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) ### Features diff --git a/packages/web/CHANGELOG.md.json b/packages/web/CHANGELOG.md.json index 4e727844e..c37082f93 100644 --- a/packages/web/CHANGELOG.md.json +++ b/packages/web/CHANGELOG.md.json @@ -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.165.0", "title": "[3.165.0](https://github.com/standardnotes/app/compare/@standardnotes/web@3.164.3...@standardnotes/web@3.165.0) (2023-07-04)", diff --git a/packages/web/package.json b/packages/web/package.json index 953bb5284..9279a56e1 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -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",