@fiduswriter/editor 0.1.20 → 0.1.22

package/dist/collab/merge/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../src/collab/merge/schema.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../src/collab/merge/schema.ts"],"names":[],"mappings":"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"}

package/dist/collab/merge/state_plugins/action.d.ts

@@ -0,0 +1,16 @@
+import { Mapping } from "prosemirror-transform";
+import type { Transaction } from "prosemirror-state";
+import type { EditorView } from "prosemirror-view";
+import type { Mark, Schema } from "prosemirror-model";
+interface Merge {
+    mergedDocMap: Mapping;
+    cpDoc: import("prosemirror-model").Node;
+}
+export declare const copyChange: (view: EditorView, from: number, to: number) => void;
+export declare const acceptChanges: (merge: Merge, mark: Mark, mergeView: EditorView, originalView: EditorView, tr: Transaction) => void;
+export declare const removeDecoration: (view: EditorView, decorationId: string) => void;
+export declare const deleteContent: (merge: Merge, view: EditorView, diffMark: Mark, mappingNeeded?: boolean) => boolean;
+export declare const addDeletedContentBack: (merge: Merge, view: EditorView, diffMark: Mark) => boolean;
+export declare const handleMarks: (view: EditorView, mark: Mark, tr: Transaction, schema: Schema) => void;
+export {};
+//# sourceMappingURL=action.d.ts.map

package/dist/collab/merge/state_plugins/action.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"action.d.ts","sourceRoot":"","sources":["../../../../src/collab/merge/state_plugins/action.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,OAAO,EAAuB,MAAM,uBAAuB,CAAA;AAChF,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAClD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAA;AAChD,OAAO,KAAK,EAAC,IAAI,EAAE,MAAM,EAAC,MAAM,mBAAmB,CAAA;AAInD,UAAU,KAAK;IACX,YAAY,EAAE,OAAO,CAAA;IACrB,KAAK,EAAE,OAAO,mBAAmB,EAAE,IAAI,CAAA;CAC1C;AAED,eAAO,MAAM,UAAU,GACnB,MAAM,UAAU,EAChB,MAAM,MAAM,EACZ,IAAI,MAAM,KACX,IA8BF,CAAA;AAED,eAAO,MAAM,aAAa,GACtB,OAAO,KAAK,EACZ,MAAM,IAAI,EACV,WAAW,UAAU,EACrB,cAAc,UAAU,EACxB,IAAI,WAAW,KAChB,IA+CF,CAAA;AAED,eAAO,MAAM,gBAAgB,GACzB,MAAM,UAAU,EAChB,cAAc,MAAM,KACrB,IAIF,CAAA;AAED,eAAO,MAAM,aAAa,GACtB,OAAO,KAAK,EACZ,MAAM,UAAU,EAChB,UAAU,IAAI,EACd,uBAAoB,KACrB,OAuBF,CAAA;AAED,eAAO,MAAM,qBAAqB,GAC9B,OAAO,KAAK,EACZ,MAAM,UAAU,EAChB,UAAU,IAAI,KACf,OAwBF,CAAA;AAED,eAAO,MAAM,WAAW,GACpB,MAAM,UAAU,EAChB,MAAM,IAAI,EACV,IAAI,WAAW,EACf,QAAQ,MAAM,KACf,IA6BF,CAAA"}

package/dist/collab/merge/state_plugins/action.js

