@manuscripts/article-editor 4.6.16 → 4.6.18
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.
- package/dist/cjs/components/Inspector.js +1 -4
- package/dist/cjs/components/Inspector.js.map +1 -1
- package/dist/cjs/components/comments/CommentActions.js +10 -1
- package/dist/cjs/components/comments/CommentActions.js.map +1 -1
- package/dist/cjs/components/comments/CommentCard.js +2 -2
- package/dist/cjs/components/comments/CommentCard.js.map +1 -1
- package/dist/cjs/components/comments/CommentThread.js +7 -4
- package/dist/cjs/components/comments/CommentThread.js.map +1 -1
- package/dist/cjs/components/comments/CommentsPanel.js +33 -9
- package/dist/cjs/components/comments/CommentsPanel.js.map +1 -1
- package/dist/cjs/components/projects/Inspector.js +1 -1
- package/dist/cjs/components/projects/Inspector.js.map +1 -1
- package/dist/cjs/lib/comments.js +23 -1
- package/dist/cjs/lib/comments.js.map +1 -1
- package/dist/es/components/Inspector.js +0 -3
- package/dist/es/components/Inspector.js.map +1 -1
- package/dist/es/components/comments/CommentActions.js +9 -1
- package/dist/es/components/comments/CommentActions.js.map +1 -1
- package/dist/es/components/comments/CommentCard.js +3 -3
- package/dist/es/components/comments/CommentCard.js.map +1 -1
- package/dist/es/components/comments/CommentThread.js +7 -4
- package/dist/es/components/comments/CommentThread.js.map +1 -1
- package/dist/es/components/comments/CommentsPanel.js +35 -11
- package/dist/es/components/comments/CommentsPanel.js.map +1 -1
- package/dist/es/components/projects/Inspector.js +2 -2
- package/dist/es/components/projects/Inspector.js.map +1 -1
- package/dist/es/lib/comments.js +22 -1
- package/dist/es/lib/comments.js.map +1 -1
- package/dist/types/components/Inspector.d.ts +0 -1
- package/dist/types/components/comments/CommentActions.d.ts +5 -0
- package/dist/types/components/comments/CommentCard.d.ts +1 -0
- package/dist/types/components/comments/CommentThread.d.ts +1 -0
- package/dist/types/lib/comments.d.ts +7 -0
- package/package.json +2 -2
|
@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.TabText = exports.Spacer = exports.IconWrapper = exports.ErrorBadge = exports.WarningBadge = exports.InspectorTabPanelHeading = exports.SecondaryInspectorTab = exports.PrimaryInspectorTab = exports.InspectorTabPanel = exports.
|
|
17
|
+
exports.TabText = exports.Spacer = exports.IconWrapper = exports.ErrorBadge = exports.WarningBadge = exports.InspectorTabPanelHeading = exports.SecondaryInspectorTab = exports.PrimaryInspectorTab = exports.InspectorTabPanel = exports.InspectorTabPanels = exports.PrimaryTabList = exports.InspectorTabList = exports.InspectorTabs = exports.InspectorContainer = void 0;
|
|
18
18
|
const react_1 = require("@headlessui/react");
|
|
19
19
|
const styled_components_1 = __importDefault(require("styled-components"));
|
|
20
20
|
exports.InspectorContainer = styled_components_1.default.div `
|
|
@@ -50,9 +50,6 @@ exports.InspectorTabPanels = (0, styled_components_1.default)(react_1.TabPanels)
|
|
|
50
50
|
flex: 1;
|
|
51
51
|
overflow-y: auto;
|
|
52
52
|
`;
|
|
53
|
-
exports.PaddedInspectorTabPanels = (0, styled_components_1.default)(exports.InspectorTabPanels) `
|
|
54
|
-
padding-bottom: 64px; // allow space for chat button
|
|
55
|
-
`;
|
|
56
53
|
exports.InspectorTabPanel = (0, styled_components_1.default)(react_1.TabPanel) `
|
|
57
54
|
font-size: ${(props) => props.theme.font.size.normal};
|
|
58
55
|
color: ${(props) => props.theme.colors.text.secondary};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Inspector.js","sourceRoot":"","sources":["../../../src/components/Inspector.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;;;;AAEH,6CAA+E;AAC/E,0EAAsC;AAEzB,QAAA,kBAAkB,GAAG,2BAAM,CAAC,GAAG,CAAA;2BACjB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ;;;;;;;CAOvE,CAAA;AAEY,QAAA,aAAa,GAAG,IAAA,2BAAM,EAAC,gBAAQ,CAAC,CAAA;;;;;CAK5C,CAAA;AAEY,QAAA,gBAAgB,GAAG,IAAA,2BAAM,EAAC,eAAO,CAAC,CAAA;;;;iBAI9B,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM;aAC3C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;;;;CAItD,CAAA;AAEY,QAAA,cAAc,GAAG,IAAA,2BAAM,EAAC,wBAAgB,CAAC,CAAA;;6BAEzB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ;CACzE,CAAA;AAEY,QAAA,kBAAkB,GAAG,IAAA,2BAAM,EAAC,iBAAS,CAAC,CAAA;;;CAGlD,CAAA;AAEY,QAAA,
|
|
1
|
+
{"version":3,"file":"Inspector.js","sourceRoot":"","sources":["../../../src/components/Inspector.tsx"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.CommentActions = exports.CommentAction = exports.ActionsIcon = void 0;
|
|
17
|
+
exports.OrphanCommentActions = exports.CommentActions = exports.CommentAction = exports.ActionsIcon = void 0;
|
|
18
18
|
const style_guide_1 = require("@manuscripts/style-guide");
|
|
19
19
|
const react_1 = __importDefault(require("react"));
|
|
20
20
|
const styled_components_1 = __importDefault(require("styled-components"));
|
|
@@ -60,4 +60,13 @@ const CommentActions = ({ comment, isResolveEnabled, isActionsEnabled, onEdit, o
|
|
|
60
60
|
isResolveEnabled && (react_1.default.createElement(CommentResolveButton_1.CommentResolveButton, { comment: comment, onClick: toggleResolve }))));
|
|
61
61
|
};
|
|
62
62
|
exports.CommentActions = CommentActions;
|
|
63
|
+
const OrphanCommentActions = ({ onDelete, isReply, isOwn }) => {
|
|
64
|
+
if (!isOwn || isReply) {
|
|
65
|
+
return null;
|
|
66
|
+
}
|
|
67
|
+
return (react_1.default.createElement(Container, null,
|
|
68
|
+
react_1.default.createElement(style_guide_1.IconButton, { className: "delete-button", "data-cy": "orphan-comment-delete", onClick: onDelete, iconColor: '#333333' },
|
|
69
|
+
react_1.default.createElement(style_guide_1.DeleteIcon, null))));
|
|
70
|
+
};
|
|
71
|
+
exports.OrphanCommentActions = OrphanCommentActions;
|
|
63
72
|
//# sourceMappingURL=CommentActions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommentActions.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentActions.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;;;;AAGH,
|
|
1
|
+
{"version":3,"file":"CommentActions.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentActions.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;;;;AAGH,0DAOiC;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,IACZ,SAAS,EAAC,eAAe,aACjB,gBAAgB,EACxB,OAAO,EAAE,QAAQ,aAGH,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;AA/CY,QAAA,cAAc,kBA+C1B;AAEM,MAAM,oBAAoB,GAI5B,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE;IACpC,IAAI,CAAC,KAAK,IAAI,OAAO,EAAE,CAAC;QACtB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,OAAO,CACL,8BAAC,SAAS;QACR,8BAAC,wBAAU,IACT,SAAS,EAAC,eAAe,aACjB,uBAAuB,EAC/B,OAAO,EAAE,QAAQ,EACjB,SAAS,EAAE,SAAS;YAEpB,8BAAC,wBAAU,OAAG,CACH,CACH,CACb,CAAA;AACH,CAAC,CAAA;AArBY,QAAA,oBAAoB,wBAqBhC"}
|
|
@@ -77,7 +77,7 @@ const RepliesCount = styled_components_1.default.div.attrs({
|
|
|
77
77
|
const Card = styled_components_1.default.div `
|
|
78
78
|
position: relative;
|
|
79
79
|
`;
|
|
80
|
-
const CommentCard = ({ comment, isReply, numOfReplies, isNew, isEndOfThread, editingCommentId, setEditingCommentId, onSave, onDelete, }) => {
|
|
80
|
+
const CommentCard = ({ comment, isReply, numOfReplies, isNew, isEndOfThread, isOrphanComment, editingCommentId, setEditingCommentId, onSave, onDelete, }) => {
|
|
81
81
|
const can = (0, capabilities_1.usePermissions)();
|
|
82
82
|
const [{ user, collaboratorsById }] = (0, store_1.useStore)((state) => ({
|
|
83
83
|
user: state.user,
|
|
@@ -139,7 +139,7 @@ const CommentCard = ({ comment, isReply, numOfReplies, isNew, isEndOfThread, edi
|
|
|
139
139
|
react_1.default.createElement(SuggestionSnippet_1.AuthorName, null, "System"))))),
|
|
140
140
|
timestamp && react_1.default.createElement(Timestamp, { date: timestamp * 1000 }),
|
|
141
141
|
numOfReplies !== 0 && react_1.default.createElement(RepliesCount, null, numOfReplies)),
|
|
142
|
-
react_1.default.createElement(CommentActions_1.CommentActions, { comment: comment, isResolveEnabled: isResolveEnabled && !isReply, isActionsEnabled: isActionsEnabled && isEndOfThread, onDelete: handleDelete, onEdit: handleEdit, toggleResolve: handleToggleResolve })),
|
|
142
|
+
!isOrphanComment ? (react_1.default.createElement(CommentActions_1.CommentActions, { comment: comment, isResolveEnabled: isResolveEnabled && !isReply, isActionsEnabled: isActionsEnabled && isEndOfThread, onDelete: handleDelete, onEdit: handleEdit, toggleResolve: handleToggleResolve })) : (react_1.default.createElement(CommentActions_1.OrphanCommentActions, { isReply: isReply, isOwn: isOwn, onDelete: handleDelete }))),
|
|
143
143
|
comment.node.attrs.originalText && (react_1.default.createElement(CommentTarget, null, comment.node.attrs.originalText)),
|
|
144
144
|
react_1.default.createElement(CommentBody_1.CommentBody, { comment: comment, isEditing: editingCommentId === commentID, onSave: handleSave, onCancel: handleCancel }),
|
|
145
145
|
showDeleteConfirmation && (react_1.default.createElement(DeleteCommentConfirmation_1.DeleteCommentConfirmation, { isReply: isReply, onCancel: cancelDelete, onConfirm: confirmDelete }))));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommentCard.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentCard.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAYA,0DAIiC;AACjC,+CAAuC;AACvC,0EAAsC;AAEtC,yDAAuD;AACvD,iDAAiE;AACjE,uCAAsC;AACtC,0FAK2D;AAC3D,
|
|
1
|
+
{"version":3,"file":"CommentCard.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentCard.tsx"],"names":[],"mappings":"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"}
|
|
@@ -75,7 +75,7 @@ const Indented = styled_components_1.default.div `
|
|
|
75
75
|
padding-left: 16px;
|
|
76
76
|
`;
|
|
77
77
|
exports.CommentThread = (0, react_1.forwardRef)((props, ref) => {
|
|
78
|
-
const { thread, isSelected, onSelect, onSave, onDelete, insertCommentReply, } = props;
|
|
78
|
+
const { thread, isSelected, onSelect, onSave, onDelete, insertCommentReply, isOrphanComment, } = props;
|
|
79
79
|
const can = (0, capabilities_1.usePermissions)();
|
|
80
80
|
const { comment, isNew, replies } = thread;
|
|
81
81
|
const cardsRef = (0, react_1.useRef)(null);
|
|
@@ -99,19 +99,22 @@ exports.CommentThread = (0, react_1.forwardRef)((props, ref) => {
|
|
|
99
99
|
};
|
|
100
100
|
return (react_1.default.createElement(Container, { "data-cy": "comment", isSelected: isSelected, ref: ref, onClick: handleSelect },
|
|
101
101
|
react_1.default.createElement(CardsWrapper, { ref: cardsRef, isSelected: isSelected, showMore: showMore },
|
|
102
|
-
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 }),
|
|
102
|
+
react_1.default.createElement(CommentCard_1.CommentCard, { comment: comment, isReply: false, numOfReplies: replies.length, isNew: isNew, isEndOfThread: !replies.length, isOrphanComment: isOrphanComment || false, editingCommentId: editingCommentId, setEditingCommentId: setEditingCommentId, onDelete: onDelete, onSave: onSave }),
|
|
103
103
|
replies.sort(comments_1.commentsByTime).map((reply, index) => {
|
|
104
104
|
return (react_1.default.createElement("div", { key: reply.node.attrs.id },
|
|
105
105
|
index === 0 && react_1.default.createElement(SeparatorLine, null),
|
|
106
106
|
react_1.default.createElement(Indented, null,
|
|
107
107
|
index !== 0 && react_1.default.createElement(SeparatorLine, null),
|
|
108
|
-
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 }))));
|
|
108
|
+
react_1.default.createElement(CommentCard_1.CommentCard, { comment: reply, isReply: true, numOfReplies: 0, isNew: false, isEndOfThread: index === replies.length - 1, isOrphanComment: isOrphanComment || false, editingCommentId: editingCommentId, setEditingCommentId: setEditingCommentId, onDelete: onDelete, onSave: onSave }))));
|
|
109
109
|
})),
|
|
110
110
|
showMore && !isSelected && (react_1.default.createElement(react_1.default.Fragment, null,
|
|
111
111
|
react_1.default.createElement(SeparatorLine, null),
|
|
112
112
|
react_1.default.createElement(ButtonContainer, null,
|
|
113
113
|
react_1.default.createElement(ShowMore, { onClick: onSelect }, "Show more")))),
|
|
114
|
-
can.createComment &&
|
|
114
|
+
can.createComment &&
|
|
115
|
+
isSelected &&
|
|
116
|
+
editingCommentId === null &&
|
|
117
|
+
!isOrphanComment && (react_1.default.createElement(ReplyBox_1.ReplyBox, { insertCommentReply: insertCommentReply, commentID: comment.node.attrs.id }))));
|
|
115
118
|
});
|
|
116
119
|
const ButtonContainer = styled_components_1.default.div `
|
|
117
120
|
display: flex;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommentThread.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentThread.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAYA,0DAAqD;AACrD,+CAAsE;AACtE,0EAAsC;AAEtC,yDAAuD;AACvD,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;
|
|
1
|
+
{"version":3,"file":"CommentThread.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentThread.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAYA,0DAAqD;AACrD,+CAAsE;AACtE,0EAAsC;AAEtC,yDAAuD;AACvD,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;AAYY,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,EAClB,eAAe,GAChB,GAAG,KAAK,CAAA;IAET,MAAM,GAAG,GAAG,IAAA,6BAAc,GAAE,CAAA;IAE5B,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,CAAC,UAAU,EAAE,CAAC;YAChB,mBAAmB,CAAC,IAAI,CAAC,CAAA;QAC3B,CAAC;IACH,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAA;IAEhB,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;YACrB,MAAM,aAAa,GAAG,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAA;YACnD,WAAW,CAAC,aAAa,GAAG,GAAG,CAAC,CAAA;QAClC,CAAC;IACH,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAA;IAEtB,MAAM,YAAY,GAAG,GAAG,EAAE;QACxB,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,QAAQ,EAAE,CAAA;QACZ,CAAC;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,eAAe,EAAE,eAAe,IAAI,KAAK,EACzC,gBAAgB,EAAE,gBAAgB,EAClC,mBAAmB,EAAE,mBAAmB,EACxC,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,GACd;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,eAAe,EAAE,eAAe,IAAI,KAAK,EACzC,gBAAgB,EAAE,gBAAgB,EAClC,mBAAmB,EAAE,mBAAmB,EACxC,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,GACd,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,GAAG,CAAC,aAAa;YAChB,UAAU;YACV,gBAAgB,KAAK,IAAI;YACzB,CAAC,eAAe,IAAI,CAClB,8BAAC,mBAAQ,IACP,kBAAkB,EAAE,kBAAkB,EACtC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,GAChC,CACH,CACO,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"}
|
|
@@ -61,6 +61,14 @@ const comments_1 = require("../../lib/comments");
|
|
|
61
61
|
const store_1 = require("../../store");
|
|
62
62
|
const CommentsPlaceholder_1 = require("./CommentsPlaceholder");
|
|
63
63
|
const CommentThread_1 = require("./CommentThread");
|
|
64
|
+
const Container = styled_components_1.default.div `
|
|
65
|
+
display: flex;
|
|
66
|
+
flex-direction: column;
|
|
67
|
+
height: 100%;
|
|
68
|
+
`;
|
|
69
|
+
const CommentsList = styled_components_1.default.div `
|
|
70
|
+
overflow-y: auto;
|
|
71
|
+
`;
|
|
64
72
|
const Header = styled_components_1.default.div `
|
|
65
73
|
display: flex;
|
|
66
74
|
justify-content: flex-end;
|
|
@@ -68,6 +76,7 @@ const Header = styled_components_1.default.div `
|
|
|
68
76
|
`;
|
|
69
77
|
const CheckboxLabelText = styled_components_1.default.div `
|
|
70
78
|
color: ${(props) => props.theme.colors.text.primary} !important;
|
|
79
|
+
margin: 0 !important;
|
|
71
80
|
`;
|
|
72
81
|
const scrollIntoView = (element) => {
|
|
73
82
|
const rect = element.getBoundingClientRect();
|
|
@@ -84,9 +93,14 @@ const CommentsPanel = () => {
|
|
|
84
93
|
user: state.user,
|
|
85
94
|
}));
|
|
86
95
|
const [showResolved, setShowResolved] = (0, react_1.useState)(true);
|
|
96
|
+
const [openTab, toggleTab] = (0, react_1.useState)('active');
|
|
97
|
+
const toggleCommentsTab = () => toggleTab(openTab === 'active' ? 'orphan' : 'active');
|
|
87
98
|
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
|
|
88
99
|
);
|
|
100
|
+
const orphanComments = (0, react_1.useMemo)(() => view?.state && (0, comments_1.getOrphanComments)(view.state), [view?.state] // eslint-disable-line react-hooks/exhaustive-deps
|
|
101
|
+
);
|
|
89
102
|
const threads = (0, react_1.useMemo)(() => (comments ? (0, comments_1.buildThreads)([...comments.values()], newCommentID) : []), [comments, newCommentID]);
|
|
103
|
+
const orphanThreads = (0, react_1.useMemo)(() => (orphanComments ? (0, comments_1.buildThreads)([...orphanComments.values()]) : []), [orphanComments]);
|
|
90
104
|
const selectedRef = (0, react_1.useCallback)((e) => {
|
|
91
105
|
if (e) {
|
|
92
106
|
scrollIntoView(e);
|
|
@@ -151,12 +165,16 @@ const CommentsPanel = () => {
|
|
|
151
165
|
});
|
|
152
166
|
};
|
|
153
167
|
const handleDelete = (id) => {
|
|
154
|
-
const comment = comments?.get(id);
|
|
168
|
+
const comment = comments?.get(id) || orphanComments?.get(id);
|
|
155
169
|
if (!comment || !view) {
|
|
156
170
|
return;
|
|
157
171
|
}
|
|
158
172
|
const tr = view.state.tr;
|
|
159
173
|
tr.delete(comment.pos, comment.pos + comment.node.nodeSize);
|
|
174
|
+
if (orphanComments?.get(id)) {
|
|
175
|
+
const thread = orphanThreads.find(({ comment }) => comment.node.attrs.id === id);
|
|
176
|
+
thread?.replies.map((reply) => tr.delete(reply.pos, reply.pos + reply.node.nodeSize));
|
|
177
|
+
}
|
|
160
178
|
deleteHighlightMarkers(id, tr);
|
|
161
179
|
view.dispatch((0, track_changes_plugin_1.skipTracking)(tr));
|
|
162
180
|
};
|
|
@@ -166,17 +184,23 @@ const CommentsPanel = () => {
|
|
|
166
184
|
if (!view) {
|
|
167
185
|
return null;
|
|
168
186
|
}
|
|
169
|
-
if (!threads.length) {
|
|
187
|
+
if (!threads.length && !orphanThreads.length) {
|
|
170
188
|
return react_1.default.createElement(CommentsPlaceholder_1.CommentsPlaceholder, null);
|
|
171
189
|
}
|
|
172
|
-
return (react_1.default.createElement(
|
|
173
|
-
react_1.default.createElement(
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
react_1.default.createElement(
|
|
177
|
-
|
|
190
|
+
return (react_1.default.createElement(Container, null,
|
|
191
|
+
react_1.default.createElement(style_guide_1.ToggleHeader, { title: `Active comments (${threads.length})`, isOpen: openTab === 'active', onToggle: toggleCommentsTab }),
|
|
192
|
+
openTab === 'active' && (react_1.default.createElement(CommentsList, { "data-cy": "active-comments" },
|
|
193
|
+
!!threads.length && (react_1.default.createElement(Header, null,
|
|
194
|
+
react_1.default.createElement(style_guide_1.CheckboxLabel, null,
|
|
195
|
+
react_1.default.createElement(style_guide_1.CheckboxField, { name: 'show-resolved', checked: showResolved, onChange: (e) => setShowResolved(e.target.checked) }),
|
|
196
|
+
react_1.default.createElement(CheckboxLabelText, null, "See resolved")))),
|
|
197
|
+
threads
|
|
198
|
+
.filter((c) => showResolved || !c.comment.node.attrs.resolved)
|
|
199
|
+
.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 }))))),
|
|
200
|
+
react_1.default.createElement(style_guide_1.ToggleHeader, { title: `Orphaned Comments (${orphanThreads.length})`, isOpen: openTab === 'orphan', onToggle: toggleCommentsTab }),
|
|
201
|
+
openTab === 'orphan' && (react_1.default.createElement(CommentsList, { "data-cy": "orphan-comments" }, orphanThreads
|
|
178
202
|
.filter((c) => showResolved || !c.comment.node.attrs.resolved)
|
|
179
|
-
.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:
|
|
203
|
+
.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: false, isOrphanComment: true, onSelect: () => '', onSave: handleSave, onDelete: handleDelete, insertCommentReply: insertCommentReply })))))));
|
|
180
204
|
};
|
|
181
205
|
exports.CommentsPanel = CommentsPanel;
|
|
182
206
|
//# sourceMappingURL=CommentsPanel.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommentsPanel.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentsPanel.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;GAUG;AACH,0DAQiC;AACjC,0DAA4D;AAC5D,
|
|
1
|
+
{"version":3,"file":"CommentsPanel.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentsPanel.tsx"],"names":[],"mappings":"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"}
|
|
@@ -141,7 +141,7 @@ const Inspector = () => {
|
|
|
141
141
|
pluginTab && (react_1.default.createElement(InspectorTab_1.InspectorTab, { cy: "plugin-button", icon: react_1.default.createElement(Inspector_1.IconWrapper, null, pluginTab.icon), isVisible: tabIndex === PLUGIN_TAB }, pluginTab.title)),
|
|
142
142
|
react_1.default.createElement(Inspector_1.Spacer, null),
|
|
143
143
|
react_1.default.createElement(DocumentOptionsDropdown_1.default, null)),
|
|
144
|
-
react_1.default.createElement(Inspector_1.
|
|
144
|
+
react_1.default.createElement(Inspector_1.InspectorTabPanels, null,
|
|
145
145
|
react_1.default.createElement(Inspector_1.InspectorTabPanel, { key: "Comments", "data-cy": "comments" }, tabIndex === COMMENTS_TAB_INDEX && (react_1.default.createElement(CommentsPanel_1.CommentsPanel, { key: "comments" }))),
|
|
146
146
|
!can.editWithoutTracking && (react_1.default.createElement(Inspector_1.InspectorTabPanel, { key: "History", "data-cy": "history" }, tabIndex === HISTORY_TAB_INDEX && (react_1.default.createElement(TrackChangesPanel_1.TrackChangesPanel, { key: "track-changes" })))),
|
|
147
147
|
react_1.default.createElement(Inspector_1.InspectorTabPanel, { key: "Files", "data-cy": "files" }, tabIndex === FILES_TAB_INDEX && react_1.default.createElement(FileManager_1.FileManager, { key: "files" })),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Inspector.js","sourceRoot":"","sources":["../../../../src/components/projects/Inspector.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Inspector.js","sourceRoot":"","sources":["../../../../src/components/projects/Inspector.tsx"],"names":[],"mappings":"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"}
|
package/dist/cjs/lib/comments.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.commentsByTime = exports.buildAuthorName = exports.buildThreads = exports.getAuthorID = void 0;
|
|
3
|
+
exports.commentsByTime = exports.buildAuthorName = exports.getOrphanComments = exports.buildThreads = exports.getAuthorID = void 0;
|
|
4
4
|
/*!
|
|
5
5
|
* 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.
|
|
6
6
|
*
|
|
@@ -13,6 +13,8 @@ exports.commentsByTime = exports.buildAuthorName = exports.buildThreads = export
|
|
|
13
13
|
* All portions of the code written by Atypon Systems LLC are Copyright (c) 2024 Atypon Systems LLC. All Rights Reserved.
|
|
14
14
|
*/
|
|
15
15
|
const body_editor_1 = require("@manuscripts/body-editor");
|
|
16
|
+
const transform_1 = require("@manuscripts/transform");
|
|
17
|
+
const prosemirror_utils_1 = require("prosemirror-utils");
|
|
16
18
|
const getAuthorID = (comment) => {
|
|
17
19
|
const contributions = comment.node.attrs.contributions;
|
|
18
20
|
if (!contributions?.length) {
|
|
@@ -32,6 +34,26 @@ const buildThreads = (comments, newCommentID) => {
|
|
|
32
34
|
}));
|
|
33
35
|
};
|
|
34
36
|
exports.buildThreads = buildThreads;
|
|
37
|
+
/**
|
|
38
|
+
* will filter out orphan comments with their reply nodes using comments plugin
|
|
39
|
+
* as a reference to decide if the comment is an orphan or not, as that plugin
|
|
40
|
+
* includes only comments that have a target id associated with a node
|
|
41
|
+
*/
|
|
42
|
+
const getOrphanComments = (state) => {
|
|
43
|
+
const comments = (state && body_editor_1.commentsKey.getState(state)?.comments) || undefined;
|
|
44
|
+
if (!comments) {
|
|
45
|
+
return undefined;
|
|
46
|
+
}
|
|
47
|
+
const commentsNode = (0, prosemirror_utils_1.findChildrenByType)(state.doc, transform_1.schema.nodes.comments)[0];
|
|
48
|
+
const allComments = (0, prosemirror_utils_1.flatten)(commentsNode.node);
|
|
49
|
+
const orphanComments = allComments.filter(({ node }) => !comments?.has(node.attrs.id));
|
|
50
|
+
const orphanCommentsReplays = allComments.filter(({ node }) => (0, body_editor_1.isReply)({ node }) &&
|
|
51
|
+
orphanComments.find((orphan) => orphan.node.attrs.id === node.attrs.target));
|
|
52
|
+
return new Map([...orphanComments.values(), ...orphanCommentsReplays]
|
|
53
|
+
.map(({ node, pos }) => ({ node, pos: commentsNode.pos + pos + 1 }))
|
|
54
|
+
.map((comment) => [comment.node.attrs.id, comment]));
|
|
55
|
+
};
|
|
56
|
+
exports.getOrphanComments = getOrphanComments;
|
|
35
57
|
const buildAuthorName = (user) => {
|
|
36
58
|
if (!user) {
|
|
37
59
|
return '';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"comments.js","sourceRoot":"","sources":["../../../src/lib/comments.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;GAUG;AACH,
|
|
1
|
+
{"version":3,"file":"comments.js","sourceRoot":"","sources":["../../../src/lib/comments.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,9 +44,6 @@ export const InspectorTabPanels = styled(TabPanels) `
|
|
|
44
44
|
flex: 1;
|
|
45
45
|
overflow-y: auto;
|
|
46
46
|
`;
|
|
47
|
-
export const PaddedInspectorTabPanels = styled(InspectorTabPanels) `
|
|
48
|
-
padding-bottom: 64px; // allow space for chat button
|
|
49
|
-
`;
|
|
50
47
|
export const InspectorTabPanel = styled(TabPanel) `
|
|
51
48
|
font-size: ${(props) => props.theme.font.size.normal};
|
|
52
49
|
color: ${(props) => props.theme.colors.text.secondary};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Inspector.js","sourceRoot":"","sources":["../../../src/components/Inspector.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC/E,OAAO,MAAM,MAAM,mBAAmB,CAAA;AAEtC,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,GAAG,CAAA;2BACjB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ;;;;;;;CAOvE,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAA;;;;;CAK5C,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,CAAA;;;;iBAI9B,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM;aAC3C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;;;;CAItD,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAA;;6BAEzB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ;CACzE,CAAA;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,SAAS,CAAC,CAAA;;;CAGlD,CAAA;AAED,MAAM,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"Inspector.js","sourceRoot":"","sources":["../../../src/components/Inspector.tsx"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
*
|
|
10
10
|
* All portions of the code written by Atypon Systems LLC are Copyright (c) 2024 Atypon Systems LLC. All Rights Reserved.
|
|
11
11
|
*/
|
|
12
|
-
import { DotsIcon, DropdownContainer, DropdownList, useDropdown, } from '@manuscripts/style-guide';
|
|
12
|
+
import { DeleteIcon, DotsIcon, DropdownContainer, DropdownList, IconButton, useDropdown, } from '@manuscripts/style-guide';
|
|
13
13
|
import React from 'react';
|
|
14
14
|
import styled from 'styled-components';
|
|
15
15
|
import { CommentResolveButton } from './CommentResolveButton';
|
|
@@ -53,4 +53,12 @@ export const CommentActions = ({ comment, isResolveEnabled, isActionsEnabled, on
|
|
|
53
53
|
React.createElement(CommentAction, { className: "delete-button", "data-cy": "comment-delete", onClick: onDelete }, "Delete"))))),
|
|
54
54
|
isResolveEnabled && (React.createElement(CommentResolveButton, { comment: comment, onClick: toggleResolve }))));
|
|
55
55
|
};
|
|
56
|
+
export const OrphanCommentActions = ({ onDelete, isReply, isOwn }) => {
|
|
57
|
+
if (!isOwn || isReply) {
|
|
58
|
+
return null;
|
|
59
|
+
}
|
|
60
|
+
return (React.createElement(Container, null,
|
|
61
|
+
React.createElement(IconButton, { className: "delete-button", "data-cy": "orphan-comment-delete", onClick: onDelete, iconColor: '#333333' },
|
|
62
|
+
React.createElement(DeleteIcon, null))));
|
|
63
|
+
};
|
|
56
64
|
//# sourceMappingURL=CommentActions.js.map
|
|
@@ -1 +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,IACZ,SAAS,EAAC,eAAe,aACjB,gBAAgB,EACxB,OAAO,EAAE,QAAQ,aAGH,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"}
|
|
1
|
+
{"version":3,"file":"CommentActions.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentActions.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,EACL,UAAU,EACV,QAAQ,EACR,iBAAiB,EACjB,YAAY,EACZ,UAAU,EACV,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,IACZ,SAAS,EAAC,eAAe,aACjB,gBAAgB,EACxB,OAAO,EAAE,QAAQ,aAGH,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;AAED,MAAM,CAAC,MAAM,oBAAoB,GAI5B,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE;IACpC,IAAI,CAAC,KAAK,IAAI,OAAO,EAAE,CAAC;QACtB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,OAAO,CACL,oBAAC,SAAS;QACR,oBAAC,UAAU,IACT,SAAS,EAAC,eAAe,aACjB,uBAAuB,EAC/B,OAAO,EAAE,QAAQ,EACjB,SAAS,EAAE,SAAS;YAEpB,oBAAC,UAAU,OAAG,CACH,CACH,CACb,CAAA;AACH,CAAC,CAAA"}
|
|
@@ -5,7 +5,7 @@ import { usePermissions } from '../../lib/capabilities';
|
|
|
5
5
|
import { buildAuthorName, getAuthorID } from '../../lib/comments';
|
|
6
6
|
import { useStore } from '../../store';
|
|
7
7
|
import { AuthorContainer, AuthorName, CardHeader, CardMetadata, } from '../track-changes/suggestion-list/SuggestionSnippet';
|
|
8
|
-
import { CommentActions } from './CommentActions';
|
|
8
|
+
import { CommentActions, OrphanCommentActions } from './CommentActions';
|
|
9
9
|
import { CommentBody } from './CommentBody';
|
|
10
10
|
import { DeleteCommentConfirmation } from './DeleteCommentConfirmation';
|
|
11
11
|
const CommentTarget = styled.div `
|
|
@@ -38,7 +38,7 @@ const RepliesCount = styled.div.attrs({
|
|
|
38
38
|
const Card = styled.div `
|
|
39
39
|
position: relative;
|
|
40
40
|
`;
|
|
41
|
-
export const CommentCard = ({ comment, isReply, numOfReplies, isNew, isEndOfThread, editingCommentId, setEditingCommentId, onSave, onDelete, }) => {
|
|
41
|
+
export const CommentCard = ({ comment, isReply, numOfReplies, isNew, isEndOfThread, isOrphanComment, editingCommentId, setEditingCommentId, onSave, onDelete, }) => {
|
|
42
42
|
const can = usePermissions();
|
|
43
43
|
const [{ user, collaboratorsById }] = useStore((state) => ({
|
|
44
44
|
user: state.user,
|
|
@@ -100,7 +100,7 @@ export const CommentCard = ({ comment, isReply, numOfReplies, isNew, isEndOfThre
|
|
|
100
100
|
React.createElement(AuthorName, null, "System"))))),
|
|
101
101
|
timestamp && React.createElement(Timestamp, { date: timestamp * 1000 }),
|
|
102
102
|
numOfReplies !== 0 && React.createElement(RepliesCount, null, numOfReplies)),
|
|
103
|
-
React.createElement(CommentActions, { comment: comment, isResolveEnabled: isResolveEnabled && !isReply, isActionsEnabled: isActionsEnabled && isEndOfThread, onDelete: handleDelete, onEdit: handleEdit, toggleResolve: handleToggleResolve })),
|
|
103
|
+
!isOrphanComment ? (React.createElement(CommentActions, { comment: comment, isResolveEnabled: isResolveEnabled && !isReply, isActionsEnabled: isActionsEnabled && isEndOfThread, onDelete: handleDelete, onEdit: handleEdit, toggleResolve: handleToggleResolve })) : (React.createElement(OrphanCommentActions, { isReply: isReply, isOwn: isOwn, onDelete: handleDelete }))),
|
|
104
104
|
comment.node.attrs.originalText && (React.createElement(CommentTarget, null, comment.node.attrs.originalText)),
|
|
105
105
|
React.createElement(CommentBody, { comment: comment, isEditing: editingCommentId === commentID, onSave: handleSave, onCancel: handleCancel }),
|
|
106
106
|
showDeleteConfirmation && (React.createElement(DeleteCommentConfirmation, { isReply: isReply, onCancel: cancelDelete, onConfirm: confirmDelete }))));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommentCard.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentCard.tsx"],"names":[],"mappings":"AAYA,OAAO,EACL,UAAU,EACV,YAAY,EACZ,oBAAoB,GACrB,MAAM,0BAA0B,CAAA;AACjC,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AACvC,OAAO,MAAM,MAAM,mBAAmB,CAAA;AAEtC,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AACvD,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AACjE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,EACL,eAAe,EACf,UAAU,EACV,UAAU,EACV,YAAY,GACb,MAAM,oDAAoD,CAAA;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"CommentCard.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentCard.tsx"],"names":[],"mappings":"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"}
|
|
@@ -36,7 +36,7 @@ const Indented = styled.div `
|
|
|
36
36
|
padding-left: 16px;
|
|
37
37
|
`;
|
|
38
38
|
export const CommentThread = forwardRef((props, ref) => {
|
|
39
|
-
const { thread, isSelected, onSelect, onSave, onDelete, insertCommentReply, } = props;
|
|
39
|
+
const { thread, isSelected, onSelect, onSave, onDelete, insertCommentReply, isOrphanComment, } = props;
|
|
40
40
|
const can = usePermissions();
|
|
41
41
|
const { comment, isNew, replies } = thread;
|
|
42
42
|
const cardsRef = useRef(null);
|
|
@@ -60,19 +60,22 @@ export const CommentThread = forwardRef((props, ref) => {
|
|
|
60
60
|
};
|
|
61
61
|
return (React.createElement(Container, { "data-cy": "comment", isSelected: isSelected, ref: ref, onClick: handleSelect },
|
|
62
62
|
React.createElement(CardsWrapper, { ref: cardsRef, isSelected: isSelected, showMore: showMore },
|
|
63
|
-
React.createElement(CommentCard, { comment: comment, isReply: false, numOfReplies: replies.length, isNew: isNew, isEndOfThread: !replies.length, editingCommentId: editingCommentId, setEditingCommentId: setEditingCommentId, onDelete: onDelete, onSave: onSave }),
|
|
63
|
+
React.createElement(CommentCard, { comment: comment, isReply: false, numOfReplies: replies.length, isNew: isNew, isEndOfThread: !replies.length, isOrphanComment: isOrphanComment || false, editingCommentId: editingCommentId, setEditingCommentId: setEditingCommentId, onDelete: onDelete, onSave: onSave }),
|
|
64
64
|
replies.sort(commentsByTime).map((reply, index) => {
|
|
65
65
|
return (React.createElement("div", { key: reply.node.attrs.id },
|
|
66
66
|
index === 0 && React.createElement(SeparatorLine, null),
|
|
67
67
|
React.createElement(Indented, null,
|
|
68
68
|
index !== 0 && React.createElement(SeparatorLine, null),
|
|
69
|
-
React.createElement(CommentCard, { comment: reply, isReply: true, numOfReplies: 0, isNew: false, isEndOfThread: index === replies.length - 1, editingCommentId: editingCommentId, setEditingCommentId: setEditingCommentId, onDelete: onDelete, onSave: onSave }))));
|
|
69
|
+
React.createElement(CommentCard, { comment: reply, isReply: true, numOfReplies: 0, isNew: false, isEndOfThread: index === replies.length - 1, isOrphanComment: isOrphanComment || false, editingCommentId: editingCommentId, setEditingCommentId: setEditingCommentId, onDelete: onDelete, onSave: onSave }))));
|
|
70
70
|
})),
|
|
71
71
|
showMore && !isSelected && (React.createElement(React.Fragment, null,
|
|
72
72
|
React.createElement(SeparatorLine, null),
|
|
73
73
|
React.createElement(ButtonContainer, null,
|
|
74
74
|
React.createElement(ShowMore, { onClick: onSelect }, "Show more")))),
|
|
75
|
-
can.createComment &&
|
|
75
|
+
can.createComment &&
|
|
76
|
+
isSelected &&
|
|
77
|
+
editingCommentId === null &&
|
|
78
|
+
!isOrphanComment && (React.createElement(ReplyBox, { insertCommentReply: insertCommentReply, commentID: comment.node.attrs.id }))));
|
|
76
79
|
});
|
|
77
80
|
const ButtonContainer = styled.div `
|
|
78
81
|
display: flex;
|
|
@@ -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,EAAE,MAAM,wBAAwB,CAAA;AACvD,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;
|
|
1
|
+
{"version":3,"file":"CommentThread.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentThread.tsx"],"names":[],"mappings":"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"}
|
|
@@ -11,17 +11,25 @@
|
|
|
11
11
|
*/
|
|
12
12
|
import { commentsKey, isNodeComment, setCommentSelection, } from '@manuscripts/body-editor';
|
|
13
13
|
import { buildContribution } from '@manuscripts/json-schema';
|
|
14
|
-
import { CheckboxField, CheckboxLabel } from '@manuscripts/style-guide';
|
|
14
|
+
import { CheckboxField, CheckboxLabel, ToggleHeader, } from '@manuscripts/style-guide';
|
|
15
15
|
import { skipTracking } from '@manuscripts/track-changes-plugin';
|
|
16
16
|
import { generateNodeID, schema } from '@manuscripts/transform';
|
|
17
17
|
import { NodeSelection, TextSelection } from 'prosemirror-state';
|
|
18
18
|
import { findChildrenByType } from 'prosemirror-utils';
|
|
19
19
|
import React, { useCallback, useMemo, useState } from 'react';
|
|
20
20
|
import styled from 'styled-components';
|
|
21
|
-
import { buildThreads } from '../../lib/comments';
|
|
21
|
+
import { buildThreads, getOrphanComments } from '../../lib/comments';
|
|
22
22
|
import { useStore } from '../../store';
|
|
23
23
|
import { CommentsPlaceholder } from './CommentsPlaceholder';
|
|
24
24
|
import { CommentThread } from './CommentThread';
|
|
25
|
+
const Container = styled.div `
|
|
26
|
+
display: flex;
|
|
27
|
+
flex-direction: column;
|
|
28
|
+
height: 100%;
|
|
29
|
+
`;
|
|
30
|
+
const CommentsList = styled.div `
|
|
31
|
+
overflow-y: auto;
|
|
32
|
+
`;
|
|
25
33
|
const Header = styled.div `
|
|
26
34
|
display: flex;
|
|
27
35
|
justify-content: flex-end;
|
|
@@ -29,6 +37,7 @@ const Header = styled.div `
|
|
|
29
37
|
`;
|
|
30
38
|
const CheckboxLabelText = styled.div `
|
|
31
39
|
color: ${(props) => props.theme.colors.text.primary} !important;
|
|
40
|
+
margin: 0 !important;
|
|
32
41
|
`;
|
|
33
42
|
const scrollIntoView = (element) => {
|
|
34
43
|
const rect = element.getBoundingClientRect();
|
|
@@ -45,9 +54,14 @@ export const CommentsPanel = () => {
|
|
|
45
54
|
user: state.user,
|
|
46
55
|
}));
|
|
47
56
|
const [showResolved, setShowResolved] = useState(true);
|
|
57
|
+
const [openTab, toggleTab] = useState('active');
|
|
58
|
+
const toggleCommentsTab = () => toggleTab(openTab === 'active' ? 'orphan' : 'active');
|
|
48
59
|
const comments = useMemo(() => view?.state ? commentsKey.getState(view.state)?.comments : undefined, [view?.state, doc] // eslint-disable-line react-hooks/exhaustive-deps
|
|
49
60
|
);
|
|
61
|
+
const orphanComments = useMemo(() => view?.state && getOrphanComments(view.state), [view?.state] // eslint-disable-line react-hooks/exhaustive-deps
|
|
62
|
+
);
|
|
50
63
|
const threads = useMemo(() => (comments ? buildThreads([...comments.values()], newCommentID) : []), [comments, newCommentID]);
|
|
64
|
+
const orphanThreads = useMemo(() => (orphanComments ? buildThreads([...orphanComments.values()]) : []), [orphanComments]);
|
|
51
65
|
const selectedRef = useCallback((e) => {
|
|
52
66
|
if (e) {
|
|
53
67
|
scrollIntoView(e);
|
|
@@ -112,12 +126,16 @@ export const CommentsPanel = () => {
|
|
|
112
126
|
});
|
|
113
127
|
};
|
|
114
128
|
const handleDelete = (id) => {
|
|
115
|
-
const comment = comments?.get(id);
|
|
129
|
+
const comment = comments?.get(id) || orphanComments?.get(id);
|
|
116
130
|
if (!comment || !view) {
|
|
117
131
|
return;
|
|
118
132
|
}
|
|
119
133
|
const tr = view.state.tr;
|
|
120
134
|
tr.delete(comment.pos, comment.pos + comment.node.nodeSize);
|
|
135
|
+
if (orphanComments?.get(id)) {
|
|
136
|
+
const thread = orphanThreads.find(({ comment }) => comment.node.attrs.id === id);
|
|
137
|
+
thread?.replies.map((reply) => tr.delete(reply.pos, reply.pos + reply.node.nodeSize));
|
|
138
|
+
}
|
|
121
139
|
deleteHighlightMarkers(id, tr);
|
|
122
140
|
view.dispatch(skipTracking(tr));
|
|
123
141
|
};
|
|
@@ -127,16 +145,22 @@ export const CommentsPanel = () => {
|
|
|
127
145
|
if (!view) {
|
|
128
146
|
return null;
|
|
129
147
|
}
|
|
130
|
-
if (!threads.length) {
|
|
148
|
+
if (!threads.length && !orphanThreads.length) {
|
|
131
149
|
return React.createElement(CommentsPlaceholder, null);
|
|
132
150
|
}
|
|
133
|
-
return (React.createElement(
|
|
134
|
-
React.createElement(
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
React.createElement(
|
|
138
|
-
|
|
151
|
+
return (React.createElement(Container, null,
|
|
152
|
+
React.createElement(ToggleHeader, { title: `Active comments (${threads.length})`, isOpen: openTab === 'active', onToggle: toggleCommentsTab }),
|
|
153
|
+
openTab === 'active' && (React.createElement(CommentsList, { "data-cy": "active-comments" },
|
|
154
|
+
!!threads.length && (React.createElement(Header, null,
|
|
155
|
+
React.createElement(CheckboxLabel, null,
|
|
156
|
+
React.createElement(CheckboxField, { name: 'show-resolved', checked: showResolved, onChange: (e) => setShowResolved(e.target.checked) }),
|
|
157
|
+
React.createElement(CheckboxLabelText, null, "See resolved")))),
|
|
158
|
+
threads
|
|
159
|
+
.filter((c) => showResolved || !c.comment.node.attrs.resolved)
|
|
160
|
+
.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 }))))),
|
|
161
|
+
React.createElement(ToggleHeader, { title: `Orphaned Comments (${orphanThreads.length})`, isOpen: openTab === 'orphan', onToggle: toggleCommentsTab }),
|
|
162
|
+
openTab === 'orphan' && (React.createElement(CommentsList, { "data-cy": "orphan-comments" }, orphanThreads
|
|
139
163
|
.filter((c) => showResolved || !c.comment.node.attrs.resolved)
|
|
140
|
-
.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:
|
|
164
|
+
.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: false, isOrphanComment: true, onSelect: () => '', onSave: handleSave, onDelete: handleDelete, insertCommentReply: insertCommentReply })))))));
|
|
141
165
|
};
|
|
142
166
|
//# sourceMappingURL=CommentsPanel.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommentsPanel.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentsPanel.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,EAGL,WAAW,EAGX,aAAa,EACb,mBAAmB,GACpB,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,
|
|
1
|
+
{"version":3,"file":"CommentsPanel.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentsPanel.tsx"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,7 @@ import { useStore } from '../../store';
|
|
|
18
18
|
import { CommentsPanel } from '../comments/CommentsPanel';
|
|
19
19
|
import DocumentOptionsDropdown from '../DocumentOptionsDropdown';
|
|
20
20
|
import { FileManager } from '../FileManager/FileManager';
|
|
21
|
-
import { ErrorBadge, IconWrapper, InspectorContainer, InspectorTabPanel,
|
|
21
|
+
import { ErrorBadge, IconWrapper, InspectorContainer, InspectorTabPanel, InspectorTabPanels, InspectorTabs, PrimaryTabList, Spacer, WarningBadge, } from '../Inspector';
|
|
22
22
|
import { InspectorTab } from '../inspector/InspectorTab';
|
|
23
23
|
import { IssuesPanel } from '../inspector/IssuesPanel';
|
|
24
24
|
import { SnapshotsList } from '../inspector/SnapshotsList';
|
|
@@ -103,7 +103,7 @@ const Inspector = () => {
|
|
|
103
103
|
pluginTab && (React.createElement(InspectorTab, { cy: "plugin-button", icon: React.createElement(IconWrapper, null, pluginTab.icon), isVisible: tabIndex === PLUGIN_TAB }, pluginTab.title)),
|
|
104
104
|
React.createElement(Spacer, null),
|
|
105
105
|
React.createElement(DocumentOptionsDropdown, null)),
|
|
106
|
-
React.createElement(
|
|
106
|
+
React.createElement(InspectorTabPanels, null,
|
|
107
107
|
React.createElement(InspectorTabPanel, { key: "Comments", "data-cy": "comments" }, tabIndex === COMMENTS_TAB_INDEX && (React.createElement(CommentsPanel, { key: "comments" }))),
|
|
108
108
|
!can.editWithoutTracking && (React.createElement(InspectorTabPanel, { key: "History", "data-cy": "history" }, tabIndex === HISTORY_TAB_INDEX && (React.createElement(TrackChangesPanel, { key: "track-changes" })))),
|
|
109
109
|
React.createElement(InspectorTabPanel, { key: "Files", "data-cy": "files" }, tabIndex === FILES_TAB_INDEX && React.createElement(FileManager, { key: "files" })),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Inspector.js","sourceRoot":"","sources":["../../../../src/components/projects/Inspector.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAA;AACvE,OAAO,EACL,QAAQ,EACR,QAAQ,EACR,UAAU,EACV,cAAc,GACf,MAAM,0BAA0B,CAAA;AACjC,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAElD,OAAO,EACL,cAAc,EACd,6BAA6B,GAC9B,MAAM,wCAAwC,CAAA;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACzD,OAAO,uBAAuB,MAAM,4BAA4B,CAAA;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,EACL,UAAU,EACV,WAAW,EACX,kBAAkB,EAClB,iBAAiB,EACjB,aAAa,EACb,
|
|
1
|
+
{"version":3,"file":"Inspector.js","sourceRoot":"","sources":["../../../../src/components/projects/Inspector.tsx"],"names":[],"mappings":"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"}
|
package/dist/es/lib/comments.js
CHANGED
|
@@ -9,7 +9,9 @@
|
|
|
9
9
|
*
|
|
10
10
|
* All portions of the code written by Atypon Systems LLC are Copyright (c) 2024 Atypon Systems LLC. All Rights Reserved.
|
|
11
11
|
*/
|
|
12
|
-
import { isReply } from '@manuscripts/body-editor';
|
|
12
|
+
import { commentsKey, isReply } from '@manuscripts/body-editor';
|
|
13
|
+
import { schema } from '@manuscripts/transform';
|
|
14
|
+
import { findChildrenByType, flatten } from 'prosemirror-utils';
|
|
13
15
|
export const getAuthorID = (comment) => {
|
|
14
16
|
const contributions = comment.node.attrs.contributions;
|
|
15
17
|
if (!contributions?.length) {
|
|
@@ -27,6 +29,25 @@ export const buildThreads = (comments, newCommentID) => {
|
|
|
27
29
|
),
|
|
28
30
|
}));
|
|
29
31
|
};
|
|
32
|
+
/**
|
|
33
|
+
* will filter out orphan comments with their reply nodes using comments plugin
|
|
34
|
+
* as a reference to decide if the comment is an orphan or not, as that plugin
|
|
35
|
+
* includes only comments that have a target id associated with a node
|
|
36
|
+
*/
|
|
37
|
+
export const getOrphanComments = (state) => {
|
|
38
|
+
const comments = (state && commentsKey.getState(state)?.comments) || undefined;
|
|
39
|
+
if (!comments) {
|
|
40
|
+
return undefined;
|
|
41
|
+
}
|
|
42
|
+
const commentsNode = findChildrenByType(state.doc, schema.nodes.comments)[0];
|
|
43
|
+
const allComments = flatten(commentsNode.node);
|
|
44
|
+
const orphanComments = allComments.filter(({ node }) => !comments?.has(node.attrs.id));
|
|
45
|
+
const orphanCommentsReplays = allComments.filter(({ node }) => isReply({ node }) &&
|
|
46
|
+
orphanComments.find((orphan) => orphan.node.attrs.id === node.attrs.target));
|
|
47
|
+
return new Map([...orphanComments.values(), ...orphanCommentsReplays]
|
|
48
|
+
.map(({ node, pos }) => ({ node, pos: commentsNode.pos + pos + 1 }))
|
|
49
|
+
.map((comment) => [comment.node.attrs.id, comment]));
|
|
50
|
+
};
|
|
30
51
|
export const buildAuthorName = (user) => {
|
|
31
52
|
if (!user) {
|
|
32
53
|
return '';
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"comments.js","sourceRoot":"","sources":["../../../src/lib/comments.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,6 @@ export declare const InspectorTabs: import("styled-components").StyledComponent<
|
|
|
14
14
|
export declare const InspectorTabList: import("styled-components").StyledComponent<import("@headlessui/react")._internal_ComponentTabList, import("styled-components").DefaultTheme, {}, never>;
|
|
15
15
|
export declare const PrimaryTabList: import("styled-components").StyledComponent<import("@headlessui/react")._internal_ComponentTabList, import("styled-components").DefaultTheme, {}, never>;
|
|
16
16
|
export declare const InspectorTabPanels: import("styled-components").StyledComponent<import("@headlessui/react")._internal_ComponentTabPanels, import("styled-components").DefaultTheme, {}, never>;
|
|
17
|
-
export declare const PaddedInspectorTabPanels: import("styled-components").StyledComponent<import("@headlessui/react")._internal_ComponentTabPanels, import("styled-components").DefaultTheme, {}, never>;
|
|
18
17
|
export declare const InspectorTabPanel: import("styled-components").StyledComponent<import("@headlessui/react")._internal_ComponentTabPanel, import("styled-components").DefaultTheme, {}, never>;
|
|
19
18
|
export declare const PrimaryInspectorTab: import("styled-components").StyledComponent<import("@headlessui/react")._internal_ComponentTab & {
|
|
20
19
|
Group: import("@headlessui/react")._internal_ComponentTabGroup;
|
|
@@ -22,3 +22,8 @@ export interface CommentActionsProps {
|
|
|
22
22
|
toggleResolve: () => void;
|
|
23
23
|
}
|
|
24
24
|
export declare const CommentActions: React.FC<CommentActionsProps>;
|
|
25
|
+
export declare const OrphanCommentActions: React.FC<{
|
|
26
|
+
onDelete: () => void;
|
|
27
|
+
isReply: boolean;
|
|
28
|
+
isOwn: boolean;
|
|
29
|
+
}>;
|
|
@@ -17,6 +17,7 @@ interface CommentCardProps {
|
|
|
17
17
|
numOfReplies: number;
|
|
18
18
|
isNew: boolean;
|
|
19
19
|
isEndOfThread: boolean;
|
|
20
|
+
isOrphanComment: boolean | false;
|
|
20
21
|
editingCommentId: string | null;
|
|
21
22
|
setEditingCommentId: (id: string | null) => void;
|
|
22
23
|
onSave: (comment: CommentAttrs) => void;
|
|
@@ -19,5 +19,6 @@ export interface CommentThreadProps {
|
|
|
19
19
|
onSave: (comment: CommentAttrs) => void;
|
|
20
20
|
onDelete: (id: string) => void;
|
|
21
21
|
insertCommentReply: (target: string, contents: string) => void;
|
|
22
|
+
isOrphanComment?: boolean;
|
|
22
23
|
}
|
|
23
24
|
export declare const CommentThread: React.ForwardRefExoticComponent<CommentThreadProps & React.RefAttributes<HTMLDivElement>>;
|
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
*/
|
|
12
12
|
import { Comment } from '@manuscripts/body-editor';
|
|
13
13
|
import { UserProfile } from '@manuscripts/json-schema';
|
|
14
|
+
import { EditorState } from 'prosemirror-state';
|
|
14
15
|
export type Thread = {
|
|
15
16
|
comment: Comment;
|
|
16
17
|
isNew: boolean;
|
|
@@ -18,5 +19,11 @@ export type Thread = {
|
|
|
18
19
|
};
|
|
19
20
|
export declare const getAuthorID: (comment: Comment) => string | undefined;
|
|
20
21
|
export declare const buildThreads: (comments: Comment[], newCommentID?: string) => Thread[];
|
|
22
|
+
/**
|
|
23
|
+
* will filter out orphan comments with their reply nodes using comments plugin
|
|
24
|
+
* as a reference to decide if the comment is an orphan or not, as that plugin
|
|
25
|
+
* includes only comments that have a target id associated with a node
|
|
26
|
+
*/
|
|
27
|
+
export declare const getOrphanComments: (state: EditorState) => Map<string, Comment> | undefined;
|
|
21
28
|
export declare const buildAuthorName: (user: UserProfile | undefined) => string;
|
|
22
29
|
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": "4.6.
|
|
3
|
+
"version": "4.6.18",
|
|
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",
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
"@fontsource/pt-sans": "5.2.5",
|
|
33
33
|
"@fontsource/pt-serif": "5.2.5",
|
|
34
34
|
"@headlessui/react": "2.2.3",
|
|
35
|
-
"@manuscripts/body-editor": "3.6.
|
|
35
|
+
"@manuscripts/body-editor": "3.6.19",
|
|
36
36
|
"@manuscripts/json-schema": "2.2.12",
|
|
37
37
|
"@manuscripts/style-guide": "3.3.5",
|
|
38
38
|
"@manuscripts/track-changes-plugin": "2.1.0",
|