rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: fix modal positioning when using themed desktop titlebar

Browse Source
This commit is contained in:
Aman Harwara
2023-07-05 20:43:55 +05:30
parent d4db3e055c
commit 2611c88cee
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/desktop/app/javascripts/Renderer/Renderer.ts
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(

2
packages/web/src/javascripts/Components/Popover/Utils/usePopoverCloseOnClickOutside.ts
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) {