Skip to content

feat: resolve copy name conflicts #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 30, 2025
Merged

feat: resolve copy name conflicts #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1856ca
feat: resolve copy name conflicts
abdel-17 Nov 30, 2025
420c301
preview: update name resolution logic
abdel-17 Nov 30, 2025
9ebde36
fix: dont update original
abdel-17 Nov 30, 2025
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
24 changes: 18 additions & 6 deletions packages/svelte-file-tree/src/lib/components/Tree.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
}
},
shouldClearClipboard = (operation) => operation === "cut",
onResolveNameConflict = () => "cancel",
onResolveNameConflict = () => "default",
onCircularReference = noop,
canCopy = truePredicate,
onCopy = noop,
Expand Down Expand Up @@ -308,7 +308,8 @@
}
}

const name = current.node.name;
const node = current.node;
let name = node.name;
if (uniqueNames.has(name)) {
const resolution = await onResolveNameConflict({
operation: "copy",
Expand All @@ -322,12 +323,21 @@
case "cancel": {
return false;
}
case "default": {
name = `${node.name} copy`;
for (let i = 2; uniqueNames.has(name); i++) {
name = `${node.name} copy ${i}`;
}
break;
}
}
}

uniqueNames.add(name);
sources.push(current);
copies.push(copyNode(current.node));
const copy = copyNode(node);
copy.name = name;
copies.push(copy);
}

if (sources.length === 0) {
Expand Down Expand Up @@ -384,7 +394,8 @@
}
}

const name = current.node.name;
const node = current.node;
const name = node.name;
if (uniqueNames.has(name)) {
const resolution = await onResolveNameConflict({
operation: "move",
Expand All @@ -395,15 +406,16 @@
case "skip": {
continue;
}
case "cancel": {
case "cancel":
case "default": {
return false;
}
}
}

uniqueNames.add(name);
sources.push(current);
sourceIds.add(current.node.id);
sourceIds.add(node.id);
sourceParents.add(current.parent);
}

Expand Down
2 changes: 1 addition & 1 deletion packages/svelte-file-tree/src/lib/components/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export type OnResolveNameConflictArgs<
name: string;
};

export type NameConflictResolution = "skip" | "cancel";
export type NameConflictResolution = "skip" | "cancel" | "default";

export type OnCircularReferenceArgs<
TFile extends FileNode = FileNode,
Expand Down
22 changes: 5 additions & 17 deletions sites/preview/src/lib/Tree.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,6 @@
},
},
dialog: {
failedToCopyItems: {
en: "Failed to copy items",
ar: "فشل نسخ العناصر",
},
failedToMoveItems: {
en: "Failed to move items",
ar: "فشل نقل العناصر",
Expand Down Expand Up @@ -192,21 +188,13 @@
operation,
name,
}: OnResolveNameConflictArgs<FileNode, FolderNode>) {
return new Promise<NameConflictResolution>((resolve) => {
let title;
switch (operation) {
case "copy": {
title = translations.dialog.failedToCopyItems[lang];
break;
}
case "move": {
title = translations.dialog.failedToMoveItems[lang];
break;
}
}
if (operation === "copy") {
return "default";
}

return new Promise<NameConflictResolution>((resolve) => {
showDialog({
title,
title: translations.dialog.failedToMoveItems[lang],
description: translations.dialog.nameConflictDescription[lang](name),
confirmLabel: translations.dialog.skip[lang],
cancelLabel: translations.dialog.cancel[lang],
Expand Down