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.
This commit is contained in:
@@ -16,7 +16,6 @@ final class PanelController: NSObject {
|
||||
|
||||
private var panel: KeyablePanel?
|
||||
private var pasteMonitor: Any?
|
||||
let editController = EditWindowController()
|
||||
|
||||
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)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,10 +18,15 @@ struct PanelView: View {
|
||||
@State private var joinCode = ""
|
||||
@State private var selection = Set<UUID>()
|
||||
@State private var lastSelectedID: UUID?
|
||||
@State private var editingItem: PromptItem?
|
||||
@State private var editText = ""
|
||||
@State private var copiedID: UUID?
|
||||
@State private var accessibilityGranted = AXIsProcessTrusted()
|
||||
|
||||
private enum Field: Hashable { case 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?
|
||||
|
||||
var body: some View {
|
||||
@@ -30,6 +35,7 @@ struct PanelView: View {
|
||||
if !accessibilityGranted {
|
||||
permissionBanner
|
||||
}
|
||||
tabPicker
|
||||
if showSearch {
|
||||
searchField
|
||||
}
|
||||
@@ -47,6 +53,7 @@ struct PanelView: View {
|
||||
.overlay(sectionSwitcher)
|
||||
.overlay(syncOverlay)
|
||||
.overlay(newWorkspaceModal)
|
||||
.overlay(editModal)
|
||||
.onDrop(of: [UTType.image.identifier, UTType.fileURL.identifier], isTargeted: nil, perform: handleDrop)
|
||||
.onReceive(NotificationCenter.default.publisher(for: .promptPanelDidShow)) { _ in
|
||||
composerFocused = true
|
||||
@@ -90,6 +97,20 @@ struct PanelView: View {
|
||||
.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 {
|
||||
HStack(spacing: 8) {
|
||||
Image(systemName: "exclamationmark.triangle.fill")
|
||||
@@ -135,21 +156,27 @@ struct PanelView: View {
|
||||
|
||||
// MARK: - Content
|
||||
|
||||
private var displayedItems: [(section: String, item: PromptItem)] {
|
||||
if search.isEmpty {
|
||||
return store.activeSection.items.map { ("", $0) }
|
||||
/// Every item across every workspace, each labeled with its workspace.
|
||||
private var allLabeledItems: [(section: String, item: PromptItem)] {
|
||||
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
|
||||
switch item.content {
|
||||
case .text(let text) where text.lowercased().contains(query):
|
||||
return (section.name, item)
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
|
||||
private var displayedItems: [(section: String, item: PromptItem)] {
|
||||
if !search.isEmpty {
|
||||
let query = search.lowercased()
|
||||
return allLabeledItems.filter { entry in
|
||||
if case .text(let text) = entry.item.content {
|
||||
return text.lowercased().contains(query)
|
||||
}
|
||||
return false
|
||||
}
|
||||
}
|
||||
if tab == .all {
|
||||
return allLabeledItems
|
||||
}
|
||||
return store.activeSection.items.map { ("", $0) }
|
||||
}
|
||||
|
||||
private var content: some View {
|
||||
@@ -296,7 +323,9 @@ struct PanelView: View {
|
||||
}
|
||||
if case .text(let text) = item.content, !multiple {
|
||||
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 {
|
||||
@@ -376,6 +405,7 @@ struct PanelView: View {
|
||||
.contentShape(Rectangle())
|
||||
.onTapGesture {
|
||||
store.activeSectionID = section.id
|
||||
tab = .workspace
|
||||
showSectionSwitcher = false
|
||||
}
|
||||
}
|
||||
@@ -512,6 +542,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
|
||||
|
||||
@ViewBuilder
|
||||
|
||||
Reference in New Issue
Block a user