@@ -19,7 +19,7 @@ export const copyChange = (view, from, to) => {
     document.body.appendChild(dom);
     const range = document.createRange();
     range.selectNode(dom);
-    window.getSelection().addRange(range);
+    window.getSelection()?.addRange(range);
     try {
         document.execCommand("copy"); // Security exception may be thrown by some browsers.
         document.body.removeChild(dom);
@@ -28,7 +28,7 @@ export const copyChange = (view, from, to) => {
     catch (_ex) {
         showSystemMessage(gettext("Copy to clipboard failed. Please copy manually."));
     }
-    window.getSelection().removeAllRanges();
+    window.getSelection()?.removeAllRanges();
 };
 export const acceptChanges = (merge, mark, mergeView, originalView, tr) => {
     /* This is used to accept a change either from the offline/online version or
@@ -42,7 +42,7 @@ export const acceptChanges = (merge, mark, mergeView, originalView, tr) => {
     const stepMaps = tr.mapping.maps
         .slice()
         .reverse()
-        .map(map => map.invert());
+        .map((map) => map.invert());
     const rebasedMapping = new Mapping(stepMaps);
     rebasedMapping.appendMapping(mergedDocMap);
     for (const stepIndex of steps) {
@@ -55,7 +55,6 @@ export const acceptChanges = (merge, mark, mergeView, originalView, tr) => {
         }
         if (mappedStep && !insertionTr.maybeStep(mappedStep).failed) {
             mergedDocMap.appendMap(mappedStep.getMap());
-            rebasedMapping.appendMap(mappedStep.getMap());
             rebasedMapping.setMirror(tr.steps.length - stepIndex - 1, tr.steps.length + mergedDocMap.maps.length - 1);
         }
     }
@@ -130,7 +129,7 @@ export const handleMarks = (view, mark, tr, schema) => {
         }
     });
     marksToBeRemoved.forEach(removalMark => newTr.removeMark(mark.attrs.from, mark.attrs.to, schema.marks[removalMark]));
-    marksToBeAdded.forEach(AddMark => newTr.addMark(mark.attrs.from, mark.attrs.to, AddMark));
+    marksToBeAdded.forEach(addMark => newTr.addMark(mark.attrs.from, mark.attrs.to, addMark));
     newTr.setMeta("notrack", true);
     newTr.setMeta("mapAppended", true);
     view.dispatch(newTr);

package/dist/collab/merge/state_plugins/action.js.map

@@ -1 +1 @@
-{"version":3,"file":"action.js","sourceRoot":"","sources":["../../../../src/collab/merge/state_plugins/action.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"action.js","sourceRoot":"","sources":["../../../../src/collab/merge/state_plugins/action.ts"],"names":[],"mappings":"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"}

package/dist/collab/merge/state_plugins/clipboard.d.ts

@@ -0,0 +1,6 @@
+import { Plugin } from "prosemirror-state";
+import type { Editor } from "../../../types.js";
+export declare const clipboardPlugin: (options: {
+    editor: Editor;
+}) => Plugin<any>;
+//# sourceMappingURL=clipboard.d.ts.map

package/dist/collab/merge/state_plugins/clipboard.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"clipboard.d.ts","sourceRoot":"","sources":["../../../../src/collab/merge/state_plugins/clipboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAA2B,MAAM,mBAAmB,CAAA;AAMlE,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mBAAmB,CAAA;AAG7C,eAAO,MAAM,eAAe,GAAI,SAAS;IAAC,MAAM,EAAE,MAAM,CAAA;CAAC,gBAgCxD,CAAA"}

package/dist/collab/merge/state_plugins/clipboard.js

@@ -1,7 +1,7 @@
 import { Plugin, PluginKey, TextSelection } from "prosemirror-state";
 import { docClipboardSerializer } from "../../../clipboard/copy/index.js";
 const key = new PluginKey("clipboard");
-export const clipboardPlugin = options => {
+export const clipboardPlugin = (options) => {
     return new Plugin({
         key,
         props: {

package/dist/collab/merge/state_plugins/clipboard.js.map

@@ -1 +1 @@
-{"version":3,"file":"clipboard.js","sourceRoot":"","sources":["../../../../src/collab/merge/state_plugins/clipboard.js"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,SAAS,EAAE,aAAa,EAAC,MAAM,mBAAmB,CAAA;AAClE,OAAO,EAAC,sBAAsB,EAAC,MAAM,kCAAkC,CAAA;AAEvE,MAAM,GAAG,GAAG,IAAI,SAAS,CAAC,WAAW,CAAC,CAAA;AACtC,MAAM,CAAC,MAAM,eAAe,GAAG,OAAO,CAAC,EAAE;IACrC,OAAO,IAAI,MAAM,CAAC;QACd,GAAG;QACH,KAAK,EAAE;YACH,UAAU,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;gBACtC,IAAI,KAAK,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;oBACjC,OAAO,KAAK,CAAA,CAAC,uFAAuF;gBACxG,CAAC;gBACD,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC;oBAC9B,IAAI,EAAE,KAAK,CAAC,OAAO;oBACnB,GAAG,EAAE,KAAK,CAAC,OAAO;iBACrB,CAAC,CAAA;gBACF,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACZ,OAAO,KAAK,CAAA;gBAChB,CAAC;gBACD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;gBACnD,IAAI,CAAC,MAAM,EAAE,CAAC;oBACV,OAAO,KAAK,CAAA;gBAChB,CAAC;gBACD,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAA;gBACxB,EAAE,CAAC,YAAY,CAAC,IAAI,aAAa,CAAC,MAAM,CAAC,CAAC,CAAA;gBAC1C,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;gBACjB,OAAO,IAAI,CAAA;YACf,CAAC;YACD,mBAAmB,EAAE,sBAAsB,CAAC,OAAO,CAAC,MAAM,CAAC;SAC9D;KACJ,CAAC,CAAA;AACN,CAAC,CAAA"}
+{"version":3,"file":"clipboard.js","sourceRoot":"","sources":["../../../../src/collab/merge/state_plugins/clipboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,SAAS,EAAE,aAAa,EAAC,MAAM,mBAAmB,CAAA;AAKlE,OAAO,EAAC,sBAAsB,EAAC,MAAM,kCAAkC,CAAA;AAGvE,MAAM,GAAG,GAAG,IAAI,SAAS,CAAC,WAAW,CAAC,CAAA;AACtC,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,OAAyB,EAAE,EAAE;IACzD,OAAO,IAAI,MAAM,CAAC;QACd,GAAG;QACH,KAAK,EAAE;YACH,UAAU,EAAE,CACR,IAAgB,EAChB,KAAgB,EAChB,KAAY,EACZ,KAAc,EAChB,EAAE;gBACA,IAAI,KAAK,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;oBACjC,OAAO,KAAK,CAAA,CAAC,uFAAuF;gBACxG,CAAC;gBACD,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC;oBAC9B,IAAI,EAAE,KAAK,CAAC,OAAO;oBACnB,GAAG,EAAE,KAAK,CAAC,OAAO;iBACrB,CAAC,CAAA;gBACF,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACZ,OAAO,KAAK,CAAA;gBAChB,CAAC;gBACD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;gBACnD,IAAI,CAAC,MAAM,EAAE,CAAC;oBACV,OAAO,KAAK,CAAA;gBAChB,CAAC;gBACD,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAA;gBACxB,EAAE,CAAC,YAAY,CAAC,IAAI,aAAa,CAAC,MAAM,CAAC,CAAC,CAAA;gBAC1C,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;gBACjB,OAAO,IAAI,CAAA;YACf,CAAC;YACD,mBAAmB,EAAE,sBAAsB,CAAC,OAAO,CAAC,MAAM,CAA6B;SAC1F;KACJ,CAAC,CAAA;AACN,CAAC,CAAA"}

package/dist/collab/merge/state_plugins/diff.d.ts

@@ -0,0 +1,32 @@
+import type { Node, Schema } from "prosemirror-model";
+import { Plugin, PluginKey } from "prosemirror-state";
+import type { Transaction } from "prosemirror-state";
+import { Mapping } from "prosemirror-transform";
+import { DecorationSet } from "prosemirror-view";
+import type { EditorView } from "prosemirror-view";
+interface DiffPluginState {
+    baseTr: Transaction | false;
+    deletionClass: string | false;
+    decos: DecorationSet;
+}
+interface MergeEditorLike {
+    schema: Schema;
+    cpDoc: Node;
+    offlineDoc: Node;
+    onlineDoc: Node;
+    offlineTr: Transaction;
+    onlineTr: Transaction;
+    mergeView1: EditorView;
+    mergeView2: EditorView;
+    mergeView3: EditorView;
+    imageDataModified: Record<string, number>;
+    offlineTrackedSteps: number[];
+    editor: any;
+    mergedDocMap: Mapping;
+}
+export declare const key: PluginKey<DiffPluginState>;
+export declare const diffPlugin: (options: {
+    merge: MergeEditorLike;
+}) => Plugin<DiffPluginState>;
+export {};
+//# sourceMappingURL=diff.d.ts.map

package/dist/collab/merge/state_plugins/diff.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"diff.d.ts","sourceRoot":"","sources":["../../../../src/collab/merge/state_plugins/diff.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAO,IAAI,EAAE,MAAM,EAAC,MAAM,mBAAmB,CAAA;AAEzD,OAAO,EAAgB,MAAM,EAAE,SAAS,EAAC,MAAM,mBAAmB,CAAA;AAClE,OAAO,KAAK,EAAc,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC/D,OAAO,EAAC,OAAO,EAAC,MAAM,uBAAuB,CAAA;AAC7C,OAAO,EAAa,aAAa,EAAC,MAAM,kBAAkB,CAAA;AAC1D,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAA;AAmBhD,UAAU,eAAe;IACrB,MAAM,EAAE,WAAW,GAAG,KAAK,CAAA;IAC3B,aAAa,EAAE,MAAM,GAAG,KAAK,CAAA;IAC7B,KAAK,EAAE,aAAa,CAAA;CACvB;AAED,UAAU,eAAe;IACrB,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,IAAI,CAAA;IACX,UAAU,EAAE,IAAI,CAAA;IAChB,SAAS,EAAE,IAAI,CAAA;IACf,SAAS,EAAE,WAAW,CAAA;IACtB,QAAQ,EAAE,WAAW,CAAA;IACrB,UAAU,EAAE,UAAU,CAAA;IACtB,UAAU,EAAE,UAAU,CAAA;IACtB,UAAU,EAAE,UAAU,CAAA;IACtB,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACzC,mBAAmB,EAAE,MAAM,EAAE,CAAA;IAC7B,MAAM,EAAE,GAAG,CAAA;IACX,YAAY,EAAE,OAAO,CAAA;CACxB;AAmkBD,eAAO,MAAM,GAAG,4BAA8C,CAAA;AAE9D,eAAO,MAAM,UAAU,GAAI,SAAS;IAAC,KAAK,EAAE,eAAe,CAAA;CAAC,4BAuQtD,CAAA"}

package/dist/collab/merge/state_plugins/diff.js

@@ -10,9 +10,8 @@ import { acceptChanges, addDeletedContentBack, copyChange, deleteContent, handle
 function createHiglightDecoration(from, to, state) {
     /* Creates a yellow coloured highlight decoration when the user
     tries to look at a change */
-    const inlineDeco = Decoration.inline(from, to, { class: "selected-dec" });
     const deco = [];
-    deco.push(inlineDeco);
+    deco.push(Decoration.inline(from, to, { class: "selected-dec" }));
     state.doc.nodesBetween(from, to, (node, pos) => {
         if (pos < from ||
             ["bullet_list", "ordered_list"].includes(node.type.name)) {
@@ -24,22 +23,26 @@ function createHiglightDecoration(from, to, state) {
         if (node && node.attrs.diffdata && node.attrs.diffdata.length > 0) {
             deco.push(Decoration.node(pos, pos + node.nodeSize, { class: "selected-dec" }, {}));
         }
+        return true;
     });
     return deco;
 }
 function createDeletionHighlight(decos, from, to, state, options) {
     /* Creates a yellow coloured highlight decoration when the user
     tries to look at a deletion change in offline editor */
-    decos.find(from + 1, to).forEach(deco => {
-        const decoId = deco.spec.id;
+    decos.find(undefined, undefined, spec => {
+        const decoId = spec.id;
         if (decoId !== undefined) {
-            const specDecoration = options.merge.mergeView2.dom.querySelector('[data-decoid="' + decoId + '"]');
-            const parentEl = specDecoration.closest(".deletion-decoration");
-            parentEl.querySelectorAll(".online-deleted").forEach(ele => {
-                ele.classList.add("selected-dec");
-                ele.classList.add("deletion-highlight");
-            });
+            const specDecoration = options.merge.mergeView2.dom.querySelector(`[data-decoid="${decoId}"]`);
+            const parentEl = specDecoration?.closest(".deletion-decoration");
+            if (parentEl) {
+                parentEl.querySelectorAll(".online-deleted").forEach(ele => {
+                    ele.classList.add("selected-dec");
+                    ele.classList.add("deletion-highlight");
+                });
+            }
         }
+        return false;
     });
     const inlineDeco = Decoration.inline(from, to, { class: "selected-dec" }, { type: "deletion-highlight" });
     const deco = [];
@@ -55,9 +58,9 @@ function createDeletionHighlight(decos, from, to, state, options) {
         if (node.attrs.diffdata) {
             deco.push(Decoration.node(pos, pos + node.nodeSize, { class: "selected-dec" }, { type: "deletion-highlight" }));
         }
+        return true;
     });
-    decos = decos.add(state.doc, deco);
-    return decos;
+    return decos.add(state.doc, deco);
 }
 function createLinkDropUp(mark) {
     const dom = document.createElement("span");
@@ -72,9 +75,10 @@ function createLinkDropUp(mark) {
 function getDecos(decos, merge, state) {
     /* Creates PM deco for the change popup */
     const $head = state.selection.$head;
-    const currentMarks = [], diffMark = $head.marks().find(mark => mark.type.name === "diffdata");
+    const currentMarks = [];
+    const diffMark = $head.marks().find(mark => mark.type.name === "diffdata");
     const linkMark = $head.marks().find(mark => mark.type.name === "link");
-    decos = decos.remove(decos.find(null, null, spec => {
+    decos = decos.remove(decos.find(undefined, undefined, spec => {
         if (spec.type && spec.type == "deletion") {
             return false;
         }
@@ -91,22 +95,22 @@ function getDecos(decos, merge, state) {
             : state.selection.$head.parent;
         const markFound = {};
         if (node && node.attrs.diffdata && node.attrs.diffdata.length > 0) {
-            markFound["attrs"] = {};
-            markFound["attrs"]["diff"] = node.attrs.diffdata[0].type;
-            markFound["attrs"]["from"] = node.attrs.diffdata[0].from;
-            markFound["attrs"]["to"] = node.attrs.diffdata[0].to;
-            markFound["attrs"]["steps"] = JSON.stringify(node.attrs.diffdata[0].steps);
+            markFound.attrs = {};
+            markFound.attrs.diff = node.attrs.diffdata[0].type;
+            markFound.attrs.from = node.attrs.diffdata[0].from;
+            markFound.attrs.to = node.attrs.diffdata[0].to;
+            markFound.attrs.steps = JSON.stringify(node.attrs.diffdata[0].steps);
             const startPos = $head.pos; // position of block start.
             const dom = createDropUp(merge, markFound, linkMark), deco = Decoration.widget(startPos, dom);
-            const highlightDecos = createHiglightDecoration(markFound["attrs"]["from"], markFound["attrs"]["to"], state);
+            const highlightDecos = createHiglightDecoration(markFound.attrs.from, markFound.attrs.to, state);
             highlightDecos.push(deco);
             return decos.add(state.doc, highlightDecos);
         }
         else if (node.marks.find(mark => mark.type.name == "diffdata")) {
-            const mark = node.marks.find(mark => mark.type.name == "diffdata");
+            const foundMark = node.marks.find(mark => mark.type.name == "diffdata");
             const startPos = $head.pos; // position of block start.
-            const dom = createDropUp(merge, mark, linkMark), deco = Decoration.widget(startPos, dom);
-            const highlightDecos = createHiglightDecoration(mark.attrs.from, mark.attrs.to, state);
+            const dom = createDropUp(merge, foundMark, linkMark), deco = Decoration.widget(startPos, dom);
+            const highlightDecos = createHiglightDecoration(foundMark.attrs.from, foundMark.attrs.to, state);
             highlightDecos.push(deco);
             return decos.add(state.doc, highlightDecos);
         }
@@ -117,6 +121,9 @@ function getDecos(decos, merge, state) {
         }
         return decos;
     }
+    if (!diffMark) {
+        return decos;
+    }
     const startPos = diffMark.attrs.to;
     const dom = createDropUp(merge, diffMark, linkMark), deco = Decoration.widget(startPos, dom);
     const highlightDecos = createHiglightDecoration(diffMark.attrs.from, diffMark.attrs.to, state);
@@ -129,11 +136,11 @@ function deletionDecorations(decos, merge, doc, tr, deletionClass) {
     const changeset = new changeSet(tr).getChangeSet(), schema = merge.schema, commonDoc = merge.cpDoc, mapping = tr.mapping;
     changeset.changes.forEach(change => {
         if (change.deleted.length > 0) {
-            let dom = document.createElement("span");
+            const dom = document.createElement("span");
             const slice = commonDoc.slice(change.fromA, change.toA);
             // Apply the marks before trying to serialize!!!!
             let stepsInvolved = [];
-            change.deleted.forEach(deletion => stepsInvolved.push(Number.parseInt(deletion.data.step)));
+            change.deleted.forEach(deletion => stepsInvolved.push(Number.parseInt(String(deletion.data.step))));
             const stepsSet = new Set(stepsInvolved);
             stepsInvolved = Array.from(stepsSet);
             stepsInvolved.sort((a, b) => a - b);
@@ -151,8 +158,9 @@ function deletionDecorations(decos, merge, doc, tr, deletionClass) {
             const deletedContent = DOMSerializer.fromSchema(schema).serializeFragment(content);
             // Parse HTML to accomodate minor changes
             if (deletedContent.querySelector("tr,td")) {
-                dom = document.createElement("tbody");
-                dom.appendChild(deletedContent);
+                const tbody = document.createElement("tbody");
+                tbody.appendChild(deletedContent);
+                dom.appendChild(tbody);
             }
             else {
                 dom.appendChild(deletedContent);
@@ -165,16 +173,17 @@ function deletionDecorations(decos, merge, doc, tr, deletionClass) {
                 footnoteElement.remove();
             });
             dom.classList.add("deletion-decoration");
-            dom.dataset.delfrom = change.fromA;
-            dom.dataset.delto = change.toA;
+            dom.dataset.delfrom = String(change.fromA);
+            dom.dataset.delto = String(change.toA);
             const dropUp = createDropUp(merge, deletionMark, undefined);
-            dropUp.dataset.decoid = index;
+            dropUp.dataset.decoid = String(index);
             dropUp.style.display = "none";
             dom.appendChild(dropUp);
             // Put decoration in proper place. In case of a footnote change, the original content
             // is put first, decoration is shown after the content
             let pos = mapping.map(change.fromA);
-            if (change.lenA == change.lenB && stepsInvolved.length == 1) {
+            if (change.lenA == change.lenB &&
+                stepsInvolved.length == 1) {
                 const JSONSlice = slice.toJSON();
                 if (JSONSlice.content &&
                     JSONSlice.content.length == 1 &&
@@ -189,15 +198,22 @@ function deletionDecorations(decos, merge, doc, tr, deletionClass) {
         }
     });
     if (deletionClass == "offline-deleted") {
-        merge.offlineTrackedSteps = merge.offlineTrackedSteps.concat(stepsTrackedByChangeset);
+        merge.offlineTrackedSteps =
+            merge.offlineTrackedSteps.concat(stepsTrackedByChangeset);
     }
     return decos;
 }
 function createDropUp(merge, diffMark, linkMark) {
     /* The actual function that creates a drop up */
-    const dropUp = document.createElement("span"), requiredPx = 10, tr = diffMark.attrs.diff.search("offline") != -1
+    const dropUp = document.createElement("span");
+    const requiredPx = 10;
+    const tr = String(diffMark.attrs.diff).search("offline") != -1
         ? merge.offlineTr
-        : merge.onlineTr, trType = diffMark.attrs.diff.search("offline") != -1 ? "offline" : "online", opType = diffMark.attrs.diff.search("inserted") != -1
+        : merge.onlineTr;
+    const trType = String(diffMark.attrs.diff).search("offline") != -1
+        ? "offline"
+        : "online";
+    const opType = String(diffMark.attrs.diff).search("inserted") != -1
         ? "insertion"
         : "deletion";
     let textToBeDisplayed = "";
@@ -222,7 +238,7 @@ function createDropUp(merge, diffMark, linkMark) {
             }
         }
     }
-    linkMark = linkMark === undefined ? false : linkMark;
+    const safeLinkMark = linkMark === undefined ? false : linkMark;
     dropUp.classList.add("drop-up-outer");
     dropUp.innerHTML = noSpaceTmp `
         <div class="link drop-up-inner" style="top: -${requiredPx}px;">
@@ -231,11 +247,11 @@ function createDropUp(merge, diffMark, linkMark) {
                     ${diffMark.attrs.diff
             ? `<div class="link-title">${gettext("Change")}:&nbsp; ${textToBeDisplayed}</div>`
             : ""}
-                    ${linkMark
-            ? `<div> Link : ${linkMark.attrs.href}</div>`
+                    ${safeLinkMark
+            ? `<div> Link : ${safeLinkMark.attrs.href}</div>`
             : ""}
-                    ${linkMark
-            ? `<div> Type : ${linkMark.attrs.href[0] == "#" ? "internal" : "external"}</div>`
+                    ${safeLinkMark
+            ? `<div> Type : ${safeLinkMark.attrs.href[0] == "#" ? "internal" : "external"}</div>`
             : ""}
                 </div>
                 <ul class="drop-up-options">
@@ -320,9 +336,14 @@ function createDropUp(merge, diffMark, linkMark) {
                     }
                     else {
                         // remove offline deletion decoration
-                        dropUp.parentNode.classList.remove("offline-deleted");
-                        dropUp.parentNode.classList.remove("deletion-decoration");
-                        dropUp.parentNode
+                        const target = event.target;
+                        const parentEl = target.closest(".deletion-decoration");
+                        if (!parentEl) {
+                            return;
+                        }
+                        parentEl.classList.remove("offline-deleted");
+                        parentEl.classList.remove("deletion-decoration");
+                        parentEl
                             .querySelectorAll(".offline-deleted")
                             .forEach(ele => {
                             ele.classList.remove("offline-deleted");
@@ -367,23 +388,24 @@ function createDropUp(merge, diffMark, linkMark) {
     return dropUp;
 }
 export const key = new PluginKey("mergeDiff");
-export const diffPlugin = options => new Plugin({
+export const diffPlugin = (options) => new Plugin({
     key,
     state: {
-        init(state) {
+        init(config) {
             let baseTr = false;
             let deletionClass = false;
             let decos = DecorationSet.empty;
-            if (state.doc.eq(options.merge.offlineDoc)) {
+            const doc = config.doc;
+            if (doc?.eq(options.merge.offlineDoc)) {
                 baseTr = options.merge.offlineTr;
                 deletionClass = "offline-deleted";
             }
-            else if (state.doc.eq(options.merge.onlineDoc)) {
+            else if (doc?.eq(options.merge.onlineDoc)) {
                 baseTr = options.merge.onlineTr;
                 deletionClass = "online-deleted";
             }
-            if (baseTr) {
-                decos = deletionDecorations(decos, options.merge, state.doc, baseTr, deletionClass);
+            if (baseTr && doc) {
+                decos = deletionDecorations(decos, options.merge, doc, baseTr, deletionClass);
             }
             return {
                 baseTr: baseTr,
@@ -392,11 +414,12 @@ export const diffPlugin = options => new Plugin({
             };
         },
         apply(tr, _prev, oldState, state) {
-            let { decos } = this.getState(oldState);
-            const { baseTr, deletionClass } = this.getState(oldState);
-            decos = getDecos(decos, options.merge, state);
+            const oldPluginState = key.getState(oldState);
+            let { decos } = oldPluginState;
+            const { baseTr, deletionClass } = oldPluginState;
+            let newDecos = getDecos(decos, options.merge, state);
             if (tr.getMeta("removeHighlight")) {
-                decos = decos.remove(decos.find(null, null, spec => spec.type == "deletion-highlight"));
+                newDecos = newDecos.remove(newDecos.find(undefined, undefined, spec => spec.type == "deletion-highlight"));
                 // Remove the class set on deletion decorations
                 options.merge.mergeView2.dom
                     .querySelectorAll(".selected-dec.deletion-highlight")
@@ -407,36 +430,35 @@ export const diffPlugin = options => new Plugin({
             }
             if (tr.getMeta("decorationId")) {
                 const decorationId = Number.parseInt(tr.getMeta("decorationId"));
-                decos = decos.remove(decos.find(null, null, spec => spec.id == decorationId));
+                newDecos = newDecos.remove(newDecos.find(undefined, undefined, spec => spec.id == decorationId));
             }
             if (tr.getMeta("highlight")) {
                 const data = tr.getMeta("highlight");
                 const from = options.merge.mergedDocMap.map(Number.parseInt(data.from));
                 const to = options.merge.mergedDocMap.map(Number.parseInt(data.to));
                 if (from && to) {
-                    decos = createDeletionHighlight(decos, from, to, state, options);
+                    newDecos = createDeletionHighlight(newDecos, from, to, state, options);
                 }
             }
             if (tr.getMeta("initialDiffMap")) {
                 // If it is initial diffMap we update mark data
                 // So no need to update the deco's position.
-                decos = decos.map(new Mapping(), tr.doc);
+                newDecos = newDecos.map(new Mapping(), tr.doc);
             }
             else {
-                decos = decos.map(tr.mapping, tr.doc);
+                newDecos = newDecos.map(tr.mapping, tr.doc);
             }
             return {
                 baseTr: baseTr,
                 deletionClass: deletionClass,
-                decos: decos
+                decos: newDecos
             };
         }
     },
     props: {
         handleClick: (view, _pos, event) => {
             const $pos = view.state.doc.resolve(_pos);
-            if ($pos.node &&
-                $pos.parent &&
+            if ($pos.parent &&
                 $pos.parent.type.name == "figure") {
                 // If the click is on a Fig element set up a node selection
                 // so that accept/reject options are shown properly.
@@ -446,47 +468,49 @@ export const diffPlugin = options => new Plugin({
                 view.dispatch(tr);
             }
             const delDeco = view.dom.querySelectorAll(".offline-deleted,.online-deleted");
-            if (delDeco) {
-                delDeco.forEach(item => item.classList.remove("selected-dec"));
-            }
+            delDeco.forEach(item => item.classList.remove("selected-dec"));
             const delPopUp = view.dom.querySelectorAll(".deletion-decoration .drop-up-outer");
-            if (delPopUp) {
-                delPopUp.forEach(popUp => (popUp.style.display = "none"));
-            }
+            delPopUp.forEach(popUp => (popUp.style.display = "none"));
             const delFnToolTip = view.dom.querySelectorAll(".deleted-footnote-element");
-            if (delFnToolTip) {
-                delFnToolTip.forEach(tooltip => (tooltip.childNodes[0].style.display = "none"));
-            }
+            delFnToolTip.forEach(tooltip => (tooltip.childNodes[0].style.display =
+                "none"));
             options.merge.mergeView2.dispatch(options.merge.mergeView2.state.tr.setMeta("removeHighlight", true));
-            if (event.target.closest(".offline-deleted")) {
-                const parentEl = event.target.closest(".deletion-decoration");
-                const highlightEle = parentEl.querySelectorAll(".offline-deleted");
-                if (highlightEle) {
-                    highlightEle.forEach(ele => ele.classList.add("selected-dec"));
+            const target = event.target;
+            const offlineDeleted = target.closest(".offline-deleted");
+            if (offlineDeleted) {
+                const parentEl = target.closest(".deletion-decoration");
+                if (!parentEl) {
+                    return false;
                 }
-                parentEl.querySelector(".drop-up-outer").style.display =
-                    "block";
+                const highlightEle = parentEl.querySelectorAll(".offline-deleted");
+                highlightEle.forEach(ele => ele.classList.add("selected-dec"));
+                parentEl.querySelector(".drop-up-outer").style.display = "block";
                 // Add a decoration to highlight decoration to the online/merged view
                 options.merge.mergeView2.dispatch(options.merge.mergeView2.state.tr.setMeta("highlight", {
                     from: parentEl.dataset.delfrom,
                     to: parentEl.dataset.delto
                 }));
             }
-            else if (event.target.closest(".online-deleted")) {
-                const parentEl = event.target.closest(".deletion-decoration");
-                const highlightEle = parentEl.querySelectorAll(".online-deleted");
-                if (highlightEle) {
+            else {
+                const onlineDeleted = target.closest(".online-deleted");
+                if (onlineDeleted) {
+                    const parentEl = target.closest(".deletion-decoration");
+                    if (!parentEl) {
+                        return false;
+                    }
+                    const highlightEle = parentEl.querySelectorAll(".online-deleted");
                     highlightEle.forEach(ele => ele.classList.add("selected-dec"));
+                    parentEl.querySelector(".drop-up-outer").style.display = "block";
                 }
-                parentEl.querySelector(".drop-up-outer").style.display =
-                    "block";
             }
-            if (event.target.matches(".deleted-footnote-element")) {
-                event.target.childNodes[0].style.display = "block";
+            if (target.matches(".deleted-footnote-element")) {
+                ;
+                target.childNodes[0].style.display = "block";
             }
+            return false;
         },
         decorations(state) {
-            const { decos } = this.getState(state);
+            const { decos } = key.getState(state);
             return decos;
         }
     },