Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a09f7b3196 | ||
|
|
569e56dbba | ||
|
|
78d56ca79b | ||
|
|
6580a79d40 | ||
|
|
c7b4ed32f2 |
@@ -13,7 +13,8 @@ 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`). Also sets `NSApp.mainMenu` with Hide Panel (Cmd+W) and Quit
|
||||
(`SMAppService`). The sync panel also carries a Launch at Login toggle (the
|
||||
app's only settings surface). 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
|
||||
@@ -27,14 +28,31 @@ clicking an item copies it back to the clipboard.
|
||||
`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` for numbered output, `copyAsLines` for plain newlines;
|
||||
both text modes skip image items). Saves on every mutation.
|
||||
- `Sources/Prompt/PanelView.swift` — the panel UI. Header (section switcher,
|
||||
search, add photos, close), item list, composer. Composer `# Name` creates/
|
||||
switches sections. Click = copy; Cmd+click toggles multi-select, Shift+click
|
||||
selects a range, and a selection bar offers Copy as List / Copy as Lines;
|
||||
right-click = context menu (Copy, Copy as List, Copy as Lines, Done, Edit,
|
||||
Open, Merge, Move To, Delete). Esc clears the selection before it hides the
|
||||
panel. Drop target for images/files.
|
||||
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/Theme.swift` — the panel's appearance-aware colours. Dark
|
||||
mode is pure black rather than the system window grey (the panel is a
|
||||
full-height strip beside your work, where grey reads as a half-lit window);
|
||||
light mode keeps the system window colour. `Theme.background` is also handed
|
||||
to the `NSPanel` so the strip under the transparent titlebar matches, and the
|
||||
row colour stays slightly lighter than black so cards remain visible.
|
||||
- `Sources/Prompt/ComposerView.swift` — the chat-style composer
|
||||
(`NSViewRepresentable` around an `NSTextView`): wraps long prompts, grows to
|
||||
fit up to seven lines, then scrolls. Return submits, Shift+Return inserts a
|
||||
newline, Esc forwards to the panel (clear selection, else hide). Height is
|
||||
measured from the text and pushed into a `height` binding the panel applies
|
||||
as a frame — a representable cannot resize itself through
|
||||
`intrinsicContentSize` once SwiftUI offers a larger size.
|
||||
- `Sources/Prompt/PanelView.swift` — the panel UI. Header (workspace switcher,
|
||||
search, add photos), item list, composer. There is no in-header close button:
|
||||
the window's own close button hides the panel. Composer `# Name` creates/
|
||||
switches sections. Click = select (Shift+click for a range); the selection
|
||||
bar offers Copy (single item), Copy as List, Copy as Lines and Delete;
|
||||
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`
|
||||
@@ -168,9 +186,13 @@ brew upgrade --cask prompt
|
||||
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.
|
||||
- **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
|
||||
|
||||
@@ -2,22 +2,26 @@
|
||||
|
||||
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.
|
||||
|
||||
- **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 select** — clicking a card selects it (Shift+click for a range),
|
||||
and the selection bar copies a single item as-is, the whole selection as a
|
||||
numbered list or as plain newline-separated lines, or deletes it.
|
||||
- **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.
|
||||
- **A composer that grows** — long prompts wrap and the input grows up to seven
|
||||
lines, then scrolls. Return sends, Shift+Return inserts a newline.
|
||||
- **Launch at Login** — toggle in the sync panel (Cmd+,) or the menu bar icon's
|
||||
right-click menu, to start Prompt on boot.
|
||||
- **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.)
|
||||
- **Copy as List / Copy as Lines** — Cmd+click to multi-select (Shift+click for
|
||||
a range), then copy the selection as a numbered list or as plain
|
||||
newline-separated text, from the selection bar or the right-click menu.
|
||||
- **Merge Notes, Mark as Done, Edit, Move To** — right-click any item.
|
||||
- **Search** — Cmd+F searches across all sections.
|
||||
- **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
|
||||
@@ -33,6 +37,7 @@ to your work. Click anything to copy it back to your clipboard.
|
||||
| Switch/create workspace | Cmd+K |
|
||||
| Search | Cmd+F |
|
||||
| Focus composer | Cmd+N |
|
||||
| New line in composer | Shift+Return |
|
||||
| Sync settings | Cmd+, |
|
||||
| Copy selection as numbered list | Shift+Cmd+C |
|
||||
| Copy selection as plain lines | Option+Cmd+C |
|
||||
|
||||
@@ -0,0 +1,157 @@
|
||||
import AppKit
|
||||
import SwiftUI
|
||||
|
||||
/// A chat-style composer backed by AppKit: wraps long prompts, grows to fit up
|
||||
/// to seven lines, then scrolls. Return submits; Shift+Return inserts a
|
||||
/// newline. A plain SwiftUI `TextField(axis: .vertical)` cannot keep Return as
|
||||
/// "send", which is why this is not one.
|
||||
///
|
||||
/// Height is driven by the caller: the representable measures the text and
|
||||
/// writes the clamped height into `height`, which the caller applies as a
|
||||
/// `.frame(height:)`. Driving the frame is what actually resizes a
|
||||
/// representable — `intrinsicContentSize` is ignored once SwiftUI offers a
|
||||
/// bigger size.
|
||||
struct ComposerView: NSViewRepresentable {
|
||||
@Binding var text: String
|
||||
@Binding var isFocused: Bool
|
||||
@Binding var height: CGFloat
|
||||
var placeholder: String
|
||||
var onSubmit: () -> Void
|
||||
var onEscape: (() -> Void)? = nil
|
||||
|
||||
private let maxLines: CGFloat = 7
|
||||
|
||||
/// The one-line height, so the composer starts at exactly one line instead
|
||||
/// of snapping to its real height on the first keystroke.
|
||||
static var oneLineHeight: CGFloat {
|
||||
let font = NSFont.systemFont(ofSize: NSFont.systemFontSize)
|
||||
return font.ascender - font.descender + font.leading + 10 // 2 x 5 inset
|
||||
}
|
||||
|
||||
func makeCoordinator() -> Coordinator { Coordinator(self) }
|
||||
|
||||
func makeNSView(context: Context) -> NSScrollView {
|
||||
let scrollView = NSScrollView()
|
||||
scrollView.drawsBackground = false
|
||||
scrollView.borderType = .noBorder
|
||||
scrollView.hasVerticalScroller = true
|
||||
scrollView.autohidesScrollers = true
|
||||
scrollView.horizontalScrollElasticity = .none
|
||||
|
||||
let textView = ComposerTextView()
|
||||
textView.delegate = context.coordinator
|
||||
textView.placeholderText = placeholder
|
||||
textView.isRichText = false
|
||||
textView.isVerticallyResizable = true
|
||||
textView.isHorizontallyResizable = false
|
||||
textView.autoresizingMask = [.width]
|
||||
textView.textContainer?.widthTracksTextView = true
|
||||
textView.textContainer?.lineFragmentPadding = 0
|
||||
textView.textContainerInset = NSSize(width: 0, height: 5)
|
||||
textView.font = .systemFont(ofSize: NSFont.systemFontSize)
|
||||
textView.textColor = .labelColor
|
||||
textView.drawsBackground = false
|
||||
// No containerSize: with widthTracksTextView the container follows the
|
||||
// view's width, which is what makes long lines wrap.
|
||||
|
||||
scrollView.documentView = textView
|
||||
textView.frame = NSRect(origin: .zero, size: scrollView.contentSize)
|
||||
context.coordinator.watchWindow(of: textView)
|
||||
return scrollView
|
||||
}
|
||||
|
||||
func updateNSView(_ scrollView: NSScrollView, context: Context) {
|
||||
guard let textView = scrollView.documentView as? ComposerTextView else { return }
|
||||
context.coordinator.parent = self
|
||||
if textView.string != text {
|
||||
textView.string = text
|
||||
updateHeight(textView)
|
||||
}
|
||||
textView.placeholderText = placeholder
|
||||
if isFocused, scrollView.window?.firstResponder != textView {
|
||||
scrollView.window?.makeFirstResponder(textView)
|
||||
}
|
||||
}
|
||||
|
||||
fileprivate func updateHeight(_ textView: ComposerTextView) {
|
||||
guard let layoutManager = textView.layoutManager,
|
||||
let textContainer = textView.textContainer else { return }
|
||||
layoutManager.ensureLayout(for: textContainer)
|
||||
let content = layoutManager.usedRect(for: textContainer).height + 2 * textView.textContainerInset.height
|
||||
let line = Self.oneLineHeight
|
||||
let clamped = max(line, min(content, line * maxLines + 1))
|
||||
if abs(height - clamped) > 0.5 {
|
||||
// Defer so the binding is not written from inside a layout pass.
|
||||
DispatchQueue.main.async { self.height = clamped }
|
||||
}
|
||||
}
|
||||
|
||||
final class Coordinator: NSObject, NSTextViewDelegate {
|
||||
var parent: ComposerView
|
||||
private var windowObserver: Any?
|
||||
|
||||
init(_ parent: ComposerView) { self.parent = parent }
|
||||
|
||||
/// Re-assert focus every time the panel becomes key again. The focus
|
||||
/// binding stays `true` while hidden, so without this a re-shown panel
|
||||
/// would not refocus the composer.
|
||||
fileprivate func watchWindow(of textView: ComposerTextView) {
|
||||
windowObserver = NotificationCenter.default.addObserver(
|
||||
forName: NSWindow.didBecomeKeyNotification, object: nil, queue: .main
|
||||
) { [weak self, weak textView] note in
|
||||
guard let self, let textView,
|
||||
(note.object as? NSWindow) === textView.window,
|
||||
self.parent.isFocused else { return }
|
||||
textView.window?.makeFirstResponder(textView)
|
||||
}
|
||||
}
|
||||
|
||||
deinit {
|
||||
if let windowObserver {
|
||||
NotificationCenter.default.removeObserver(windowObserver)
|
||||
}
|
||||
}
|
||||
|
||||
func textDidChange(_ notification: Notification) {
|
||||
guard let textView = notification.object as? ComposerTextView else { return }
|
||||
if parent.text != textView.string {
|
||||
parent.text = textView.string
|
||||
}
|
||||
parent.updateHeight(textView)
|
||||
}
|
||||
|
||||
// Return sends, Shift+Return inserts a newline. Esc is forwarded so the
|
||||
// panel can clear its selection or hide, which a TextField used to do
|
||||
// via onExitCommand.
|
||||
func textView(_ textView: NSTextView, doCommandBy commandSelector: Selector) -> Bool {
|
||||
if commandSelector == #selector(NSResponder.cancelOperation(_:)) {
|
||||
parent.onEscape?()
|
||||
return true
|
||||
}
|
||||
guard commandSelector == #selector(NSResponder.insertNewline(_:)) else { return false }
|
||||
if NSApp.currentEvent?.modifierFlags.contains(.shift) == true {
|
||||
return false
|
||||
}
|
||||
parent.onSubmit()
|
||||
return true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private final class ComposerTextView: NSTextView {
|
||||
var placeholderText: String = "" {
|
||||
didSet { needsDisplay = true }
|
||||
}
|
||||
|
||||
override func draw(_ dirtyRect: NSRect) {
|
||||
super.draw(dirtyRect)
|
||||
guard string.isEmpty, !placeholderText.isEmpty else { return }
|
||||
let attributes: [NSAttributedString.Key: Any] = [
|
||||
.font: font as Any,
|
||||
.foregroundColor: NSColor.placeholderTextColor,
|
||||
]
|
||||
let inset = textContainerInset
|
||||
let origin = NSPoint(x: inset.width + (textContainer?.lineFragmentPadding ?? 0), y: inset.height)
|
||||
placeholderText.draw(at: origin, withAttributes: attributes)
|
||||
}
|
||||
}
|
||||
@@ -56,6 +56,10 @@ final class PanelController: NSObject {
|
||||
panel.isMovableByWindowBackground = true
|
||||
panel.hidesOnDeactivate = false
|
||||
panel.isReleasedWhenClosed = false
|
||||
panel.isOpaque = true
|
||||
// Match the SwiftUI content so the titlebar strip and any resize flash
|
||||
// do not show the system grey through.
|
||||
panel.backgroundColor = Theme.background
|
||||
panel.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary]
|
||||
panel.contentView = NSHostingView(rootView: PanelView(store: Store.shared))
|
||||
panel.setFrameAutosaveName("PromptPanel")
|
||||
|
||||
@@ -7,6 +7,8 @@ struct PanelView: View {
|
||||
@ObservedObject private var sync = SyncService.shared
|
||||
|
||||
@State private var composer = ""
|
||||
@State private var composerFocused = false
|
||||
@State private var composerHeight: CGFloat = ComposerView.oneLineHeight
|
||||
@State private var search = ""
|
||||
@State private var showSearch = false
|
||||
@State private var showSectionSwitcher = false
|
||||
@@ -19,7 +21,7 @@ struct PanelView: View {
|
||||
@State private var copiedID: UUID?
|
||||
@State private var accessibilityGranted = AXIsProcessTrusted()
|
||||
|
||||
private enum Field: Hashable { case composer, search, newWorkspace }
|
||||
private enum Field: Hashable { case search, newWorkspace }
|
||||
@FocusState private var focusedField: Field?
|
||||
|
||||
var body: some View {
|
||||
@@ -40,16 +42,17 @@ struct PanelView: View {
|
||||
composerField
|
||||
}
|
||||
.frame(minWidth: 300)
|
||||
.background(Theme.backgroundSwiftUI)
|
||||
.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
|
||||
composerFocused = true
|
||||
accessibilityGranted = AXIsProcessTrusted()
|
||||
}
|
||||
.onAppear { focusedField = .composer }
|
||||
.onAppear { composerFocused = true }
|
||||
}
|
||||
|
||||
// MARK: - Header
|
||||
@@ -82,9 +85,6 @@ struct PanelView: View {
|
||||
.buttonStyle(.plain).foregroundStyle(.secondary).help("Search (Cmd+F)")
|
||||
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("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)
|
||||
@@ -122,7 +122,7 @@ struct PanelView: View {
|
||||
.onExitCommand {
|
||||
search = ""
|
||||
showSearch = false
|
||||
focusedField = .composer
|
||||
composerFocused = true
|
||||
}
|
||||
if !search.isEmpty {
|
||||
Button { search = "" } label: { Image(systemName: "xmark.circle.fill") }
|
||||
@@ -193,20 +193,20 @@ struct PanelView: View {
|
||||
.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.
|
||||
/// 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 {
|
||||
HStack(alignment: .top, spacing: 8) {
|
||||
Button {
|
||||
store.toggleDone(item.id)
|
||||
toggleSelection(item.id)
|
||||
} label: {
|
||||
Image(systemName: item.done ? "checkmark.circle.fill" : "circle")
|
||||
Image(systemName: selection.contains(item.id) ? "checkmark.circle.fill" : "circle")
|
||||
.font(.system(size: 15))
|
||||
.foregroundStyle(item.done ? Color.accentColor : Color.secondary.opacity(0.55))
|
||||
.foregroundStyle(selection.contains(item.id) ? Color.accentColor : Color.secondary.opacity(0.55))
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
.help(item.done ? "Mark as not done" : "Mark as done")
|
||||
.help(selection.contains(item.id) ? "Deselect" : "Select for copy or delete")
|
||||
|
||||
VStack(alignment: .leading, spacing: 6) {
|
||||
if !sectionName.isEmpty {
|
||||
@@ -242,13 +242,13 @@ struct PanelView: View {
|
||||
}
|
||||
.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")
|
||||
.help("Click to select · Shift+click for a range · right-click to copy, delete and more")
|
||||
.contextMenu { contextMenu(for: item) }
|
||||
}
|
||||
|
||||
private func rowBackground(_ item: PromptItem) -> Color {
|
||||
if selection.contains(item.id) { return Color.accentColor.opacity(0.25) }
|
||||
return Color.primary.opacity(0.05)
|
||||
return Theme.rowSwiftUI
|
||||
}
|
||||
|
||||
@ViewBuilder
|
||||
@@ -278,43 +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))
|
||||
Button(multiple ? "Copy \(ids.count) as List" : "Copy as List") {
|
||||
store.copyAsList(ids: ids)
|
||||
flashCopied(item.id)
|
||||
}
|
||||
Button("Copy as Lines") {
|
||||
store.copyAsLines(ids: effectiveIDs(for: item))
|
||||
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)
|
||||
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
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -467,6 +475,12 @@ struct PanelView: View {
|
||||
.font(.caption)
|
||||
.foregroundStyle(.secondary)
|
||||
}
|
||||
Divider()
|
||||
Toggle("Launch at Login", isOn: Binding(
|
||||
get: { LoginItem.isEnabled },
|
||||
set: { _ in _ = LoginItem.toggle() }
|
||||
))
|
||||
.font(.callout)
|
||||
if let error = sync.lastError {
|
||||
Text(error)
|
||||
.font(.caption)
|
||||
@@ -542,7 +556,7 @@ struct PanelView: View {
|
||||
private func dismissNewWorkspace() {
|
||||
showNewWorkspace = false
|
||||
newWorkspaceName = ""
|
||||
focusedField = .composer
|
||||
composerFocused = true
|
||||
}
|
||||
|
||||
// MARK: - Selection
|
||||
@@ -553,6 +567,12 @@ struct PanelView: View {
|
||||
.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)
|
||||
@@ -561,6 +581,12 @@ struct PanelView: View {
|
||||
.font(.caption)
|
||||
.buttonStyle(.plain)
|
||||
.foregroundStyle(Color.accentColor)
|
||||
Button { deleteSelection() } label: {
|
||||
Image(systemName: "trash")
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
.foregroundStyle(.red)
|
||||
.help("Delete selected")
|
||||
Button { clearSelection() } label: {
|
||||
Image(systemName: "xmark.circle.fill")
|
||||
}
|
||||
@@ -573,6 +599,12 @@ struct PanelView: View {
|
||||
.background(Color.accentColor.opacity(0.12))
|
||||
}
|
||||
|
||||
private func deleteSelection() {
|
||||
guard !selection.isEmpty else { return }
|
||||
store.delete(ids: selection)
|
||||
clearSelection()
|
||||
}
|
||||
|
||||
private func copySelection(asList: Bool) {
|
||||
guard !selection.isEmpty else { return }
|
||||
if asList {
|
||||
@@ -591,28 +623,32 @@ struct PanelView: View {
|
||||
// MARK: - Composer
|
||||
|
||||
private var composerField: some View {
|
||||
HStack(spacing: 8) {
|
||||
TextField("Add a note or prompt (\(store.activeSection.name))", text: $composer)
|
||||
.textFieldStyle(.plain)
|
||||
.focused($focusedField, equals: .composer)
|
||||
.onSubmit(submit)
|
||||
.onExitCommand {
|
||||
// Esc clears a selection first, and only hides the panel
|
||||
// once there is nothing selected.
|
||||
HStack(alignment: .bottom, spacing: 8) {
|
||||
ComposerView(
|
||||
text: $composer,
|
||||
isFocused: $composerFocused,
|
||||
height: $composerHeight,
|
||||
placeholder: "Add a note or prompt (\(store.activeSection.name))",
|
||||
onSubmit: submit,
|
||||
onEscape: {
|
||||
if selection.isEmpty {
|
||||
PanelController.shared.hide()
|
||||
} else {
|
||||
clearSelection()
|
||||
}
|
||||
}
|
||||
)
|
||||
.frame(maxWidth: .infinity)
|
||||
.frame(height: composerHeight)
|
||||
if !composer.isEmpty {
|
||||
Button(action: submit) { Image(systemName: "arrow.up.circle.fill") }
|
||||
.buttonStyle(.plain)
|
||||
.foregroundStyle(Color.accentColor)
|
||||
.help("Add (Return; Shift+Return for a new line)")
|
||||
}
|
||||
}
|
||||
.padding(.horizontal, 12)
|
||||
.padding(.vertical, 10)
|
||||
.padding(.vertical, 8)
|
||||
}
|
||||
|
||||
private func submit() {
|
||||
@@ -639,7 +675,7 @@ struct PanelView: View {
|
||||
withAnimation(.easeInOut(duration: 0.15)) { showSectionSwitcher.toggle() }
|
||||
}
|
||||
.keyboardShortcut("k", modifiers: .command)
|
||||
Button("") { focusedField = .composer }
|
||||
Button("") { composerFocused = true }
|
||||
.keyboardShortcut("n", modifiers: .command)
|
||||
Button("") {
|
||||
withAnimation(.easeInOut(duration: 0.15)) { showSync.toggle() }
|
||||
@@ -661,22 +697,25 @@ 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) {
|
||||
let modifiers = NSApp.currentEvent?.modifierFlags ?? []
|
||||
if modifiers.contains(.command) {
|
||||
if selection.contains(item.id) {
|
||||
selection.remove(item.id)
|
||||
} else {
|
||||
selection.insert(item.id)
|
||||
}
|
||||
lastSelectedID = item.id
|
||||
return
|
||||
}
|
||||
if modifiers.contains(.shift), let anchor = lastSelectedID, anchor != item.id {
|
||||
selectRange(from: anchor, to: item.id)
|
||||
return
|
||||
}
|
||||
copy(item)
|
||||
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) {
|
||||
@@ -712,7 +751,7 @@ struct PanelView: View {
|
||||
focusedField = .search
|
||||
} else {
|
||||
search = ""
|
||||
focusedField = .composer
|
||||
composerFocused = true
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -190,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) {
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
import AppKit
|
||||
import SwiftUI
|
||||
|
||||
/// Appearance-aware colours for the panel.
|
||||
///
|
||||
/// Dark mode is pure black rather than the system window grey: the panel is a
|
||||
/// full-height strip that sits beside your work, and the grey reads as a
|
||||
/// half-lit window next to a dark editor or terminal.
|
||||
enum Theme {
|
||||
static func isDark(_ appearance: NSAppearance) -> Bool {
|
||||
appearance.bestMatch(from: [.aqua, .darkAqua]) == .darkAqua
|
||||
}
|
||||
|
||||
/// The panel's own background (also handed to the NSPanel so the area under
|
||||
/// the transparent titlebar matches).
|
||||
static let background = NSColor(name: nil) { appearance in
|
||||
isDark(appearance) ? .black : .windowBackgroundColor
|
||||
}
|
||||
|
||||
/// Card background, kept subtle but visible against pure black.
|
||||
static let row = NSColor(name: nil) { appearance in
|
||||
isDark(appearance) ? NSColor(white: 1, alpha: 0.07) : NSColor(white: 0, alpha: 0.05)
|
||||
}
|
||||
|
||||
/// Same colours for SwiftUI.
|
||||
static let backgroundSwiftUI = Color(nsColor: background)
|
||||
static let rowSwiftUI = Color(nsColor: row)
|
||||
}
|
||||
Reference in New Issue
Block a user