Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0a6ef314c0 | ||
|
|
a09f7b3196 |
@@ -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
|
||||
@@ -37,9 +38,18 @@ clicking an item copies it back to the clipboard.
|
||||
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/
|
||||
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
|
||||
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,
|
||||
@@ -47,8 +57,9 @@ clicking an item copies it back to the clipboard.
|
||||
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`
|
||||
(separate edit window with a `TextEditor`).
|
||||
`PromptPanel`), and the Cmd+V paste monitor. Editing a note is an in-panel
|
||||
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
|
||||
CGEvent tap on `flagsChanged` (left Shift ×2 = capture, right Shift ×2 =
|
||||
toggle panel), plus Carbon `RegisterEventHotKey` fallbacks (Cmd+Shift+Space
|
||||
|
||||
@@ -11,10 +11,18 @@ to your work. Select what you need and send it back to your clipboard.
|
||||
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.)
|
||||
- **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,
|
||||
Edit, Open, Merge Notes, Move To, Delete — each acting on the whole selection.
|
||||
- **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 |
|
||||
| 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)
|
||||
}
|
||||
}
|
||||
@@ -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)
|
||||
}
|
||||
}
|
||||
|
||||
+126
-28
@@ -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
|
||||
@@ -16,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 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?
|
||||
|
||||
var body: some View {
|
||||
@@ -28,6 +35,7 @@ struct PanelView: View {
|
||||
if !accessibilityGranted {
|
||||
permissionBanner
|
||||
}
|
||||
tabPicker
|
||||
if showSearch {
|
||||
searchField
|
||||
}
|
||||
@@ -45,12 +53,13 @@ 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
|
||||
focusedField = .composer
|
||||
composerFocused = true
|
||||
accessibilityGranted = AXIsProcessTrusted()
|
||||
}
|
||||
.onAppear { focusedField = .composer }
|
||||
.onAppear { composerFocused = true }
|
||||
}
|
||||
|
||||
// MARK: - Header
|
||||
@@ -88,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")
|
||||
@@ -120,7 +143,7 @@ struct PanelView: View {
|
||||
.onExitCommand {
|
||||
search = ""
|
||||
showSearch = false
|
||||
focusedField = .composer
|
||||
composerFocused = true
|
||||
}
|
||||
if !search.isEmpty {
|
||||
Button { search = "" } label: { Image(systemName: "xmark.circle.fill") }
|
||||
@@ -133,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 {
|
||||
@@ -294,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 {
|
||||
@@ -374,6 +405,7 @@ struct PanelView: View {
|
||||
.contentShape(Rectangle())
|
||||
.onTapGesture {
|
||||
store.activeSectionID = section.id
|
||||
tab = .workspace
|
||||
showSectionSwitcher = false
|
||||
}
|
||||
}
|
||||
@@ -473,6 +505,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)
|
||||
@@ -504,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
|
||||
@@ -548,7 +642,7 @@ struct PanelView: View {
|
||||
private func dismissNewWorkspace() {
|
||||
showNewWorkspace = false
|
||||
newWorkspaceName = ""
|
||||
focusedField = .composer
|
||||
composerFocused = true
|
||||
}
|
||||
|
||||
// MARK: - Selection
|
||||
@@ -615,28 +709,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() {
|
||||
@@ -663,7 +761,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() }
|
||||
@@ -739,7 +837,7 @@ struct PanelView: View {
|
||||
focusedField = .search
|
||||
} else {
|
||||
search = ""
|
||||
focusedField = .composer
|
||||
composerFocused = true
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user