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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (40) hide show
  1. package/dist/cjs/components/comments/CommentActions.js +7 -11
  2. package/dist/cjs/components/comments/CommentActions.js.map +1 -1
  3. package/dist/cjs/components/comments/CommentBody.js +6 -10
  4. package/dist/cjs/components/comments/CommentBody.js.map +1 -1
  5. package/dist/cjs/components/comments/CommentResolveButton.js +1 -1
  6. package/dist/cjs/components/comments/CommentThread.js +89 -83
  7. package/dist/cjs/components/comments/CommentThread.js.map +1 -1
  8. package/dist/cjs/components/comments/CommentsPanel.js +10 -33
  9. package/dist/cjs/components/comments/CommentsPanel.js.map +1 -1
  10. package/dist/cjs/lib/comments.js +5 -26
  11. package/dist/cjs/lib/comments.js.map +1 -1
  12. package/dist/es/components/comments/CommentActions.js +7 -11
  13. package/dist/es/components/comments/CommentActions.js.map +1 -1
  14. package/dist/es/components/comments/CommentBody.js +7 -11
  15. package/dist/es/components/comments/CommentBody.js.map +1 -1
  16. package/dist/es/components/comments/CommentResolveButton.js +1 -1
  17. package/dist/es/components/comments/CommentThread.js +92 -86
  18. package/dist/es/components/comments/CommentThread.js.map +1 -1
  19. package/dist/es/components/comments/CommentsPanel.js +12 -35
  20. package/dist/es/components/comments/CommentsPanel.js.map +1 -1
  21. package/dist/es/lib/comments.js +3 -23
  22. package/dist/es/lib/comments.js.map +1 -1
  23. package/dist/types/components/comments/CommentThread.d.ts +2 -3
  24. package/dist/types/lib/comments.d.ts +3 -4
  25. package/package.json +2 -2
  26. package/dist/cjs/components/comments/CommentCard.js +0 -165
  27. package/dist/cjs/components/comments/CommentCard.js.map +0 -1
  28. package/dist/cjs/components/comments/DeleteCommentConfirmation.js +0 -74
  29. package/dist/cjs/components/comments/DeleteCommentConfirmation.js.map +0 -1
  30. package/dist/cjs/components/comments/ReplyBox.js +0 -121
  31. package/dist/cjs/components/comments/ReplyBox.js.map +0 -1
  32. package/dist/es/components/comments/CommentCard.js +0 -135
  33. package/dist/es/components/comments/CommentCard.js.map +0 -1
  34. package/dist/es/components/comments/DeleteCommentConfirmation.js +0 -67
  35. package/dist/es/components/comments/DeleteCommentConfirmation.js.map +0 -1
  36. package/dist/es/components/comments/ReplyBox.js +0 -91
  37. package/dist/es/components/comments/ReplyBox.js.map +0 -1
  38. package/dist/types/components/comments/CommentCard.d.ts +0 -27
  39. package/dist/types/components/comments/DeleteCommentConfirmation.d.ts +0 -19
  40. package/dist/types/components/comments/ReplyBox.d.ts +0 -18
