@manuscripts/article-editor 3.2.19-LEAN-3894.0 → 3.2.19

package/dist/es/components/comments/CommentThread.js

@@ -1,93 +1,105 @@
-import { TextButton } from '@manuscripts/style-guide';
-import React, { forwardRef, useEffect, useRef, useState } from 'react';
+import { AvatarIcon, RelativeDate, SystemUserAvatarIcon, usePermissions, } from '@manuscripts/style-guide';
+import React, { forwardRef, useState } from 'react';
 import styled from 'styled-components';
-import { commentsByTime } from '../../lib/comments';
-import { CommentCard } from './CommentCard';
-import { ReplyBox } from './ReplyBox';
+import { buildAuthorName, getAuthorID } from '../../lib/comments';
+import { useStore } from '../../store';
+import { CommentActions } from './CommentActions';
+import { CommentBody } from './CommentBody';
 const Container = styled.div `
-  padding: 8px;
-  background-color: ${(props) => (props.isSelected ? '#fff' : '#fafafa')};
-  border: 1px solid #c9c9c9;
-  ${(props) => props.isSelected && 'border-left-width: 4px'};
-  border-radius: 4px;
+  padding: 16px;
+  background-color: ${(props) => (props.isSelected ? '#f2fbfc' : '#ffffff')};
+  border: 1px solid ${(props) => (props.isSelected ? '#bce7f6' : '#e2e2e2')};
+  border-left-width: 4px;
   margin-bottom: 16px;
-  margin-left: 12px;
-  margin-right: 12px;
-
-  .actions-icon {
-    visibility: ${(props) => (props.isSelected ? 'visible' : 'hidden')};
-  }
-
-  &:hover {
-    background-color: #fff;
+`;
+const CommentHeader = styled.div `
+  display: flex;
+  margin-bottom: 16px;
+`;
+const CommentMetadata = styled.div `
+  flex: 1;
+  padding-left: 8px;
+  padding-right: 8px;
+`;
+const CommentAuthor = styled.div `
+  display: flex;
+  color: #353535;
+  font-weight: 400;
+  max-width: 200px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 100%;
 
-    .actions-icon {
-      visibility: visible;
-    }
+  svg {
+    padding-right: 10px;
   }
 `;
