ianhitchman/tiptap
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:ueberdosis/tiptap-next into main

Browse Source 
# Conflicts:
#	docs/src/demos/Experiments/CollaborationAnnotation/extension/AnnotationState.ts
This commit is contained in:
Hans Pagel
2021-02-12 21:54:03 +01:00
parent d7bee8bed9 34af078be6
commit f6f467949c
1 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
docs/src/demos/Experiments/CollaborationAnnotation/extension/AnnotationState.ts
View File

@@ -83,10 +83,7 @@ export class AnnotationState {
const { doc, type, binding } = ystate const { doc, type, binding } = ystate
const decorations: Decoration[] = [] const decorations: Decoration[] = []
Array map.forEach((annotation, id) => {
.from(map.keys())
.forEach(id => {
const annotation = map.get(id)
const from = relativePositionToAbsolutePosition(doc, type, annotation.from, binding.mapping) const from = relativePositionToAbsolutePosition(doc, type, annotation.from, binding.mapping)
const to = relativePositionToAbsolutePosition(doc, type, annotation.to, binding.mapping) const to = relativePositionToAbsolutePosition(doc, type, annotation.to, binding.mapping)
@@ -100,12 +97,8 @@ export class AnnotationState {
console.warn(`[${this.options.instance}] corrupt decoration `, annotation.from, from, annotation.to, to) console.warn(`[${this.options.instance}] corrupt decoration `, annotation.from, from, annotation.to, to)
} }
return decorations.push( decorations.push(
Decoration.inline(from, to, HTMLAttributes, { Decoration.inline(from, to, HTMLAttributes, { id, data: annotation.data, inclusiveEnd: true }),
id,
data: annotation.data,
inclusiveEnd: true,
}),
) )
}) })