@@ -1 +1 @@
1
- {"version":3,"file":"CommentBody.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentBody.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"CommentBody.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentBody.tsx"],"names":[],"mappings":"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"}
@@ -19,7 +19,7 @@ const Button = styled.button `
19
19
  height: 24px;
20
20
  border-radius: 12px;
21
21
  border: none;
22
- background: none;
22
+ background: #ffffff;
23
23
  padding: 0;
24
24
  cursor: pointer;
25
25
 
@@ -1,99 +1,105 @@
1
- import { TextButton } from '@manuscripts/style-guide';
2
- import React, { forwardRef, useEffect, useRef, useState } from 'react';
1
+ import { AvatarIcon, RelativeDate, SystemUserAvatarIcon, usePermissions, } from '@manuscripts/style-guide';
2
+ import React, { forwardRef, useState } from 'react';
3
3
  import styled from 'styled-components';
4
- import { commentsByTime } from '../../lib/comments';
5
- import { CommentCard } from './CommentCard';
6
- import { ReplyBox } from './ReplyBox';
4
+ import { buildAuthorName, getAuthorID } from '../../lib/comments';
5
+ import { useStore } from '../../store';
6
+ import { CommentActions } from './CommentActions';
7
+ import { CommentBody } from './CommentBody';
7
8
  const Container = styled.div `
8
- padding: 8px;
9
- background-color: ${(props) => (props.isSelected ? '#fff' : '#fafafa')};
10
- border: 1px solid #c9c9c9;
11
- ${(props) => props.isSelected && 'border-left-width: 4px'};
12
- border-radius: 4px;
9
+ padding: 16px;
10
+ background-color: ${(props) => (props.isSelected ? '#f2fbfc' : '#ffffff')};
11
+ border: 1px solid ${(props) => (props.isSelected ? '#bce7f6' : '#e2e2e2')};
12
+ border-left-width: 4px;
13
13
  margin-bottom: 16px;
14
- margin-left: 12px;
15
- margin-right: 12px;
16
- cursor: pointer;
17
- .actions-icon {
18
- visibility: ${(props) => (props.isSelected ? 'visible' : 'hidden')};
19
- }
20
-
21
- &:hover {
22
- background-color: #fff;
14
+ `;
15
+ const CommentHeader = styled.div `
16
+ display: flex;
17
+ margin-bottom: 16px;
18
+ `;
19
+ const CommentMetadata = styled.div `
20
+ flex: 1;
21
+ padding-left: 8px;
22
+ padding-right: 8px;
23
+ `;
24
+ const CommentAuthor = styled.div `
25
+ display: flex;
26
+ color: #353535;
27
+ font-weight: 400;
28
+ max-width: 200px;
29
+ white-space: nowrap;
30
+ overflow: hidden;
31
+ text-overflow: ellipsis;
32
+ width: 100%;
23
33
 
24
- .actions-icon {
25
- visibility: visible;
26
- }
34
+ svg {
35
+ padding-right: 10px;
27
36
  }
28
37
  `;
29
- const SeparatorLine = styled.div `
30
- margin-bottom: 8px;
31
- background-color: #c9c9c9;
32
- height: 1px;
38
+ const CommentTarget = styled.div `
39
+ font-size: 14px;
40
+ color: #353535;
41
+ background-color: #ffeebf;
42
+ padding: 4px 8px;
43
+ margin-top: 16px;
44
+ margin-bottom: 16px;
33
45
  `;
34
- const Indented = styled.div `
35
- padding-left: 16px;
46
+ const Timestamp = styled(RelativeDate) `
47
+ font-size: 12px;
48
+ line-height: 16px;
49
+ font-weight: 400;
50
+ color: #6e6e6e;
36
51
  `;
37
52
  export const CommentThread = forwardRef((props, ref) => {
38
- const { thread, isSelected, onSelect, onSave, onDelete, insertCommentReply, } = props;
39
- const { comment, isNew, replies } = thread;
40
- const cardsRef = useRef(null);
41
- const [showMore, setShowMore] = useState(false);
42
- const [editingCommentId, setEditingCommentId] = useState(isNew ? comment.node.attrs.id : null);
43
- useEffect(() => {
44
- if (cardsRef.current) {
45
- const contentHeight = cardsRef.current.scrollHeight;
46
- setShowMore(contentHeight > 280);
47
- }
48
- }, [comment, replies]);
49
- const handleSelect = () => {
50
- if (!isSelected) {
51
- onSelect();
53
+ const { tree, isSelected, onSelect, onSave, onDelete } = props;
54
+ const can = usePermissions();
55
+ const [{ user, collaboratorsById }] = useStore((state) => ({
56
+ user: state.user,
57
+ collaboratorsById: state.collaboratorsById,
58
+ }));
59
+ const authorID = getAuthorID(tree.comment);
60
+ const authorName = authorID
61
+ ? buildAuthorName(collaboratorsById.get(authorID))
62
+ : '';
63
+ const timestamp = tree.comment.node.attrs.contributions?.[0].timestamp;
64
+ const isOwn = authorID === user._id;
65
+ const isResolveEnabled = isOwn
66
+ ? can.resolveOwnComment
67
+ : can.resolveOthersComment;
68
+ const isActionsEnabled = isOwn
69
+ ? can.handleOwnComments
70
+ : can.handleOthersComments;
71
+ const [isEditing, setEditing] = useState(tree.isNew);
72
+ const handleEdit = () => setEditing(true);
73
+ const handleSave = (contents) => {
74
+ onSave({
75
+ ...tree.comment.node.attrs,
76
+ contents,
77
+ });
78
+ setEditing(false);
79
+ };
80
+ const handleCancel = () => {
81
+ setEditing(false);
82
+ if (tree.isNew) {
83
+ onDelete(tree.comment.node.attrs.id);
52
84
  }
53
85
  };
54
- return (React.createElement(Container, { "data-cy": "comment", isSelected: isSelected, ref: ref, onClick: handleSelect },
55
- React.createElement(CardsWrapper, { ref: cardsRef, isSelected: isSelected, showMore: showMore },
56
- React.createElement(CommentCard, { comment: comment, isReply: false, numOfReplies: replies.length, isNew: isNew, isEndOfThread: !replies.length, editingCommentId: editingCommentId, setEditingCommentId: setEditingCommentId, onDelete: onDelete, onSave: onSave, onSelect: onSelect }),
57
- replies.sort(commentsByTime).map((reply, index) => {
58
- return (React.createElement("div", { key: reply.node.attrs.id },
59
- index === 0 && React.createElement(SeparatorLine, null),
60
- React.createElement(Indented, null,
61
- index !== 0 && React.createElement(SeparatorLine, null),
62
- React.createElement(CommentCard, { comment: reply, isReply: true, numOfReplies: 0, isNew: false, isEndOfThread: index === replies.length - 1, editingCommentId: editingCommentId, setEditingCommentId: setEditingCommentId, onDelete: onDelete, onSave: onSave, onSelect: onSelect }))));
63
- })),
64
- showMore && !isSelected && (React.createElement(React.Fragment, null,
65
- React.createElement(SeparatorLine, null),
66
- React.createElement(ButtonContainer, null,
67
- React.createElement(ShowMore, { onClick: onSelect }, "Show more")))),
68
- isSelected && editingCommentId === null && (React.createElement(ReplyBox, { insertCommentReply: insertCommentReply, commentID: comment.node.attrs.id }))));
86
+ const handleToggleResolve = () => {
87
+ onSave({
88
+ ...tree.comment.node.attrs,
89
+ resolved: !tree.comment.node.attrs.resolved,
90
+ });
91
+ };
92
+ return (React.createElement(Container, { "data-cy": "comment", isSelected: isSelected, ref: ref },
93
+ React.createElement(CommentHeader, { "data-cy": "comment-header" },
94
+ React.createElement(CommentMetadata, null,
95
+ React.createElement(CommentAuthor, null, authorName ? (React.createElement(React.Fragment, null,
96
+ React.createElement(AvatarIcon, { width: 20, height: 20 }),
97
+ React.createElement(CommentAuthor, null, authorName))) : (React.createElement(React.Fragment, null,
98
+ React.createElement(SystemUserAvatarIcon, { width: 20, height: 20 }),
99
+ React.createElement(CommentAuthor, null, "System")))),
100
+ timestamp && React.createElement(Timestamp, { date: timestamp * 1000 })),
101
+ React.createElement(CommentActions, { comment: tree.comment, isResolveEnabled: isResolveEnabled, isActionsEnabled: isActionsEnabled, onDelete: () => onDelete(tree.comment.node.attrs.id), onEdit: handleEdit, toggleResolve: handleToggleResolve })),
102
+ tree.comment.node.attrs.originalText && (React.createElement(CommentTarget, null, tree.comment.node.attrs.originalText)),
103
+ React.createElement(CommentBody, { comment: tree.comment, isEditing: tree.isNew || isEditing, onSave: handleSave, onCancel: handleCancel, onSelect: onSelect })));
69
104
  });
70
- const ButtonContainer = styled.div `
71
- display: flex;
72
- justify-content: center;
73
- align-items: center;
74
- `;
75
- const ShowMore = styled(TextButton) `
76
- cursor: pointer;
77
- text-align: center;
78
- margin-top: 6px;
79
- color: #353535;
80
- `;
81
- const CardsWrapper = styled.div `
82
- max-height: ${({ isSelected }) => (isSelected ? 'none' : '280px')};
83
- position: relative;
84
- ${({ showMore, isSelected }) => showMore &&
85
- !isSelected &&
86
- `
87
- overflow: hidden;
88
- &:after {
89
- content: '';
90
- position: absolute;
91
- bottom: 0;
92
- left: 0;
93
- right: 0;
94
- height: 40px;
95
- background: linear-gradient(to bottom, rgba(255, 255, 255, 0), rgba(255, 255, 255, 1));
96
- }
97
- `}
98
- `;
99
105
  //# sourceMappingURL=CommentThread.js.map
@@ -1 +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;IAC/C,MAAM,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,GAAG,QAAQ,CACtD,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CACrC,CAAA;IAED,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,MAAM,YAAY,GAAG,GAAG,EAAE;QACxB,IAAI,CAAC,UAAU,EAAE;YACf,QAAQ,EAAE,CAAA;SACX;IACH,CAAC,CAAA;IAED,OAAO,CACL,oBAAC,SAAS,eACA,SAAS,EACjB,UAAU,EAAE,UAAU,EACtB,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,YAAY;QAErB,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,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,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,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,oBAAC,aAAa,OAAG;YACjB,oBAAC,eAAe;gBACd,oBAAC,QAAQ,IAAC,OAAO,EAAE,QAAQ,gBAAsB,CACjC,CACjB,CACJ;QACA,UAAU,IAAI,gBAAgB,KAAK,IAAI,IAAI,CAC1C,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"}
1
+ {"version":3,"file":"CommentThread.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentThread.tsx"],"names":[],"mappings":"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"}
@@ -9,16 +9,13 @@
9
9
  *
10
10
  * All portions of the code written by Atypon Systems LLC are Copyright (c) 2019 Atypon Systems LLC. All Rights Reserved.
11
11
  */
12
- import { commentsKey, isNodeComment, setCommentSelection, } from '@manuscripts/body-editor';
13
- import { buildContribution } from '@manuscripts/json-schema';
12
+ import { clearCommentSelection, commentsKey, isNodeComment, setCommentSelection, } from '@manuscripts/body-editor';
14
13
  import { CheckboxField, CheckboxLabel } from '@manuscripts/style-guide';
15
14
  import { skipTracking } from '@manuscripts/track-changes-plugin';
16
- import { generateNodeID, schema } from '@manuscripts/transform';
17
15
  import { NodeSelection, TextSelection } from 'prosemirror-state';
18
- import { findChildrenByType } from 'prosemirror-utils';
19
16
  import React, { useCallback, useMemo, useState } from 'react';
20
17
  import styled from 'styled-components';
21
- import { buildThreads } from '../../lib/comments';
18
+ import { buildCommentTrees } from '../../lib/comments';
22
19
  import { useStore } from '../../store';
23
20
  import { CommentsPlaceholder } from './CommentsPlaceholder';
24
21
  import { CommentThread } from './CommentThread';
@@ -37,17 +34,14 @@ const scrollIntoView = (element) => {
37
34
  }
38
35
  };
39
36
  export const CommentsPanel = () => {
40
- const [{ view, newCommentID, selectedCommentKey, user, doc }] = useStore((state) => ({
37
+ const [{ view, newCommentID, selectedCommentKey }] = useStore((state) => ({
41
38
  view: state.view,
42
- doc: state.doc,
43
39
  newCommentID: state.newCommentID,
44
40
  selectedCommentKey: state.selectedCommentKey,
45
- user: state.user,
46
41
  }));
47
42
  const [showResolved, setShowResolved] = useState(true);
48
- const comments = useMemo(() => view?.state ? commentsKey.getState(view.state)?.comments : undefined, [view?.state, doc] // eslint-disable-line react-hooks/exhaustive-deps
49
- );
50
- const threads = useMemo(() => (comments ? buildThreads([...comments.values()], newCommentID) : []), [comments, newCommentID]);
43
+ const comments = useMemo(() => view?.state ? commentsKey.getState(view.state)?.comments : undefined, [view?.state]);
44
+ const trees = useMemo(() => comments ? buildCommentTrees([...comments.values()], newCommentID) : [], [comments, newCommentID]);
51
45
  const selectedRef = useCallback((e) => {
52
46
  if (e) {
53
47
  scrollIntoView(e);
@@ -72,25 +66,6 @@ export const CommentsPanel = () => {
72
66
  view.focus();
73
67
  view.dispatch(tr);
74
68
  };
75
- const insertCommentReply = (target, contents) => {
76
- if (!view) {
77
- return;
78
- }
79
- const attrs = {
80
- id: generateNodeID(schema.nodes.comment),
81
- contents,
82
- target,
83
- contributions: [buildContribution(user._id)],
84
- resolved: false,
85
- };
86
- const comment = view.state.schema.nodes.comment.create(attrs);
87
- const comments = findChildrenByType(view.state.doc, view.state.schema.nodes.comments)[0];
88
- if (comments) {
89
- const pos = comments.pos + 1;
90
- const tr = view.state.tr.insert(pos, comment);
91
- view.dispatch(skipTracking(tr));
92
- }
93
- };
94
69
  const handleSave = (attrs) => {
95
70
  const comment = comments?.get(attrs.id);
96
71
  if (!comment || !view) {
@@ -98,6 +73,7 @@ export const CommentsPanel = () => {
98
73
  }
99
74
  const tr = view.state.tr;
100
75
  tr.setNodeMarkup(comment.pos, undefined, attrs);
76
+ clearCommentSelection(tr);
101
77
  view.dispatch(skipTracking(tr));
102
78
  };
103
79
  const handleDelete = (id) => {
@@ -107,15 +83,16 @@ export const CommentsPanel = () => {
107
83
  }
108
84
  const tr = view.state.tr;
109
85
  tr.delete(comment.pos, comment.pos + comment.node.nodeSize);
86
+ clearCommentSelection(tr);
110
87
  view.dispatch(skipTracking(tr));
111
88
  };
112
- const isSelected = (thread) => {
113
- return thread && selectedCommentKey === thread.comment.key;
89
+ const isSelected = (tree) => {
90
+ return tree && selectedCommentKey === tree.comment.key;
114
91
  };
115
92
  if (!view) {
116
93
  return null;
117
94
  }
118
- if (!threads.length) {
95
+ if (!trees.length) {
119
96
  return React.createElement(CommentsPlaceholder, null);
120
97
  }
121
98
  return (React.createElement(React.Fragment, null,
@@ -123,8 +100,8 @@ export const CommentsPanel = () => {
123
100
  React.createElement(CheckboxLabel, null,
124
101
  React.createElement(CheckboxField, { name: 'show-resolved', checked: showResolved, onChange: (e) => setShowResolved(e.target.checked) }),
125
102
  React.createElement(CheckboxLabelText, null, "See resolved"))),
126
- threads
103
+ trees
127
104
  .filter((c) => showResolved || !c.comment.node.attrs.resolved)
128
- .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 })))));
105
+ .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 })))));
129
106
  };
130
107
  //# sourceMappingURL=CommentsPanel.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"CommentsPanel.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentsPanel.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"CommentsPanel.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentsPanel.tsx"],"names":[],"mappings":"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"}
@@ -1,15 +1,3 @@
1
- /*!
2
- * 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.
3
- *
4
- * 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.
5
- *
6
- * The Original Code is manuscripts-frontend.
7
- *
8
- * The Original Developer is the Initial Developer. The Initial Developer of the Original Code is Atypon Systems LLC.
9
- *
10
- * All portions of the code written by Atypon Systems LLC are Copyright (c) 2024 Atypon Systems LLC. All Rights Reserved.
11
- */
12
- import { isReply } from '@manuscripts/body-editor';
13
1
  export const getAuthorID = (comment) => {
14
2
  const contributions = comment.node.attrs.contributions;
15
3
  if (!contributions?.length) {
@@ -17,14 +5,11 @@ export const getAuthorID = (comment) => {
17
5
  }
18
6
  return contributions[0].profileID;
19
7
  };
20
- export const buildThreads = (comments, newCommentID) => {
21
- return comments
22
- .filter((c) => !isReply(c)) // Filter out replies
23
- .map((c) => ({
8
+ export const buildCommentTrees = (comments, newCommentID) => {
9
+ return comments.map((c) => ({
24
10
  comment: c,
25
11
  isNew: newCommentID === c.node.attrs.id,
26
- replies: comments.filter((reply) => reply.node.attrs.target === c.node.attrs.id // Find replies for each comment
27
- ),
12
+ children: [],
28
13
  }));
29
14
  };
30
15
  export const buildAuthorName = (user) => {
@@ -35,9 +20,4 @@ export const buildAuthorName = (user) => {
35
20
  .filter(Boolean)
36
21
  .join(' ');
37
22
  };
38
- export const commentsByTime = (a, b) => {
39
- const aTimestamp = a.node.attrs.contributions?.[0].timestamp || 0;
40
- const bTimestamp = b.node.attrs.contributions?.[0].timestamp || 0;
41
- return aTimestamp - bTimestamp;
42
- };
43
23
  //# sourceMappingURL=comments.js.map
@@ -1 +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"}
1
+ {"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"}
@@ -11,13 +11,12 @@
11
11
  */
12
12
  import { CommentAttrs } from '@manuscripts/body-editor';
13
13
  import React from 'react';
14
- import { Thread } from '../../lib/comments';
14
+ import { CommentTree } from '../../lib/comments';
15
15
  export interface CommentThreadProps {
16
- thread: Thread;
16
+ tree: CommentTree;
17
17
  isSelected: boolean;
18
18
  onSelect: () => void;
19
19
  onSave: (comment: CommentAttrs) => void;
20
20
  onDelete: (id: string) => void;
21
- insertCommentReply: (target: string, contents: string) => void;
22
21
  }
23
22
  export declare const CommentThread: React.ForwardRefExoticComponent<CommentThreadProps & React.RefAttributes<HTMLDivElement>>;
@@ -11,12 +11,11 @@
11
11
  */
12
12
  import { Comment } from '@manuscripts/body-editor';
13
13
  import { UserProfile } from '@manuscripts/json-schema';
14
- export type Thread = {
14
+ export type CommentTree = {
15
15
  comment: Comment;
16
16
  isNew: boolean;
17
- replies: Comment[];
17
+ children: CommentTree[];
18
18
  };
19
19
  export declare const getAuthorID: (comment: Comment) => string | undefined;
20
- export declare const buildThreads: (comments: Comment[], newCommentID?: string) => Thread[];
20
+ export declare const buildCommentTrees: (comments: Comment[], newCommentID?: string) => CommentTree[];
21
21
  export declare const buildAuthorName: (user: UserProfile | undefined) => string;
22
- export declare const commentsByTime: (a: Comment, b: Comment) => number;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@manuscripts/article-editor",
3
- "version": "3.4.2-LEAN-3894.0",
3
+ "version": "3.4.2-LEAN-3638.0",
4
4
  "license": "CPAL-1.0",
5
5
  "description": "React components for editing and viewing manuscripts",
6
6
  "repository": "github:Atypon-OpenSource/manuscripts-article-editor",
@@ -35,7 +35,7 @@
35
35
  "@fontsource/lato": "^4.5.10",
36
36
  "@fontsource/pt-sans": "^4.5.11",
37
37
  "@fontsource/pt-serif": "^4.5.11",
38
- "@manuscripts/body-editor": "2.5.2-LEAN-3894.0",
38
+ "@manuscripts/body-editor": "2.5.2-LEAN-3638.0",
39
39
  "@manuscripts/json-schema": "2.2.11",
40
40
  "@manuscripts/library": "1.3.11",
41
41
  "@manuscripts/style-guide": "2.0.21",