-const SeparatorLine = styled.div `
-  margin-bottom: 8px;
-  background-color: #c9c9c9;
-  height: 1px;
+const CommentTarget = styled.div `
+  font-size: 14px;
+  color: #353535;
+  background-color: #ffeebf;
+  padding: 4px 8px;
+  margin-top: 16px;
+  margin-bottom: 16px;
 `;
-const Indented = styled.div `
-  padding-left: 16px;
+const Timestamp = styled(RelativeDate) `
+  font-size: 12px;
+  line-height: 16px;
+  font-weight: 400;
+  color: #6e6e6e;
 `;
 export const CommentThread = forwardRef((props, ref) => {
-    const { thread, isSelected, onSelect, onSave, onDelete, insertCommentReply, } = props;
-    const { comment, isNew, replies } = thread;
-    const cardsRef = useRef(null);
-    const [showMore, setShowMore] = useState(false);
-    useEffect(() => {
-        if (cardsRef.current) {
-            const contentHeight = cardsRef.current.scrollHeight;
-            setShowMore(contentHeight > 280);
+    const { tree, isSelected, onSelect, onSave, onDelete } = props;
+    const can = usePermissions();
+    const [{ user, collaboratorsById }] = useStore((state) => ({
+        user: state.user,
+        collaboratorsById: state.collaboratorsById,
+    }));
+    const authorID = getAuthorID(tree.comment);
+    const authorName = authorID
+        ? buildAuthorName(collaboratorsById.get(authorID))
+        : '';
+    const timestamp = tree.comment.node.attrs.contributions?.[0].timestamp;
+    const isOwn = authorID === user._id;
+    const isResolveEnabled = isOwn
+        ? can.resolveOwnComment
+        : can.resolveOthersComment;
+    const isActionsEnabled = isOwn
+        ? can.handleOwnComments
+        : can.handleOthersComments;
+    const [isEditing, setEditing] = useState(tree.isNew);
+    const handleEdit = () => setEditing(true);
+    const handleSave = (contents) => {
+        onSave({
+            ...tree.comment.node.attrs,
+            contents,
+        });
+        setEditing(false);
+    };
+    const handleCancel = () => {
+        setEditing(false);
+        if (tree.isNew) {
+            onDelete(tree.comment.node.attrs.id);
         }
-    }, [comment, replies]);
+    };
+    const handleToggleResolve = () => {
+        onSave({
+            ...tree.comment.node.attrs,
+            resolved: !tree.comment.node.attrs.resolved,
+        });
+    };
     return (React.createElement(Container, { "data-cy": "comment", isSelected: isSelected, ref: ref },
-        React.createElement(CardsWrapper, { ref: cardsRef, isSelected: isSelected, showMore: showMore },
-            React.createElement(CommentCard, { comment: comment, isReply: false, numOfReplies: replies.length, isNew: isNew, isEndOfThread: !replies.length, onDelete: onDelete, onSave: onSave, onSelect: onSelect }),
-            replies.sort(commentsByTime).map((reply, index) => {
-                return (React.createElement("div", { key: reply.node.attrs.id },
-                    index === 0 && React.createElement(SeparatorLine, null),
-                    React.createElement(Indented, null,
-                        index !== 0 && React.createElement(SeparatorLine, null),
-                        React.createElement(CommentCard, { comment: reply, isReply: true, numOfReplies: 0, isNew: false, isEndOfThread: index === replies.length - 1, onDelete: onDelete, onSave: onSave, onSelect: onSelect }))));
-            })),
-        showMore && !isSelected && (React.createElement(React.Fragment, null,
-            React.createElement(SeparatorLine, null),
-            React.createElement(ButtonContainer, null,
-                React.createElement(ShowMore, { onClick: onSelect }, "Show more")))),
-        isSelected && !isNew && (React.createElement(ReplyBox, { insertCommentReply: insertCommentReply, commentID: comment.node.attrs.id }))));
+        React.createElement(CommentHeader, { "data-cy": "comment-header" },
+            React.createElement(CommentMetadata, null,
+                React.createElement(CommentAuthor, null, authorName ? (React.createElement(React.Fragment, null,
+                    React.createElement(AvatarIcon, { width: 20, height: 20 }),
+                    React.createElement(CommentAuthor, null, authorName))) : (React.createElement(React.Fragment, null,
+                    React.createElement(SystemUserAvatarIcon, { width: 20, height: 20 }),
+                    React.createElement(CommentAuthor, null, "System")))),
+                timestamp && React.createElement(Timestamp, { date: timestamp * 1000 })),
+            React.createElement(CommentActions, { comment: tree.comment, isResolveEnabled: isResolveEnabled, isActionsEnabled: isActionsEnabled, onDelete: () => onDelete(tree.comment.node.attrs.id), onEdit: handleEdit, toggleResolve: handleToggleResolve })),
+        tree.comment.node.attrs.originalText && (React.createElement(CommentTarget, null, tree.comment.node.attrs.originalText)),
+        React.createElement(CommentBody, { comment: tree.comment, isEditing: tree.isNew || isEditing, onSave: handleSave, onCancel: handleCancel, onSelect: onSelect })));
 });
-const ButtonContainer = styled.div `
-  display: flex;
-  justify-content: center;
-  align-items: center;
-`;
-const ShowMore = styled(TextButton) `
-  cursor: pointer;
-  text-align: center;
-  margin-top: 6px;
-  color: #353535;
-`;
-const CardsWrapper = styled.div `
-  max-height: ${({ isSelected }) => (isSelected ? 'none' : '280px')};
-  position: relative;
-  ${({ showMore, isSelected }) => showMore &&
-    !isSelected &&
-    `
-    overflow: hidden;
-    &:after {
-      content: '';
-      position: absolute;
-      bottom: 0;
-      left: 0;
-      right: 0;
-      height: 40px;
-      background: linear-gradient(to bottom, rgba(255, 255, 255, 0), rgba(255, 255, 255, 1));
-    }
-  `}
-`;
 //# sourceMappingURL=CommentThread.js.map

