From 92d5b073aef0270c9552d95048402507f21b490f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Fri, 12 Feb 2021 10:18:37 +0100
Subject: [PATCH] fix types

---
 .../Annotation/extension/AnnotationItem.ts    |  4 +--
 .../Annotation/extension/AnnotationState.ts   | 33 ++++++++++++-------
 .../Annotation/extension/annotation.ts        |  6 ++--
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/docs/src/demos/Experiments/Annotation/extension/AnnotationItem.ts b/docs/src/demos/Experiments/Annotation/extension/AnnotationItem.ts
index 56b854598..8885247c8 100644
--- a/docs/src/demos/Experiments/Annotation/extension/AnnotationItem.ts
+++ b/docs/src/demos/Experiments/Annotation/extension/AnnotationItem.ts
@@ -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
   }
diff --git a/docs/src/demos/Experiments/Annotation/extension/AnnotationState.ts b/docs/src/demos/Experiments/Annotation/extension/AnnotationState.ts
index 45c4073aa..df26363c1 100644
--- a/docs/src/demos/Experiments/Annotation/extension/AnnotationState.ts
+++ b/docs/src/demos/Experiments/Annotation/extension/AnnotationState.ts
@@ -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)
   }
@@ -115,5 +127,4 @@ export class AnnotationState {
 
     return this
   }
-
 }
diff --git a/docs/src/demos/Experiments/Annotation/extension/annotation.ts b/docs/src/demos/Experiments/Annotation/extension/annotation.ts
index 7a6c92c04..0d80f1c00 100644
--- a/docs/src/demos/Experiments/Annotation/extension/annotation.ts
+++ b/docs/src/demos/Experiments/Annotation/extension/annotation.ts
@@ -4,7 +4,7 @@ import { AnnotationItem } from './AnnotationItem'
 import { AnnotationPlugin, AnnotationPluginKey } from './AnnotationPlugin'
 
 function randomId() {
-  return Math.floor(Math.random() * 0xffffffff)
+  return Math.floor(Math.random() * 0xffffffff).toString()
 }
 
 export interface AddAnnotationAction {
@@ -15,7 +15,7 @@ export interface AddAnnotationAction {
 }
 
 export interface DeleteAnnotationAction {
-  id: number,
+  id: string,
   type: 'deleteAnnotation',
 }
 
@@ -74,7 +74,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',