mi/hohoff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐛 fix highlight positioning

Browse Source
This commit is contained in:
Alex Hernandez
2026-03-01 16:01:40 +10:00
parent 010b7302cc
commit 338eaf5c5f
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/renderer/components/Editor/MarkdownEditor.tsx
View File

@@ -145,26 +145,36 @@ export function analyseAnnotation(
// without prop-drilling. Set in the mount effect, nulled on cleanup. // without prop-drilling. Set in the mount effect, nulled on cleanup.
export let currentEditorView: EditorView | null = null export let currentEditorView: EditorView | null = null
// Scroll the editor to an annotation and place the cursor there // Scroll the editor to an annotation and place the cursor there.
// Always resolves the position from CM's rawAnnotationsField so that edits
// made since the annotation was created don't send the cursor to a stale offset.
export function scrollToAnnotation(ann: TextAnnotation): void { export function scrollToAnnotation(ann: TextAnnotation): void {
const view = currentEditorView const view = currentEditorView
if (!view) return if (!view) return
const tracked = view.state.field(rawAnnotationsField).find(a => a.id === ann.id) ?? ann
view.dispatch({ view.dispatch({
selection: { anchor: ann.from }, selection: { anchor: tracked.from },
effects: EditorView.scrollIntoView(ann.from, { y: 'center' }) effects: EditorView.scrollIntoView(tracked.from, { y: 'center' })
}) })
} }
// Apply a suggestion to the document and mark that annotation as applied // Apply a suggestion to the document and mark that annotation as applied.
// Always resolves positions from CM's rawAnnotationsField so that edits made
// since the annotation was created don't apply the change at a stale offset,
// and so surviving annotation positions are also remapped from their current
// (post-edit) locations rather than the stale values held by the store.
export function applyAnnotation(ann: TextAnnotation, suggestion: string): void { export function applyAnnotation(ann: TextAnnotation, suggestion: string): void {
const view = currentEditorView const view = currentEditorView
if (!view) return if (!view) return
const { annotations: anns, markAnnotationApplied } = useEditorStore.getState() const { markAnnotationApplied } = useEditorStore.getState()
const changeSpec = { from: ann.from, to: ann.to, insert: suggestion } const cmAnnotations = view.state.field(rawAnnotationsField)
const tracked = cmAnnotations.find(a => a.id === ann.id)
if (!tracked) return
const changeSpec = { from: tracked.from, to: tracked.to, insert: suggestion }
// Map surviving annotation positions through the text change so // Map surviving annotation positions through the text change so
// their from/to reflect the new document offsets. // their from/to reflect the new document offsets.
const changeSet = view.state.changes(changeSpec) const changeSet = view.state.changes(changeSpec)
const remaining = anns const remaining = cmAnnotations
.filter(a => a.id !== ann.id) .filter(a => a.id !== ann.id)
.map(a => ({ ...a, from: changeSet.mapPos(a.from), to: changeSet.mapPos(a.to) })) .map(a => ({ ...a, from: changeSet.mapPos(a.from), to: changeSet.mapPos(a.to) }))
// Combine text replacement + annotation update in one transaction // Combine text replacement + annotation update in one transaction