package/dist/es/components/comments/CommentThread.js.map

@@ -1 +1 @@
-{"version":3,"file":"CommentThread.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentThread.tsx"],"names":[],"mappings":"AAYA,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AACrD,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AACtE,OAAO,MAAM,MAAM,mBAAmB,CAAA;AAEtC,OAAO,EAAE,cAAc,EAAU,MAAM,oBAAoB,CAAA;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAA0B;;sBAEhC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;;IAEpE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,IAAI,wBAAwB;;;;;;;kBAOzC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC;;;;;;;;;;CAUrE,CAAA;AACD,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAA;;;;CAI/B,CAAA;AACD,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAA;;CAE1B,CAAA;AAWD,MAAM,CAAC,MAAM,aAAa,GAAG,UAAU,CACrC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;IACb,MAAM,EACJ,MAAM,EACN,UAAU,EACV,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,kBAAkB,GACnB,GAAG,KAAK,CAAA;IAET,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM,CAAA;IAE1C,MAAM,QAAQ,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAA;IAC7C,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IAE/C,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,QAAQ,CAAC,OAAO,EAAE;YACpB,MAAM,aAAa,GAAG,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAA;YACnD,WAAW,CAAC,aAAa,GAAG,GAAG,CAAC,CAAA;SACjC;IACH,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAA;IAEtB,OAAO,CACL,oBAAC,SAAS,eAAS,SAAS,EAAC,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG;QAC3D,oBAAC,YAAY,IACX,GAAG,EAAE,QAAQ,EACb,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,QAAQ;YAElB,oBAAC,WAAW,IACV,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,KAAK,EACd,YAAY,EAAE,OAAO,CAAC,MAAM,EAC5B,KAAK,EAAE,KAAK,EACZ,aAAa,EAAE,CAAC,OAAO,CAAC,MAAM,EAC9B,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,QAAQ,GAClB;YACD,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;gBACjD,OAAO,CACL,6BAAK,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;oBAC1B,KAAK,KAAK,CAAC,IAAI,oBAAC,aAAa,OAAG;oBACjC,oBAAC,QAAQ;wBACN,KAAK,KAAK,CAAC,IAAI,oBAAC,aAAa,OAAG;wBACjC,oBAAC,WAAW,IACV,OAAO,EAAE,KAAK,EACd,OAAO,EAAE,IAAI,EACb,YAAY,EAAE,CAAC,EACf,KAAK,EAAE,KAAK,EACZ,aAAa,EAAE,KAAK,KAAK,OAAO,CAAC,MAAM,GAAG,CAAC,EAC3C,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,QAAQ,GAClB,CACO,CACP,CACP,CAAA;YACH,CAAC,CAAC,CACW;QAEd,QAAQ,IAAI,CAAC,UAAU,IAAI,CAC1B;YACE,oBAAC,aAAa,OAAG;YACjB,oBAAC,eAAe;gBACd,oBAAC,QAAQ,IAAC,OAAO,EAAE,QAAQ,gBAAsB,CACjC,CACjB,CACJ;QACA,UAAU,IAAI,CAAC,KAAK,IAAI,CACvB,oBAAC,QAAQ,IACP,kBAAkB,EAAE,kBAAkB,EACtC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,GAChC,CACH,CACS,CACb,CAAA;AACH,CAAC,CACF,CAAA;AAED,MAAM,eAAe,GAAG,MAAM,CAAC,GAAG,CAAA;;;;CAIjC,CAAA;AAED,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC,CAAA;;;;;CAKlC,CAAA;AAED,MAAM,YAAY,GAAG,MAAM,CAAC,GAAG,CAG7B;gBACc,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;;IAE/D,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,EAAE,CAC7B,QAAQ;IACR,CAAC,UAAU;IACX;;;;;;;;;;;GAWD;CACF,CAAA"}
+{"version":3,"file":"CommentThread.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentThread.tsx"],"names":[],"mappings":"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"}

