fix menu not closing

This commit is contained in:
vcoppe
2025-10-25 15:05:11 +02:00
parent 6db8696a36
commit 30981130c9

View File

@@ -74,6 +74,7 @@
import { copied, selection } from '$lib/logic/selection'; import { copied, selection } from '$lib/logic/selection';
import { allHidden } from '$lib/logic/hidden'; import { allHidden } from '$lib/logic/hidden';
import { boundsManager } from '$lib/logic/bounds'; import { boundsManager } from '$lib/logic/bounds';
import { tick } from 'svelte';
const { const {
distanceUnits, distanceUnits,
@@ -91,6 +92,9 @@
routing, routing,
} = settings; } = settings;
const canUndo = fileActionManager.canUndo;
const canRedo = fileActionManager.canRedo;
function switchBasemaps() { function switchBasemaps() {
[$currentBasemap, $previousBasemap] = [$previousBasemap, $currentBasemap]; [$currentBasemap, $previousBasemap] = [$previousBasemap, $currentBasemap];
} }
@@ -143,7 +147,7 @@
</Menubar.Item> </Menubar.Item>
<Menubar.Separator /> <Menubar.Separator />
<Menubar.Item <Menubar.Item
onclick={fileActions.deleteSelectedFiles} onclick={() => tick().then(fileActions.deleteSelectedFiles)}
disabled={$selection.size == 0} disabled={$selection.size == 0}
> >
<FileX size="16" /> <FileX size="16" />
@@ -183,18 +187,12 @@
<span class="hidden md:block">{i18n._('menu.edit')}</span> <span class="hidden md:block">{i18n._('menu.edit')}</span>
</Menubar.Trigger> </Menubar.Trigger>
<Menubar.Content class="border-none"> <Menubar.Content class="border-none">
<Menubar.Item <Menubar.Item onclick={() => fileActionManager.undo()} disabled={!$canUndo}>
onclick={() => fileActionManager.undo()}
disabled={!fileActionManager.canUndo}
>
<Undo2 size="16" /> <Undo2 size="16" />
{i18n._('menu.undo')} {i18n._('menu.undo')}
<Shortcut key="Z" ctrl={true} /> <Shortcut key="Z" ctrl={true} />
</Menubar.Item> </Menubar.Item>
<Menubar.Item <Menubar.Item onclick={() => fileActionManager.redo()} disabled={!$canRedo}>
onclick={() => fileActionManager.redo()}
disabled={!fileActionManager.canRedo}
>
<Redo2 size="16" /> <Redo2 size="16" />
{i18n._('menu.redo')} {i18n._('menu.redo')}
<Shortcut key="Z" ctrl={true} shift={true} /> <Shortcut key="Z" ctrl={true} shift={true} />
@@ -335,7 +333,7 @@
{/if} {/if}
<Menubar.Separator /> <Menubar.Separator />
<Menubar.Item <Menubar.Item
onclick={fileActions.deleteSelection} onclick={() => tick().then(fileActions.deleteSelection)}
disabled={$selection.size == 0} disabled={$selection.size == 0}
> >
<Trash2 size="16" /> <Trash2 size="16" />