Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions scripts/menuModalGuards.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import assert from 'node:assert/strict';
import { readFileSync } from 'node:fs';
import test from 'node:test';

const viewer = readFileSync(new URL('../src/lib/MarkdownViewer.svelte', import.meta.url), 'utf8');
const titleBar = readFileSync(new URL('../src/lib/components/TitleBar.svelte', import.meta.url), 'utf8');
const modal = readFileSync(new URL('../src/lib/components/Modal.svelte', import.meta.url), 'utf8');

test('document context menus do not open while a modal is active', () => {
assert.match(
viewer,
/function handleContextMenu\(e: MouseEvent\) \{\n\t\tif \(modalState\.show\) return;/,
);
});

test('titlebar menus close before a document context menu opens', () => {
assert.match(titleBar, /window\.addEventListener\('contextmenu', handleGlobalDismiss\)/);
assert.match(titleBar, /window\.addEventListener\('blur', handleGlobalDismiss\)/);
});

test('modal backdrop consumes context-menu events', () => {
assert.match(modal, /oncontextmenu=\{\(e\) => \{ e\.preventDefault\(\); e\.stopPropagation\(\); \}\}/);
});
1 change: 1 addition & 0 deletions src/lib/MarkdownViewer.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -2093,6 +2093,7 @@ import { t } from './utils/i18n.js';
}

function handleContextMenu(e: MouseEvent) {
if (modalState.show) return;
if (mode !== 'app') return;
e.preventDefault();

Expand Down
7 changes: 6 additions & 1 deletion src/lib/components/Modal.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,12 @@
</script>

{#if show}
<div class="modal-backdrop" transition:fade={{ duration: 150 }} onclick={handleBackdropClick} role="presentation">
<div
class="modal-backdrop"
transition:fade={{ duration: 150 }}
onclick={handleBackdropClick}
oncontextmenu={(e) => { e.preventDefault(); e.stopPropagation(); }}
role="presentation">
<div
class="modal-content {kind}"
bind:this={modalContent}
Expand Down
19 changes: 12 additions & 7 deletions src/lib/components/TitleBar.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -275,17 +275,22 @@
themeMenuOpen = false;
}

function handleGlobalDismiss() {
themeMenuOpen = false;
kebabMenuOpen = false;
homeMenuOpen = false;
}

$effect(() => {
const handleGlobalClick = () => {
themeMenuOpen = false;
kebabMenuOpen = false;
homeMenuOpen = false;
};
if (themeMenuOpen || kebabMenuOpen || homeMenuOpen) {
window.addEventListener('click', handleGlobalClick);
window.addEventListener('click', handleGlobalDismiss);
window.addEventListener('contextmenu', handleGlobalDismiss);
window.addEventListener('blur', handleGlobalDismiss);
}
return () => {
window.removeEventListener('click', handleGlobalClick);
window.removeEventListener('click', handleGlobalDismiss);
window.removeEventListener('contextmenu', handleGlobalDismiss);
window.removeEventListener('blur', handleGlobalDismiss);
};
});
</script>
Expand Down
Loading