@manuscripts/article-editor 3.4.2-LEAN-3894.0 → 3.4.2-LEAN-3872.0

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

@@ -35,29 +35,25 @@ exports.ActionsIcon = styled_components_1.default.button `
 exports.CommentAction = styled_components_1.default.div `
   font-family: ${(props) => props.theme.font.family.Lato};
   cursor: pointer;
-  font-size: 14px;
+  font-size: 16px;
   line-height: 24px;
   color: ${(props) => props.theme.colors.text.primary};
-  padding: 6px 0 6px 8px;
+  padding: 16px;
   &:hover,
   &:focus {
     background: #f2fbfc;
   }
 `;
-const Container = styled_components_1.default.div `
-  display: flex;
-  align-items: end;
-`;
 const CommentActions = ({ comment, isResolveEnabled, isActionsEnabled, onEdit, onDelete, toggleResolve, }) => {
     const { isOpen, toggleOpen, wrapperRef } = (0, style_guide_1.useDropdown)();
-    return (react_1.default.createElement(Container, null,
+    return (react_1.default.createElement(react_1.default.Fragment, null,
+        isResolveEnabled && (react_1.default.createElement(CommentResolveButton_1.CommentResolveButton, { comment: comment, onClick: toggleResolve })),
         isActionsEnabled && (react_1.default.createElement(style_guide_1.DropdownContainer, { ref: wrapperRef },
-            react_1.default.createElement(exports.ActionsIcon, { "data-cy": "comment-dropdown-trigger", onClick: toggleOpen, className: "actions-icon" },
+            react_1.default.createElement(exports.ActionsIcon, { "data-cy": "comment-dropdown-trigger", onClick: toggleOpen },
                 react_1.default.createElement(style_guide_1.DotsIcon, null)),
-            isOpen && (react_1.default.createElement(style_guide_1.DropdownList, { "data-cy": "comment-dropdown", direction: 'right', width: 82, onClick: toggleOpen },
+            isOpen && (react_1.default.createElement(style_guide_1.DropdownList, { "data-cy": "comment-dropdown", direction: 'right', width: 125, onClick: toggleOpen },
                 react_1.default.createElement(exports.CommentAction, { "data-cy": "comment-edit", onClick: onEdit }, "Edit"),
-                react_1.default.createElement(exports.CommentAction, { "data-cy": "comment-delete", onClick: onDelete }, "Delete"))))),
-        isResolveEnabled && (react_1.default.createElement(CommentResolveButton_1.CommentResolveButton, { comment: comment, onClick: toggleResolve }))));
+                react_1.default.createElement(exports.CommentAction, { "data-cy": "comment-delete", onClick: onDelete }, "Delete")))))));
 };
 exports.CommentActions = CommentActions;
 //# sourceMappingURL=CommentActions.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"CommentActions.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentActions.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;;;;AAGH,0DAKiC;AACjC,kDAAyB;AACzB,0EAAsC;AAEtC,iEAA6D;AAEhD,QAAA,WAAW,GAAG,2BAAM,CAAC,MAAM,CAAA;;;;;;;;;;;;CAYvC,CAAA;AAEY,QAAA,aAAa,GAAG,2BAAM,CAAC,GAAG,CAAA;iBACtB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;;;;WAI7C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;;;;;;CAMpD,CAAA;AAED,MAAM,SAAS,GAAG,2BAAM,CAAC,GAAG,CAAA;;;CAG3B,CAAA;AAWM,MAAM,cAAc,GAAkC,CAAC,EAC5D,OAAO,EACP,gBAAgB,EAChB,gBAAgB,EAChB,MAAM,EACN,QAAQ,EACR,aAAa,GACd,EAAE,EAAE;IACH,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,IAAA,yBAAW,GAAE,CAAA;IAExD,OAAO,CACL,8BAAC,SAAS;QACP,gBAAgB,IAAI,CACnB,8BAAC,+BAAiB,IAAC,GAAG,EAAE,UAAU;YAChC,8BAAC,mBAAW,eACF,0BAA0B,EAClC,OAAO,EAAE,UAAU,EACnB,SAAS,EAAC,cAAc;gBAExB,8BAAC,sBAAQ,OAAG,CACA;YACb,MAAM,IAAI,CACT,8BAAC,0BAAY,eACH,kBAAkB,EAC1B,SAAS,EAAE,OAAO,EAClB,KAAK,EAAE,EAAE,EACT,OAAO,EAAE,UAAU;gBAEnB,8BAAC,qBAAa,eAAS,cAAc,EAAC,OAAO,EAAE,MAAM,WAErC;gBAChB,8BAAC,qBAAa,eAAS,gBAAgB,EAAC,OAAO,EAAE,QAAQ,aAEzC,CACH,CAChB,CACiB,CACrB;QACA,gBAAgB,IAAI,CACnB,8BAAC,2CAAoB,IAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAI,CACnE,CACS,CACb,CAAA;AACH,CAAC,CAAA;AA3CY,QAAA,cAAc,kBA2C1B"}
+{"version":3,"file":"CommentActions.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentActions.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;;;;AAGH,0DAKiC;AACjC,kDAAyB;AACzB,0EAAsC;AAEtC,iEAA6D;AAEhD,QAAA,WAAW,GAAG,2BAAM,CAAC,MAAM,CAAA;;;;;;;;;;;;CAYvC,CAAA;AAEY,QAAA,aAAa,GAAG,2BAAM,CAAC,GAAG,CAAA;iBACtB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;;;;WAI7C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;;;;;;CAMpD,CAAA;AAWM,MAAM,cAAc,GAAkC,CAAC,EAC5D,OAAO,EACP,gBAAgB,EAChB,gBAAgB,EAChB,MAAM,EACN,QAAQ,EACR,aAAa,GACd,EAAE,EAAE;IACH,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,IAAA,yBAAW,GAAE,CAAA;IAExD,OAAO,CACL;QACG,gBAAgB,IAAI,CACnB,8BAAC,2CAAoB,IAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAI,CACnE;QACA,gBAAgB,IAAI,CACnB,8BAAC,+BAAiB,IAAC,GAAG,EAAE,UAAU;YAChC,8BAAC,mBAAW,eAAS,0BAA0B,EAAC,OAAO,EAAE,UAAU;gBACjE,8BAAC,sBAAQ,OAAG,CACA;YACb,MAAM,IAAI,CACT,8BAAC,0BAAY,eACH,kBAAkB,EAC1B,SAAS,EAAE,OAAO,EAClB,KAAK,EAAE,GAAG,EACV,OAAO,EAAE,UAAU;gBAEnB,8BAAC,qBAAa,eAAS,cAAc,EAAC,OAAO,EAAE,MAAM,WAErC;gBAChB,8BAAC,qBAAa,eAAS,gBAAgB,EAAC,OAAO,EAAE,QAAQ,aAEzC,CACH,CAChB,CACiB,CACrB,CACA,CACJ,CAAA;AACH,CAAC,CAAA;AAvCY,QAAA,cAAc,kBAuC1B"}

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

@@ -31,6 +31,9 @@ const style_guide_1 = require("@manuscripts/style-guide");
 const react_1 = __importStar(require("react"));
 const styled_components_1 = __importDefault(require("styled-components"));
 const utils_1 = require("../../lib/utils");
+const CommentContent = styled_components_1.default.div `
+  cursor: pointer;
+`;
 const CommentEditor = styled_components_1.default.textarea `
   cursor: text;
   font-family: ${(props) => props.theme.font.family.sans};
