fix: use native close-only window decorations for notes

2026-10-19 17:40:41 +02:00
parent adac0723a1
commit 2e4a791f29
5 changed files with 77 additions and 22 deletions
@@ -228,6 +228,62 @@ func notesLauncherRoutesShortcutsAndTearsDownPickersWithoutTakingEditorNavigatio
    #expect(launcherSearch.isHidden == false)
 }

+@Test(arguments: [false, true]) @MainActor
+func notesNativeClosePreservesUnsavedEditsAndRestoresBorderlessLauncher(_ blockSaving: Bool) throws {
+    _ = NSApplication.shared
+    let suite = "NotesNativeClose.\(UUID().uuidString)"
+    let defaults = try #require(UserDefaults(suiteName: suite))
+    let root = FileManager.default.temporaryDirectory.appendingPathComponent(suite)
+    let directory = root.appendingPathComponent("Notes")
+    let backup = root.appendingPathComponent("Backup")
+    defer {
+        defaults.removePersistentDomain(forName: suite)
+        try? FileManager.default.removeItem(at: root)
+    }
+    let launcher = LauncherWindowController(
+        history: LaunchHistory(defaults: defaults, now: { Date(timeIntervalSinceReferenceDate: 12_000) }),
+        defaults: defaults, notesDirectory: directory)
+    let window = try #require(launcher.window)
+    defer { launcher.dismiss(restoringFocus: false) }
+    let originalSize = window.frame.size
+    launcher.present(command: .notes)
+    let content = try #require(window.contentView)
+    content.layoutSubtreeIfNeeded()
+    func descendants(_ view: NSView) -> [NSView] { [view] + view.subviews.flatMap(descendants) }
+    let editor = try #require(descendants(content).compactMap { $0 as? NotesTextView }.first)
+    let close = try #require(window.standardWindowButton(.closeButton))
+    #expect(window.styleMask.contains(.titled))
+    #expect(!close.isHidden && close.isEnabled)
+    #expect(window.standardWindowButton(.miniaturizeButton)?.isHidden != false)
+    #expect(window.standardWindowButton(.zoomButton)?.isHidden != false)
+    #expect(window.frame.size == NSSize(width: 570, height: 404))
+    if blockSaving {
+        try FileManager.default.moveItem(at: directory, to: backup)
+        try Data("Blocked storage".utf8).write(to: directory)
+    }
+    editor.insertText("Keep this note", replacementRange: editor.selectedRange())
+    close.performClick(nil)
+    if blockSaving {
+        #expect(window.isVisible)
+        #expect(editor.markdownString == "Keep this note")
+        #expect(window.styleMask.contains(.titled))
+        try FileManager.default.removeItem(at: directory)
+        try FileManager.default.moveItem(at: backup, to: directory)
+        close.performClick(nil)
+    }
+    #expect(!window.isVisible)
+    #expect(window.styleMask == .borderless)
+    #expect(window.frame.size == originalSize)
+    #expect(try NotesStore(directory: directory).notes.first?.contents.string == "Keep this note")
+    launcher.present(command: .emoji)
+    #expect(window.styleMask == .borderless)
+    #expect(!descendants(content).contains { $0 is NotesTextView })
+    launcher.present(command: .notes)
+    #expect(window.standardWindowButton(.closeButton)?.isHidden == false)
+    #expect(window.standardWindowButton(.miniaturizeButton)?.isHidden != false)
+    #expect(window.standardWindowButton(.zoomButton)?.isHidden != false)
+}
+
@Test @MainActor
 func markdownListReturnContinuesExitsAndUndoesAtArbitraryDepths() throws {
    _ = NSApplication.shared