@manuscripts/body-editor 2.5.6 → 2.5.7

package/dist/cjs/commands.js

@@ -983,6 +983,11 @@ const addInlineComment = (state, dispatch) => {
     }
     let from = selection.from;
     let to = selection.to;
+    if (from === to) {
+        const result = (0, helpers_1.findWordBoundaries)(state, from);
+        from = result.from;
+        to = result.to;
+    }
     const props = (0, editor_props_1.getEditorProps)(state);
     const contribution = (0, json_schema_1.buildContribution)(props.userID);
     const attrs = {
@@ -990,7 +995,7 @@ const addInlineComment = (state, dispatch) => {
         contents: '',
         target: node.attrs.id,
         contributions: [contribution],
-        originalText: selectedText(),
+        originalText: selectedText() || state.doc.textBetween(from, to),
         selector: {
             from,
             to,
@@ -1001,11 +1006,6 @@ const addInlineComment = (state, dispatch) => {
     if (comments) {
         const pos = comments.pos + 1;
         const tr = state.tr.insert(pos, comment);
-        if (from === to) {
-            const result = (0, helpers_1.findWordBoundaries)(state, from);
-            from = result.from;
-            to = result.to;
-        }
         const start = transform_1.schema.nodes.highlight_marker.create({
             id: comment.attrs.id,
             tid: node.attrs.id,

package/dist/cjs/lib/comments.js

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createCommentMarker = exports.getCommentRange = exports.getCommentKey = exports.isNodeComment = void 0;
+exports.createCommentMarker = exports.getCommentRange = exports.getCommentKey = exports.isReply = exports.isNodeComment = void 0;
 const isNodeComment = (c) => !c.range;
 exports.isNodeComment = isNodeComment;
+const isReply = (comment) => {
+    return comment.node.attrs.target.includes('MPCommentAnnotation');
+};
+exports.isReply = isReply;
 const getCommentKey = (comment, range, target) => {
     if (!range) {
         return target.attrs.id;

package/dist/cjs/plugins/comments.js

@@ -133,14 +133,16 @@ const buildPluginState = (doc, selection) => {
         })
             .forEach((c) => {
             allComments.push(c);
-            if (!c.range) {
-                nodeComments.push(c);
-            }
-            else if (c.range.size) {
-                highlightComments.push(c);
-            }
-            else {
-                pointComments.push(c);
+            if (!(0, comments_1.isReply)(c)) {
+                if (!c.range) {
+                    nodeComments.push(c);
+                }
+                else if (c.range.size) {
+                    highlightComments.push(c);
+                }
+                else {
+                    pointComments.push(c);
+                }
             }
         });
         for (const comment of highlightComments) {

package/dist/cjs/versions.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MATHJAX_VERSION = exports.VERSION = void 0;
-exports.VERSION = '2.5.6';
+exports.VERSION = '2.5.7';
 exports.MATHJAX_VERSION = '3.2.2';

package/dist/es/commands.js

@@ -937,6 +937,11 @@ export const addInlineComment = (state, dispatch) => {
     }
     let from = selection.from;
     let to = selection.to;
+    if (from === to) {
+        const result = findWordBoundaries(state, from);
+        from = result.from;
+        to = result.to;
+    }
     const props = getEditorProps(state);
     const contribution = buildContribution(props.userID);
     const attrs = {
@@ -944,7 +949,7 @@ export const addInlineComment = (state, dispatch) => {
         contents: '',
         target: node.attrs.id,
         contributions: [contribution],
-        originalText: selectedText(),
+        originalText: selectedText() || state.doc.textBetween(from, to),
         selector: {
             from,
             to,
@@ -955,11 +960,6 @@ export const addInlineComment = (state, dispatch) => {
     if (comments) {
         const pos = comments.pos + 1;
         const tr = state.tr.insert(pos, comment);
-        if (from === to) {
-            const result = findWordBoundaries(state, from);
-            from = result.from;
-            to = result.to;
-        }
         const start = schema.nodes.highlight_marker.create({
             id: comment.attrs.id,
             tid: node.attrs.id,

package/dist/es/lib/comments.js

@@ -1,4 +1,7 @@
 export const isNodeComment = (c) => !c.range;
+export const isReply = (comment) => {
+    return comment.node.attrs.target.includes('MPCommentAnnotation');
+};
 export const getCommentKey = (comment, range, target) => {
     if (!range) {
         return target.attrs.id;

package/dist/es/plugins/comments.js

@@ -2,7 +2,7 @@ import { schema, } from '@manuscripts/transform';
 import { Plugin, PluginKey } from 'prosemirror-state';
 import { findChildrenByType } from 'prosemirror-utils';
 import { Decoration, DecorationSet } from 'prosemirror-view';
-import { createCommentMarker, getCommentKey, } from '../lib/comments';
+import { createCommentMarker, getCommentKey, isReply, } from '../lib/comments';
 export const commentsKey = new PluginKey('comments');
 const COMMENT_SELECTION = 'comment-selection';
 const EMPTY_SELECTION = {};
@@ -128,14 +128,16 @@ const buildPluginState = (doc, selection) => {
         })
             .forEach((c) => {
             allComments.push(c);
-            if (!c.range) {
-                nodeComments.push(c);
-            }
-            else if (c.range.size) {
-                highlightComments.push(c);
-            }
-            else {
-                pointComments.push(c);
+            if (!isReply(c)) {
+                if (!c.range) {
+                    nodeComments.push(c);
+                }
+                else if (c.range.size) {
+                    highlightComments.push(c);
+                }
+                else {
+                    pointComments.push(c);
+                }
             }
         });
         for (const comment of highlightComments) {

package/dist/es/versions.js

@@ -1,2 +1,2 @@
-export const VERSION = '2.5.6';
+export const VERSION = '2.5.7';
 export const MATHJAX_VERSION = '3.2.2';

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

@@ -27,6 +27,7 @@ export type CommentSelection = {
     isNew: boolean;
 };
 export declare const isNodeComment: (c: any) => c is NodeComment;
+export declare const isReply: (comment: Comment) => boolean;
 export declare const getCommentKey: (comment: CommentAttrs, range: CommentRange | undefined, target: ManuscriptNode) => CommentKey;
 export declare const getCommentRange: (comment: CommentAttrs) => {
     pos: number;

package/dist/types/versions.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "2.5.6";
+export declare const VERSION = "2.5.7";
 export declare const MATHJAX_VERSION = "3.2.2";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/body-editor",
   "description": "Prosemirror components for editing and viewing manuscripts",
-  "version": "2.5.6",
+  "version": "2.5.7",
   "repository": "github:Atypon-OpenSource/manuscripts-body-editor",
   "license": "Apache-2.0",
   "main": "dist/cjs",