steven/gpx.studio
1
0
Fork 0
mirror of https://github.com/gpxstudio/gpx.studio.git synced 2025-11-04 21:41:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix copied & cut stores

Browse Source
This commit is contained in:
vcoppe
2025-10-18 09:36:55 +02:00
parent 4ae0bc25c2
commit 9fa8fe5767
5 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
website/src/lib/components/Menu.svelte
View File

@@ -71,7 +71,7 @@
} from '$lib/logic/file-actions';
import { fileStateCollection } from '$lib/logic/file-state';
import { fileActionManager } from '$lib/logic/file-action-manager';
import { selection } from '$lib/logic/selection';
import { copied, selection } from '$lib/logic/selection';
const {
distanceUnits,
@@ -317,10 +317,10 @@
<Shortcut key="X" ctrl={true} />
</Menubar.Item>
<Menubar.Item
disabled={selection.copied === undefined ||
selection.copied.length === 0 ||
disabled={$copied === undefined ||
$copied.length === 0 ||
($selection.size > 0 &&
!allowedPastes[selection.copied[0].level].includes(
!allowedPastes[$copied[0].level].includes(
$selection.getSelected().pop()?.level
))}
onclick={pasteSelection}

8
website/src/lib/components/file-list/FileList.svelte
View File

@@ -10,7 +10,7 @@
import { settings } from '$lib/logic/settings';
import { fileStateCollection } from '$lib/logic/file-state';
import { createFile, pasteSelection } from '$lib/logic/file-actions';
import { selection } from '$lib/logic/selection';
import { selection, copied } from '$lib/logic/selection';
let {
orientation,
@@ -86,9 +86,9 @@
</ContextMenu.Item>
<ContextMenu.Separator />
<ContextMenu.Item
disabled={selection.copied === undefined ||
selection.copied.length === 0 ||
!allowedPastes[selection.copied[0].level].includes(ListLevel.ROOT)}
disabled={$copied === undefined ||
$copied.length === 0 ||
!allowedPastes[$copied[0].level].includes(ListLevel.ROOT)}
onclick={pasteSelection}
>
<ClipboardPaste size="16" class="mr-1" />

11
website/src/lib/components/file-list/FileListNodeLabel.svelte
View File

@@ -37,7 +37,7 @@
import { editStyle } from '$lib/components/file-list/style/utils.svelte';
import { waypointPopup } from '$lib/components/map/gpx-layer/GPXLayerPopup';
import { getSymbolKey, symbols } from '$lib/assets/symbols';
import { selection } from '$lib/logic/selection';
import { selection, copied, cut } from '$lib/logic/selection';
import { map } from '$lib/components/map/map';
import { fileActions, pasteSelection } from '$lib/logic/file-actions';
@@ -151,8 +151,7 @@
<span
class="w-full text-left truncate py-1 flex flex-row items-center {hidden
? 'text-muted-foreground'
: ''} {selection.cut &&
selection.copied?.some((i) => i.getFullId() === item.getFullId())
: ''} {$cut && $copied?.some((i) => i.getFullId() === item.getFullId())
? 'text-muted-foreground'
: ''}"
oncontextmenu={(e) => {
@@ -310,9 +309,9 @@
<Shortcut key="X" ctrl={true} />
</ContextMenu.Item>
<ContextMenu.Item
disabled={selection.copied === undefined ||
selection.copied.length === 0 ||
!allowedPastes[selection.copied[0].level].includes(item.level)}
disabled={$copied === undefined ||
$copied.length === 0 ||
!allowedPastes[$copied[0].level].includes(item.level)}
onclick={pasteSelection}
>
<ClipboardPaste size="16" class="mr-1" />