Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c7b4ed32f2 | ||
|
|
9f0c0f8113 | ||
|
|
93cd6f2056 |
@@ -27,13 +27,17 @@ clicking an item copies it back to the clipboard.
|
|||||||
`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` for numbered output, `copyAsLines` for plain newlines;
|
(`copy`, `copyAsList` for numbered output, `copyAsLines` for plain newlines;
|
||||||
both text modes skip image items). Saves on every mutation.
|
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,
|
- `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 toggles multi-select, Shift+click
|
switches sections. Click = copy; the row checkbox selects, Cmd+click toggles
|
||||||
selects a range, and a selection bar offers Copy as List / Copy as Lines;
|
multi-select, Shift+click selects a range, and a selection bar offers Copy as
|
||||||
right-click = context menu (Copy, Copy as List, Copy as Lines, Done, Edit,
|
List / Copy as Lines; right-click = context menu acting on the selection
|
||||||
Open, Merge, Move To, Delete). Esc clears the selection before it hides the
|
(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.
|
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
|
||||||
@@ -156,6 +160,23 @@ 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
|
||||||
|
selecting the item, and nested buttons never receive clicks. The row uses
|
||||||
|
`contentShape` + `onTapGesture` for click-to-copy instead. Selection is
|
||||||
|
driven by the checkbox, Cmd+click (toggle) and Shift+click (range); the
|
||||||
|
context menu acts on the whole selection via `effectiveIDs(for:)`.
|
||||||
- **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
|
||||||
|
|||||||
@@ -4,13 +4,21 @@ 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.
|
||||||
|
|
||||||
|
- **Checkbox to select** — every item has a checkbox; tick several and act on
|
||||||
|
them at once (copy, delete, move, merge). Clicking the row itself still
|
||||||
|
copies that item.
|
||||||
- **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 / Copy as Lines** — Cmd+click to multi-select (Shift+click for
|
the Cmd+K switcher (which opens a name modal); Cmd+K switches, and the
|
||||||
a range), then copy the selection as a numbered list or as plain
|
up/down arrows in the switcher reorder them. (The code and the saved JSON
|
||||||
newline-separated text, from the selection bar or the right-click menu.
|
still call these `sections` so existing data keeps working.)
|
||||||
|
- **Copy as List / Copy as Lines** — select with the checkboxes (or Cmd+click,
|
||||||
|
or Shift+click for a range), then copy the selection as a numbered list or as
|
||||||
|
plain newline-separated text, from the selection bar, the right-click menu, or
|
||||||
|
Shift+Cmd+C / Option+Cmd+C. The same menu deletes, moves or merges the
|
||||||
|
selection.
|
||||||
- **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
|
||||||
@@ -25,7 +33,7 @@ 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+, |
|
||||||
|
|||||||
+27
-19
@@ -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
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -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
|
||||||
}
|
}
|
||||||
|
|||||||
+155
-63
@@ -10,6 +10,8 @@ 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>()
|
||||||
@@ -17,7 +19,7 @@ struct PanelView: View {
|
|||||||
@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 {
|
||||||
@@ -41,6 +43,7 @@ struct PanelView: View {
|
|||||||
.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
|
||||||
@@ -66,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()
|
||||||
|
|
||||||
@@ -113,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 {
|
||||||
@@ -190,8 +193,21 @@ struct PanelView: View {
|
|||||||
.padding(.vertical, 48)
|
.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 {
|
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) {
|
VStack(alignment: .leading, spacing: 6) {
|
||||||
if !sectionName.isEmpty {
|
if !sectionName.isEmpty {
|
||||||
Text(sectionName.uppercased())
|
Text(sectionName.uppercased())
|
||||||
@@ -205,29 +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())
|
||||||
.help("Click to copy · Cmd+click to select several · Shift+click for a range · right-click for more")
|
.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) }
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -263,43 +278,51 @@ struct PanelView: View {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private func contextMenu(for item: PromptItem) -> some 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") { copy(item) }
|
||||||
Button("Copy as List") {
|
Button(multiple ? "Copy \(ids.count) as List" : "Copy as List") {
|
||||||
store.copyAsList(ids: effectiveIDs(for: item))
|
store.copyAsList(ids: ids)
|
||||||
flashCopied(item.id)
|
flashCopied(item.id)
|
||||||
}
|
}
|
||||||
Button("Copy as Lines") {
|
Button(multiple ? "Copy \(ids.count) as Lines" : "Copy as Lines") {
|
||||||
store.copyAsLines(ids: effectiveIDs(for: item))
|
store.copyAsLines(ids: ids)
|
||||||
flashCopied(item.id)
|
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") {
|
||||||
if case .text(let text) = item.content {
|
store.setDone(!item.done, ids: ids)
|
||||||
|
}
|
||||||
|
if case .text(let text) = item.content, !multiple {
|
||||||
Button("Edit…") {
|
Button("Edit…") {
|
||||||
PanelController.shared.editController.edit(itemID: item.id, text: text)
|
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") {
|
Button("Open") {
|
||||||
NSWorkspace.shared.open(store.imageURL(for: filename))
|
NSWorkspace.shared.open(store.imageURL(for: filename))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if selection.count > 1, selection.contains(item.id) {
|
if multiple {
|
||||||
Button("Merge Notes") {
|
Button("Merge Notes") {
|
||||||
store.merge(ids: selection)
|
store.merge(ids: ids)
|
||||||
clearSelection()
|
clearSelection()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Menu("Move To") {
|
Menu("Move To") {
|
||||||
ForEach(store.sections.filter { $0.id != store.sectionID(of: item.id) }) { section in
|
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()
|
Divider()
|
||||||
Button("Delete", role: .destructive) {
|
Button(multiple ? "Delete \(ids.count) Items" : "Delete", role: .destructive) {
|
||||||
selection.remove(item.id)
|
store.delete(ids: ids)
|
||||||
store.delete(item.id)
|
selection.subtract(ids)
|
||||||
|
lastSelectedID = nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -315,39 +338,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)
|
||||||
@@ -465,6 +506,53 @@ 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
|
// MARK: - Selection
|
||||||
|
|
||||||
private var selectionBar: some View {
|
private var selectionBar: some View {
|
||||||
@@ -584,12 +672,7 @@ struct PanelView: View {
|
|||||||
private func handleClick(_ item: PromptItem) {
|
private func handleClick(_ item: PromptItem) {
|
||||||
let modifiers = NSApp.currentEvent?.modifierFlags ?? []
|
let modifiers = NSApp.currentEvent?.modifierFlags ?? []
|
||||||
if modifiers.contains(.command) {
|
if modifiers.contains(.command) {
|
||||||
if selection.contains(item.id) {
|
toggleSelection(item.id)
|
||||||
selection.remove(item.id)
|
|
||||||
} else {
|
|
||||||
selection.insert(item.id)
|
|
||||||
}
|
|
||||||
lastSelectedID = item.id
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if modifiers.contains(.shift), let anchor = lastSelectedID, anchor != item.id {
|
if modifiers.contains(.shift), let anchor = lastSelectedID, anchor != item.id {
|
||||||
@@ -599,6 +682,15 @@ struct PanelView: View {
|
|||||||
copy(item)
|
copy(item)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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) {
|
private func selectRange(from anchor: UUID, to target: UUID) {
|
||||||
let ids = displayedItems.map(\.item.id)
|
let ids = displayedItems.map(\.item.id)
|
||||||
guard let start = ids.firstIndex(of: anchor), let end = ids.firstIndex(of: target) else { return }
|
guard let start = ids.firstIndex(of: anchor), let end = ids.firstIndex(of: target) else { return }
|
||||||
|
|||||||
+59
-10
@@ -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
|
||||||
@@ -172,18 +190,49 @@ final class Store: ObservableObject {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func delete(_ id: UUID) {
|
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 {
|
for sectionIndex in sections.indices {
|
||||||
if let itemIndex = sections[sectionIndex].items.firstIndex(where: { $0.id == id }) {
|
for item in sections[sectionIndex].items where ids.contains(item.id) {
|
||||||
let item = sections[sectionIndex].items[itemIndex]
|
removedAny = true
|
||||||
if case .image(let filename) = item.content {
|
if case .image(let filename) = item.content {
|
||||||
try? FileManager.default.removeItem(at: imagesDirectory.appendingPathComponent(filename))
|
try? FileManager.default.removeItem(at: imagesDirectory.appendingPathComponent(filename))
|
||||||
imageCache.removeObject(forKey: filename as NSString)
|
imageCache.removeObject(forKey: filename as NSString)
|
||||||
}
|
}
|
||||||
sections[sectionIndex].items.remove(at: itemIndex)
|
}
|
||||||
save()
|
sections[sectionIndex].items.removeAll { ids.contains($0.id) }
|
||||||
return
|
}
|
||||||
|
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) {
|
func move(_ id: UUID, to targetSectionID: UUID) {
|
||||||
|
|||||||
Reference in New Issue
Block a user