package/dist/es/components/comments/CommentsPanel.js

@@ -9,16 +9,13 @@
  *
  * All portions of the code written by Atypon Systems LLC are Copyright (c) 2019 Atypon Systems LLC. All Rights Reserved.
  */
-import { commentsKey, isNodeComment, setCommentSelection, } from '@manuscripts/body-editor';
-import { buildContribution } from '@manuscripts/json-schema';
+import { clearCommentSelection, commentsKey, isNodeComment, setCommentSelection, } from '@manuscripts/body-editor';
 import { CheckboxField, CheckboxLabel } from '@manuscripts/style-guide';
 import { skipTracking } from '@manuscripts/track-changes-plugin';
-import { generateNodeID, schema } from '@manuscripts/transform';
 import { NodeSelection, TextSelection } from 'prosemirror-state';
-import { findChildrenByType } from 'prosemirror-utils';
 import React, { useCallback, useMemo, useState } from 'react';
 import styled from 'styled-components';
-import { buildThreads } from '../../lib/comments';
+import { buildCommentTrees } from '../../lib/comments';
 import { useStore } from '../../store';
 import { CommentsPlaceholder } from './CommentsPlaceholder';
 import { CommentThread } from './CommentThread';
@@ -37,17 +34,14 @@ const scrollIntoView = (element) => {
     }
 };
 export const CommentsPanel = () => {
-    const [{ view, newCommentID, selectedCommentKey, user, doc }] = useStore((state) => ({
+    const [{ view, newCommentID, selectedCommentKey }] = useStore((state) => ({
         view: state.view,
-        doc: state.doc,
         newCommentID: state.newCommentID,
         selectedCommentKey: state.selectedCommentKey,
-        user: state.user,
     }));
     const [showResolved, setShowResolved] = useState(true);
-    const comments = useMemo(() => view?.state ? commentsKey.getState(view.state)?.comments : undefined, [view?.state, doc] // eslint-disable-line react-hooks/exhaustive-deps
-    );
-    const threads = useMemo(() => (comments ? buildThreads([...comments.values()], newCommentID) : []), [comments, newCommentID]);
+    const comments = useMemo(() => view?.state ? commentsKey.getState(view.state)?.comments : undefined, [view?.state]);
+    const trees = useMemo(() => comments ? buildCommentTrees([...comments.values()], newCommentID) : [], [comments, newCommentID]);
     const selectedRef = useCallback((e) => {
         if (e) {
             scrollIntoView(e);
@@ -72,25 +66,6 @@ export const CommentsPanel = () => {
         view.focus();
         view.dispatch(tr);
     };
-    const insertCommentReply = (target, contents) => {
-        if (!view) {
-            return;
-        }
-        const attrs = {
-            id: generateNodeID(schema.nodes.comment),
-            contents,
-            target,
-            contributions: [buildContribution(user._id)],
-            resolved: false,
-        };
-        const comment = view.state.schema.nodes.comment.create(attrs);
-        const comments = findChildrenByType(view.state.doc, view.state.schema.nodes.comments)[0];
-        if (comments) {
-            const pos = comments.pos + 1;
-            const tr = view.state.tr.insert(pos, comment);
-            view.dispatch(skipTracking(tr));
-        }
-    };
     const handleSave = (attrs) => {
         const comment = comments?.get(attrs.id);
         if (!comment || !view) {
@@ -98,6 +73,7 @@ export const CommentsPanel = () => {
         }
         const tr = view.state.tr;
         tr.setNodeMarkup(comment.pos, undefined, attrs);
+        clearCommentSelection(tr);
         view.dispatch(skipTracking(tr));
     };
     const handleDelete = (id) => {
@@ -107,15 +83,16 @@ export const CommentsPanel = () => {
         }
         const tr = view.state.tr;
         tr.delete(comment.pos, comment.pos + comment.node.nodeSize);
+        clearCommentSelection(tr);
         view.dispatch(skipTracking(tr));
     };
-    const isSelected = (thread) => {
-        return thread && selectedCommentKey === thread.comment.key;
+    const isSelected = (tree) => {
+        return tree && selectedCommentKey === tree.comment.key;
     };
     if (!view) {
         return null;
     }
-    if (!threads.length) {
+    if (!trees.length) {
         return React.createElement(CommentsPlaceholder, null);
     }
     return (React.createElement(React.Fragment, null,
@@ -123,8 +100,8 @@ export const CommentsPanel = () => {
             React.createElement(CheckboxLabel, null,
                 React.createElement(CheckboxField, { name: 'show-resolved', checked: showResolved, onChange: (e) => setShowResolved(e.target.checked) }),
                 React.createElement(CheckboxLabelText, null, "See resolved"))),
-        threads
+        trees
             .filter((c) => showResolved || !c.comment.node.attrs.resolved)
-            .map((c, i, a) => (React.createElement(CommentThread, { key: c.comment.node.attrs.id, ref: isSelected(c) && !isSelected(a[i - 1]) ? selectedRef : null, thread: c, isSelected: isSelected(c), onSelect: () => setSelectedComment(c.comment), onSave: handleSave, onDelete: handleDelete, insertCommentReply: insertCommentReply })))));
+            .map((c, i, a) => (React.createElement(CommentThread, { key: c.comment.node.attrs.id, ref: isSelected(c) && !isSelected(a[i - 1]) ? selectedRef : null, tree: c, isSelected: isSelected(c), onSelect: () => setSelectedComment(c.comment), onSave: handleSave, onDelete: handleDelete })))));
 };
 //# sourceMappingURL=CommentsPanel.js.map

package/dist/es/components/comments/CommentsPanel.js.map

@@ -1 +1 @@
-{"version":3,"file":"CommentsPanel.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentsPanel.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"CommentsPanel.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentsPanel.tsx"],"names":[],"mappings":"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"}

package/dist/es/lib/comments.js

@@ -1,15 +1,3 @@
-/*!
- * The contents of this file are subject to the Common Public Attribution License Version 1.0 (the “License”); you may not use this file except in compliance with the License. You may obtain a copy of the License at https://mpapp-public.gitlab.io/manuscripts-frontend/LICENSE. The License is based on the Mozilla Public License Version 1.1 but Sections 14 and 15 have been added to cover use of software over a computer network and provide for limited attribution for the Original Developer. In addition, Exhibit A has been modified to be consistent with Exhibit B.
- *
- * Software distributed under the License is distributed on an “AS IS” basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License.
- *
- * The Original Code is manuscripts-frontend.
- *
- * The Original Developer is the Initial Developer. The Initial Developer of the Original Code is Atypon Systems LLC.
- *
- * All portions of the code written by Atypon Systems LLC are Copyright (c) 2024 Atypon Systems LLC. All Rights Reserved.
- */
-import { isReply } from '@manuscripts/body-editor';
 export const getAuthorID = (comment) => {
     const contributions = comment.node.attrs.contributions;
     if (!contributions?.length) {
@@ -17,14 +5,11 @@ export const getAuthorID = (comment) => {
     }
     return contributions[0].profileID;
 };
-export const buildThreads = (comments, newCommentID) => {
-    return comments
-        .filter((c) => !isReply(c)) // Filter out replies
-        .map((c) => ({
+export const buildCommentTrees = (comments, newCommentID) => {
+    return comments.map((c) => ({
         comment: c,
         isNew: newCommentID === c.node.attrs.id,
-        replies: comments.filter((reply) => reply.node.attrs.target === c.node.attrs.id // Find replies for each comment
-        ),
+        children: [],
     }));
 };
 export const buildAuthorName = (user) => {
@@ -35,9 +20,4 @@ export const buildAuthorName = (user) => {
         .filter(Boolean)
         .join(' ');
 };
-export const commentsByTime = (a, b) => {
-    const aTimestamp = a.node.attrs.contributions?.[0].timestamp || 0;
-    const bTimestamp = b.node.attrs.contributions?.[0].timestamp || 0;
-    return aTimestamp - bTimestamp;
-};
 //# sourceMappingURL=comments.js.map

package/dist/es/lib/comments.js.map

@@ -1 +1 @@
-{"version":3,"file":"comments.js","sourceRoot":"","sources":["../../../src/lib/comments.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,EAAW,OAAO,EAAE,MAAM,0BAA0B,CAAA;AAS3D,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,OAAgB,EAAE,EAAE;IAC9C,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAA;IACtD,IAAI,CAAC,aAAa,EAAE,MAAM,EAAE;QAC1B,OAAO,SAAS,CAAA;KACjB;IACD,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;AACnC,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,CAC1B,QAAmB,EACnB,YAAqB,EACX,EAAE;IACZ,OAAO,QAAQ;SACZ,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,qBAAqB;SAChD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACX,OAAO,EAAE,CAAC;QACV,KAAK,EAAE,YAAY,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;QACvC,OAAO,EAAE,QAAQ,CAAC,MAAM,CACtB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,gCAAgC;SACxF;KACF,CAAC,CAAC,CAAA;AACP,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAA6B,EAAE,EAAE;IAC/D,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,EAAE,CAAA;KACV;IACD,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC;SACjE,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,GAAG,CAAC,CAAA;AACd,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAU,EAAE,CAAU,EAAE,EAAE;IACvD,MAAM,UAAU,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,CAAA;IACjE,MAAM,UAAU,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,CAAA;IACjE,OAAO,UAAU,GAAG,UAAU,CAAA;AAChC,CAAC,CAAA"}
+{"version":3,"file":"comments.js","sourceRoot":"","sources":["../../../src/lib/comments.ts"],"names":[],"mappings":"AAoBA,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,OAAgB,EAAE,EAAE;IAC9C,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAA;IACtD,IAAI,CAAC,aAAa,EAAE,MAAM,EAAE;QAC1B,OAAO,SAAS,CAAA;KACjB;IACD,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;AACnC,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,QAAmB,EACnB,YAAqB,EACN,EAAE;IACjB,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC1B,OAAO,EAAE,CAAC;QACV,KAAK,EAAE,YAAY,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;QACvC,QAAQ,EAAE,EAAE;KACb,CAAC,CAAC,CAAA;AACL,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAA6B,EAAE,EAAE;IAC/D,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,EAAE,CAAA;KACV;IACD,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC;SACjE,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,GAAG,CAAC,CAAA;AACd,CAAC,CAAA"}

package/dist/types/components/comments/CommentThread.d.ts

@@ -11,13 +11,12 @@
  */
 import { CommentAttrs } from '@manuscripts/body-editor';
 import React from 'react';
-import { Thread } from '../../lib/comments';
+import { CommentTree } from '../../lib/comments';
 export interface CommentThreadProps {
-    thread: Thread;
+    tree: CommentTree;
     isSelected: boolean;
     onSelect: () => void;
     onSave: (comment: CommentAttrs) => void;
     onDelete: (id: string) => void;
-    insertCommentReply: (target: string, contents: string) => void;
 }
 export declare const CommentThread: React.ForwardRefExoticComponent<CommentThreadProps & React.RefAttributes<HTMLDivElement>>;

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

@@ -11,12 +11,11 @@
  */
 import { Comment } from '@manuscripts/body-editor';
 import { UserProfile } from '@manuscripts/json-schema';
-export type Thread = {
+export type CommentTree = {
     comment: Comment;
     isNew: boolean;
-    replies: Comment[];
+    children: CommentTree[];
 };
 export declare const getAuthorID: (comment: Comment) => string | undefined;
-export declare const buildThreads: (comments: Comment[], newCommentID?: string) => Thread[];
+export declare const buildCommentTrees: (comments: Comment[], newCommentID?: string) => CommentTree[];
 export declare const buildAuthorName: (user: UserProfile | undefined) => string;
-export declare const commentsByTime: (a: Comment, b: Comment) => number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@manuscripts/article-editor",
-  "version": "3.2.19-LEAN-3894.0",
+  "version": "3.2.19",
   "license": "CPAL-1.0",
   "description": "React components for editing and viewing manuscripts",
   "repository": "github:Atypon-OpenSource/manuscripts-article-editor",
@@ -35,12 +35,12 @@
     "@fontsource/lato": "^4.5.10",
     "@fontsource/pt-sans": "^4.5.11",
     "@fontsource/pt-serif": "^4.5.11",
-    "@manuscripts/body-editor": "2.2.20-LEAN-3894.0",
+    "@manuscripts/body-editor": "2.2.20",
     "@manuscripts/json-schema": "2.2.11",
     "@manuscripts/library": "1.3.11",
     "@manuscripts/style-guide": "2.0.21",
     "@manuscripts/track-changes-plugin": "1.7.23",
-    "@manuscripts/transform": "3.0.4",
+    "@manuscripts/transform": "3.0.5",
     "@popperjs/core": "^2.11.8",
     "@reach/tabs": "^0.18.0",
     "@types/use-sync-external-store": "^0.0.6",
@@ -108,4 +108,4 @@
   "resolutions": {
     "@types/react": "^18.3.1"
   }
-}
+}

package/dist/cjs/components/comments/CommentCard.js

@@ -1,162 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommentCard = void 0;
-const style_guide_1 = require("@manuscripts/style-guide");
-const react_1 = __importStar(require("react"));
-const styled_components_1 = __importDefault(require("styled-components"));
-const comments_1 = require("../../lib/comments");
-const store_1 = require("../../store");
-const CommentActions_1 = require("./CommentActions");
-const CommentBody_1 = require("./CommentBody");
-const DeleteCommentConfirmation_1 = require("./DeleteCommentConfirmation");
-const CommentHeader = styled_components_1.default.div `
-  display: flex;
-  justify-content: space-between;
-  margin-bottom: 8px;
-`;
-const CommentMetadata = styled_components_1.default.div `
-  display: flex;
-  align-items: center;
-  padding-right: 8px;
-`;
-const CommentAuthor = styled_components_1.default.div `
-  display: flex;
-  color: #353535;
-  font-weight: 400;
-  max-width: 200px;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  width: 100%;
-
-  svg {
-    padding-right: 10px;
-  }
-`;
-const CommentTarget = styled_components_1.default.div `
-  font-size: 14px;
-  color: #353535;
-  background-color: #ffeebf;
-  padding: 4px 8px;
-  margin-top: 16px;
-  margin-bottom: 16px;
-`;
-const Timestamp = (0, styled_components_1.default)(style_guide_1.RelativeDate) `
-  font-size: 12px;
-  line-height: 16px;
-  font-weight: 400;
-  color: #6e6e6e;
-  white-space: nowrap;
-  padding-right: 8px;
-`;
-const RepliesCount = styled_components_1.default.div `
-  border-radius: 50%;
-  width: 20px;
-  height: 12px;
-  color: #ffffff;
-  background-color: #1a9bc7;
-  text-align: center;
-  font-size: 9px;
-`;
-const Card = styled_components_1.default.div `
-  position: relative;
-`;
-const CommentCard = ({ comment, isReply, numOfReplies, isNew, isEndOfThread, onSave, onDelete, onSelect, }) => {
-    const can = (0, style_guide_1.usePermissions)();
-    const [{ user, collaboratorsById }] = (0, store_1.useStore)((state) => ({
-        user: state.user,
-        collaboratorsById: state.collaboratorsById,
-    }));
-    const authorID = (0, comments_1.getAuthorID)(comment);
-    const authorName = authorID
-        ? (0, comments_1.buildAuthorName)(collaboratorsById.get(authorID))
-        : '';
-    const timestamp = comment.node.attrs.contributions?.[0].timestamp;
-    const isOwn = authorID === user._id;
-    const isResolveEnabled = isOwn
-        ? can.resolveOwnComment
-        : can.resolveOthersComment;
-    const isActionsEnabled = isOwn
-        ? can.handleOwnComments
-        : can.handleOthersComments;
-    const [isEditing, setEditing] = (0, react_1.useState)(isNew);
-    const [showDeleteConfirmation, setShowDeleteConfirmation] = (0, react_1.useState)(false);
-    const handleEdit = () => {
-        setEditing(true);
-        onSelect();
-    };
-    const handleSave = (contents) => {
-        onSave({
-            ...comment.node.attrs,
-            contents,
-        });
-        setEditing(false);
-    };
-    const handleCancel = () => {
-        setEditing(false);
-        if (isNew) {
-            onDelete(comment.node.attrs.id);
-        }
-    };
-    const handleToggleResolve = () => {
-        onSave({
-            ...comment.node.attrs,
-            resolved: !comment.node.attrs.resolved,
-        });
-    };
-    const handleDelete = () => {
-        setShowDeleteConfirmation(true);
-    };
-    const confirmDelete = () => {
-        onDelete(comment.node.attrs.id);
-        setShowDeleteConfirmation(false);
-    };
-    const cancelDelete = () => {
-        setShowDeleteConfirmation(false);
-    };
-    return (react_1.default.createElement(Card, null,
-        react_1.default.createElement(CommentHeader, { "data-cy": "comment-header" },
-            react_1.default.createElement(CommentMetadata, null,
-                react_1.default.createElement(CommentAuthor, null, authorName ? (react_1.default.createElement(react_1.default.Fragment, null,
-                    react_1.default.createElement(style_guide_1.AvatarIcon, { width: 20, height: 20 }),
-                    react_1.default.createElement(CommentAuthor, null, authorName))) : (!isReply && (react_1.default.createElement(react_1.default.Fragment, null,
-                    react_1.default.createElement(style_guide_1.SystemUserAvatarIcon, { width: 20, height: 20 }),
-                    react_1.default.createElement(CommentAuthor, null, "System"))))),
-                timestamp && react_1.default.createElement(Timestamp, { date: timestamp * 1000 }),
-                numOfReplies !== 0 && react_1.default.createElement(RepliesCount, null,
-                    " ",
-                    numOfReplies,
-                    " ")),
-            react_1.default.createElement(CommentActions_1.CommentActions, { comment: comment, isResolveEnabled: isResolveEnabled && !isReply, isActionsEnabled: isActionsEnabled && isEndOfThread, onDelete: handleDelete, onEdit: handleEdit, toggleResolve: handleToggleResolve })),
-        comment.node.attrs.originalText && (react_1.default.createElement(CommentTarget, null, comment.node.attrs.originalText)),
-        react_1.default.createElement(CommentBody_1.CommentBody, { comment: comment, isEditing: isNew || isEditing, onSave: handleSave, onCancel: handleCancel, onSelect: onSelect }),
-        showDeleteConfirmation && (react_1.default.createElement(DeleteCommentConfirmation_1.DeleteCommentConfirmation, { onCancel: cancelDelete, onConfirm: confirmDelete }))));
-};
-exports.CommentCard = CommentCard;
-//# sourceMappingURL=CommentCard.js.map

package/dist/cjs/components/comments/CommentCard.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"CommentCard.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentCard.tsx"],"names":[],"mappings":"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"}