github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Maintain the current scroll position when applying remote changes (#16777)

Browse source 
GitOrigin-RevId: 5d2d0fd5aaefcc6b1e7f4dbd2ce29287cf8dbbdb
This commit is contained in:
Alf Eaton 2024-02-01 09:47:00 +00:00 committed by Copybot
parent efe44f08b8
commit 614d1d05cc
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
services/web/frontend/js/features/source-editor/extensions/realtime.ts
View file

@ -1,4 +1,4 @@
import { Prec, Transaction, Annotation } from '@codemirror/state'
import { Prec, Transaction, Annotation, ChangeSpec } from '@codemirror/state'
import { EditorView, ViewPlugin } from '@codemirror/view'
import { EventEmitter } from 'events'
import { CurrentDoc } from '../../../../../types/current-doc'
@ -92,24 +92,29 @@ export class EditorFacade extends EventEmitter {
}
// Dispatch changes to CodeMirror view
cmInsert(position: number, text: string, origin?: string) {
cmChange(changes: ChangeSpec, origin?: string) {
const isRemote = origin === 'remote'
this.view.dispatch({
changes: { from: position, insert: text },
changes,
annotations: [
Transaction.remote.of(origin === 'remote'),
Transaction.addToHistory.of(origin !== 'remote'),
Transaction.remote.of(isRemote),
Transaction.addToHistory.of(!isRemote),
],
effects:
// if this is a remote change, restore a snapshot of the current scroll position after the change has been applied
isRemote
? this.view.scrollSnapshot().map(this.view.state.changes(changes))
: undefined,
})
}
cmInsert(position: number, text: string, origin?: string) {
this.cmChange({ from: position, insert: text }, origin)
}
cmDelete(position: number, text: string, origin?: string) {
this.view.dispatch({
changes: { from: position, to: position + text.length },
annotations: [
Transaction.remote.of(origin === 'remote'),
Transaction.addToHistory.of(origin !== 'remote'),
],
})
this.cmChange({ from: position, to: position + text.length }, origin)
}
// Connect to ShareJS, passing changes to the CodeMirror view