3 Commits
Author SHA1 Message Date
TZGyn 9f0c0f8113 Make pasting reliable and turn items into checkboxes
Pasting still failed because the panel is a nonactivating panel: it can
be key while the app is not active, and menu key equivalents are not
delivered reliably in that state. Cmd+V is now dispatched to the
responder chain directly, and the app no longer replaces SwiftUI's main
menu — it only adds Hide Panel to it, so the Edit items that AppKit
routes text shortcuts through stay intact.

Rows also gained a checkbox so a workspace works as a checklist without
turning the row into a button, which would swallow the checkbox's clicks.
2026-10-09 17:49:06 +08:00
TZGyn 93cd6f2056 Restore pasting and rename sections to workspaces
Replacing the main menu dropped the Edit menu that AppKit routes
Cmd+V/C/A/Z through, so the composer could not paste at all. The menu is
rebuilt with those items, which --diag now dumps so the wiring can be
checked without a keyboard.

Workspaces also gained an order: the Cmd+K switcher has up/down controls,
creating one opens a naming modal instead of prefilling the composer, and
the UI now says workspace throughout. The stored JSON keeps the original
`sections` keys so existing data and sync payloads stay valid.
2026-10-09 17:29:16 +08:00
TZGyn c5011d03e7 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.
2026-10-09 17:18:04 +08:00
6 changed files with 337 additions and 106 deletions
+24 -5
View File
@@ -26,12 +26,15 @@ clicking an item copies it back to the clipboard.
`~/Library/Application Support/Prompt/store.json`; images are PNG files in `~/Library/Application Support/Prompt/store.json`; images are PNG files in
`Images/` next to it, cached in an `NSCache`. Owns all mutations (add, `Images/` next to it, cached in an `NSCache`. Owns all mutations (add,
toggle done, edit, delete, move, merge, clear done) and clipboard writes 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, - `Sources/Prompt/PanelView.swift` — the panel UI. Header (section switcher,
search, add photos, close), item list, composer. Composer `# Name` creates/ search, add photos, close), item list, composer. Composer `# Name` creates/
switches sections. Click = copy; Cmd+click = multi-select; right-click = switches sections. Click = copy; Cmd+click toggles multi-select, Shift+click
context menu (Copy, Copy as List, Done, Edit, Open, Merge, Move To, Delete). selects a range, and a selection bar offers Copy as List / Copy as Lines;
Drop target for images/files. 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` - `Sources/Prompt/PanelController.swift` — owns the floating `NSPanel`
(`.nonactivatingPanel`, `.floating`, right-edge docked, frame autosaved as (`.nonactivatingPanel`, `.floating`, right-edge docked, frame autosaved as
`PromptPanel`), the Cmd+V image-paste monitor, and `EditWindowController` `PromptPanel`), the Cmd+V image-paste monitor, and `EditWindowController`
@@ -153,10 +156,26 @@ brew upgrade --cask prompt
## Gotchas ## Gotchas
- **Never assign `NSApp.mainMenu`.** SwiftUI installs a menu whose Edit items
are how AppKit routes Cmd+C/V/X/A/Z; replacing it with a hand-built menu
silently breaks pasting, copying and select-all in the composer (this shipped
once and had to be reverted). `installMenuItems()` only *augments* the
existing menu: it adds Hide Panel (Cmd+W) and removes SwiftUI's Settings item,
whose empty scene would otherwise shadow the in-panel Cmd+, sync panel.
- **Cmd+V is handled by the paste monitor, not the menu.** The panel is a
`.nonactivatingPanel`, so it can be key while the app is not active, and menu
key equivalents are not reliably delivered in that state. The monitor
dispatches `paste:` to the responder chain itself for text, and adds the
clipboard image to the store when there is no text. `Prompt --diag` dumps the
menu so the wiring can be checked without a keyboard.
- **A row is not a `Button`** because it contains a checkbox `Button` for
ticking items off, and nested buttons never receive clicks. The row uses
`contentShape` + `onTapGesture` for click-to-copy instead.
- **Never bind bare keys as `.keyboardShortcut` in the panel** (Space, Delete, - **Never bind bare keys as `.keyboardShortcut` in the panel** (Space, Delete,
plain Cmd+C). SwiftUI key equivalents are matched before text input and plain Cmd+C). SwiftUI key equivalents are matched before text input and
would steal characters from the composer TextField. Only Cmd-modified 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 This is why Copy has no in-panel shortcut: click-to-copy is the primary
gesture, matching Copper's intent. gesture, matching Copper's intent.
- The panel is a `.nonactivatingPanel`; its `canBecomeKey` override is what - The panel is a `.nonactivatingPanel`; its `canBecomeKey` override is what
+12 -4
View File
@@ -4,12 +4,18 @@ A native macOS app for keeping prompts and photos, in the spirit of
[Copper](https://shadcn.com/copper) by shadcn: a floating panel that sits next [Copper](https://shadcn.com/copper) by shadcn: a floating panel that sits next
to your work. Click anything to copy it back to your clipboard. to your work. Click anything to copy it back to your clipboard.
- **Checklists by default** — every item has a checkbox, so a workspace doubles
as a to-do list; done items stay in place, dimmed and struck through.
- **Click to copy** — text notes go back as text, photos go back as images. - **Click to copy** — text notes go back as text, photos go back as images.
- **Capture from anywhere** — select text in any app and tap **Left Shift twice**. - **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. - **Photos** — paste (Cmd+V), drag & drop, or add via the photo button.
- **Sections** — type `# Name` in the composer; Cmd+K switches sections. - **Workspaces** — type `# Name` in the composer, or use "New Workspace" in
- **Copy as List** — Cmd+click to multi-select, right-click → Copy as List the Cmd+K switcher (which opens a name modal); Cmd+K switches, and the
(or Shift+Cmd+C) for a numbered list ready to paste into a chat. up/down arrows in the switcher reorder them. (The code and the saved JSON
still call these `sections` so existing data keeps working.)
- **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. - **Merge Notes, Mark as Done, Edit, Move To** — right-click any item.
- **Search** — Cmd+F searches across all sections. - **Search** — Cmd+F searches across all sections.
- **Sync (optional)** — generate an 8-digit code (`1234-5678`) on one Mac and - **Sync (optional)** — generate an 8-digit code (`1234-5678`) on one Mac and
@@ -24,11 +30,13 @@ to your work. Click anything to copy it back to your clipboard.
| --- | --- | | --- | --- |
| Capture current selection | Left Shift ×2 (or Cmd+Shift+C) | | Capture current selection | Left Shift ×2 (or Cmd+Shift+C) |
| Show/hide panel | Right Shift ×2 (or Cmd+Shift+Space) | | Show/hide panel | Right Shift ×2 (or Cmd+Shift+Space) |
| Switch/create section | Cmd+K | | Switch/create workspace | Cmd+K |
| Search | Cmd+F | | Search | Cmd+F |
| Focus composer | Cmd+N | | Focus composer | Cmd+N |
| Sync settings | Cmd+, | | Sync settings | Cmd+, |
| Copy selection as numbered list | Shift+Cmd+C | | Copy selection as numbered list | Shift+Cmd+C |
| Copy selection as plain lines | Option+Cmd+C |
| Clear selection | Esc |
| Close panel | Esc | | Close panel | Esc |
Double-Shift gestures require **Accessibility access** (Prompt reads the Double-Shift gestures require **Accessibility access** (Prompt reads the
+27 -19
View File
@@ -32,6 +32,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
// which locks the user out once the panel is hidden. // which locks the user out once the panel is hidden.
if CommandLine.arguments.contains("--diag") { if CommandLine.arguments.contains("--diag") {
setupStatusItem() setupStatusItem()
installMenuItems()
DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) { DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
self.writeDiagnostics() self.writeDiagnostics()
NSApp.terminate(nil) NSApp.terminate(nil)
@@ -59,9 +60,11 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
HotkeyManager.shared.start() HotkeyManager.shared.start()
setupStatusItem() setupStatusItem()
setupMainMenu()
promptForAccessibilityIfNeeded() promptForAccessibilityIfNeeded()
// Let SwiftUI finish installing its main menu, then augment it.
DispatchQueue.main.async { self.installMenuItems() }
// Show the panel on launch so the app is discoverable (it has no Dock // Show the panel on launch so the app is discoverable (it has no Dock
// icon and the menu bar icon can be hard to spot on a full bar). // icon and the menu bar icon can be hard to spot on a full bar).
Task { @MainActor in Task { @MainActor in
@@ -110,28 +113,24 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
return .terminateNow return .terminateNow
} }
/// Accessory apps have no visible menu bar, but the main menu still /// Adds "Hide Panel" to the menu SwiftUI already installed. Do NOT replace
/// services key equivalents — this is what makes Cmd+Q and Cmd+W work /// `NSApp.mainMenu`: SwiftUI's menu carries the Edit items that AppKit
/// while the panel has focus. /// routes Cmd+C/V/X/A/Z through, so replacing it breaks text editing in the
private func setupMainMenu() { /// composer. This only inserts one item and drops SwiftUI's Settings item,
let mainMenu = NSMenu() /// whose empty scene would otherwise shadow the in-panel Cmd+, sync panel.
let appMenuItem = NSMenuItem() private func installMenuItems() {
mainMenu.addItem(appMenuItem) guard let appMenu = NSApp.mainMenu?.items.first?.submenu else { return }
let appMenu = NSMenu() if let settings = appMenu.items.firstIndex(where: { $0.keyEquivalent == "," && $0.keyEquivalentModifierMask == [.command] }) {
appMenuItem.submenu = appMenu appMenu.removeItem(at: settings)
}
guard !appMenu.items.contains(where: { $0.action == #selector(hidePanel) }) else { return }
let hide = NSMenuItem(title: "Hide Panel", action: #selector(hidePanel), keyEquivalent: "w") let hide = NSMenuItem(title: "Hide Panel", action: #selector(hidePanel), keyEquivalent: "w")
hide.target = self hide.target = self
appMenu.addItem(hide) let quitIndex = appMenu.items.firstIndex { $0.action == #selector(NSApplication.terminate(_:)) } ?? appMenu.items.count
appMenu.insertItem(.separator(), at: quitIndex)
appMenu.addItem(.separator()) appMenu.insertItem(hide, at: quitIndex + 1)
let quit = NSMenuItem(title: "Quit Prompt", action: #selector(quit), keyEquivalent: "q")
quit.target = self
appMenu.addItem(quit)
NSApp.mainMenu = mainMenu
} }
@MainActor @objc private func hidePanel() { @MainActor @objc private func hidePanel() {
@@ -153,6 +152,15 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
lines.append("status item has no window (not in the menu bar)") lines.append("status item has no window (not in the menu bar)")
} }
lines.append("preferred position: \(UserDefaults.standard.object(forKey: "NSStatusItem Preferred Position Prompt") ?? "unset")") lines.append("preferred position: \(UserDefaults.standard.object(forKey: "NSStatusItem Preferred Position Prompt") ?? "unset")")
lines.append("main menu:")
for item in NSApp.mainMenu?.items ?? [] {
lines.append(" \(item.submenu?.title ?? item.title)")
for entry in item.submenu?.items ?? [] {
guard !entry.isSeparatorItem else { continue }
let action = entry.action.map(NSStringFromSelector) ?? "-"
lines.append(" \(entry.title) [\(entry.keyEquivalentModifierMask.rawValue)] \(action)")
}
}
try? lines.joined(separator: "\n").write( try? lines.joined(separator: "\n").write(
to: URL(fileURLWithPath: "/tmp/prompt-diag.txt"), atomically: true, encoding: .utf8 to: URL(fileURLWithPath: "/tmp/prompt-diag.txt"), atomically: true, encoding: .utf8
) )
+16 -10
View File
@@ -71,21 +71,27 @@ final class PanelController: NSObject {
panel.setFrameOrigin(NSPoint(x: screen.maxX - size.width - 12, y: screen.minY + 12)) panel.setFrameOrigin(NSPoint(x: screen.maxX - size.width - 12, y: screen.minY + 12))
} }
// Intercept Cmd+V when the panel is key and the clipboard holds an image // Cmd+V is handled here rather than left to a menu key equivalent. The
// (and no text, so normal text paste into the composer is unaffected). // panel is a nonactivating panel, so it can be key while the app is not
// active, and menu key equivalents are not reliably delivered in that
// state — which is what silently broke pasting. Dispatching paste: to the
// responder chain ourselves removes that dependency.
private func installPasteMonitor() { private func installPasteMonitor() {
guard pasteMonitor == nil else { return } guard pasteMonitor == nil else { return }
pasteMonitor = NSEvent.addLocalMonitorForEvents(matching: .keyDown) { [weak self] event in pasteMonitor = NSEvent.addLocalMonitorForEvents(matching: .keyDown) { [weak self] event in
guard let self, let panel = self.panel, event.window == panel else { return event } guard let self, let panel = self.panel, event.window == panel else { return event }
let modifiers = event.modifierFlags.intersection(.deviceIndependentFlagsMask) let modifiers = event.modifierFlags.intersection(.deviceIndependentFlagsMask)
if modifiers == [.command], event.charactersIgnoringModifiers == "v" { guard modifiers == [.command], event.charactersIgnoringModifiers == "v" else { return event }
let pasteboard = NSPasteboard.general
if pasteboard.string(forType: .string) == nil, let pasteboard = NSPasteboard.general
let images = pasteboard.readObjects(forClasses: [NSImage.self], options: nil) as? [NSImage], if pasteboard.string(forType: .string) != nil {
let image = images.first { NSApp.sendAction(#selector(NSText.paste(_:)), to: nil, from: nil)
Task { @MainActor in Store.shared.addImage(image) } return nil
return nil }
} if let images = pasteboard.readObjects(forClasses: [NSImage.self], options: nil) as? [NSImage],
let image = images.first {
Task { @MainActor in Store.shared.addImage(image) }
return nil
} }
return event return event
} }
+211 -55
View File
@@ -10,13 +10,16 @@ struct PanelView: View {
@State private var search = "" @State private var search = ""
@State private var showSearch = false @State private var showSearch = false
@State private var showSectionSwitcher = false @State private var showSectionSwitcher = false
@State private var showNewWorkspace = false
@State private var newWorkspaceName = ""
@State private var showSync = false @State private var showSync = false
@State private var joinCode = "" @State private var joinCode = ""
@State private var selection = Set<UUID>() @State private var selection = Set<UUID>()
@State private var lastSelectedID: UUID?
@State private var copiedID: UUID? @State private var copiedID: UUID?
@State private var accessibilityGranted = AXIsProcessTrusted() @State private var accessibilityGranted = AXIsProcessTrusted()
private enum Field: Hashable { case composer, search } private enum Field: Hashable { case composer, search, newWorkspace }
@FocusState private var focusedField: Field? @FocusState private var focusedField: Field?
var body: some View { var body: some View {
@@ -31,12 +34,16 @@ struct PanelView: View {
Divider() Divider()
content content
Divider() Divider()
if !selection.isEmpty {
selectionBar
}
composerField composerField
} }
.frame(minWidth: 300) .frame(minWidth: 300)
.background(shortcutButtons) .background(shortcutButtons)
.overlay(sectionSwitcher) .overlay(sectionSwitcher)
.overlay(syncOverlay) .overlay(syncOverlay)
.overlay(newWorkspaceModal)
.onDrop(of: [UTType.image.identifier, UTType.fileURL.identifier], isTargeted: nil, perform: handleDrop) .onDrop(of: [UTType.image.identifier, UTType.fileURL.identifier], isTargeted: nil, perform: handleDrop)
.onReceive(NotificationCenter.default.publisher(for: .promptPanelDidShow)) { _ in .onReceive(NotificationCenter.default.publisher(for: .promptPanelDidShow)) { _ in
focusedField = .composer focusedField = .composer
@@ -62,7 +69,7 @@ struct PanelView: View {
.foregroundStyle(.secondary) .foregroundStyle(.secondary)
} }
.buttonStyle(.plain) .buttonStyle(.plain)
.help("Switch section (Cmd+K)") .help("Switch workspace (Cmd+K)")
Spacer() Spacer()
@@ -109,7 +116,7 @@ struct PanelView: View {
private var searchField: some View { private var searchField: some View {
HStack(spacing: 8) { HStack(spacing: 8) {
Image(systemName: "magnifyingglass").foregroundStyle(.secondary) Image(systemName: "magnifyingglass").foregroundStyle(.secondary)
TextField("Search all sections", text: $search) TextField("Search all workspaces", text: $search)
.textFieldStyle(.plain) .textFieldStyle(.plain)
.focused($focusedField, equals: .search) .focused($focusedField, equals: .search)
.onExitCommand { .onExitCommand {
@@ -186,8 +193,21 @@ struct PanelView: View {
.padding(.vertical, 48) .padding(.vertical, 48)
} }
/// Rows are checklists by default: a checkbox to tick an item off, with the
/// rest of the row copying on click. The row cannot be a Button because the
/// checkbox is one, and nested buttons do not receive clicks.
private func row(for item: PromptItem, sectionName: String) -> some View { private func row(for item: PromptItem, sectionName: String) -> some View {
Button { handleClick(item) } label: { HStack(alignment: .top, spacing: 8) {
Button {
store.toggleDone(item.id)
} label: {
Image(systemName: item.done ? "checkmark.circle.fill" : "circle")
.font(.system(size: 15))
.foregroundStyle(item.done ? Color.accentColor : Color.secondary.opacity(0.55))
}
.buttonStyle(.plain)
.help(item.done ? "Mark as not done" : "Mark as done")
VStack(alignment: .leading, spacing: 6) { VStack(alignment: .leading, spacing: 6) {
if !sectionName.isEmpty { if !sectionName.isEmpty {
Text(sectionName.uppercased()) Text(sectionName.uppercased())
@@ -201,28 +221,28 @@ struct PanelView: View {
Text(sourceApp) Text(sourceApp)
} }
Text(item.createdAt, style: .time) Text(item.createdAt, style: .time)
if item.done {
Image(systemName: "checkmark")
}
} }
.font(.caption2) .font(.caption2)
.foregroundStyle(.tertiary) .foregroundStyle(.tertiary)
} }
.padding(10)
.frame(maxWidth: .infinity, alignment: .leading) .frame(maxWidth: .infinity, alignment: .leading)
.background(rowBackground(item)) }
.cornerRadius(8) .padding(10)
.overlay(alignment: .topTrailing) { .frame(maxWidth: .infinity, alignment: .leading)
if copiedID == item.id { .background(rowBackground(item))
Label("Copied", systemImage: "checkmark.circle.fill") .cornerRadius(8)
.font(.caption2) .overlay(alignment: .topTrailing) {
.foregroundStyle(.green) if copiedID == item.id {
.padding(6) Label("Copied", systemImage: "checkmark.circle.fill")
.transition(.opacity) .font(.caption2)
} .foregroundStyle(.green)
.padding(6)
.transition(.opacity)
} }
} }
.buttonStyle(.plain) .contentShape(Rectangle())
.onTapGesture { handleClick(item) }
.help("Click to copy · checkbox to tick off · Cmd+click to select several · Shift+click for a range · right-click for more")
.contextMenu { contextMenu(for: item) } .contextMenu { contextMenu(for: item) }
} }
@@ -262,7 +282,11 @@ struct PanelView: View {
Button("Copy") { copy(item) } Button("Copy") { copy(item) }
Button("Copy as List") { Button("Copy as List") {
store.copyAsList(ids: effectiveIDs(for: item)) 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() Divider()
Button(item.done ? "Mark as Not Done" : "Mark as Done") { store.toggleDone(item.id) } Button(item.done ? "Mark as Not Done" : "Mark as Done") { store.toggleDone(item.id) }
@@ -279,7 +303,7 @@ struct PanelView: View {
if selection.count > 1, selection.contains(item.id) { if selection.count > 1, selection.contains(item.id) {
Button("Merge Notes") { Button("Merge Notes") {
store.merge(ids: selection) store.merge(ids: selection)
selection.removeAll() clearSelection()
} }
} }
Menu("Move To") { Menu("Move To") {
@@ -306,39 +330,57 @@ struct PanelView: View {
} }
.frame(maxWidth: .infinity, maxHeight: .infinity) .frame(maxWidth: .infinity, maxHeight: .infinity)
VStack(spacing: 0) { VStack(spacing: 0) {
ForEach(store.sections) { section in ForEach(Array(store.sections.enumerated()), id: \.element.id) { index, section in
Button { HStack(spacing: 6) {
Text(section.name)
.font(.callout)
Spacer()
Text("\(section.items.count)")
.font(.caption)
.foregroundStyle(.tertiary)
if section.id == store.activeSection.id {
Image(systemName: "checkmark")
.font(.caption)
.foregroundStyle(Color.accentColor)
}
// Reorder the workspace list; the boundary rows are
// disabled rather than hidden so the list does not jump.
HStack(spacing: 0) {
Button {
store.moveSection(section.id, by: -1)
} label: {
Image(systemName: "chevron.up")
}
.disabled(index == 0)
Button {
store.moveSection(section.id, by: 1)
} label: {
Image(systemName: "chevron.down")
}
.disabled(index == store.sections.count - 1)
}
.buttonStyle(.plain)
.font(.system(size: 9, weight: .bold))
.foregroundStyle(.tertiary)
}
.padding(.horizontal, 14)
.padding(.vertical, 8)
.contentShape(Rectangle())
.onTapGesture {
store.activeSectionID = section.id store.activeSectionID = section.id
showSectionSwitcher = false showSectionSwitcher = false
} label: {
HStack {
Text(section.name)
.font(.callout)
Spacer()
Text("\(section.items.count)")
.font(.caption)
.foregroundStyle(.tertiary)
if section.id == store.activeSection.id {
Image(systemName: "checkmark")
.font(.caption)
.foregroundStyle(Color.accentColor)
}
}
.padding(.horizontal, 14)
.padding(.vertical, 8)
.contentShape(Rectangle())
} }
.buttonStyle(.plain)
} }
Divider() Divider()
Button { Button {
composer = "# "
showSectionSwitcher = false showSectionSwitcher = false
focusedField = .composer newWorkspaceName = ""
showNewWorkspace = true
focusedField = .newWorkspace
} label: { } label: {
HStack { HStack {
Image(systemName: "plus") Image(systemName: "plus")
Text("New Section") Text("New Workspace")
Spacer() Spacer()
} }
.padding(.horizontal, 14) .padding(.horizontal, 14)
@@ -456,6 +498,96 @@ struct PanelView: View {
} }
} }
// MARK: - New workspace
@ViewBuilder
private var newWorkspaceModal: some View {
if showNewWorkspace {
ZStack {
Color.black.opacity(0.25)
.onTapGesture { dismissNewWorkspace() }
VStack(alignment: .leading, spacing: 12) {
Text("New Workspace")
.font(.headline)
TextField("Name", text: $newWorkspaceName)
.textFieldStyle(.roundedBorder)
.focused($focusedField, equals: .newWorkspace)
.onSubmit(createWorkspace)
.onExitCommand { dismissNewWorkspace() }
HStack {
Spacer()
Button("Cancel") { dismissNewWorkspace() }
Button("Create") { createWorkspace() }
.keyboardShortcut(.defaultAction)
.disabled(newWorkspaceName.trimmingCharacters(in: .whitespaces).isEmpty)
}
}
.padding(16)
.frame(width: 260)
.background(.regularMaterial)
.cornerRadius(12)
.shadow(radius: 18)
}
.transition(.opacity)
}
}
private func createWorkspace() {
let name = newWorkspaceName.trimmingCharacters(in: .whitespacesAndNewlines)
guard !name.isEmpty else { return }
store.createSection(named: name)
dismissNewWorkspace()
}
private func dismissNewWorkspace() {
showNewWorkspace = false
newWorkspaceName = ""
focusedField = .composer
}
// 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 // MARK: - Composer
private var composerField: some View { private var composerField: some View {
@@ -464,7 +596,15 @@ struct PanelView: View {
.textFieldStyle(.plain) .textFieldStyle(.plain)
.focused($focusedField, equals: .composer) .focused($focusedField, equals: .composer)
.onSubmit(submit) .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 { if !composer.isEmpty {
Button(action: submit) { Image(systemName: "arrow.up.circle.fill") } Button(action: submit) { Image(systemName: "arrow.up.circle.fill") }
.buttonStyle(.plain) .buttonStyle(.plain)
@@ -506,11 +646,13 @@ struct PanelView: View {
} }
.keyboardShortcut(",", modifiers: .command) .keyboardShortcut(",", modifiers: .command)
Button("") { Button("") {
guard !selection.isEmpty else { return } copySelection(asList: true)
store.copyAsList(ids: selection)
if let id = selection.first { flashCopied(PromptItem(id: id, content: .text(""))) }
} }
.keyboardShortcut("c", modifiers: [.command, .shift]) .keyboardShortcut("c", modifiers: [.command, .shift])
Button("") {
copySelection(asList: false)
}
.keyboardShortcut("c", modifiers: [.command, .option])
} }
.opacity(0) .opacity(0)
.frame(width: 0, height: 0) .frame(width: 0, height: 0)
@@ -520,26 +662,40 @@ struct PanelView: View {
// MARK: - Actions // MARK: - Actions
private func handleClick(_ item: PromptItem) { 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) { if selection.contains(item.id) {
selection.remove(item.id) selection.remove(item.id)
} else { } else {
selection.insert(item.id) 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 return
} }
copy(item) copy(item)
} }
private func copy(_ item: PromptItem) { private func selectRange(from anchor: UUID, to target: UUID) {
store.copy(item) let ids = displayedItems.map(\.item.id)
flashCopied(item) 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) { private func copy(_ item: PromptItem) {
withAnimation { copiedID = item.id } store.copy(item)
flashCopied(item.id)
}
private func flashCopied(_ id: UUID) {
withAnimation { copiedID = id }
DispatchQueue.main.asyncAfter(deadline: .now() + 1.2) { DispatchQueue.main.asyncAfter(deadline: .now() + 1.2) {
if copiedID == item.id { if copiedID == id {
withAnimation { copiedID = nil } withAnimation { copiedID = nil }
} }
} }
+47 -13
View File
@@ -38,11 +38,17 @@ final class Store: ObservableObject {
private let storeFile: URL private let storeFile: URL
private let imageCache = NSCache<NSString, NSImage>() private let imageCache = NSCache<NSString, NSImage>()
init() { /// `directory` is injectable so the store can be exercised against a
let appSupport = FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask)[0] /// scratch folder instead of the user's real data.
directory = appSupport.appendingPathComponent("Prompt", isDirectory: true) init(directory: URL? = nil) {
imagesDirectory = directory.appendingPathComponent("Images", isDirectory: true) if let directory {
storeFile = directory.appendingPathComponent("store.json") self.directory = directory
} else {
let appSupport = FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask)[0]
self.directory = appSupport.appendingPathComponent("Prompt", isDirectory: true)
}
imagesDirectory = self.directory.appendingPathComponent("Images", isDirectory: true)
storeFile = self.directory.appendingPathComponent("store.json")
try? FileManager.default.createDirectory(at: imagesDirectory, withIntermediateDirectories: true) try? FileManager.default.createDirectory(at: imagesDirectory, withIntermediateDirectories: true)
load() load()
@@ -130,6 +136,18 @@ final class Store: ObservableObject {
return section return section
} }
/// Reorders a workspace within the list. The UI calls these "workspaces";
/// the model and the persisted JSON keep the original `sections` naming so
/// existing stores and sync payloads keep working.
func moveSection(_ id: UUID, by offset: Int) {
guard let index = sections.firstIndex(where: { $0.id == id }) else { return }
let target = index + offset
guard sections.indices.contains(target) else { return }
let section = sections.remove(at: index)
sections.insert(section, at: target)
save()
}
// MARK: - Items // MARK: - Items
@discardableResult @discardableResult
@@ -269,18 +287,34 @@ final class Store: ObservableObject {
} }
func copyAsList(ids: Set<UUID>) { func copyAsList(ids: Set<UUID>) {
let items = sections.flatMap(\.items) let texts = selectedTexts(ids: ids)
.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
}
guard !texts.isEmpty else { return } guard !texts.isEmpty else { return }
let list = texts.enumerated().map { "\($0.offset + 1). \($0.element)" }.joined(separator: "\n") 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<UUID>) {
let texts = selectedTexts(ids: ids)
guard !texts.isEmpty else { return }
writeToPasteboard(texts.joined(separator: "\n"))
}
private func selectedTexts(ids: Set<UUID>) -> [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 let pasteboard = NSPasteboard.general
pasteboard.clearContents() pasteboard.clearContents()
pasteboard.setString(list, forType: .string) pasteboard.setString(string, forType: .string)
} }
// MARK: - Images // MARK: - Images