hl-valdemar/conjure
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Wiki Activity

style: align notes controls with action pills

Browse Source
This commit is contained in:
Valdemar Lorenzen
2026-10-19 09:51:00 +02:00
parent fcd2d1229f
commit 0b5d27752c
7 changed files with 96 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tests/ConjureKitTests/EscapeDismissalTests.swift
+3 -1
View File
@@ -59,7 +59,9 @@ import Testing
})
window.makeFirstResponder(output)
} else if destination == "notes-editor" {
let editor = try #require(descendants(content).compactMap { $0 as? NotesTextView }.first)
let editor = try #require(descendants(content).compactMap { $0 as? NSTextView }.first {
$0.accessibilityLabel() == "Note editor"
})
window.makeFirstResponder(editor)
}
#expect(window.isVisible)
Tests/ConjureKitTests/NotesEditingTests.swift
+33 -18
View File
@@ -19,40 +19,55 @@ func notesSwitchWithoutLeakingEditsUndoOrAttachmentsAndRestoreSelection() throws
defer { window.orderOut(nil) }
func descendants(_ view: NSView) -> [NSView] { [view] + view.subviews.flatMap(descendants) }
let views = descendants(controller.view)
let editor = try #require(views.compactMap { $0 as? NotesTextView }.first)
let picker = try #require(views.compactMap { $0 as? NSPopUpButton }.first)
let create = try #require(views.compactMap { $0 as? NSButton }.first { $0.title == "New Note" })
let firstID = try #require(picker.selectedItem?.representedObject as? UUID)
let editor = try #require(views.compactMap { $0 as? NSTextView }.first)
let actions = try #require(views.compactMap { $0 as? NSButton }.first { $0.accessibilityLabel() == "Choose a note" })
let menu = try #require(actions.menu)
let firstID = try #require(menu.items.first { $0.state == .on }?.representedObject as? UUID)
// Empty notes have duplicate titles; both must remain individually selectable.
create.performClick(nil)
#expect(picker.numberOfItems == 2)
let secondID = try #require(picker.selectedItem?.representedObject as? UUID)
window.makeFirstResponder(editor)
let newNoteKey = try #require(NSEvent.keyEvent(with: .keyDown, location: .zero,
modifierFlags: .command, timestamp: 1, windowNumber: window.windowNumber, context: nil,
characters: "n", charactersIgnoringModifiers: "n", isARepeat: false, keyCode: 45))
#expect(window.performKeyEquivalent(with: newNoteKey))
let secondID = try #require(menu.items.first { $0.state == .on }?.representedObject as? UUID)
#expect(secondID != firstID)
editor.insertText("# Second 🦊\n**bold** and `code`", replacementRange: editor.selectedRange())
#expect((editor.textStorage?.attribute(.font, at: 0, effectiveRange: nil) as? NSFont)?.pointSize == 17)
let codeRange = (editor.string as NSString).range(of: "`code`")
let codeFont = try #require(editor.textStorage?.attribute(.font, at: codeRange.location, effectiveRange: nil) as? NSFont)
#expect(codeFont.isFixedPitch)
let firstIndex = try #require(picker.itemArray.firstIndex { $0.representedObject as? UUID == firstID })
picker.selectItem(at: firstIndex)
_ = NSApp.sendAction(try #require(picker.action), to: picker.target, from: picker)
menu.performActionForItem(at: try #require(menu.items.firstIndex { $0.representedObject as? UUID == firstID }))
#expect(editor.string.isEmpty)
#expect(editor.undoManager?.canUndo != true)
editor.insertText("First note", replacementRange: editor.selectedRange())
let bitmap = try #require(NSBitmapImageRep(bitmapDataPlanes: nil, pixelsWide: 1, pixelsHigh: 1, bitsPerSample: 8, samplesPerPixel: 4, hasAlpha: true, isPlanar: false, colorSpaceName: .deviceRGB, bytesPerRow: 0, bitsPerPixel: 0))
bitmap.setColor(.red, atX: 0, y: 0)
let imageURL = directory.appendingPathComponent("image.png")
try #require(bitmap.representation(using: .png, properties: [:])).write(to: imageURL)
try editor.insertImage(at: imageURL)
let png = try #require(bitmap.representation(using: .png, properties: [:]))
try png.write(to: imageURL)
let pasteboard = NSPasteboard.withUniqueName()
defer { pasteboard.releaseGlobally() }
pasteboard.setData(png, forType: .png)
#expect(editor.readSelection(from: pasteboard))
pasteboard.clearContents()
pasteboard.writeObjects([imageURL as NSURL])
#expect(editor.readSelection(from: pasteboard))
#expect(controller.save())
let returnKey = try #require(NSEvent.keyEvent(with: .keyDown, location: .zero,
modifierFlags: [], timestamp: 2, windowNumber: window.windowNumber, context: nil,
characters: "\r", charactersIgnoringModifiers: "\r", isARepeat: false, keyCode: 36))
editor.keyDown(with: returnKey)
#expect(editor.string == "First note\u{fffc}\u{fffc}\n")
#expect(menu.items.first { $0.state == .on }?.representedObject as? UUID == firstID)
let restored = try NotesStore(directory: directory)
let first = try #require(restored.notes.first { $0.id == firstID })
#expect(first.contents.string == "First note\u{fffc}")
#expect(first.contents.string == "First note\u{fffc}\u{fffc}\n")
#expect(first.contents.attribute(.attachment, at: 10, effectiveRange: nil) is NSTextAttachment)
#expect(first.contents.attribute(.attachment, at: 11, effectiveRange: nil) is NSTextAttachment)
#expect(restored.notes.first { $0.id == secondID }?.contents.string == "# Second 🦊\n**bold** and `code`")
let reopened = NotesController(defaults: defaults, directory: directory)
let reopenedViews = descendants(reopened.view)
let reopenedEditor = try #require(reopenedViews.compactMap { $0 as? NotesTextView }.first)
let reopenedEditor = try #require(reopenedViews.compactMap { $0 as? NSTextView }.first)
#expect(reopenedEditor.string == first.contents.string)
// Removing Markdown must also remove its previous visual style without changing the source.
reopenedEditor.insertText("Plain text", replacementRange: NSRange(location: 0, length: reopenedEditor.string.utf16.count))
@@ -68,11 +83,11 @@ func notesSwitchWithoutLeakingEditsUndoOrAttachmentsAndRestoreSelection() throws
reopened.goBack()
#expect(!closed)
#expect(!reopened.save())
let reopenedPicker = try #require(reopenedViews.compactMap { $0 as? NSPopUpButton }.first)
reopenedPicker.selectItem(at: try #require(reopenedPicker.itemArray.firstIndex { $0.representedObject as? UUID == secondID }))
_ = NSApp.sendAction(try #require(reopenedPicker.action), to: reopenedPicker.target, from: reopenedPicker)
let reopenedActions = try #require(reopenedViews.compactMap { $0 as? NSButton }.first { $0.accessibilityLabel() == "Choose a note" })
let reopenedMenu = try #require(reopenedActions.menu)
reopenedMenu.performActionForItem(at: try #require(reopenedMenu.items.firstIndex { $0.representedObject as? UUID == secondID }))
#expect(reopenedEditor.string == "Unsaved")
#expect(reopenedPicker.selectedItem?.representedObject as? UUID == firstID)
#expect(reopenedMenu.items.first { $0.state == .on }?.representedObject as? UUID == firstID)
try FileManager.default.removeItem(at: directory)
try FileManager.default.moveItem(at: backup, to: directory)
#expect(reopened.save())