@@ -64,19 +67,11 @@ const CommentViewer = styled_components_1.default.div `
   letter-spacing: -0.2px;
   color: ${(props) => props.theme.colors.text.primary};
   margin: ${(props) => props.theme.grid.unit * 2}px 0;
-  word-wrap: break-word;
 `;
 const EditorActions = (0, styled_components_1.default)(style_guide_1.ButtonGroup) `
   & button:not(:last-of-type) {
     margin-right: 4px;
   }
-
-  & ${style_guide_1.TertiaryButton} {
-    &:hover {
-      background-color: inherit !important;
-      border-color: transparent !important;
-    }
-  }
 `;
 const CommentBody = ({ comment, isEditing, onSave, onCancel, onSelect, }) => {
     const editor = (0, react_1.useRef)(null);
@@ -97,9 +92,10 @@ const CommentBody = ({ comment, isEditing, onSave, onCancel, onSelect, }) => {
     return (react_1.default.createElement(react_1.default.Fragment, null, isEditing ? (react_1.default.createElement(react_1.default.Fragment, null,
         react_1.default.createElement(CommentEditor, { "data-cy": "comment-editor", ref: ref, defaultValue: comment.node.attrs.contents, onChange: onTextChange, onBlur: (event) => !event.target.value.length && onCancel() }),
         react_1.default.createElement(EditorActions, { "data-cy": "comment-actions" },
-            react_1.default.createElement(style_guide_1.TertiaryButton, { onClick: onCancel }, "Cancel"),
+            react_1.default.createElement(style_guide_1.SecondaryButton, { onClick: onCancel }, "Cancel"),
             react_1.default.createElement(style_guide_1.PrimaryButton, { onClick: handleSave, disabled: disableSaveButton }, "Save")))) : (react_1.default.createElement(react_1.default.Fragment, null,
-        react_1.default.createElement(CommentViewer, { "data-cy": "comment-text" }, (0, utils_1.decodeHTMLEntities)(comment.node.attrs.contents))))));
+        react_1.default.createElement(CommentContent, { onClick: onSelect },
+            react_1.default.createElement(CommentViewer, { "data-cy": "comment-text" }, (0, utils_1.decodeHTMLEntities)(comment.node.attrs.contents)))))));
 };
 exports.CommentBody = CommentBody;
 //# sourceMappingURL=CommentBody.js.map

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

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

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

