Compare commits
7
Commits
1bd346ce20
..
v0.1.8
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6580a79d40 | ||
|
|
c7b4ed32f2 | ||
|
|
9f0c0f8113 | ||
|
|
93cd6f2056 | ||
|
|
c5011d03e7 | ||
|
|
90890186c0 | ||
|
|
962c205d1d |
@@ -13,19 +13,31 @@ clicking an item copies it back to the clipboard.
|
||||
`NSStatusItem Preferred Position Prompt`). Left click toggles the panel,
|
||||
right click shows the menu (accessibility state, launch at login, open data
|
||||
folder, quit). Contains the single-instance guard and `LoginItem`
|
||||
(`SMAppService`).
|
||||
(`SMAppService`). Also sets `NSApp.mainMenu` with Hide Panel (Cmd+W) and Quit
|
||||
(Cmd+Q) — an accessory app shows no menu bar, but the main menu still
|
||||
services key equivalents, which is the only way to quit from the keyboard
|
||||
while the panel has focus. `applicationShouldHandleReopen` shows the panel so
|
||||
launching an already-running app does something. Supports `--sync-check` and
|
||||
`--diag` (writes the status item's frame and permission state to
|
||||
`/tmp/prompt-diag.txt`, then exits).
|
||||
- `Sources/Prompt/Store.swift` — `@MainActor` `ObservableObject` singleton.
|
||||
Data model: `Section` → `[PromptItem]`, item content is
|
||||
`.text(String)` or `.image(String)` (filename). Persists to
|
||||
`~/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). Batch mutations (`delete(ids:)`,
|
||||
`setDone(_:ids:)`, `move(ids:to:)`) back the selection context menu, so one
|
||||
action applies to every selected item and image files are cleaned up once.
|
||||
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 = select (Shift+click for a range); the selection
|
||||
bar offers Copy (single item), Copy as List and Copy as Lines; right-click =
|
||||
context menu acting on the whole selection (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`
|
||||
@@ -147,10 +159,30 @@ brew upgrade --cask prompt
|
||||
|
||||
## 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`, and
|
||||
nested buttons never receive clicks. The row uses `contentShape` +
|
||||
`onTapGesture` so a click anywhere on the card selects it. Selection is
|
||||
driven by the card click, the checkbox, Cmd+click (toggle) and Shift+click
|
||||
(range); the context menu acts on the whole selection via `effectiveIDs(for:)`.
|
||||
Copying is an explicit action (selection bar or context menu), never a side
|
||||
effect of a click — that was changed deliberately.
|
||||
- **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
|
||||
@@ -167,7 +199,10 @@ brew upgrade --cask prompt
|
||||
the main thread (the hotkey handler already dispatches to a global queue).
|
||||
- The double-Shift tap needs Accessibility; without it the event tap silently
|
||||
fails and only the Carbon fallbacks work. The panel banner and the status
|
||||
menu both surface the permission state.
|
||||
menu both surface the permission state, and `AppDelegate` shows a launch
|
||||
alert when it is missing — otherwise a user who hides the panel is locked out
|
||||
(no hotkey, no Dock icon) and reports it as "the app won't come back". Check
|
||||
with `Prompt --diag` (`accessibility: false` is the tell).
|
||||
- `Info.plist` sets `NSAllowsArbitraryLoads` because the sync server URL is
|
||||
user-supplied and is often plain HTTP (LAN address, self-hosted box). ATS
|
||||
would otherwise block it with a confusing error.
|
||||
|
||||
@@ -2,16 +2,22 @@
|
||||
|
||||
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
|
||||
to your work. Click anything to copy it back to your clipboard.
|
||||
to your work. Select what you need and send it back to your clipboard.
|
||||
|
||||
- **Click to copy** — text notes go back as text, photos go back as images.
|
||||
- **Click to select** — clicking a card selects it (Shift+click for a range),
|
||||
and the selection bar copies a single item as-is, or the whole selection as a
|
||||
numbered list or as plain newline-separated lines.
|
||||
- **Text or photo** — copying sends text back as text and a photo back as an
|
||||
image.
|
||||
- **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.
|
||||
- **Merge Notes, Mark as Done, Edit, Move To** — right-click any item.
|
||||
- **Search** — Cmd+F searches across all sections.
|
||||
- **Workspaces** — type `# Name` in the composer, or use "New Workspace" in
|
||||
the Cmd+K switcher (which opens a name modal); Cmd+K switches, and the
|
||||
up/down arrows in the switcher reorder them. (The code and the saved JSON
|
||||
still call these `sections` so existing data keeps working.)
|
||||
- **Right-click for actions** — Copy, Copy as List, Copy as Lines, Mark as Done,
|
||||
Edit, Open, Merge Notes, Move To, Delete — each acting on the whole selection.
|
||||
- **Search** — Cmd+F searches across all workspaces.
|
||||
- **Sync (optional)** — generate an 8-digit code (`1234-5678`) on one Mac and
|
||||
enter it on the other; no account, no login. The code is the only secret.
|
||||
- **Local & private** — everything lives in
|
||||
@@ -24,18 +30,21 @@ to your work. Click anything to copy it back to your clipboard.
|
||||
| --- | --- |
|
||||
| Capture current selection | Left Shift ×2 (or Cmd+Shift+C) |
|
||||
| Show/hide panel | Right Shift ×2 (or Cmd+Shift+Space) |
|
||||
| Switch/create section | Cmd+K |
|
||||
| Switch/create workspace | Cmd+K |
|
||||
| Search | Cmd+F |
|
||||
| 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
|
||||
selection by simulating Cmd+C, then restores your clipboard untouched). The
|
||||
Cmd+Shift fallbacks work without it. Bare keys like Space and Cmd+C are
|
||||
deliberately not bound inside the panel so they never conflict with typing in
|
||||
the composer.
|
||||
selection by simulating Cmd+C, then restores your clipboard untouched). Until
|
||||
it is granted, use Cmd+Shift+Space and Cmd+Shift+C, or click the menu bar icon
|
||||
— and launching the app again always brings the panel back. Bare keys like
|
||||
Space and Cmd+C are deliberately not bound inside the panel so they never
|
||||
conflict with typing in the composer.
|
||||
|
||||
## Install
|
||||
|
||||
|
||||
@@ -27,6 +27,19 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
|
||||
return
|
||||
}
|
||||
|
||||
// --diag reports where the status item landed. On a notched Mac a
|
||||
// brand-new item can be placed under the notch and be unclickable,
|
||||
// which locks the user out once the panel is hidden.
|
||||
if CommandLine.arguments.contains("--diag") {
|
||||
setupStatusItem()
|
||||
installMenuItems()
|
||||
DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
|
||||
self.writeDiagnostics()
|
||||
NSApp.terminate(nil)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
// Single instance: stale copies keep their hotkeys alive after an
|
||||
// update and eat the events meant for the new instance.
|
||||
let myPid = ProcessInfo.processInfo.processIdentifier
|
||||
@@ -47,6 +60,10 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
|
||||
HotkeyManager.shared.start()
|
||||
|
||||
setupStatusItem()
|
||||
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
|
||||
// icon and the menu bar icon can be hard to spot on a full bar).
|
||||
@@ -56,6 +73,99 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
|
||||
}
|
||||
}
|
||||
|
||||
/// Without Accessibility the Shift-Shift gestures fail silently, so the
|
||||
/// panel can be hidden with no obvious way back. Say so on launch and
|
||||
/// point at the shortcut that works without the permission.
|
||||
private func promptForAccessibilityIfNeeded() {
|
||||
guard !AXIsProcessTrusted() else { return }
|
||||
let alert = NSAlert()
|
||||
alert.messageText = "Prompt needs Accessibility access"
|
||||
alert.informativeText = """
|
||||
Capturing with Shift-Shift (and showing the panel with right Shift twice) \
|
||||
only works with Accessibility access.
|
||||
|
||||
Until it is granted, use Cmd+Shift+Space to show or hide the panel and \
|
||||
Cmd+Shift+C to capture, or click the menu bar icon.
|
||||
"""
|
||||
alert.addButton(withTitle: "Open Settings")
|
||||
alert.addButton(withTitle: "Later")
|
||||
if alert.runModal() == .alertFirstButtonReturn {
|
||||
let options = [kAXTrustedCheckOptionPrompt.takeUnretainedValue(): true] as CFDictionary
|
||||
_ = AXIsProcessTrustedWithOptions(options)
|
||||
}
|
||||
}
|
||||
|
||||
/// A launched-again app must reveal itself. Without this, `open` (or
|
||||
/// clicking it in Finder/Spotlight) hits the running instance, which does
|
||||
/// nothing, so the app looks like it never started.
|
||||
@MainActor
|
||||
func applicationShouldHandleReopen(_ sender: NSApplication, hasVisibleWindows flag: Bool) -> Bool {
|
||||
PanelController.shared.show()
|
||||
return true
|
||||
}
|
||||
|
||||
@MainActor
|
||||
func applicationShouldTerminate(_ sender: NSApplication) -> NSApplication.TerminateReply {
|
||||
// Stop the poll timer, any queued push, the event tap and the Carbon
|
||||
// hotkeys so termination cannot be held up by a live callback.
|
||||
SyncService.shared.stop()
|
||||
HotkeyManager.shared.stop()
|
||||
return .terminateNow
|
||||
}
|
||||
|
||||
/// Adds "Hide Panel" to the menu SwiftUI already installed. Do NOT replace
|
||||
/// `NSApp.mainMenu`: SwiftUI's menu carries the Edit items that AppKit
|
||||
/// routes Cmd+C/V/X/A/Z through, so replacing it breaks text editing in the
|
||||
/// composer. This only inserts one item and drops SwiftUI's Settings item,
|
||||
/// whose empty scene would otherwise shadow the in-panel Cmd+, sync panel.
|
||||
private func installMenuItems() {
|
||||
guard let appMenu = NSApp.mainMenu?.items.first?.submenu else { return }
|
||||
|
||||
if let settings = appMenu.items.firstIndex(where: { $0.keyEquivalent == "," && $0.keyEquivalentModifierMask == [.command] }) {
|
||||
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")
|
||||
hide.target = self
|
||||
let quitIndex = appMenu.items.firstIndex { $0.action == #selector(NSApplication.terminate(_:)) } ?? appMenu.items.count
|
||||
appMenu.insertItem(.separator(), at: quitIndex)
|
||||
appMenu.insertItem(hide, at: quitIndex + 1)
|
||||
}
|
||||
|
||||
@MainActor @objc private func hidePanel() {
|
||||
PanelController.shared.hide()
|
||||
}
|
||||
|
||||
@MainActor
|
||||
private func writeDiagnostics() {
|
||||
var lines = ["Prompt diagnostics", "accessibility: \(AXIsProcessTrusted())"]
|
||||
if let window = statusItem?.button?.window {
|
||||
lines.append("status item frame: \(window.frame)")
|
||||
if let screen = window.screen ?? NSScreen.main {
|
||||
lines.append("screen: \(screen.frame) visible: \(screen.visibleFrame)")
|
||||
lines.append("notch inset: \(screen.safeAreaInsets)")
|
||||
let underNotch = window.frame.maxX > screen.frame.maxX - screen.safeAreaInsets.right
|
||||
lines.append("under the notch: \(underNotch)")
|
||||
}
|
||||
} else {
|
||||
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("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(
|
||||
to: URL(fileURLWithPath: "/tmp/prompt-diag.txt"), atomically: true, encoding: .utf8
|
||||
)
|
||||
}
|
||||
|
||||
private func setupStatusItem() {
|
||||
let item = NSStatusBar.system.statusItem(withLength: NSStatusItem.squareLength)
|
||||
item.autosaveName = "Prompt"
|
||||
|
||||
@@ -34,6 +34,22 @@ final class HotkeyManager {
|
||||
registerFallbackHotkeys()
|
||||
}
|
||||
|
||||
func stop() {
|
||||
if let tap = eventTap {
|
||||
CGEvent.tapEnable(tap: tap, enable: false)
|
||||
CFMachPortInvalidate(tap)
|
||||
}
|
||||
if let source = runLoopSource {
|
||||
CFRunLoopRemoveSource(CFRunLoopGetMain(), source, .commonModes)
|
||||
}
|
||||
for ref in hotKeyRefs {
|
||||
if let ref { UnregisterEventHotKey(ref) }
|
||||
}
|
||||
hotKeyRefs.removeAll()
|
||||
eventTap = nil
|
||||
runLoopSource = nil
|
||||
}
|
||||
|
||||
// MARK: - Double-Shift event tap
|
||||
|
||||
private func startEventTap() {
|
||||
|
||||
@@ -31,12 +31,14 @@ final class PanelController: NSObject {
|
||||
}
|
||||
NSApp.activate(ignoringOtherApps: true)
|
||||
panel.makeKeyAndOrderFront(nil)
|
||||
NSLog("Prompt: panel shown")
|
||||
NotificationCenter.default.post(name: .promptPanelDidShow, object: nil)
|
||||
}
|
||||
|
||||
func hide() {
|
||||
panel?.orderOut(nil)
|
||||
NSApp.deactivate()
|
||||
NSLog("Prompt: panel hidden (app keeps running for the Shift-Shift hotkeys)")
|
||||
}
|
||||
|
||||
private func makePanel() -> KeyablePanel {
|
||||
@@ -69,21 +71,27 @@ final class PanelController: NSObject {
|
||||
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
|
||||
// (and no text, so normal text paste into the composer is unaffected).
|
||||
// Cmd+V is handled here rather than left to a menu key equivalent. The
|
||||
// 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() {
|
||||
guard pasteMonitor == nil else { return }
|
||||
pasteMonitor = NSEvent.addLocalMonitorForEvents(matching: .keyDown) { [weak self] event in
|
||||
guard let self, let panel = self.panel, event.window == panel else { return event }
|
||||
let modifiers = event.modifierFlags.intersection(.deviceIndependentFlagsMask)
|
||||
if modifiers == [.command], event.charactersIgnoringModifiers == "v" {
|
||||
let pasteboard = NSPasteboard.general
|
||||
if pasteboard.string(forType: .string) == nil,
|
||||
let images = pasteboard.readObjects(forClasses: [NSImage.self], options: nil) as? [NSImage],
|
||||
let image = images.first {
|
||||
Task { @MainActor in Store.shared.addImage(image) }
|
||||
return nil
|
||||
}
|
||||
guard modifiers == [.command], event.charactersIgnoringModifiers == "v" else { return event }
|
||||
|
||||
let pasteboard = NSPasteboard.general
|
||||
if pasteboard.string(forType: .string) != nil {
|
||||
NSApp.sendAction(#selector(NSText.paste(_:)), to: nil, from: 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
|
||||
}
|
||||
|
||||
+253
-74
@@ -10,13 +10,16 @@ struct PanelView: View {
|
||||
@State private var search = ""
|
||||
@State private var showSearch = false
|
||||
@State private var showSectionSwitcher = false
|
||||
@State private var showNewWorkspace = false
|
||||
@State private var newWorkspaceName = ""
|
||||
@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()
|
||||
|
||||
private enum Field: Hashable { case composer, search }
|
||||
private enum Field: Hashable { case composer, search, newWorkspace }
|
||||
@FocusState private var focusedField: Field?
|
||||
|
||||
var body: some View {
|
||||
@@ -31,12 +34,16 @@ struct PanelView: View {
|
||||
Divider()
|
||||
content
|
||||
Divider()
|
||||
if !selection.isEmpty {
|
||||
selectionBar
|
||||
}
|
||||
composerField
|
||||
}
|
||||
.frame(minWidth: 300)
|
||||
.background(shortcutButtons)
|
||||
.overlay(sectionSwitcher)
|
||||
.overlay(syncOverlay)
|
||||
.overlay(newWorkspaceModal)
|
||||
.onDrop(of: [UTType.image.identifier, UTType.fileURL.identifier], isTargeted: nil, perform: handleDrop)
|
||||
.onReceive(NotificationCenter.default.publisher(for: .promptPanelDidShow)) { _ in
|
||||
focusedField = .composer
|
||||
@@ -62,7 +69,7 @@ struct PanelView: View {
|
||||
.foregroundStyle(.secondary)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
.help("Switch section (Cmd+K)")
|
||||
.help("Switch workspace (Cmd+K)")
|
||||
|
||||
Spacer()
|
||||
|
||||
@@ -76,7 +83,8 @@ struct PanelView: View {
|
||||
Button { addPhotos() } label: { Image(systemName: "photo.on.rectangle.angled") }
|
||||
.buttonStyle(.plain).foregroundStyle(.secondary).help("Add photos")
|
||||
Button { PanelController.shared.hide() } label: { Image(systemName: "xmark") }
|
||||
.buttonStyle(.plain).foregroundStyle(.secondary).help("Close (Esc)")
|
||||
.buttonStyle(.plain).foregroundStyle(.secondary)
|
||||
.help("Hide the panel (Cmd+W) — Prompt keeps running so Shift-Shift capture still works. Quit from the menu bar icon or Cmd+Q.")
|
||||
}
|
||||
.padding(.horizontal, 12)
|
||||
.padding(.vertical, 10)
|
||||
@@ -86,8 +94,13 @@ struct PanelView: View {
|
||||
HStack(spacing: 8) {
|
||||
Image(systemName: "exclamationmark.triangle.fill")
|
||||
.foregroundStyle(.yellow)
|
||||
Text("Shift-tap capture needs Accessibility access.")
|
||||
.font(.caption)
|
||||
VStack(alignment: .leading, spacing: 2) {
|
||||
Text("Shift-tap capture needs Accessibility access.")
|
||||
.font(.caption)
|
||||
Text("Meanwhile: Cmd+Shift+Space toggles this panel.")
|
||||
.font(.caption2)
|
||||
.foregroundStyle(.secondary)
|
||||
}
|
||||
Spacer()
|
||||
Button("Grant…") {
|
||||
let options = [kAXTrustedCheckOptionPrompt.takeUnretainedValue(): true] as CFDictionary
|
||||
@@ -103,7 +116,7 @@ struct PanelView: View {
|
||||
private var searchField: some View {
|
||||
HStack(spacing: 8) {
|
||||
Image(systemName: "magnifyingglass").foregroundStyle(.secondary)
|
||||
TextField("Search all sections", text: $search)
|
||||
TextField("Search all workspaces", text: $search)
|
||||
.textFieldStyle(.plain)
|
||||
.focused($focusedField, equals: .search)
|
||||
.onExitCommand {
|
||||
@@ -180,8 +193,21 @@ struct PanelView: View {
|
||||
.padding(.vertical, 48)
|
||||
}
|
||||
|
||||
/// Rows carry a checkbox that *selects* the item, so a selection can be
|
||||
/// copied or deleted from the context menu. 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 {
|
||||
Button { handleClick(item) } label: {
|
||||
HStack(alignment: .top, spacing: 8) {
|
||||
Button {
|
||||
toggleSelection(item.id)
|
||||
} label: {
|
||||
Image(systemName: selection.contains(item.id) ? "checkmark.circle.fill" : "circle")
|
||||
.font(.system(size: 15))
|
||||
.foregroundStyle(selection.contains(item.id) ? Color.accentColor : Color.secondary.opacity(0.55))
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
.help(selection.contains(item.id) ? "Deselect" : "Select for copy or delete")
|
||||
|
||||
VStack(alignment: .leading, spacing: 6) {
|
||||
if !sectionName.isEmpty {
|
||||
Text(sectionName.uppercased())
|
||||
@@ -195,28 +221,28 @@ struct PanelView: View {
|
||||
Text(sourceApp)
|
||||
}
|
||||
Text(item.createdAt, style: .time)
|
||||
if item.done {
|
||||
Image(systemName: "checkmark")
|
||||
}
|
||||
}
|
||||
.font(.caption2)
|
||||
.foregroundStyle(.tertiary)
|
||||
}
|
||||
.padding(10)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
.background(rowBackground(item))
|
||||
.cornerRadius(8)
|
||||
.overlay(alignment: .topTrailing) {
|
||||
if copiedID == item.id {
|
||||
Label("Copied", systemImage: "checkmark.circle.fill")
|
||||
.font(.caption2)
|
||||
.foregroundStyle(.green)
|
||||
.padding(6)
|
||||
.transition(.opacity)
|
||||
}
|
||||
}
|
||||
.padding(10)
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
.background(rowBackground(item))
|
||||
.cornerRadius(8)
|
||||
.overlay(alignment: .topTrailing) {
|
||||
if copiedID == item.id {
|
||||
Label("Copied", systemImage: "checkmark.circle.fill")
|
||||
.font(.caption2)
|
||||
.foregroundStyle(.green)
|
||||
.padding(6)
|
||||
.transition(.opacity)
|
||||
}
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
.contentShape(Rectangle())
|
||||
.onTapGesture { handleClick(item) }
|
||||
.help("Click to select · Shift+click for a range · right-click to copy, delete and more")
|
||||
.contextMenu { contextMenu(for: item) }
|
||||
}
|
||||
|
||||
@@ -252,39 +278,51 @@ struct PanelView: View {
|
||||
}
|
||||
|
||||
private func contextMenu(for item: PromptItem) -> some View {
|
||||
Group {
|
||||
let ids = effectiveIDs(for: item)
|
||||
let multiple = ids.count > 1
|
||||
return Group {
|
||||
Button("Copy") { copy(item) }
|
||||
Button("Copy as List") {
|
||||
store.copyAsList(ids: effectiveIDs(for: item))
|
||||
flashCopied(item)
|
||||
Button(multiple ? "Copy \(ids.count) as List" : "Copy as List") {
|
||||
store.copyAsList(ids: ids)
|
||||
flashCopied(item.id)
|
||||
}
|
||||
Button(multiple ? "Copy \(ids.count) as Lines" : "Copy as Lines") {
|
||||
store.copyAsLines(ids: ids)
|
||||
flashCopied(item.id)
|
||||
}
|
||||
Divider()
|
||||
Button(item.done ? "Mark as Not Done" : "Mark as Done") { store.toggleDone(item.id) }
|
||||
if case .text(let text) = item.content {
|
||||
Button(item.done ? "Mark as Not Done" : "Mark as Done") {
|
||||
store.setDone(!item.done, ids: ids)
|
||||
}
|
||||
if case .text(let text) = item.content, !multiple {
|
||||
Button("Edit…") {
|
||||
PanelController.shared.editController.edit(itemID: item.id, text: text)
|
||||
}
|
||||
}
|
||||
if case .image(let filename) = item.content {
|
||||
if case .image(let filename) = item.content, !multiple {
|
||||
Button("Open") {
|
||||
NSWorkspace.shared.open(store.imageURL(for: filename))
|
||||
}
|
||||
}
|
||||
if selection.count > 1, selection.contains(item.id) {
|
||||
if multiple {
|
||||
Button("Merge Notes") {
|
||||
store.merge(ids: selection)
|
||||
selection.removeAll()
|
||||
store.merge(ids: ids)
|
||||
clearSelection()
|
||||
}
|
||||
}
|
||||
Menu("Move To") {
|
||||
ForEach(store.sections.filter { $0.id != store.sectionID(of: item.id) }) { section in
|
||||
Button(section.name) { store.move(item.id, to: section.id) }
|
||||
Button(section.name) {
|
||||
store.move(ids: ids, to: section.id)
|
||||
if multiple { clearSelection() }
|
||||
}
|
||||
}
|
||||
}
|
||||
Divider()
|
||||
Button("Delete", role: .destructive) {
|
||||
selection.remove(item.id)
|
||||
store.delete(item.id)
|
||||
Button(multiple ? "Delete \(ids.count) Items" : "Delete", role: .destructive) {
|
||||
store.delete(ids: ids)
|
||||
selection.subtract(ids)
|
||||
lastSelectedID = nil
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -300,39 +338,57 @@ struct PanelView: View {
|
||||
}
|
||||
.frame(maxWidth: .infinity, maxHeight: .infinity)
|
||||
VStack(spacing: 0) {
|
||||
ForEach(store.sections) { section in
|
||||
Button {
|
||||
ForEach(Array(store.sections.enumerated()), id: \.element.id) { index, section in
|
||||
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
|
||||
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()
|
||||
Button {
|
||||
composer = "# "
|
||||
showSectionSwitcher = false
|
||||
focusedField = .composer
|
||||
newWorkspaceName = ""
|
||||
showNewWorkspace = true
|
||||
focusedField = .newWorkspace
|
||||
} label: {
|
||||
HStack {
|
||||
Image(systemName: "plus")
|
||||
Text("New Section")
|
||||
Text("New Workspace")
|
||||
Spacer()
|
||||
}
|
||||
.padding(.horizontal, 14)
|
||||
@@ -450,6 +506,102 @@ 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()
|
||||
if selection.count == 1, let id = selection.first, let item = store.item(id) {
|
||||
Button("Copy") { copy(item) }
|
||||
.font(.caption)
|
||||
.buttonStyle(.plain)
|
||||
.foregroundStyle(Color.accentColor)
|
||||
}
|
||||
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 {
|
||||
@@ -458,7 +610,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)
|
||||
@@ -500,11 +660,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)
|
||||
@@ -513,27 +675,44 @@ struct PanelView: View {
|
||||
|
||||
// MARK: - Actions
|
||||
|
||||
/// A click anywhere on the card selects it (Shift+click selects a range).
|
||||
/// Copying is then an action on the selection — from the selection bar or
|
||||
/// the right-click menu — rather than the side effect of a click.
|
||||
private func handleClick(_ item: PromptItem) {
|
||||
if NSApp.currentEvent?.modifierFlags.contains(.command) == true {
|
||||
if selection.contains(item.id) {
|
||||
selection.remove(item.id)
|
||||
} else {
|
||||
selection.insert(item.id)
|
||||
}
|
||||
let modifiers = NSApp.currentEvent?.modifierFlags ?? []
|
||||
if modifiers.contains(.shift), let anchor = lastSelectedID, anchor != item.id {
|
||||
selectRange(from: anchor, to: item.id)
|
||||
return
|
||||
}
|
||||
copy(item)
|
||||
toggleSelection(item.id)
|
||||
}
|
||||
|
||||
private func toggleSelection(_ id: UUID) {
|
||||
if selection.contains(id) {
|
||||
selection.remove(id)
|
||||
} else {
|
||||
selection.insert(id)
|
||||
}
|
||||
lastSelectedID = id
|
||||
}
|
||||
|
||||
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 copy(_ item: PromptItem) {
|
||||
store.copy(item)
|
||||
flashCopied(item)
|
||||
flashCopied(item.id)
|
||||
}
|
||||
|
||||
private func flashCopied(_ item: PromptItem) {
|
||||
withAnimation { copiedID = 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 }
|
||||
}
|
||||
}
|
||||
|
||||
+83
-18
@@ -38,11 +38,17 @@ final class Store: ObservableObject {
|
||||
private let storeFile: URL
|
||||
private let imageCache = NSCache<NSString, NSImage>()
|
||||
|
||||
init() {
|
||||
let appSupport = FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask)[0]
|
||||
directory = appSupport.appendingPathComponent("Prompt", isDirectory: true)
|
||||
imagesDirectory = directory.appendingPathComponent("Images", isDirectory: true)
|
||||
storeFile = directory.appendingPathComponent("store.json")
|
||||
/// `directory` is injectable so the store can be exercised against a
|
||||
/// scratch folder instead of the user's real data.
|
||||
init(directory: URL? = nil) {
|
||||
if let directory {
|
||||
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)
|
||||
load()
|
||||
@@ -130,6 +136,18 @@ final class Store: ObservableObject {
|
||||
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
|
||||
|
||||
@discardableResult
|
||||
@@ -172,18 +190,49 @@ final class Store: ObservableObject {
|
||||
}
|
||||
|
||||
func delete(_ id: UUID) {
|
||||
delete(ids: [id])
|
||||
}
|
||||
|
||||
/// Deletes every item in `ids` in one pass, cleaning up their image files.
|
||||
func delete(ids: Set<UUID>) {
|
||||
guard !ids.isEmpty else { return }
|
||||
var removedAny = false
|
||||
for sectionIndex in sections.indices {
|
||||
if let itemIndex = sections[sectionIndex].items.firstIndex(where: { $0.id == id }) {
|
||||
let item = sections[sectionIndex].items[itemIndex]
|
||||
for item in sections[sectionIndex].items where ids.contains(item.id) {
|
||||
removedAny = true
|
||||
if case .image(let filename) = item.content {
|
||||
try? FileManager.default.removeItem(at: imagesDirectory.appendingPathComponent(filename))
|
||||
imageCache.removeObject(forKey: filename as NSString)
|
||||
}
|
||||
sections[sectionIndex].items.remove(at: itemIndex)
|
||||
save()
|
||||
return
|
||||
}
|
||||
sections[sectionIndex].items.removeAll { ids.contains($0.id) }
|
||||
}
|
||||
if removedAny { save() }
|
||||
}
|
||||
|
||||
func setDone(_ done: Bool, ids: Set<UUID>) {
|
||||
guard !ids.isEmpty else { return }
|
||||
for sectionIndex in sections.indices {
|
||||
for itemIndex in sections[sectionIndex].items.indices
|
||||
where ids.contains(sections[sectionIndex].items[itemIndex].id) {
|
||||
sections[sectionIndex].items[itemIndex].done = done
|
||||
}
|
||||
}
|
||||
save()
|
||||
}
|
||||
|
||||
/// Moves every item in `ids` into `targetSectionID`, keeping their order.
|
||||
func move(ids: Set<UUID>, to targetSectionID: UUID) {
|
||||
guard !ids.isEmpty,
|
||||
let targetIndex = sections.firstIndex(where: { $0.id == targetSectionID }) else { return }
|
||||
var moved: [PromptItem] = []
|
||||
for sectionIndex in sections.indices where sectionIndex != targetIndex {
|
||||
moved.append(contentsOf: sections[sectionIndex].items.filter { ids.contains($0.id) })
|
||||
sections[sectionIndex].items.removeAll { ids.contains($0.id) }
|
||||
}
|
||||
guard !moved.isEmpty else { return }
|
||||
sections[targetIndex].items.append(contentsOf: moved)
|
||||
save()
|
||||
}
|
||||
|
||||
func move(_ id: UUID, to targetSectionID: UUID) {
|
||||
@@ -269,18 +318,34 @@ final class Store: ObservableObject {
|
||||
}
|
||||
|
||||
func copyAsList(ids: Set<UUID>) {
|
||||
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<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
|
||||
pasteboard.clearContents()
|
||||
pasteboard.setString(list, forType: .string)
|
||||
pasteboard.setString(string, forType: .string)
|
||||
}
|
||||
|
||||
// MARK: - Images
|
||||
|
||||
@@ -67,6 +67,14 @@ final class SyncService: ObservableObject {
|
||||
restartPolling()
|
||||
}
|
||||
|
||||
func stop() {
|
||||
pollTimer?.invalidate()
|
||||
pollTimer = nil
|
||||
pushWork?.cancel()
|
||||
pushWork = nil
|
||||
Store.shared.onDidChange = nil
|
||||
}
|
||||
|
||||
// MARK: - Group membership
|
||||
|
||||
func generateCode() {
|
||||
|
||||
Reference in New Issue
Block a user