Skip to content
Merged
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
8 changes: 6 additions & 2 deletions scripts/toolbarCustomizationWiring.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,13 @@ test('settings modal uses a dedicated resize handle instead of native CSS resize
assert.match(settingsComponent, /\.settings-modal[\s\S]*max-height:/);
});

test('settings modal can be dragged by the header and resized from every edge', () => {
test('settings modal starts dragging only from the non-interactive header surface', () => {
assert.match(settingsComponent, /handleSettingsModalDragPointerDown/);
assert.match(settingsComponent, /class="settings-header"[\s\S]*onpointerdown=\{handleSettingsModalDragPointerDown\}/);
assert.match(settingsComponent, /class="settings-modal"[\s\S]*onpointerdown=\{handleSettingsModalDragPointerDown\}/);
assert.match(settingsComponent, /closest\('\.settings-header'\)/);
assert.doesNotMatch(settingsComponent, /class="settings-header"[^>]*onpointerdown=/);
assert.match(settingsComponent, /isSettingsHeaderInteractiveTarget\(e\.target\)/);

assert.match(settingsComponent, /settingsResizeHandles/);
for (const handleClass of ['resize-n', 'resize-ne', 'resize-e', 'resize-se', 'resize-s', 'resize-sw', 'resize-w', 'resize-nw']) {
assert.match(settingsComponent, new RegExp(`className: '${handleClass}'`));
Expand Down
6 changes: 4 additions & 2 deletions src/lib/components/Settings.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,8 @@
}

function handleSettingsModalDragPointerDown(e: PointerEvent) {
if (e.button !== 0 || isSettingsHeaderInteractiveTarget(e.target)) return;
const header = e.target instanceof HTMLElement ? e.target.closest('.settings-header') : null;
if (e.button !== 0 || !header || !settingsModal?.contains(header) || isSettingsHeaderInteractiveTarget(e.target)) return;
const frame = getCurrentSettingsModalFrame();
if (!frame) return;

Expand Down Expand Up @@ -575,8 +576,9 @@
aria-modal="true"
aria-labelledby="settings-title"
tabindex="-1"
onpointerdown={handleSettingsModalDragPointerDown}
onkeydown={handleModalKeydown}>
<div class="settings-header" onpointerdown={handleSettingsModalDragPointerDown}>
<div class="settings-header">
<h1 id="settings-title">{t('settings.title', settings.language)}</h1>
<button class="close-btn" onclick={onclose} aria-label={t('common.close', settings.language)}>
<svg
Expand Down
Loading