Commit `13ab79873c`

13ab79873c80622eca482318aece2880cfb69e34

parent: 37a20f818f

Verified · cmc

cmc <hello@cleberg.net> · 2026-10-08 03:29 UTC

Fix Mac menu shortcut, trash warning, capture and Quick Open

- Put ⌥⌘O back on Show or Hide Outline.
- Warn before trashing only when the trashed file has unsaved edits.
- Show capture problems while the editor is showing too.
- Select multi-key capture templates by typing their keys; Delete drops the last one.
- Allow agenda spans up to 366 days.
- Move the Quick Open selection with Up/Down and C-n/C-p; Return opens it.

Layout: unified · split

Sources/Orgstar/CaptureView.swift +21 −5

     @State private var selection: TextSelection?
     @State private var context = CaptureContext()
     @State private var editing = false
+    /// The template keys typed so far, for multi-key templates such as "wb".
+    @State private var keys = ""
     @FocusState private var focused: Bool
     @Environment(\.dismissWindow) private var dismissWindow
                         .keyboardShortcut(.defaultAction)
                 }
             } else {
-                Text("Capture").font(.headline)
+                Text(keys.isEmpty ? "Capture" : "Capture: \(keys)").font(.headline)
-                ForEach(templates) { template in
+                ForEach(templates.filter { $0.key.hasPrefix(keys) }) { template in
                     Button {
                         choose(template)
                     } label: {
                     }
                     .buttonStyle(.plain)
                 }
-                if let problem { Text(problem).font(.caption).foregroundStyle(.red) }
             }
+            if let problem { Text(problem).font(.caption).foregroundStyle(.red) }
         }
         .padding(16)
         .frame(width: 520)
         .onKeyPress(phases: .down) { press in
-            guard template == nil, let match = templates.first(where: { $0.key == press.characters }) else { return .ignored }
+            guard template == nil else { return .ignored }
-            choose(match)
+            if press.key == .delete, !keys.isEmpty {
+                keys.removeLast()
+                return .handled
+            }
+            // Keys narrow the list until they name a template, as `org-capture` selects one.
+            let typed = keys + press.characters
+            if let match = templates.first(where: { $0.key == typed }) {
+                choose(match)
+            } else if !press.characters.isEmpty, templates.contains(where: { $0.key.hasPrefix(typed) }) {
+                keys = typed
+            } else {
+                return .ignored
+            }
             return .handled
         }
         .onAppear {
         problem = loaded.problems.first
         template = nil
         editing = false
+        keys = ""
         let clocked = clock.running
         let clockFile = clocked.map { Links.abbreviate($0.path, home: NSHomeDirectory()) }
         context = CaptureContext(
     private func choose(_ chosen: CaptureTemplate) {
         template = chosen
+        keys = ""
         // `%^g` offers the target file's tags.
         let path = DocumentSession.resolve(chosen.target.file, root: workspace.rootPaths.first)
         if !chosen.target.file.isEmpty, let text = session.openDocuments.first(where: { $0.path == path })?.document.text ?? (try? String(contentsOfFile: path, encoding: .utf8)) {

Sources/Orgstar/ContentView.swift +29 −9

     let workspace: WorkspaceModel
     let open: (FileEntry) -> Void
     @State private var query = ""
+    /// The highlighted match, moved by ↑/↓ or C-p/C-n and opened by Return.
+    @State private var selected = 0
     @Environment(\.dismiss) private var dismiss
     var body: some View {
         let matches = workspace.quickOpen(query)
+        let current = min(selected, matches.count - 1)
         VStack(spacing: 0) {
             TextField("Open file", text: $query)
                 .textFieldStyle(.plain)
                 .font(.title3)
                 .padding(12)
-                .onSubmit { if let first = matches.first { open(first) } }
+                .onSubmit { if current >= 0 { open(matches[current]) } }
+                .onKeyPress(phases: .down) { press in
+                    let control = press.modifiers == .control
+                    let step = if press.key == .downArrow || control && press.characters == "n" { 1 }
+                        else if press.key == .upArrow || control && press.characters == "p" { -1 } else { 0 }
+                    guard step != 0 else { return .ignored }
+                    selected = max(0, min(current + step, matches.count - 1))
+                    return .handled
+                }
+                .onChange(of: query) { selected = 0 }
             Divider()
-            List(matches) { entry in
+            ScrollViewReader { proxy in
-                Button {
+                List(matches.indices, id: \.self) { index in
-                    open(entry)
+                    let entry = matches[index]
-                } label: {
+                    Button {
-                    VStack(alignment: .leading, spacing: 2) {
+                        open(entry)
-                        Text(entry.name)
+                    } label: {
-                        Text(entry.relativePath).font(.caption).foregroundStyle(.secondary)
+                        VStack(alignment: .leading, spacing: 2) {
+                            Text(entry.name)
+                            Text(entry.relativePath).font(.caption).foregroundStyle(.secondary)
+                        }
+                        .frame(maxWidth: .infinity, alignment: .leading)
+                        .contentShape(Rectangle())
                     }
+                    .buttonStyle(.plain)
+                    .listRowBackground(index == current ? Color.accentColor.opacity(0.25) : Color.clear)
+                    .accessibilityAddTraits(index == current ? .isSelected : [])
                 }
-                .buttonStyle(.plain)
+                .onChange(of: current) { if current >= 0 { proxy.scrollTo(current) } }
             }
         }
         .frame(width: 520, height: 360)

Sources/Orgstar/OrgstarApp.swift +2 −2

             }
             CommandGroup(after: .sidebar) {
                 Button("Show or Hide Outline") { commands.run("app.toggle-outline") }
+                    .keyboardShortcut("o", modifiers: [.command, .option])
                 Button("Show or Hide Backlinks") { commands.run("app.toggle-backlinks") }
                 Button("Show or Hide Columns and Clock") { commands.run("app.toggle-inspector") }
                     .keyboardShortcut("i", modifiers: [.command, .option])
-                    .keyboardShortcut("o", modifiers: [.command, .option])
                 MarkupToggle()
             }
             CommandGroup(after: .pasteboard) {
     private var agenda: some View {
         Form {
             Section {
-                Stepper("Agenda shows \(agendaSpan) days", value: $agendaSpan, in: 1...31)
+                Stepper("Agenda shows \(agendaSpan) days", value: $agendaSpan, in: 1...366)
                 Stepper(agendaStartOffset == 0 ? "Agenda starts today" : "Agenda starts \(-agendaStartOffset) days before today", value: $agendaStartOffset, in: -14...0)
                 Toggle("Include files in subfolders", isOn: $agendaSubfolders)
             }

Sources/Orgstar/SidebarFiles.swift +3 −3

	@@ -35,8 +35,8 @@ extension Sidebar {
35	session.openPaths.filter { $0 == path \|\| $0.hasPrefix(path + "/") }	35	session.openPaths.filter { $0 == path \|\| $0.hasPrefix(path + "/") }
36	}	36	}
37		37
38	/// Whether `path` is an open file or a folder holding one.	38	/// Whether `path` is an open file with unsaved edits or a folder holding one.
39	func holdsOpenFile(_ path: String) -> Bool { !openFiles(under: path).isEmpty }	39	func holdsUnsavedFile(_ path: String) -> Bool { openFiles(under: path).contains(where: session.dirtyPaths.contains) }
40		40
41	func finish() {	41	func finish() {
42	guard let operation = pending else { return }	42	guard let operation = pending else { return }
	@@ -90,7 +90,7 @@ extension View {
90	.confirmationDialog(title(sidebar.pending), isPresented: Binding { sidebar.pending?.needsName == false } set: { if !$0 { sidebar.pending = nil } }) {	90	.confirmationDialog(title(sidebar.pending), isPresented: Binding { sidebar.pending?.needsName == false } set: { if !$0 { sidebar.pending = nil } }) {
91	Button("Move to Trash", role: .destructive) { sidebar.finish() }	91	Button("Move to Trash", role: .destructive) { sidebar.finish() }
92	} message: {	92	} message: {
93	if case .trash(let path) = sidebar.pending, sidebar.holdsOpenFile(path), sidebar.session.isDirty {	93	if case .trash(let path) = sidebar.pending, sidebar.holdsUnsavedFile(path) {
94	Text("Unsaved changes to the open file will be lost.")	94	Text("Unsaved changes to the open file will be lost.")
95	} else {	95	} else {
96	Text("You can put it back from the Trash in Finder.")	96	Text("You can put it back from the Trash in Finder.")

Commit 13ab79873c

Commit `13ab79873c`