4 Commits
Author SHA1 Message Date
TZGyn d665d493af Stop the sync poll from rebuilding the panel every 5 s
@Published fires even when the assigned value is unchanged, so the poll's
unconditional lastError = nil invalidated PanelView — which observes
SyncService — every 5 seconds, forever, hidden or visible. Over five days
that was ~185 CPU-minutes and ~190 MB, and clicks started to lag.

- Route poll state through setError, which skips equal values.
- Watch SyncService from a tiny SyncDot view instead of the panel body.
- Skip the URL cache on polls and give them timeouts.
- Only reassign the composer placeholder when it changed.
2026-10-22 23:55:32 +08:00
TZGyn 0a6ef314c0 Edit in place and add a global All tab
Editing a prompt opened a separate floating window that ignored the
panel's theme; it is now an in-panel modal that matches. A Workspace/All
segmented tab above the list shows every prompt labeled with its
workspace, so the whole library is browsable without typing a search.
2026-10-17 13:38:03 +08:00
TZGyn a09f7b3196 Make the composer wrap and grow, and surface Launch at Login
Long prompts hit a single-line field before; the composer is now an
NSTextView that wraps and grows up to seven lines, keeps Return as send,
and uses Shift+Return for a newline. Launch at Login already existed in
the menu bar icon's right-click menu, so it is now also a toggle in the
sync panel where it is easier to find.
2026-10-16 22:28:16 +08:00
TZGyn 569e56dbba Add delete to the selection bar and drop the in-header close button
The selection bar covered copying but not the other action people reach
for with a selection. The header also carried a second close button next
to the window's own traffic light, so it was removed in favor of that.
2026-10-09 22:45:16 +08:00
6 changed files with 376 additions and 104 deletions
+29 -9
View File
@@ -13,7 +13,8 @@ clicking an item copies it back to the clipboard.
`NSStatusItem Preferred Position Prompt`). Left click toggles the panel, `NSStatusItem Preferred Position Prompt`). Left click toggles the panel,
right click shows the menu (accessibility state, launch at login, open data right click shows the menu (accessibility state, launch at login, open data
folder, quit). Contains the single-instance guard and `LoginItem` 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 (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 services key equivalents, which is the only way to quit from the keyboard
while the panel has focus. `applicationShouldHandleReopen` shows the panel so while the panel has focus. `applicationShouldHandleReopen` shows the panel so
@@ -37,17 +38,28 @@ clicking an item copies it back to the clipboard.
light mode keeps the system window colour. `Theme.background` is also handed 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 to the `NSPanel` so the strip under the transparent titlebar matches, and the
row colour stays slightly lighter than black so cards remain visible. row colour stays slightly lighter than black so cards remain visible.
- `Sources/Prompt/PanelView.swift` — the panel UI. Header (section switcher, - `Sources/Prompt/ComposerView.swift` — the chat-style composer
search, add photos, close), item list, composer. Composer `# Name` creates/ (`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), a segmented Workspace/All tab (All lists every prompt
labeled with its workspace), item list, in-panel edit modal, 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 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 = bar offers Copy (single item), Copy as List, Copy as Lines and Delete;
context menu acting on the whole selection (Copy, Copy as List, Copy as right-click = context menu acting on the whole selection (Copy, Copy as List,
Lines, Done, Edit, Open, Merge, Move To, Delete). Esc clears the selection Copy as Lines, Done, Edit, Open, Merge, Move To, Delete). Esc clears the
before it hides the panel. Drop target for images/files. selection before it hides the panel. Drop target for images/files.
- `Sources/Prompt/PanelController.swift` — owns the floating `NSPanel` - `Sources/Prompt/PanelController.swift` — owns the floating `NSPanel`
(`.nonactivatingPanel`, `.floating`, right-edge docked, frame autosaved as (`.nonactivatingPanel`, `.floating`, right-edge docked, frame autosaved as
`PromptPanel`), the Cmd+V image-paste monitor, and `EditWindowController` `PromptPanel`), and the Cmd+V paste monitor. Editing a note is an in-panel
(separate edit window with a `TextEditor`). modal in `PanelView`, not a window — a separate edit window used to float
loose from the panel and its theme.
- `Sources/Prompt/HotkeyManager.swift` — double-Shift detection via a - `Sources/Prompt/HotkeyManager.swift` — double-Shift detection via a
CGEvent tap on `flagsChanged` (left Shift ×2 = capture, right Shift ×2 = CGEvent tap on `flagsChanged` (left Shift ×2 = capture, right Shift ×2 =
toggle panel), plus Carbon `RegisterEventHotKey` fallbacks (Cmd+Shift+Space toggle panel), plus Carbon `RegisterEventHotKey` fallbacks (Cmd+Shift+Space
@@ -165,6 +177,14 @@ brew upgrade --cask prompt
## Gotchas ## Gotchas
- **`@Published` publishes on every assignment, even when the value is
unchanged.** The 5-second sync poll used to assign `lastError = nil`
unconditionally; `PanelView` observes `SyncService`, so the entire panel
(rows, overlays, composer) rebuilt every 5 seconds, forever. Over five days
of uptime that was ~185 CPU-minutes and ~190 MB of footprint, and every
click started to lag. Poll state now goes through `setError`, which no-ops
when equal, and the header's sync dot is its own view so sync publishes
cannot invalidate the list.
- **Never assign `NSApp.mainMenu`.** SwiftUI installs a menu whose Edit items - **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 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 silently breaks pasting, copying and select-all in the composer (this shipped
+11 -2
View File
@@ -5,16 +5,24 @@ A native macOS app for keeping prompts and photos, in the spirit of
to your work. Select what you need and send it back to your clipboard. to your work. Select what you need and send it back to your clipboard.
- **Click to select** — clicking a card selects it (Shift+click for a range), - **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 and the selection bar copies a single item as-is, the whole selection as a
numbered list or as plain newline-separated lines. 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 - **Text or photo** — copying sends text back as text and a photo back as an
image. image.
- **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.
- **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 - **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 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 up/down arrows in the switcher reorder them. (The code and the saved JSON
still call these `sections` so existing data keeps working.) still call these `sections` so existing data keeps working.)
- **An "All" tab** — a global view of every prompt across every workspace,
each labeled with the workspace it lives in.
- **Edit in place** — right-click → Edit opens an in-panel modal on the same
theme, not a separate window.
- **Right-click for actions** — Copy, Copy as List, Copy as Lines, Mark as Done, - **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. Edit, Open, Merge Notes, Move To, Delete — each acting on the whole selection.
- **Search** — Cmd+F searches across all workspaces. - **Search** — Cmd+F searches across all workspaces.
@@ -33,6 +41,7 @@ to your work. Select what you need and send it back to your clipboard.
| Switch/create workspace | Cmd+K | | Switch/create workspace | Cmd+K |
| Search | Cmd+F | | Search | Cmd+F |
| Focus composer | Cmd+N | | Focus composer | Cmd+N |
| New line in composer | Shift+Return |
| Sync settings | Cmd+, | | Sync settings | Cmd+, |
| Copy selection as numbered list | Shift+Cmd+C | | Copy selection as numbered list | Shift+Cmd+C |
| Copy selection as plain lines | Option+Cmd+C | | Copy selection as plain lines | Option+Cmd+C |
+159
View File
@@ -0,0 +1,159 @@
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)
}
if textView.placeholderText != placeholder {
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)
}
}
-53
View File
@@ -16,7 +16,6 @@ final class PanelController: NSObject {
private var panel: KeyablePanel? private var panel: KeyablePanel?
private var pasteMonitor: Any? private var pasteMonitor: Any?
let editController = EditWindowController()
var isVisible: Bool { panel?.isVisible ?? false } var isVisible: Bool { panel?.isVisible ?? false }
@@ -102,56 +101,4 @@ final class PanelController: NSObject {
} }
} }
@MainActor
final class EditWindowController: NSObject {
private var window: NSWindow?
func edit(itemID: UUID, text: String) {
let view = EditView(
text: text,
onSave: { [weak self] newText in
Store.shared.updateText(itemID, newText: newText)
self?.window?.close()
},
onCancel: { [weak self] in self?.window?.close() }
)
let window = NSWindow(
contentRect: NSRect(x: 0, y: 0, width: 480, height: 320),
styleMask: [.titled, .closable, .resizable],
backing: .buffered,
defer: false
)
window.title = "Edit Note"
window.contentView = NSHostingView(rootView: view)
window.isReleasedWhenClosed = false
window.center()
window.makeKeyAndOrderFront(nil)
NSApp.activate(ignoringOtherApps: true)
self.window = window
}
}
private struct EditView: View {
@State var text: String
var onSave: (String) -> Void
var onCancel: () -> Void
var body: some View {
VStack(spacing: 12) {
TextEditor(text: $text)
.font(.body)
.padding(4)
.background(Color.primary.opacity(0.05))
.cornerRadius(6)
HStack {
Spacer()
Button("Cancel", action: onCancel)
.keyboardShortcut(.cancelAction)
Button("Save") { onSave(text) }
.keyboardShortcut(.defaultAction)
.keyboardShortcut("s", modifiers: .command)
}
}
.padding(16)
}
}
+151 -34
View File
@@ -5,8 +5,9 @@ import UniformTypeIdentifiers
struct PanelView: View { struct PanelView: View {
@ObservedObject var store: Store @ObservedObject var store: Store
@ObservedObject private var sync = SyncService.shared @ObservedObject private var sync = SyncService.shared
@State private var composer = "" @State private var composer = ""
@State private var composerFocused = false
@State private var composerHeight: CGFloat = ComposerView.oneLineHeight
@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
@@ -16,10 +17,15 @@ struct PanelView: View {
@State private var joinCode = "" @State private var joinCode = ""
@State private var selection = Set<UUID>() @State private var selection = Set<UUID>()
@State private var lastSelectedID: UUID? @State private var lastSelectedID: UUID?
@State private var editingItem: PromptItem?
@State private var editText = ""
@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, newWorkspace } private enum Tab { case workspace, all }
@State private var tab: Tab = .workspace
private enum Field: Hashable { case search, newWorkspace, editor }
@FocusState private var focusedField: Field? @FocusState private var focusedField: Field?
var body: some View { var body: some View {
@@ -28,6 +34,7 @@ struct PanelView: View {
if !accessibilityGranted { if !accessibilityGranted {
permissionBanner permissionBanner
} }
tabPicker
if showSearch { if showSearch {
searchField searchField
} }
@@ -45,12 +52,13 @@ struct PanelView: View {
.overlay(sectionSwitcher) .overlay(sectionSwitcher)
.overlay(syncOverlay) .overlay(syncOverlay)
.overlay(newWorkspaceModal) .overlay(newWorkspaceModal)
.overlay(editModal)
.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 composerFocused = true
accessibilityGranted = AXIsProcessTrusted() accessibilityGranted = AXIsProcessTrusted()
} }
.onAppear { focusedField = .composer } .onAppear { composerFocused = true }
} }
// MARK: - Header // MARK: - Header
@@ -75,22 +83,32 @@ struct PanelView: View {
Spacer() Spacer()
Button { withAnimation(.easeInOut(duration: 0.15)) { showSync.toggle() } } label: { Button { withAnimation(.easeInOut(duration: 0.15)) { showSync.toggle() } } label: {
Image(systemName: "arrow.triangle.2.circlepath") SyncDot()
.foregroundStyle(sync.code == nil ? Color.secondary : Color.accentColor)
} }
.buttonStyle(.plain).help("Sync") .buttonStyle(.plain).help("Sync")
Button { toggleSearch() } label: { Image(systemName: "magnifyingglass") } Button { toggleSearch() } label: { Image(systemName: "magnifyingglass") }
.buttonStyle(.plain).foregroundStyle(.secondary).help("Search (Cmd+F)") .buttonStyle(.plain).foregroundStyle(.secondary).help("Search (Cmd+F)")
Button { addPhotos() } label: { Image(systemName: "photo.on.rectangle.angled") } Button { addPhotos() } label: { Image(systemName: "photo.on.rectangle.angled") }
.buttonStyle(.plain).foregroundStyle(.secondary).help("Add photos") .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(.horizontal, 12)
.padding(.vertical, 10) .padding(.vertical, 10)
} }
// MARK: - Tabs
/// The global view: every prompt across every workspace, each labeled.
private var tabPicker: some View {
Picker("View", selection: $tab) {
Text(store.activeSection.name).tag(Tab.workspace)
Text("All").tag(Tab.all)
}
.pickerStyle(.segmented)
.labelsHidden()
.padding(.horizontal, 12)
.padding(.vertical, 6)
}
private var permissionBanner: some View { private var permissionBanner: some View {
HStack(spacing: 8) { HStack(spacing: 8) {
Image(systemName: "exclamationmark.triangle.fill") Image(systemName: "exclamationmark.triangle.fill")
@@ -123,7 +141,7 @@ struct PanelView: View {
.onExitCommand { .onExitCommand {
search = "" search = ""
showSearch = false showSearch = false
focusedField = .composer composerFocused = true
} }
if !search.isEmpty { if !search.isEmpty {
Button { search = "" } label: { Image(systemName: "xmark.circle.fill") } Button { search = "" } label: { Image(systemName: "xmark.circle.fill") }
@@ -136,21 +154,27 @@ struct PanelView: View {
// MARK: - Content // MARK: - Content
private var displayedItems: [(section: String, item: PromptItem)] { /// Every item across every workspace, each labeled with its workspace.
if search.isEmpty { private var allLabeledItems: [(section: String, item: PromptItem)] {
return store.activeSection.items.map { ("", $0) } store.sections.flatMap { section in
section.items.map { (section.name, $0) }
} }
let query = search.lowercased() }
return store.sections.flatMap { section in
section.items.compactMap { item in private var displayedItems: [(section: String, item: PromptItem)] {
switch item.content { if !search.isEmpty {
case .text(let text) where text.lowercased().contains(query): let query = search.lowercased()
return (section.name, item) return allLabeledItems.filter { entry in
default: if case .text(let text) = entry.item.content {
return nil return text.lowercased().contains(query)
} }
return false
} }
} }
if tab == .all {
return allLabeledItems
}
return store.activeSection.items.map { ("", $0) }
} }
private var content: some View { private var content: some View {
@@ -297,7 +321,9 @@ struct PanelView: View {
} }
if case .text(let text) = item.content, !multiple { if case .text(let text) = item.content, !multiple {
Button("Edit…") { Button("Edit…") {
PanelController.shared.editController.edit(itemID: item.id, text: text) editText = text
editingItem = item
focusedField = .editor
} }
} }
if case .image(let filename) = item.content, !multiple { if case .image(let filename) = item.content, !multiple {
@@ -377,6 +403,7 @@ struct PanelView: View {
.contentShape(Rectangle()) .contentShape(Rectangle())
.onTapGesture { .onTapGesture {
store.activeSectionID = section.id store.activeSectionID = section.id
tab = .workspace
showSectionSwitcher = false showSectionSwitcher = false
} }
} }
@@ -476,6 +503,12 @@ struct PanelView: View {
.font(.caption) .font(.caption)
.foregroundStyle(.secondary) .foregroundStyle(.secondary)
} }
Divider()
Toggle("Launch at Login", isOn: Binding(
get: { LoginItem.isEnabled },
set: { _ in _ = LoginItem.toggle() }
))
.font(.callout)
if let error = sync.lastError { if let error = sync.lastError {
Text(error) Text(error)
.font(.caption) .font(.caption)
@@ -507,6 +540,62 @@ struct PanelView: View {
} }
} }
// MARK: - Edit
@ViewBuilder
private var editModal: some View {
if let item = editingItem {
ZStack {
Color.black.opacity(0.25)
.onTapGesture { dismissEditor() }
VStack(alignment: .leading, spacing: 12) {
Text("Edit")
.font(.headline)
TextEditor(text: $editText)
.font(.callout)
.scrollContentBackground(.hidden)
.frame(minHeight: 120, maxHeight: 280)
.padding(8)
.background(Theme.rowSwiftUI)
.cornerRadius(8)
.focused($focusedField, equals: .editor)
HStack {
Spacer()
Button("Cancel") { dismissEditor() }
.keyboardShortcut(.cancelAction)
Button("Save") { saveEdit(item) }
.keyboardShortcut("s", modifiers: .command)
.disabled(editText.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty)
}
}
.padding(16)
.frame(maxWidth: 320)
.background(Theme.backgroundSwiftUI)
.cornerRadius(12)
.overlay(
RoundedRectangle(cornerRadius: 12)
.stroke(Color.primary.opacity(0.12), lineWidth: 1)
)
.shadow(radius: 18)
}
.transition(.opacity)
}
}
private func saveEdit(_ item: PromptItem) {
let text = editText.trimmingCharacters(in: .whitespacesAndNewlines)
if !text.isEmpty {
store.updateText(item.id, newText: text)
}
dismissEditor()
}
private func dismissEditor() {
editingItem = nil
editText = ""
composerFocused = true
}
// MARK: - New workspace // MARK: - New workspace
@ViewBuilder @ViewBuilder
@@ -551,7 +640,7 @@ struct PanelView: View {
private func dismissNewWorkspace() { private func dismissNewWorkspace() {
showNewWorkspace = false showNewWorkspace = false
newWorkspaceName = "" newWorkspaceName = ""
focusedField = .composer composerFocused = true
} }
// MARK: - Selection // MARK: - Selection
@@ -576,6 +665,12 @@ struct PanelView: View {
.font(.caption) .font(.caption)
.buttonStyle(.plain) .buttonStyle(.plain)
.foregroundStyle(Color.accentColor) .foregroundStyle(Color.accentColor)
Button { deleteSelection() } label: {
Image(systemName: "trash")
}
.buttonStyle(.plain)
.foregroundStyle(.red)
.help("Delete selected")
Button { clearSelection() } label: { Button { clearSelection() } label: {
Image(systemName: "xmark.circle.fill") Image(systemName: "xmark.circle.fill")
} }
@@ -588,6 +683,12 @@ struct PanelView: View {
.background(Color.accentColor.opacity(0.12)) .background(Color.accentColor.opacity(0.12))
} }
private func deleteSelection() {
guard !selection.isEmpty else { return }
store.delete(ids: selection)
clearSelection()
}
private func copySelection(asList: Bool) { private func copySelection(asList: Bool) {
guard !selection.isEmpty else { return } guard !selection.isEmpty else { return }
if asList { if asList {
@@ -606,28 +707,32 @@ struct PanelView: View {
// MARK: - Composer // MARK: - Composer
private var composerField: some View { private var composerField: some View {
HStack(spacing: 8) { HStack(alignment: .bottom, spacing: 8) {
TextField("Add a note or prompt (\(store.activeSection.name))", text: $composer) ComposerView(
.textFieldStyle(.plain) text: $composer,
.focused($focusedField, equals: .composer) isFocused: $composerFocused,
.onSubmit(submit) height: $composerHeight,
.onExitCommand { placeholder: "Add a note or prompt (\(store.activeSection.name))",
// Esc clears a selection first, and only hides the panel onSubmit: submit,
// once there is nothing selected. onEscape: {
if selection.isEmpty { if selection.isEmpty {
PanelController.shared.hide() PanelController.shared.hide()
} else { } else {
clearSelection() clearSelection()
} }
} }
)
.frame(maxWidth: .infinity)
.frame(height: composerHeight)
if !composer.isEmpty { if !composer.isEmpty {
Button(action: submit) { Image(systemName: "arrow.up.circle.fill") } Button(action: submit) { Image(systemName: "arrow.up.circle.fill") }
.buttonStyle(.plain) .buttonStyle(.plain)
.foregroundStyle(Color.accentColor) .foregroundStyle(Color.accentColor)
.help("Add (Return; Shift+Return for a new line)")
} }
} }
.padding(.horizontal, 12) .padding(.horizontal, 12)
.padding(.vertical, 10) .padding(.vertical, 8)
} }
private func submit() { private func submit() {
@@ -654,7 +759,7 @@ struct PanelView: View {
withAnimation(.easeInOut(duration: 0.15)) { showSectionSwitcher.toggle() } withAnimation(.easeInOut(duration: 0.15)) { showSectionSwitcher.toggle() }
} }
.keyboardShortcut("k", modifiers: .command) .keyboardShortcut("k", modifiers: .command)
Button("") { focusedField = .composer } Button("") { composerFocused = true }
.keyboardShortcut("n", modifiers: .command) .keyboardShortcut("n", modifiers: .command)
Button("") { Button("") {
withAnimation(.easeInOut(duration: 0.15)) { showSync.toggle() } withAnimation(.easeInOut(duration: 0.15)) { showSync.toggle() }
@@ -730,7 +835,7 @@ struct PanelView: View {
focusedField = .search focusedField = .search
} else { } else {
search = "" search = ""
focusedField = .composer composerFocused = true
} }
} }
@@ -774,3 +879,15 @@ struct PanelView: View {
return (try? AttributedString(markdown: string, options: options)) ?? AttributedString(string) return (try? AttributedString(markdown: string, options: options)) ?? AttributedString(string)
} }
} }
/// Sync status lives in its own view so a `SyncService` publish cannot
/// invalidate the panel's list. Watching it from `PanelView`'s body meant every
/// sync event — including the 5-second poll — re-rendered every row.
private struct SyncDot: View {
@ObservedObject private var sync = SyncService.shared
var body: some View {
Image(systemName: "arrow.triangle.2.circlepath")
.foregroundStyle(sync.code == nil ? Color.secondary : Color.accentColor)
}
}
+26 -6
View File
@@ -193,13 +193,20 @@ final class SyncService: ObservableObject {
private func poll() { private func poll() {
guard !isSyncing, let code, let versionURL = endpoint("/api/sync/\(code)/version") else { return } guard !isSyncing, let code, let versionURL = endpoint("/api/sync/\(code)/version") else { return }
// A cached /version would keep reporting the version the client already
// has, so polls must always hit the network. The responses are a few
// bytes; letting CFNetwork write them to the disk cache every 5 s only
// adds churn.
var versionRequest = URLRequest(url: versionURL)
versionRequest.cachePolicy = .reloadIgnoringLocalCacheData
versionRequest.timeoutInterval = 15
Task { Task {
do { do {
// Cheap poll first: the full payload can be megabytes of // Cheap poll first: the full payload can be megabytes of
// base64 images, so only download it when the version moved. // base64 images, so only download it when the version moved.
let (versionData, versionResponse) = try await URLSession.shared.data(from: versionURL) let (versionData, versionResponse) = try await URLSession.shared.data(for: versionRequest)
if (versionResponse as? HTTPURLResponse)?.statusCode == 404 { if (versionResponse as? HTTPURLResponse)?.statusCode == 404 {
lastError = "Sync group no longer exists on the server" setError("Sync group no longer exists on the server")
return return
} }
guard let versionHTTP = versionResponse as? HTTPURLResponse, versionHTTP.statusCode == 200 else { guard let versionHTTP = versionResponse as? HTTPURLResponse, versionHTTP.statusCode == 200 else {
@@ -208,12 +215,15 @@ final class SyncService: ObservableObject {
} }
let remoteVersion = try JSONDecoder().decode([String: Int64].self, from: versionData)["version"] ?? 0 let remoteVersion = try JSONDecoder().decode([String: Int64].self, from: versionData)["version"] ?? 0
guard remoteVersion > lastVersion else { guard remoteVersion > lastVersion else {
lastError = nil setError(nil)
return return
} }
syncLog("poll remote v\(remoteVersion) local v\(lastVersion) — fetching payload") syncLog("poll remote v\(remoteVersion) local v\(lastVersion) — fetching payload")
guard let payloadURL = endpoint("/api/sync/\(code)") else { return } guard let payloadURL = endpoint("/api/sync/\(code)") else { return }
let (data, response) = try await URLSession.shared.data(from: payloadURL) var payloadRequest = URLRequest(url: payloadURL)
payloadRequest.cachePolicy = .reloadIgnoringLocalCacheData
payloadRequest.timeoutInterval = 30
let (data, response) = try await URLSession.shared.data(for: payloadRequest)
guard let http = response as? HTTPURLResponse, http.statusCode == 200 else { return } guard let http = response as? HTTPURLResponse, http.statusCode == 200 else { return }
let remote = try JSONDecoder().decode(SyncGetResponse.self, from: data) let remote = try JSONDecoder().decode(SyncGetResponse.self, from: data)
if let payload = remote.data { if let payload = remote.data {
@@ -221,15 +231,25 @@ final class SyncService: ObservableObject {
} else { } else {
lastVersion = remote.version lastVersion = remote.version
} }
lastError = nil setError(nil)
} catch { } catch {
syncLog("poll failed: \(error.localizedDescription)") syncLog("poll failed: \(error.localizedDescription)")
// Polling errors are transient; stay quiet unless nothing ever worked. // Polling errors are transient; stay quiet unless nothing ever worked.
if lastSyncedAt == nil { lastError = "Cannot reach sync server" } if lastSyncedAt == nil { setError("Cannot reach sync server") }
} }
} }
} }
/// `@Published` fires on every assignment, even when the value is
/// unchanged. The 5-second poll would otherwise republish `lastError`
/// forever, and since `PanelView` observes this object, the whole panel
/// (list, rows, overlays) re-rendered every 5 seconds — the app grew to
/// ~190 MB and ~90 ms of layout per poll over five days of uptime.
private func setError(_ message: String?) {
guard lastError != message else { return }
lastError = message
}
private func restartPolling() { private func restartPolling() {
pollTimer?.invalidate() pollTimer?.invalidate()
pollTimer = nil pollTimer = nil