feror/Sapling
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(editor): defer mouse presentation activation

Browse source
This commit is contained in:
Feror 2026-06-02 23:28:55 +02:00
parent 771f3368b4
commit 3b9b165464
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Sources/SaplingEditor/HybridMarkdownEditor.swift
View file

@ -209,7 +209,7 @@ private struct NativeMarkdownTextView: NSViewRepresentable {
coordinator?.applyHybridAttributes(to: textView, cause: .focusChange) coordinator?.applyHybridAttributes(to: textView, cause: .focusChange)
} }
textView.onUserEditingInteraction = { [weak coordinator = context.coordinator] textView, interactionKind in textView.onUserEditingInteraction = { [weak coordinator = context.coordinator] textView, interactionKind in
coordinator?.activateEditingPresentation(in: textView, interactionKind: interactionKind) coordinator?.recordUserEditingInteraction(interactionKind)
} }
textView.isRichText = false textView.isRichText = false
textView.isEditable = true textView.isEditable = true
@ -317,6 +317,9 @@ private struct NativeMarkdownTextView: NSViewRepresentable {
guard parent.selection != newSelection else { return } guard parent.selection != newSelection else { return }
let interactionKind = pendingSelectionInteractionKind ?? lastUserInteractionKind let interactionKind = pendingSelectionInteractionKind ?? lastUserInteractionKind
pendingSelectionInteractionKind = nil pendingSelectionInteractionKind = nil
if interactionKind != .programmatic {
hasUserActivatedEditing = true
}
applyHybridAttributes(to: textView, cause: .selectionChange(interactionKind)) applyHybridAttributes(to: textView, cause: .selectionChange(interactionKind))
parent.selection = newSelection parent.selection = newSelection
} }
@ -417,6 +420,10 @@ private struct NativeMarkdownTextView: NSViewRepresentable {
applyHybridAttributes(to: textView, cause: .editingActivation(interactionKind)) applyHybridAttributes(to: textView, cause: .editingActivation(interactionKind))
} }
func recordUserEditingInteraction(_ interactionKind: EditorInteractionKind) {
lastUserInteractionKind = interactionKind
}
func setSelection( func setSelection(
_ range: NSRange, _ range: NSRange,
in textView: NSTextView, in textView: NSTextView,
@ -1123,7 +1130,7 @@ public final class HybridMarkdownLiveEditorHarness {
coordinator?.applyHybridAttributes(to: textView, cause: .focusChange) coordinator?.applyHybridAttributes(to: textView, cause: .focusChange)
} }
self.textView.onUserEditingInteraction = { [weak coordinator] textView, interactionKind in self.textView.onUserEditingInteraction = { [weak coordinator] textView, interactionKind in
coordinator?.activateEditingPresentation(in: textView, interactionKind: interactionKind) coordinator?.recordUserEditingInteraction(interactionKind)
} }
self.textView.string = source self.textView.string = source
self.textView.delegate = coordinator self.textView.delegate = coordinator
@ -1186,7 +1193,11 @@ public final class HybridMarkdownLiveEditorHarness {
} }
private func setSelection(_ range: NSRange, interactionKind: EditorInteractionKind) { private func setSelection(_ range: NSRange, interactionKind: EditorInteractionKind) {
if interactionKind == .programmatic {
coordinator.activateEditingPresentation(in: textView, interactionKind: interactionKind) coordinator.activateEditingPresentation(in: textView, interactionKind: interactionKind)
} else {
coordinator.recordUserEditingInteraction(interactionKind)
}
coordinator.setSelection(range, in: textView, interactionKind: interactionKind) coordinator.setSelection(range, in: textView, interactionKind: interactionKind)
coordinator.textViewDidChangeSelection(Notification(name: NSTextView.didChangeSelectionNotification, object: textView)) coordinator.textViewDidChangeSelection(Notification(name: NSTextView.didChangeSelectionNotification, object: textView))
syncState() syncState()