Added deleting notes if empty from popout window

Automattic · Oct 19, 2024 · d249b6f · d249b6f
1 parent 658a9a5
commit d249b6f
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/Simplenote/NoteEditorViewController+Swift.swift b/Simplenote/NoteEditorViewController+Swift.swift
@@ -1,4 +1,5 @@
 import Foundation
+import CoreSpotlight
 import SimplenoteFoundation
 import SimplenoteInterlinks
 import SimplenoteSearch
@@ -74,6 +75,24 @@ extension NoteEditorViewController {
         clipView.contentInsets.top = SplitItemMetrics.editorContentTopInset
         scrollView.scrollerInsets.top = SplitItemMetrics.editorScrollerTopInset
     }
+
+    public func deleteCurrentNoteIfEmpty() {
+        guard let note,
+              note.content == nil || note.content?.isEmpty == true else {
+            return
+        }
+
+        delete(note: note)
+    }
+
+    @objc(deleteNote:)
+    func delete(note noteToDelete: Note) {
+
+        SPTracker.trackEditorNoteDeleted()
+        noteToDelete.deleted = true
+        noteActionsDelegate?.editorController(self, deletedNoteWithSimperiumKey: noteToDelete.simperiumKey)
+        CSSearchableIndex.default().deleteSearchableNote(noteToDelete)
+    }
 }
 
 // MARK: - Public

diff --git a/Simplenote/NoteEditorViewController.m b/Simplenote/NoteEditorViewController.m
@@ -402,11 +402,8 @@ - (IBAction)deleteAction:(id)sender
         if (noteToDelete.deleted) {
             continue;
         }
-
-        [SPTracker trackEditorNoteDeleted];
-        noteToDelete.deleted = YES;
-        [self.noteActionsDelegate editorController:self deletedNoteWithSimperiumKey:noteToDelete.simperiumKey];
-        [[CSSearchableIndex defaultSearchableIndex] deleteSearchableNote:noteToDelete];
+
+        [self deleteNote:noteToDelete];
     }
 
     [self save];

diff --git a/Simplenote/NoteWindow.swift b/Simplenote/NoteWindow.swift
@@ -42,4 +42,9 @@ class NoteWindow: NSWindow {
         editor.displayNote(note)
         title = note.titlePreview
     }
+
+    override func close() {
+        super.close()
+        editor.deleteCurrentNoteIfEmpty()
+    }
 }