@manuscripts/body-editor 1.11.8 → 1.13.0

package/dist/cjs/lib/comments.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCommentMarker = exports.getCommentRange = exports.getCommentKey = exports.isNodeComment = void 0;
-const isNodeComment = (comment) => !comment.range;
+const isNodeComment = (c) => !c.range;
 exports.isNodeComment = isNodeComment;
 const getCommentKey = (comment, range, target) => {
     if (!range) {

package/dist/cjs/plugins/comments.js

@@ -90,13 +90,12 @@ const findCommentRanges = (doc) => {
     return ranges;
 };
 const findComments = (doc) => {
-    const nodes = (0, prosemirror_utils_1.findChildrenByType)(doc, transform_1.schema.nodes.comment);
+    const comments = (0, prosemirror_utils_1.findChildrenByType)(doc, transform_1.schema.nodes.comment);
     const commentsByTarget = new Map();
-    for (const { node } of nodes) {
-        const attrs = node.attrs;
-        const targetID = attrs.target;
-        const comments = commentsByTarget.get(targetID) || [];
-        commentsByTarget.set(targetID, [...comments, attrs]);
+    for (const comment of comments) {
+        const targetID = comment.node.attrs.target;
+        const list = commentsByTarget.get(targetID) || [];
+        commentsByTarget.set(targetID, [...list, comment]);
     }
     return commentsByTarget;
 };
@@ -118,27 +117,32 @@ const buildPluginState = (doc, selection) => {
         const nodeComments = [];
         const highlightComments = [];
         const pointComments = [];
-        for (const attrs of comments) {
+        comments
+            .map((c) => {
+            const attrs = c.node.attrs;
             const id = attrs.id;
             const range = ranges.get(id);
             const key = (0, comments_1.getCommentKey)(attrs, range, node);
-            const comment = {
+            return {
                 key,
-                attrs,
+                node: c.node,
+                pos: c.pos,
                 target,
                 range,
             };
-            allComments.push(comment);
-            if (!comment.range) {
-                nodeComments.push(comment);
+        })
+            .forEach((c) => {
+            allComments.push(c);
+            if (!c.range) {
+                nodeComments.push(c);
             }
-            else if (comment.range.size) {
-                highlightComments.push(comment);
+            else if (c.range.size) {
+                highlightComments.push(c);
             }
             else {
-                pointComments.push(comment);
+                pointComments.push(c);
             }
-        }
+        });
         for (const comment of highlightComments) {
             const key = comment.key;
             const range = comment.range;
@@ -161,7 +165,7 @@ const buildPluginState = (doc, selection) => {
     });
     return {
         decorations: prosemirror_view_1.DecorationSet.create(doc, decorations),
-        comments: new Map(allComments.map((c) => [c.attrs.id, c])),
+        comments: new Map(allComments.map((c) => [c.node.attrs.id, c])),
         commentsByKey: groupByKey(allComments),
         selection,
     };

package/dist/es/lib/comments.js

@@ -1,4 +1,4 @@
-export const isNodeComment = (comment) => !comment.range;
+export const isNodeComment = (c) => !c.range;
 export const getCommentKey = (comment, range, target) => {
     if (!range) {
         return target.attrs.id;

package/dist/es/plugins/comments.js

@@ -85,13 +85,12 @@ const findCommentRanges = (doc) => {
     return ranges;
 };
 const findComments = (doc) => {
-    const nodes = findChildrenByType(doc, schema.nodes.comment);
+    const comments = findChildrenByType(doc, schema.nodes.comment);
     const commentsByTarget = new Map();
-    for (const { node } of nodes) {
-        const attrs = node.attrs;
-        const targetID = attrs.target;
-        const comments = commentsByTarget.get(targetID) || [];
-        commentsByTarget.set(targetID, [...comments, attrs]);
+    for (const comment of comments) {
+        const targetID = comment.node.attrs.target;
+        const list = commentsByTarget.get(targetID) || [];
+        commentsByTarget.set(targetID, [...list, comment]);
     }
     return commentsByTarget;
 };
@@ -113,27 +112,32 @@ const buildPluginState = (doc, selection) => {
         const nodeComments = [];
         const highlightComments = [];
         const pointComments = [];
-        for (const attrs of comments) {
+        comments
+            .map((c) => {
+            const attrs = c.node.attrs;
             const id = attrs.id;
             const range = ranges.get(id);
             const key = getCommentKey(attrs, range, node);
-            const comment = {
+            return {
                 key,
-                attrs,
+                node: c.node,
+                pos: c.pos,
                 target,
                 range,
             };
-            allComments.push(comment);
-            if (!comment.range) {
-                nodeComments.push(comment);
+        })
+            .forEach((c) => {
+            allComments.push(c);
+            if (!c.range) {
+                nodeComments.push(c);
             }
-            else if (comment.range.size) {
-                highlightComments.push(comment);
+            else if (c.range.size) {
+                highlightComments.push(c);
             }
             else {
-                pointComments.push(comment);
+                pointComments.push(c);
             }
-        }
+        });
         for (const comment of highlightComments) {
             const key = comment.key;
             const range = comment.range;
@@ -156,7 +160,7 @@ const buildPluginState = (doc, selection) => {
     });
     return {
         decorations: DecorationSet.create(doc, decorations),
-        comments: new Map(allComments.map((c) => [c.attrs.id, c])),
+        comments: new Map(allComments.map((c) => [c.node.attrs.id, c])),
         commentsByKey: groupByKey(allComments),
         selection,
     };

package/dist/types/lib/comments.d.ts

@@ -5,12 +5,14 @@ export type HighlightMarkerAttrs = HighlightMarkerNode['attrs'];
 export type Comment = NodeComment | InlineComment;
 export type NodeComment = {
     key: CommentKey;
-    attrs: CommentAttrs;
+    node: CommentNode;
+    pos: number;
     target: NodeWithPos;
 };
 export type InlineComment = {
     key: CommentKey;
-    attrs: CommentAttrs;
+    node: CommentNode;
+    pos: number;
     target: NodeWithPos;
     range: CommentRange;
 };
@@ -24,7 +26,7 @@ export type CommentSelection = {
     id: string;
     isNew: boolean;
 };
-export declare const isNodeComment: (comment: any) => comment is NodeComment;
+export declare const isNodeComment: (c: any) => c is NodeComment;
 export declare const getCommentKey: (comment: CommentAttrs, range: CommentRange | undefined, target: ManuscriptNode) => CommentKey;
 export declare const getCommentRange: (comment: CommentAttrs) => {
     pos: number;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/body-editor",
   "description": "Prosemirror components for editing and viewing manuscripts",
-  "version": "1.11.8",
+  "version": "1.13.0",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -30,7 +30,7 @@
     "@iarna/word-count": "^1.1.2",
     "@manuscripts/json-schema": "2.2.8",
     "@manuscripts/library": "1.3.7",
-    "@manuscripts/style-guide": "1.12.16",
+    "@manuscripts/style-guide": "1.13.0",
     "@manuscripts/track-changes-plugin": "1.7.13",
     "@manuscripts/transform": "2.3.9",
     "astrocite-eutils": "^0.16.4",