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

Merge pull request #13520 from overleaf/ae-state-tree

Browse source 
[visual] Refactoring in the atomic decorations state field

GitOrigin-RevId: e3cfd945dd900b3d7527bc9249132213d2a0e1bc
This commit is contained in:
Alf Eaton 2023-06-29 09:54:14 +01:00 committed by Copybot
parent c6d832d6d9
commit 4d39c31acc
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
services/web/frontend/js/features/source-editor/extensions/visual/atomic-decorations.ts
View file

@ -897,19 +897,19 @@ export const atomicDecorations = (options: Options) => {
return Decoration.set(decorations, true)
}
let previousTree: Tree
return [
StateField.define<{
mousedown: boolean
decorations: DecorationSet
previousTree: Tree
}>({
create(state) {
previousTree = syntaxTree(state)
const previousTree = syntaxTree(state)
return {
mousedown: false,
decorations: createDecorations(state, previousTree),
previousTree,
}
},
update(value, tr) {
@ -917,33 +917,35 @@ export const atomicDecorations = (options: Options) => {
// store the "mousedown" value when it changes
if (effect.is(mouseDownEffect)) {
value = {
...value,
mousedown: effect.value,
decorations: value.decorations, // unchanged
}
}
}
const tree = syntaxTree(tr.state)
if (
tree.type === previousTree.type &&
tree.type === value.previousTree.type &&
tree.length < tr.state.doc.length
) {
// still parsing
value = {
mousedown: value.mousedown, // unchanged
...value,
decorations: value.decorations.map(tr.changes),
}
} else if (
// only update the decorations when the mouse is not making a selection
!value.mousedown &&
(tree !== previousTree || tr.selection || hasMouseDownEffect(tr))
(tree !== value.previousTree ||
tr.selection ||
hasMouseDownEffect(tr))
) {
// tree changed
previousTree = tree
// TODO: update the existing decorations for the changed range(s)?
value = {
mousedown: value.mousedown, // unchanged
...value,
decorations: createDecorations(tr.state, tree),
previousTree: tree,
}
}