refactor: name the merge options and drop their subtext

This commit is contained in:
2026-08-17 11:06:19 -04:00
parent a3443d36f1
commit 202cbed30e
2 changed files with 14 additions and 43 deletions
@@ -199,27 +199,14 @@
>
<GitMerge />
</DropdownMenu.Trigger>
<DropdownMenu.Content class="w-72">
<DropdownMenu.Item class="flex-col items-start gap-0.5" onclick={quickMerge}>
<span class="flex w-full min-w-0 items-center gap-2">
<DropdownMenu.Content>
<DropdownMenu.Item onclick={quickMerge}>
<GitMerge class="size-4 shrink-0" />
<span class="truncate">Keep “{selectedBooks[0].title}</span>
</span>
<span class="pl-6 text-xs text-wrap text-muted-foreground">
Files move onto the book you selected first, which keeps its own metadata.
</span>
Merge into first selected
</DropdownMenu.Item>
<DropdownMenu.Item
class="flex-col items-start gap-0.5"
onclick={() => (mergingBooks = selectedBooks)}
>
<span class="flex items-center gap-2">
<DropdownMenu.Item onclick={() => (mergingBooks = selectedBooks)}>
<SlidersHorizontal class="size-4 shrink-0" />
Choose what to keep
</span>
<span class="pl-6 text-xs text-wrap text-muted-foreground">
Pick the record that survives and resolve the metadata field by field.
</span>
Manual merge
</DropdownMenu.Item>
</DropdownMenu.Content>
</DropdownMenu.Root>
@@ -149,30 +149,14 @@
>
Merge…
</DropdownMenu.Trigger>
<DropdownMenu.Content align="end" class="w-72">
<DropdownMenu.Item
class="flex-col items-start gap-0.5"
onclick={() => quickMerge(group)}
>
<span class="flex w-full min-w-0 items-center gap-2">
<DropdownMenu.Content align="end">
<DropdownMenu.Item onclick={() => quickMerge(group)}>
<GitMerge class="size-4 shrink-0" />
<span class="truncate">Keep “{records[0]?.title}</span>
</span>
<span class="pl-6 text-xs text-wrap text-muted-foreground">
Files move onto the first book, which keeps its own metadata.
</span>
Merge into first selected
</DropdownMenu.Item>
<DropdownMenu.Item
class="flex-col items-start gap-0.5"
onclick={() => (merging = group)}
>
<span class="flex items-center gap-2">
<DropdownMenu.Item onclick={() => (merging = group)}>
<SlidersHorizontal class="size-4 shrink-0" />
Choose what to keep
</span>
<span class="pl-6 text-xs text-wrap text-muted-foreground">
Pick the record that survives and resolve the metadata field by field.
</span>
Manual merge
</DropdownMenu.Item>
</DropdownMenu.Content>
</DropdownMenu.Root>