Merge branch 'main' of https://github.com/Ebullioscopic/Atoll into feature/lunar-support

conflict resolution needed
This commit is contained in:
Hariharan Mudaliar 2026-03-19 22:26:07 +05:30
commit 9396a5a8ff
No known key found for this signature in database
GPG key ID: 025583EB0BE5640E
4 changed files with 78 additions and 16 deletions

View file

@ -158,9 +158,13 @@ struct NotchNotesView: View {
return
}
// Fallback to text if not editing and clipboard has text
if !isEditingNewNote && selectedNoteId == nil {
if let text = pasteboard.string(forType: .string) {
// Handle text paste
if let text = pasteboard.string(forType: .string) {
if isEditingNewNote || selectedNoteId != nil {
// In editor: insert text at the end of content since we intercepted the shortcut
editorContent.append(text)
} else {
// Not in editor: create a new note with the pasted text
createNoteWithContent(text)
}
}