diff --git a/AGENTS.md b/AGENTS.md index 767e096..71ee9d0 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -26,12 +26,15 @@ clicking an item copies it back to the clipboard. `~/Library/Application Support/Prompt/store.json`; images are PNG files in `Images/` next to it, cached in an `NSCache`. Owns all mutations (add, toggle done, edit, delete, move, merge, clear done) and clipboard writes - (`copy`, `copyAsList`). Saves on every mutation. + (`copy`, `copyAsList` for numbered output, `copyAsLines` for plain newlines; + both text modes skip image items). Saves on every mutation. - `Sources/Prompt/PanelView.swift` — the panel UI. Header (section switcher, search, add photos, close), item list, composer. Composer `# Name` creates/ - switches sections. Click = copy; Cmd+click = multi-select; right-click = - context menu (Copy, Copy as List, Done, Edit, Open, Merge, Move To, Delete). - Drop target for images/files. + switches sections. Click = copy; Cmd+click toggles multi-select, Shift+click + selects a range, and a selection bar offers Copy as List / Copy as Lines; + right-click = context menu (Copy, Copy as List, Copy as Lines, Done, Edit, + Open, Merge, Move To, Delete). Esc clears the selection before it hides the + panel. Drop target for images/files. - `Sources/Prompt/PanelController.swift` — owns the floating `NSPanel` (`.nonactivatingPanel`, `.floating`, right-edge docked, frame autosaved as `PromptPanel`), the Cmd+V image-paste monitor, and `EditWindowController` @@ -156,7 +159,8 @@ brew upgrade --cask prompt - **Never bind bare keys as `.keyboardShortcut` in the panel** (Space, Delete, plain Cmd+C). SwiftUI key equivalents are matched before text input and would steal characters from the composer TextField. Only Cmd-modified - shortcuts that TextFields don't use are bound (Cmd+F/K/N, Shift+Cmd+C). + shortcuts that TextFields don't use are bound (Cmd+F/K/N, Shift+Cmd+C, + Option+Cmd+C). This is why Copy has no in-panel shortcut: click-to-copy is the primary gesture, matching Copper's intent. - The panel is a `.nonactivatingPanel`; its `canBecomeKey` override is what diff --git a/README.md b/README.md index 72c82d0..cb4fd28 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,9 @@ to your work. Click anything to copy it back to your clipboard. - **Capture from anywhere** — select text in any app and tap **Left Shift twice**. - **Photos** — paste (Cmd+V), drag & drop, or add via the photo button. - **Sections** — type `# Name` in the composer; Cmd+K switches sections. -- **Copy as List** — Cmd+click to multi-select, right-click → Copy as List - (or Shift+Cmd+C) for a numbered list ready to paste into a chat. +- **Copy as List / Copy as Lines** — Cmd+click to multi-select (Shift+click for + a range), then copy the selection as a numbered list or as plain + newline-separated text, from the selection bar or the right-click menu. - **Merge Notes, Mark as Done, Edit, Move To** — right-click any item. - **Search** — Cmd+F searches across all sections. - **Sync (optional)** — generate an 8-digit code (`1234-5678`) on one Mac and @@ -29,6 +30,8 @@ to your work. Click anything to copy it back to your clipboard. | Focus composer | Cmd+N | | Sync settings | Cmd+, | | Copy selection as numbered list | Shift+Cmd+C | +| Copy selection as plain lines | Option+Cmd+C | +| Clear selection | Esc | | Close panel | Esc | Double-Shift gestures require **Accessibility access** (Prompt reads the diff --git a/Sources/Prompt/PanelView.swift b/Sources/Prompt/PanelView.swift index eb146b0..84279ed 100644 --- a/Sources/Prompt/PanelView.swift +++ b/Sources/Prompt/PanelView.swift @@ -13,6 +13,7 @@ struct PanelView: View { @State private var showSync = false @State private var joinCode = "" @State private var selection = Set() + @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 } } } diff --git a/Sources/Prompt/Store.swift b/Sources/Prompt/Store.swift index bceae4d..f8a8dc6 100644 --- a/Sources/Prompt/Store.swift +++ b/Sources/Prompt/Store.swift @@ -269,18 +269,34 @@ final class Store: ObservableObject { } func copyAsList(ids: Set) { - let items = sections.flatMap(\.items) - .filter { ids.contains($0.id) } - .sorted { $0.createdAt < $1.createdAt } - let texts = items.compactMap { item -> String? in - if case .text(let text) = item.content { return text } - return nil - } + let texts = selectedTexts(ids: ids) guard !texts.isEmpty else { return } let list = texts.enumerated().map { "\($0.offset + 1). \($0.element)" }.joined(separator: "\n") + writeToPasteboard(list) + } + + /// Same selection as `copyAsList`, but joined with plain newlines so it + /// drops into a prompt without numbering. + func copyAsLines(ids: Set) { + let texts = selectedTexts(ids: ids) + guard !texts.isEmpty else { return } + writeToPasteboard(texts.joined(separator: "\n")) + } + + private func selectedTexts(ids: Set) -> [String] { + sections.flatMap(\.items) + .filter { ids.contains($0.id) } + .sorted { $0.createdAt < $1.createdAt } + .compactMap { item in + if case .text(let text) = item.content { return text } + return nil + } + } + + private func writeToPasteboard(_ string: String) { let pasteboard = NSPasteboard.general pasteboard.clearContents() - pasteboard.setString(list, forType: .string) + pasteboard.setString(string, forType: .string) } // MARK: - Images