@@ -25,7 +25,7 @@ const Button = styled_components_1.default.button `
   height: 24px;
   border-radius: 12px;
   border: none;
-  background: none;
+  background: #ffffff;
   padding: 0;
   cursor: pointer;
 

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

@@ -31,98 +31,104 @@ 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 CommentCard_1 = require("./CommentCard");
-const ReplyBox_1 = require("./ReplyBox");
+const store_1 = require("../../store");
+const CommentActions_1 = require("./CommentActions");
+const CommentBody_1 = require("./CommentBody");
 const Container = styled_components_1.default.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;
-  cursor: pointer;
-  .actions-icon {
-    visibility: ${(props) => (props.isSelected ? 'visible' : 'hidden')};
-  }
-
-  &:hover {
-    background-color: #fff;
+`;
+const CommentHeader = styled_components_1.default.div `
+  display: flex;
+  margin-bottom: 16px;
+`;
+const CommentMetadata = styled_components_1.default.div `
+  flex: 1;
+  padding-left: 8px;
+  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%;
 
-    .actions-icon {
-      visibility: visible;
-    }
+  svg {
+    padding-right: 10px;
   }
 `;
-const SeparatorLine = styled_components_1.default.div `
-  margin-bottom: 8px;
-  background-color: #c9c9c9;
-  height: 1px;
+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 Indented = styled_components_1.default.div `
-  padding-left: 16px;
+const Timestamp = (0, styled_components_1.default)(style_guide_1.RelativeDate) `
+  font-size: 12px;
+  line-height: 16px;
+  font-weight: 400;
+  color: #6e6e6e;
 `;
 exports.CommentThread = (0, react_1.forwardRef)((props, ref) => {
-    const { thread, isSelected, onSelect, onSave, onDelete, insertCommentReply, } = props;
-    const { comment, isNew, replies } = thread;
-    const cardsRef = (0, react_1.useRef)(null);
-    const [showMore, setShowMore] = (0, react_1.useState)(false);
-    const [editingCommentId, setEditingCommentId] = (0, react_1.useState)(isNew ? comment.node.attrs.id : null);
-    (0, react_1.useEffect)(() => {
-        if (cardsRef.current) {
-            const contentHeight = cardsRef.current.scrollHeight;
-            setShowMore(contentHeight > 280);
-        }
-    }, [comment, replies]);
-    const handleSelect = () => {
-        if (!isSelected) {
-            onSelect();
+    const { tree, isSelected, onSelect, onSave, onDelete } = props;
+    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)(tree.comment);
+    const authorName = authorID
+        ? (0, comments_1.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] = (0, react_1.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);
         }
     };
-    return (react_1.default.createElement(Container, { "data-cy": "comment", isSelected: isSelected, ref: ref, onClick: handleSelect },
-        react_1.default.createElement(CardsWrapper, { ref: cardsRef, isSelected: isSelected, showMore: showMore },
-            react_1.default.createElement(CommentCard_1.CommentCard, { comment: comment, isReply: false, numOfReplies: replies.length, isNew: isNew, isEndOfThread: !replies.length, editingCommentId: editingCommentId, setEditingCommentId: setEditingCommentId, onDelete: onDelete, onSave: onSave, onSelect: onSelect }),
-            replies.sort(comments_1.commentsByTime).map((reply, index) => {
-                return (react_1.default.createElement("div", { key: reply.node.attrs.id },
-                    index === 0 && react_1.default.createElement(SeparatorLine, null),
-                    react_1.default.createElement(Indented, null,
-                        index !== 0 && react_1.default.createElement(SeparatorLine, null),
-                        react_1.default.createElement(CommentCard_1.CommentCard, { comment: reply, isReply: true, numOfReplies: 0, isNew: false, isEndOfThread: index === replies.length - 1, editingCommentId: editingCommentId, setEditingCommentId: setEditingCommentId, onDelete: onDelete, onSave: onSave, onSelect: onSelect }))));
-            })),
-        showMore && !isSelected && (react_1.default.createElement(react_1.default.Fragment, null,
-            react_1.default.createElement(SeparatorLine, null),
-            react_1.default.createElement(ButtonContainer, null,
-                react_1.default.createElement(ShowMore, { onClick: onSelect }, "Show more")))),
-        isSelected && editingCommentId === null && (react_1.default.createElement(ReplyBox_1.ReplyBox, { insertCommentReply: insertCommentReply, commentID: comment.node.attrs.id }))));
+    const handleToggleResolve = () => {
+        onSave({
+            ...tree.comment.node.attrs,
+            resolved: !tree.comment.node.attrs.resolved,
+        });
+    };
+    return (react_1.default.createElement(Container, { "data-cy": "comment", isSelected: isSelected, ref: ref },
+        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))) : (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 })),
+            react_1.default.createElement(CommentActions_1.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_1.default.createElement(CommentTarget, null, tree.comment.node.attrs.originalText)),
+        react_1.default.createElement(CommentBody_1.CommentBody, { comment: tree.comment, isEditing: tree.isNew || isEditing, onSave: handleSave, onCancel: handleCancel, onSelect: onSelect })));
 });
