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

# Conflicts:
#	docs/src/demos/Experiments/Annotation/extension/annotation.ts
This commit is contained in:
Hans Pagel 2021-02-12 10:39:17 +01:00
commit bc0f38570c
3 changed files with 27 additions and 16 deletions

View File

@ -1,9 +1,9 @@
export class AnnotationItem {
public id!: number
public id!: string
public text!: string
constructor(id: number, text: string) {
constructor(id: string, text: string) {
this.id = id
this.text = text
}

View File

@ -1,4 +1,3 @@
// @ts-nocheck
import * as Y from 'yjs'
import { EditorState, Transaction } from 'prosemirror-state'
import { Decoration, DecorationSet } from 'prosemirror-view'
@ -27,7 +26,7 @@ export class AnnotationState {
// })
}
findAnnotation(id: number) {
findAnnotation(id: string) {
// TODO: Get from Y.js?
// this.decorations.get(id)
@ -59,11 +58,16 @@ export class AnnotationState {
this.decorations = this.decorations.add(state.doc, [decoration])
}
deleteAnnotation(id: number) {
deleteAnnotation(id: string) {
const { map } = this.options
const decoration = this.findAnnotation(id)
map.delete(id)
if (!decoration) {
return
}
this.decorations = this.decorations.remove([decoration])
}
@ -75,15 +79,23 @@ export class AnnotationState {
const { map, HTMLAttributes } = this.options
const ystate = ySyncPluginKey.getState(state)
const { doc, type, binding } = ystate
const decorations: Decoration[] = []
const decorations = Array.from(map.keys()).map(id => {
const dec = map.get(id)
const from = relativePositionToAbsolutePosition(doc, type, dec.from, binding.mapping)
const to = relativePositionToAbsolutePosition(doc, type, dec.to, binding.mapping)
const decoration = Decoration.inline(from, to, HTMLAttributes, { data: dec.data })
Array
.from(map.keys())
.forEach(id => {
const dec = map.get(id)
const from = relativePositionToAbsolutePosition(doc, type, dec.from, binding.mapping)
const to = relativePositionToAbsolutePosition(doc, type, dec.to, binding.mapping)
return decoration
})
if (!from || !to) {
return
}
const decoration = Decoration.inline(from, to, HTMLAttributes, { data: dec.data })
return decorations.push(decoration)
})
this.decorations = DecorationSet.create(state.doc, decorations)
}
@ -118,5 +130,4 @@ export class AnnotationState {
return this
}
}

View File

@ -5,7 +5,7 @@ import { AnnotationPlugin, AnnotationPluginKey } from './AnnotationPlugin'
function randomId() {
// TODO: That seems … to simple.
return Math.floor(Math.random() * 0xffffffff)
return Math.floor(Math.random() * 0xffffffff).toString()
}
export interface AddAnnotationAction {
@ -16,7 +16,7 @@ export interface AddAnnotationAction {
}
export interface DeleteAnnotationAction {
id: number,
id: string,
type: 'deleteAnnotation',
}
@ -78,7 +78,7 @@ export const Annotation = Extension.create({
return true
},
deleteAnnotation: (id: number): Command => ({ dispatch, state }) => {
deleteAnnotation: (id: string): Command => ({ dispatch, state }) => {
if (dispatch) {
state.tr.setMeta(AnnotationPluginKey, <DeleteAnnotationAction>{
type: 'deleteAnnotation',