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.
This commit is contained in:
@@ -156,14 +156,21 @@ brew upgrade --cask prompt
|
|||||||
|
|
||||||
## Gotchas
|
## Gotchas
|
||||||
|
|
||||||
- **Setting `NSApp.mainMenu` replaces SwiftUI's default menu.** SwiftUI installs
|
- **Never assign `NSApp.mainMenu`.** SwiftUI installs a menu whose Edit items
|
||||||
a menu containing the standard Edit items, and AppKit routes Cmd+C/V/X/A/Z
|
are how AppKit routes Cmd+C/V/X/A/Z; replacing it with a hand-built menu
|
||||||
through those items — so a hand-built menu with only Hide/Quit silently
|
silently breaks pasting, copying and select-all in the composer (this shipped
|
||||||
breaks pasting, copying and select-all in the composer. `setupMainMenu()`
|
once and had to be reverted). `installMenuItems()` only *augments* the
|
||||||
therefore rebuilds an Edit menu with `undo:`/`redo:`/`cut:`/`copy:`/`paste:`/
|
existing menu: it adds Hide Panel (Cmd+W) and removes SwiftUI's Settings item,
|
||||||
`selectAll:` (nil targets, so they travel the responder chain to the field
|
whose empty scene would otherwise shadow the in-panel Cmd+, sync panel.
|
||||||
editor). `Prompt --diag` dumps the menu so this can be checked without a
|
- **Cmd+V is handled by the paste monitor, not the menu.** The panel is a
|
||||||
keyboard.
|
`.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
|
||||||
|
|||||||
@@ -4,6 +4,8 @@ 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.
|
||||||
|
|||||||
+18
-36
@@ -32,7 +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()
|
||||||
setupMainMenu()
|
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)
|
||||||
@@ -60,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
|
||||||
@@ -111,44 +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
|
||||||
///
|
/// composer. This only inserts one item and drops SwiftUI's Settings item,
|
||||||
/// The Edit menu is not decoration: AppKit routes Cmd+C/V/X/A/Z through
|
/// whose empty scene would otherwise shadow the in-panel Cmd+, sync panel.
|
||||||
/// these items, so a minimal main menu silently breaks pasting and
|
private func installMenuItems() {
|
||||||
/// selecting in the composer.
|
guard let appMenu = NSApp.mainMenu?.items.first?.submenu else { return }
|
||||||
private func setupMainMenu() {
|
|
||||||
let mainMenu = NSMenu()
|
|
||||||
|
|
||||||
let appMenuItem = NSMenuItem()
|
if let settings = appMenu.items.firstIndex(where: { $0.keyEquivalent == "," && $0.keyEquivalentModifierMask == [.command] }) {
|
||||||
mainMenu.addItem(appMenuItem)
|
appMenu.removeItem(at: settings)
|
||||||
let appMenu = NSMenu(title: "Prompt")
|
}
|
||||||
appMenuItem.submenu = appMenu
|
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.addItem(.separator())
|
appMenu.insertItem(.separator(), at: quitIndex)
|
||||||
let quit = NSMenuItem(title: "Quit Prompt", action: #selector(quit), keyEquivalent: "q")
|
appMenu.insertItem(hide, at: quitIndex + 1)
|
||||||
quit.target = self
|
|
||||||
appMenu.addItem(quit)
|
|
||||||
|
|
||||||
let editMenuItem = NSMenuItem()
|
|
||||||
mainMenu.addItem(editMenuItem)
|
|
||||||
let editMenu = NSMenu(title: "Edit")
|
|
||||||
editMenuItem.submenu = editMenu
|
|
||||||
|
|
||||||
editMenu.addItem(withTitle: "Undo", action: Selector(("undo:")), keyEquivalent: "z")
|
|
||||||
let redo = editMenu.addItem(withTitle: "Redo", action: Selector(("redo:")), keyEquivalent: "z")
|
|
||||||
redo.keyEquivalentModifierMask = [.command, .shift]
|
|
||||||
editMenu.addItem(.separator())
|
|
||||||
editMenu.addItem(withTitle: "Cut", action: #selector(NSText.cut(_:)), keyEquivalent: "x")
|
|
||||||
editMenu.addItem(withTitle: "Copy", action: #selector(NSText.copy(_:)), keyEquivalent: "c")
|
|
||||||
editMenu.addItem(withTitle: "Paste", action: #selector(NSText.paste(_:)), keyEquivalent: "v")
|
|
||||||
editMenu.addItem(withTitle: "Select All", action: #selector(NSText.selectAll(_:)), keyEquivalent: "a")
|
|
||||||
|
|
||||||
NSApp.mainMenu = mainMenu
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@MainActor @objc private func hidePanel() {
|
@MainActor @objc private func hidePanel() {
|
||||||
|
|||||||
@@ -71,22 +71,28 @@ 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
|
let pasteboard = NSPasteboard.general
|
||||||
if pasteboard.string(forType: .string) == nil,
|
if pasteboard.string(forType: .string) != nil {
|
||||||
let images = pasteboard.readObjects(forClasses: [NSImage.self], options: nil) as? [NSImage],
|
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 {
|
let image = images.first {
|
||||||
Task { @MainActor in Store.shared.addImage(image) }
|
Task { @MainActor in Store.shared.addImage(image) }
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
}
|
|
||||||
return event
|
return event
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -193,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())
|
||||||
@@ -208,13 +221,12 @@ 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)
|
||||||
}
|
}
|
||||||
|
.frame(maxWidth: .infinity, alignment: .leading)
|
||||||
|
}
|
||||||
.padding(10)
|
.padding(10)
|
||||||
.frame(maxWidth: .infinity, alignment: .leading)
|
.frame(maxWidth: .infinity, alignment: .leading)
|
||||||
.background(rowBackground(item))
|
.background(rowBackground(item))
|
||||||
@@ -228,9 +240,9 @@ struct PanelView: View {
|
|||||||
.transition(.opacity)
|
.transition(.opacity)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
.contentShape(Rectangle())
|
||||||
.buttonStyle(.plain)
|
.onTapGesture { handleClick(item) }
|
||||||
.help("Click to copy · Cmd+click to select several · Shift+click for a range · right-click for more")
|
.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) }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user