Let a multi-selection be copied as plain lines as well as a list

Copying several notes only produced a numbered list, which is wrong for
pasting into a prompt that already has structure. The selection now
offers both forms, Shift+click selects a range, and a selection bar
makes it obvious that more than one note is selected. Esc clears the
selection before it hides the panel.
This commit is contained in:
2026-10-09 17:18:04 +08:00
parent 90890186c0
commit c5011d03e7
4 changed files with 127 additions and 28 deletions
+89 -13
View File
@@ -13,6 +13,7 @@ struct PanelView: View {
@State private var showSync = false
@State private var joinCode = ""
@State private var selection = Set<UUID>()
@State private var lastSelectedID: UUID?
@State private var copiedID: UUID?
@State private var accessibilityGranted = AXIsProcessTrusted()
@@ -31,6 +32,9 @@ struct PanelView: View {
Divider()
content
Divider()
if !selection.isEmpty {
selectionBar
}
composerField
}
.frame(minWidth: 300)
@@ -223,6 +227,7 @@ struct PanelView: View {
}
}
.buttonStyle(.plain)
.help("Click to copy · Cmd+click to select several · Shift+click for a range · right-click for more")
.contextMenu { contextMenu(for: item) }
}
@@ -262,7 +267,11 @@ struct PanelView: View {
Button("Copy") { copy(item) }
Button("Copy as List") {
store.copyAsList(ids: effectiveIDs(for: item))
flashCopied(item)
flashCopied(item.id)
}
Button("Copy as Lines") {
store.copyAsLines(ids: effectiveIDs(for: item))
flashCopied(item.id)
}
Divider()
Button(item.done ? "Mark as Not Done" : "Mark as Done") { store.toggleDone(item.id) }
@@ -279,7 +288,7 @@ struct PanelView: View {
if selection.count > 1, selection.contains(item.id) {
Button("Merge Notes") {
store.merge(ids: selection)
selection.removeAll()
clearSelection()
}
}
Menu("Move To") {
@@ -456,6 +465,49 @@ struct PanelView: View {
}
}
// MARK: - Selection
private var selectionBar: some View {
HStack(spacing: 12) {
Text("\(selection.count) selected")
.font(.caption)
.foregroundStyle(.secondary)
Spacer()
Button("Copy as List") { copySelection(asList: true) }
.font(.caption)
.buttonStyle(.plain)
.foregroundStyle(Color.accentColor)
Button("Copy as Lines") { copySelection(asList: false) }
.font(.caption)
.buttonStyle(.plain)
.foregroundStyle(Color.accentColor)
Button { clearSelection() } label: {
Image(systemName: "xmark.circle.fill")
}
.buttonStyle(.plain)
.foregroundStyle(.tertiary)
.help("Clear selection (Esc)")
}
.padding(.horizontal, 12)
.padding(.vertical, 6)
.background(Color.accentColor.opacity(0.12))
}
private func copySelection(asList: Bool) {
guard !selection.isEmpty else { return }
if asList {
store.copyAsList(ids: selection)
} else {
store.copyAsLines(ids: selection)
}
if let id = selection.first { flashCopied(id) }
}
private func clearSelection() {
selection.removeAll()
lastSelectedID = nil
}
// MARK: - Composer
private var composerField: some View {
@@ -464,7 +516,15 @@ struct PanelView: View {
.textFieldStyle(.plain)
.focused($focusedField, equals: .composer)
.onSubmit(submit)
.onExitCommand { PanelController.shared.hide() }
.onExitCommand {
// Esc clears a selection first, and only hides the panel
// once there is nothing selected.
if selection.isEmpty {
PanelController.shared.hide()
} else {
clearSelection()
}
}
if !composer.isEmpty {
Button(action: submit) { Image(systemName: "arrow.up.circle.fill") }
.buttonStyle(.plain)
@@ -506,11 +566,13 @@ struct PanelView: View {
}
.keyboardShortcut(",", modifiers: .command)
Button("") {
guard !selection.isEmpty else { return }
store.copyAsList(ids: selection)
if let id = selection.first { flashCopied(PromptItem(id: id, content: .text(""))) }
copySelection(asList: true)
}
.keyboardShortcut("c", modifiers: [.command, .shift])
Button("") {
copySelection(asList: false)
}
.keyboardShortcut("c", modifiers: [.command, .option])
}
.opacity(0)
.frame(width: 0, height: 0)
@@ -520,26 +582,40 @@ struct PanelView: View {
// MARK: - Actions
private func handleClick(_ item: PromptItem) {
if NSApp.currentEvent?.modifierFlags.contains(.command) == true {
let modifiers = NSApp.currentEvent?.modifierFlags ?? []
if modifiers.contains(.command) {
if selection.contains(item.id) {
selection.remove(item.id)
} else {
selection.insert(item.id)
}
lastSelectedID = item.id
return
}
if modifiers.contains(.shift), let anchor = lastSelectedID, anchor != item.id {
selectRange(from: anchor, to: item.id)
return
}
copy(item)
}
private func copy(_ item: PromptItem) {
store.copy(item)
flashCopied(item)
private func selectRange(from anchor: UUID, to target: UUID) {
let ids = displayedItems.map(\.item.id)
guard let start = ids.firstIndex(of: anchor), let end = ids.firstIndex(of: target) else { return }
let range = start <= end ? start...end : end...start
selection = Set(ids[range])
lastSelectedID = target
}
private func flashCopied(_ item: PromptItem) {
withAnimation { copiedID = item.id }
private func copy(_ item: PromptItem) {
store.copy(item)
flashCopied(item.id)
}
private func flashCopied(_ id: UUID) {
withAnimation { copiedID = id }
DispatchQueue.main.asyncAfter(deadline: .now() + 1.2) {
if copiedID == item.id {
if copiedID == id {
withAnimation { copiedID = nil }
}
}