-const ButtonContainer = styled_components_1.default.div `
-  display: flex;
-  justify-content: center;
-  align-items: center;
-`;
-const ShowMore = (0, styled_components_1.default)(style_guide_1.TextButton) `
-  cursor: pointer;
-  text-align: center;
-  margin-top: 6px;
-  color: #353535;
-`;
-const CardsWrapper = styled_components_1.default.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/cjs/components/comments/CommentThread.js.map

@@ -1 +1 @@
-{"version":3,"file":"CommentThread.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentThread.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAYA,0DAAqD;AACrD,+CAAsE;AACtE,0EAAsC;AAEtC,iDAA2D;AAC3D,+CAA2C;AAC3C,yCAAqC;AAErC,MAAM,SAAS,GAAG,2BAAM,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,2BAAM,CAAC,GAAG,CAAA;;;;CAI/B,CAAA;AACD,MAAM,QAAQ,GAAG,2BAAM,CAAC,GAAG,CAAA;;CAE1B,CAAA;AAWY,QAAA,aAAa,GAAG,IAAA,kBAAU,EACrC,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,IAAA,cAAM,EAAiB,IAAI,CAAC,CAAA;IAC7C,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAA;IAC/C,MAAM,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,GAAG,IAAA,gBAAQ,EACtD,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CACrC,CAAA;IAED,IAAA,iBAAS,EAAC,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,MAAM,YAAY,GAAG,GAAG,EAAE;QACxB,IAAI,CAAC,UAAU,EAAE;YACf,QAAQ,EAAE,CAAA;SACX;IACH,CAAC,CAAA;IAED,OAAO,CACL,8BAAC,SAAS,eACA,SAAS,EACjB,UAAU,EAAE,UAAU,EACtB,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,YAAY;QAErB,8BAAC,YAAY,IACX,GAAG,EAAE,QAAQ,EACb,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,QAAQ;YAElB,8BAAC,yBAAW,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,gBAAgB,EAAE,gBAAgB,EAClC,mBAAmB,EAAE,mBAAmB,EACxC,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,QAAQ,GAClB;YACD,OAAO,CAAC,IAAI,CAAC,yBAAc,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;gBACjD,OAAO,CACL,uCAAK,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;oBAC1B,KAAK,KAAK,CAAC,IAAI,8BAAC,aAAa,OAAG;oBACjC,8BAAC,QAAQ;wBACN,KAAK,KAAK,CAAC,IAAI,8BAAC,aAAa,OAAG;wBACjC,8BAAC,yBAAW,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,gBAAgB,EAAE,gBAAgB,EAClC,mBAAmB,EAAE,mBAAmB,EACxC,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,8BAAC,aAAa,OAAG;YACjB,8BAAC,eAAe;gBACd,8BAAC,QAAQ,IAAC,OAAO,EAAE,QAAQ,gBAAsB,CACjC,CACjB,CACJ;QACA,UAAU,IAAI,gBAAgB,KAAK,IAAI,IAAI,CAC1C,8BAAC,mBAAQ,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,2BAAM,CAAC,GAAG,CAAA;;;;CAIjC,CAAA;AAED,MAAM,QAAQ,GAAG,IAAA,2BAAM,EAAC,wBAAU,CAAC,CAAA;;;;;CAKlC,CAAA;AAED,MAAM,YAAY,GAAG,2BAAM,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/cjs/components/comments/CommentsPanel.js

@@ -39,12 +39,9 @@ exports.CommentsPanel = void 0;
  * All portions of the code written by Atypon Systems LLC are Copyright (c) 2019 Atypon Systems LLC. All Rights Reserved.
  */
 const body_editor_1 = require("@manuscripts/body-editor");
-const json_schema_1 = require("@manuscripts/json-schema");
 const style_guide_1 = require("@manuscripts/style-guide");
 const track_changes_plugin_1 = require("@manuscripts/track-changes-plugin");
-const transform_1 = require("@manuscripts/transform");
 const prosemirror_state_1 = require("prosemirror-state");
-const prosemirror_utils_1 = require("prosemirror-utils");
 const react_1 = __importStar(require("react"));
 const styled_components_1 = __importDefault(require("styled-components"));
 const comments_1 = require("../../lib/comments");
@@ -66,17 +63,14 @@ const scrollIntoView = (element) => {
     }
 };
 const CommentsPanel = () => {
-    const [{ view, newCommentID, selectedCommentKey, user, doc }] = (0, store_1.useStore)((state) => ({
+    const [{ view, newCommentID, selectedCommentKey }] = (0, store_1.useStore)((state) => ({
         view: state.view,
-        doc: state.doc,
         newCommentID: state.newCommentID,
         selectedCommentKey: state.selectedCommentKey,
-        user: state.user,
     }));
     const [showResolved, setShowResolved] = (0, react_1.useState)(true);
-    const comments = (0, react_1.useMemo)(() => view?.state ? body_editor_1.commentsKey.getState(view.state)?.comments : undefined, [view?.state, doc] // eslint-disable-line react-hooks/exhaustive-deps
-    );
-    const threads = (0, react_1.useMemo)(() => (comments ? (0, comments_1.buildThreads)([...comments.values()], newCommentID) : []), [comments, newCommentID]);
+    const comments = (0, react_1.useMemo)(() => view?.state ? body_editor_1.commentsKey.getState(view.state)?.comments : undefined, [view?.state]);
+    const trees = (0, react_1.useMemo)(() => comments ? (0, comments_1.buildCommentTrees)([...comments.values()], newCommentID) : [], [comments, newCommentID]);
     const selectedRef = (0, react_1.useCallback)((e) => {
         if (e) {
             scrollIntoView(e);
@@ -101,25 +95,6 @@ const CommentsPanel = () => {
         view.focus();
         view.dispatch(tr);
     };
-    const insertCommentReply = (target, contents) => {
-        if (!view) {
-            return;
-        }
-        const attrs = {
-            id: (0, transform_1.generateNodeID)(transform_1.schema.nodes.comment),
-            contents,
-            target,
-            contributions: [(0, json_schema_1.buildContribution)(user._id)],
-            resolved: false,
-        };
-        const comment = view.state.schema.nodes.comment.create(attrs);
-        const comments = (0, prosemirror_utils_1.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((0, track_changes_plugin_1.skipTracking)(tr));
-        }
-    };
     const handleSave = (attrs) => {
         const comment = comments?.get(attrs.id);
         if (!comment || !view) {
@@ -127,6 +102,7 @@ const CommentsPanel = () => {
         }
         const tr = view.state.tr;
         tr.setNodeMarkup(comment.pos, undefined, attrs);
+        (0, body_editor_1.clearCommentSelection)(tr);
         view.dispatch((0, track_changes_plugin_1.skipTracking)(tr));
     };
     const handleDelete = (id) => {
@@ -136,15 +112,16 @@ const CommentsPanel = () => {
         }
         const tr = view.state.tr;
         tr.delete(comment.pos, comment.pos + comment.node.nodeSize);
+        (0, body_editor_1.clearCommentSelection)(tr);
         view.dispatch((0, track_changes_plugin_1.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_1.default.createElement(CommentsPlaceholder_1.CommentsPlaceholder, null);
     }
     return (react_1.default.createElement(react_1.default.Fragment, null,
@@ -152,9 +129,9 @@ const CommentsPanel = () => {
             react_1.default.createElement(style_guide_1.CheckboxLabel, null,
                 react_1.default.createElement(style_guide_1.CheckboxField, { name: 'show-resolved', checked: showResolved, onChange: (e) => setShowResolved(e.target.checked) }),
                 react_1.default.createElement(CheckboxLabelText, null, "See resolved"))),
-        threads
+        trees
             .filter((c) => showResolved || !c.comment.node.attrs.resolved)
-            .map((c, i, a) => (react_1.default.createElement(CommentThread_1.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_1.default.createElement(CommentThread_1.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 })))));
 };
 exports.CommentsPanel = CommentsPanel;
 //# sourceMappingURL=CommentsPanel.js.map

package/dist/cjs/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/cjs/lib/comments.js

@@ -1,18 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.commentsByTime = exports.buildAuthorName = exports.buildThreads = exports.getAuthorID = void 0;
-/*!
- * 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.
- */
-const body_editor_1 = require("@manuscripts/body-editor");
+exports.buildAuthorName = exports.buildCommentTrees = exports.getAuthorID = void 0;
 const getAuthorID = (comment) => {
     const contributions = comment.node.attrs.contributions;
     if (!contributions?.length) {
@@ -21,17 +9,14 @@ const getAuthorID = (comment) => {
     return contributions[0].profileID;
 };
 exports.getAuthorID = getAuthorID;
-const buildThreads = (comments, newCommentID) => {
-    return comments
-        .filter((c) => !(0, body_editor_1.isReply)(c)) // Filter out replies
-        .map((c) => ({
+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: [],
     }));
 };
-exports.buildThreads = buildThreads;
+exports.buildCommentTrees = buildCommentTrees;
 const buildAuthorName = (user) => {
     if (!user) {
         return '';
@@ -41,10 +26,4 @@ const buildAuthorName = (user) => {
         .join(' ');
 };
 exports.buildAuthorName = buildAuthorName;
-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;
-};
-exports.commentsByTime = commentsByTime;
 //# sourceMappingURL=comments.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"comments.js","sourceRoot":"","sources":["../../../src/lib/comments.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;GAUG;AACH,0DAA2D;AASpD,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;AANY,QAAA,WAAW,eAMvB;AAEM,MAAM,YAAY,GAAG,CAC1B,QAAmB,EACnB,YAAqB,EACX,EAAE;IACZ,OAAO,QAAQ;SACZ,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAA,qBAAO,EAAC,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;AAbY,QAAA,YAAY,gBAaxB;AAEM,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;AAPY,QAAA,eAAe,mBAO3B;AAEM,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;AAJY,QAAA,cAAc,kBAI1B"}
+{"version":3,"file":"comments.js","sourceRoot":"","sources":["../../../src/lib/comments.ts"],"names":[],"mappings":";;;AAoBO,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;AANY,QAAA,WAAW,eAMvB;AAEM,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;AATY,QAAA,iBAAiB,qBAS7B;AAEM,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;AAPY,QAAA,eAAe,mBAO3B"}

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

@@ -29,28 +29,24 @@ export const ActionsIcon = styled.button `
 export const CommentAction = styled.div `
   font-family: ${(props) => props.theme.font.family.Lato};
   cursor: pointer;
-  font-size: 14px;
+  font-size: 16px;
   line-height: 24px;
   color: ${(props) => props.theme.colors.text.primary};
-  padding: 6px 0 6px 8px;
+  padding: 16px;
   &:hover,
   &:focus {
     background: #f2fbfc;
   }
 `;
-const Container = styled.div `
-  display: flex;
-  align-items: end;
-`;
 export const CommentActions = ({ comment, isResolveEnabled, isActionsEnabled, onEdit, onDelete, toggleResolve, }) => {
     const { isOpen, toggleOpen, wrapperRef } = useDropdown();
-    return (React.createElement(Container, null,
+    return (React.createElement(React.Fragment, null,
+        isResolveEnabled && (React.createElement(CommentResolveButton, { comment: comment, onClick: toggleResolve })),
         isActionsEnabled && (React.createElement(DropdownContainer, { ref: wrapperRef },
-            React.createElement(ActionsIcon, { "data-cy": "comment-dropdown-trigger", onClick: toggleOpen, className: "actions-icon" },
+            React.createElement(ActionsIcon, { "data-cy": "comment-dropdown-trigger", onClick: toggleOpen },
                 React.createElement(DotsIcon, null)),
-            isOpen && (React.createElement(DropdownList, { "data-cy": "comment-dropdown", direction: 'right', width: 82, onClick: toggleOpen },
+            isOpen && (React.createElement(DropdownList, { "data-cy": "comment-dropdown", direction: 'right', width: 125, onClick: toggleOpen },
                 React.createElement(CommentAction, { "data-cy": "comment-edit", onClick: onEdit }, "Edit"),
-                React.createElement(CommentAction, { "data-cy": "comment-delete", onClick: onDelete }, "Delete"))))),
-        isResolveEnabled && (React.createElement(CommentResolveButton, { comment: comment, onClick: toggleResolve }))));
+                React.createElement(CommentAction, { "data-cy": "comment-delete", onClick: onDelete }, "Delete")))))));
 };
 //# sourceMappingURL=CommentActions.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"CommentActions.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentActions.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,EACL,QAAQ,EACR,iBAAiB,EACjB,YAAY,EACZ,WAAW,GACZ,MAAM,0BAA0B,CAAA;AACjC,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,MAAM,MAAM,mBAAmB,CAAA;AAEtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAE7D,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAA;;;;;;;;;;;;CAYvC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAA;iBACtB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;;;;WAI7C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;;;;;;CAMpD,CAAA;AAED,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAA;;;CAG3B,CAAA;AAWD,MAAM,CAAC,MAAM,cAAc,GAAkC,CAAC,EAC5D,OAAO,EACP,gBAAgB,EAChB,gBAAgB,EAChB,MAAM,EACN,QAAQ,EACR,aAAa,GACd,EAAE,EAAE;IACH,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,WAAW,EAAE,CAAA;IAExD,OAAO,CACL,oBAAC,SAAS;QACP,gBAAgB,IAAI,CACnB,oBAAC,iBAAiB,IAAC,GAAG,EAAE,UAAU;YAChC,oBAAC,WAAW,eACF,0BAA0B,EAClC,OAAO,EAAE,UAAU,EACnB,SAAS,EAAC,cAAc;gBAExB,oBAAC,QAAQ,OAAG,CACA;YACb,MAAM,IAAI,CACT,oBAAC,YAAY,eACH,kBAAkB,EAC1B,SAAS,EAAE,OAAO,EAClB,KAAK,EAAE,EAAE,EACT,OAAO,EAAE,UAAU;gBAEnB,oBAAC,aAAa,eAAS,cAAc,EAAC,OAAO,EAAE,MAAM,WAErC;gBAChB,oBAAC,aAAa,eAAS,gBAAgB,EAAC,OAAO,EAAE,QAAQ,aAEzC,CACH,CAChB,CACiB,CACrB;QACA,gBAAgB,IAAI,CACnB,oBAAC,oBAAoB,IAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAI,CACnE,CACS,CACb,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"CommentActions.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentActions.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,EACL,QAAQ,EACR,iBAAiB,EACjB,YAAY,EACZ,WAAW,GACZ,MAAM,0BAA0B,CAAA;AACjC,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,MAAM,MAAM,mBAAmB,CAAA;AAEtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAE7D,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAA;;;;;;;;;;;;CAYvC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAA;iBACtB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;;;;WAI7C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;;;;;;CAMpD,CAAA;AAWD,MAAM,CAAC,MAAM,cAAc,GAAkC,CAAC,EAC5D,OAAO,EACP,gBAAgB,EAChB,gBAAgB,EAChB,MAAM,EACN,QAAQ,EACR,aAAa,GACd,EAAE,EAAE;IACH,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,WAAW,EAAE,CAAA;IAExD,OAAO,CACL;QACG,gBAAgB,IAAI,CACnB,oBAAC,oBAAoB,IAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAI,CACnE;QACA,gBAAgB,IAAI,CACnB,oBAAC,iBAAiB,IAAC,GAAG,EAAE,UAAU;YAChC,oBAAC,WAAW,eAAS,0BAA0B,EAAC,OAAO,EAAE,UAAU;gBACjE,oBAAC,QAAQ,OAAG,CACA;YACb,MAAM,IAAI,CACT,oBAAC,YAAY,eACH,kBAAkB,EAC1B,SAAS,EAAE,OAAO,EAClB,KAAK,EAAE,GAAG,EACV,OAAO,EAAE,UAAU;gBAEnB,oBAAC,aAAa,eAAS,cAAc,EAAC,OAAO,EAAE,MAAM,WAErC;gBAChB,oBAAC,aAAa,eAAS,gBAAgB,EAAC,OAAO,EAAE,QAAQ,aAEzC,CACH,CAChB,CACiB,CACrB,CACA,CACJ,CAAA;AACH,CAAC,CAAA"}

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

@@ -1,7 +1,10 @@
-import { ButtonGroup, PrimaryButton, TertiaryButton, } from '@manuscripts/style-guide';
+import { ButtonGroup, PrimaryButton, SecondaryButton, } from '@manuscripts/style-guide';
 import React, { useCallback, useMemo, useRef, useState, } from 'react';
 import styled from 'styled-components';
 import { decodeHTMLEntities } from '../../lib/utils';
+const CommentContent = styled.div `
+  cursor: pointer;
+`;
 const CommentEditor = styled.textarea `
   cursor: text;
   font-family: ${(props) => props.theme.font.family.sans};
@@ -35,19 +38,11 @@ const CommentViewer = styled.div `
   letter-spacing: -0.2px;
   color: ${(props) => props.theme.colors.text.primary};
   margin: ${(props) => props.theme.grid.unit * 2}px 0;
-  word-wrap: break-word;
 `;
 const EditorActions = styled(ButtonGroup) `
   & button:not(:last-of-type) {
     margin-right: 4px;
   }
-
-  & ${TertiaryButton} {
-    &:hover {
-      background-color: inherit !important;
-      border-color: transparent !important;
-    }
-  }
 `;
 export const CommentBody = ({ comment, isEditing, onSave, onCancel, onSelect, }) => {
     const editor = useRef(null);
@@ -68,8 +63,9 @@ export const CommentBody = ({ comment, isEditing, onSave, onCancel, onSelect, })
     return (React.createElement(React.Fragment, null, isEditing ? (React.createElement(React.Fragment, null,
         React.createElement(CommentEditor, { "data-cy": "comment-editor", ref: ref, defaultValue: comment.node.attrs.contents, onChange: onTextChange, onBlur: (event) => !event.target.value.length && onCancel() }),
         React.createElement(EditorActions, { "data-cy": "comment-actions" },
-            React.createElement(TertiaryButton, { onClick: onCancel }, "Cancel"),
+            React.createElement(SecondaryButton, { onClick: onCancel }, "Cancel"),
             React.createElement(PrimaryButton, { onClick: handleSave, disabled: disableSaveButton }, "Save")))) : (React.createElement(React.Fragment, null,
-        React.createElement(CommentViewer, { "data-cy": "comment-text" }, decodeHTMLEntities(comment.node.attrs.contents))))));
+        React.createElement(CommentContent, { onClick: onSelect },
+            React.createElement(CommentViewer, { "data-cy": "comment-text" }, decodeHTMLEntities(comment.node.attrs.contents)))))));
 };
 //# sourceMappingURL=CommentBody.js.map