@manuscripts/article-editor 1.14.9-LEAN-3591.1 → 1.14.9
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/Panel.js +14 -4
- package/dist/cjs/components/Panel.js.map +1 -1
- package/dist/cjs/components/projects/CommentList.js +58 -65
- package/dist/cjs/components/projects/CommentList.js.map +1 -1
- package/dist/cjs/components/projects/CommentsTab.js +1 -1
- package/dist/cjs/components/projects/CommentsTab.js.map +1 -1
- package/dist/cjs/components/projects/HighlightedText.js +31 -2
- package/dist/cjs/components/projects/HighlightedText.js.map +1 -1
- package/dist/cjs/components/projects/Inspector.js +3 -2
- package/dist/cjs/components/projects/Inspector.js.map +1 -1
- package/dist/cjs/components/projects/ManuscriptPageContainer.js +3 -12
- package/dist/cjs/components/projects/ManuscriptPageContainer.js.map +1 -1
- package/dist/cjs/hooks/use-comment-manager.js +54 -17
- package/dist/cjs/hooks/use-comment-manager.js.map +1 -1
- package/dist/cjs/hooks/use-create-editor.js +13 -1
- package/dist/cjs/hooks/use-create-editor.js.map +1 -1
- package/dist/cjs/store/DataSourceStrategy.js +1 -0
- package/dist/cjs/store/DataSourceStrategy.js.map +1 -1
- package/dist/cjs/store/Store.js.map +1 -1
- package/dist/cjs/tracked-models/creators.js +0 -3
- package/dist/cjs/tracked-models/creators.js.map +1 -1
- package/dist/es/components/Panel.js +14 -4
- package/dist/es/components/Panel.js.map +1 -1
- package/dist/es/components/projects/CommentList.js +50 -57
- package/dist/es/components/projects/CommentList.js.map +1 -1
- package/dist/es/components/projects/CommentsTab.js +1 -1
- package/dist/es/components/projects/CommentsTab.js.map +1 -1
- package/dist/es/components/projects/HighlightedText.js +8 -2
- package/dist/es/components/projects/HighlightedText.js.map +1 -1
- package/dist/es/components/projects/Inspector.js +3 -2
- package/dist/es/components/projects/Inspector.js.map +1 -1
- package/dist/es/components/projects/ManuscriptPageContainer.js +4 -13
- package/dist/es/components/projects/ManuscriptPageContainer.js.map +1 -1
- package/dist/es/hooks/use-comment-manager.js +55 -18
- package/dist/es/hooks/use-comment-manager.js.map +1 -1
- package/dist/es/hooks/use-create-editor.js +13 -1
- package/dist/es/hooks/use-create-editor.js.map +1 -1
- package/dist/es/store/DataSourceStrategy.js +1 -0
- package/dist/es/store/DataSourceStrategy.js.map +1 -1
- package/dist/es/store/Store.js.map +1 -1
- package/dist/es/tracked-models/creators.js +0 -3
- package/dist/es/tracked-models/creators.js.map +1 -1
- package/dist/types/components/projects/CommentList.d.ts +6 -12
- package/dist/types/hooks/use-comment-manager.d.ts +9 -5
- package/dist/types/store/Store.d.ts +2 -4
- package/package.json +7 -7
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-create-editor.js","sourceRoot":"","sources":["../../../src/hooks/use-create-editor.ts"],"names":[],"mappings":";;;;;;AAAA;;;;;;;;;;GAUG;AACH,0DAAoD;
|
|
1
|
+
{"version":3,"file":"use-create-editor.js","sourceRoot":"","sources":["../../../src/hooks/use-create-editor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataSourceStrategy.js","sourceRoot":"","sources":["../../../src/store/DataSourceStrategy.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;AAgBH,MAAa,WAAW;IAEtB,YACE,cAA8B,EAC9B,SAAiB,EACjB,YAAoB,EACpB,KAAuB,EACvB,gBAA0B,EAC1B,MAA2B,EAC3B,SAA8B;
|
|
1
|
+
{"version":3,"file":"DataSourceStrategy.js","sourceRoot":"","sources":["../../../src/store/DataSourceStrategy.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;AAgBH,MAAa,WAAW;IAEtB,YACE,cAA8B,EAC9B,SAAiB,EACjB,YAAoB,EACpB,KAAuB,EACvB,gBAA0B,EAC1B,MAA2B,EAC3B,SAA8B;QAchC,UAAK,GAAc,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;YACjC,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;QACxB,CAAC,CAAA;QAdC,IAAI,CAAC,IAAI,GAAG;YACV,cAAc;YACd,SAAS;YACT,YAAY;YACZ,KAAK;YACL,gBAAgB;YAChB,MAAM;YACN,SAAS;YACT,WAAW,EAAE,IAAI,GAAG,EAAE;SACvB,CAAA;IACH,CAAC;CAKF;AA1BD,kCA0BC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Store.js","sourceRoot":"","sources":["../../../src/store/Store.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;AAqBH,wBAAkE;
|
|
1
|
+
{"version":3,"file":"Store.js","sourceRoot":"","sources":["../../../src/store/Store.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,6 @@
|
|
|
12
12
|
*/
|
|
13
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
14
|
exports.deleteSupplementNode = exports.createSupplementNode = exports.deleteComment = exports.saveComment = exports.createAffiliationNode = exports.createContributorNode = void 0;
|
|
15
|
-
const body_editor_1 = require("@manuscripts/body-editor");
|
|
16
15
|
const track_changes_plugin_1 = require("@manuscripts/track-changes-plugin");
|
|
17
16
|
const transform_1 = require("@manuscripts/transform");
|
|
18
17
|
const createContributorNode = (model, view, doc, state) => {
|
|
@@ -87,7 +86,6 @@ const saveComment = (comment, view, doc, state, modelMap) => {
|
|
|
87
86
|
}
|
|
88
87
|
}
|
|
89
88
|
});
|
|
90
|
-
(0, body_editor_1.clearCommentSelection)(tr);
|
|
91
89
|
view.dispatch(tr);
|
|
92
90
|
return Promise.resolve(comment);
|
|
93
91
|
};
|
|
@@ -109,7 +107,6 @@ const deleteComment = (comment, view, doc, state) => {
|
|
|
109
107
|
if (node.attrs.id === comment._id && node.type === transform_1.schema.nodes.comment) {
|
|
110
108
|
tr.delete(pos, pos + node.nodeSize);
|
|
111
109
|
tr.setMeta('track-changes-skip-tracking', true);
|
|
112
|
-
(0, body_editor_1.clearCommentSelection)(tr);
|
|
113
110
|
view.dispatch(tr);
|
|
114
111
|
return false;
|
|
115
112
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"creators.js","sourceRoot":"","sources":["../../../src/tracked-models/creators.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;
|
|
1
|
+
{"version":3,"file":"creators.js","sourceRoot":"","sources":["../../../src/tracked-models/creators.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,17 +29,21 @@ const Panel = (props) => {
|
|
|
29
29
|
});
|
|
30
30
|
const hideWhenQuery = useRef();
|
|
31
31
|
const firstRender = useRef(true);
|
|
32
|
-
const [
|
|
33
|
-
|
|
32
|
+
const [store, dispatch] = useStore((store) => ({
|
|
33
|
+
selectedComment: store.selectedComment,
|
|
34
34
|
selectedSuggestionID: store.selectedSuggestionID,
|
|
35
|
+
isThereNewComments: store.newComments,
|
|
35
36
|
}));
|
|
37
|
+
const newComment = store.isThereNewComments;
|
|
38
|
+
const selectedSuggestion = store.selectedSuggestionID;
|
|
39
|
+
const selectedComment = store.selectedComment || newComment.size > 0;
|
|
36
40
|
useEffect(() => {
|
|
37
41
|
const { name } = props;
|
|
38
42
|
if (name === 'inspector' && !firstRender.current) {
|
|
39
43
|
const data = layout.get(name);
|
|
40
44
|
//we should not close the inspector automatically when
|
|
41
45
|
//things are deselected
|
|
42
|
-
if (data.collapsed && (
|
|
46
|
+
if (data.collapsed && (selectedComment || selectedSuggestion)) {
|
|
43
47
|
updateState(layout.set(name, {
|
|
44
48
|
...data,
|
|
45
49
|
collapsed: false,
|
|
@@ -47,7 +51,7 @@ const Panel = (props) => {
|
|
|
47
51
|
}
|
|
48
52
|
}
|
|
49
53
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
50
|
-
}, [
|
|
54
|
+
}, [selectedComment, selectedSuggestion]);
|
|
51
55
|
useEffect(() => {
|
|
52
56
|
if (props.hideWhen) {
|
|
53
57
|
hideWhenQuery.current = window.matchMedia(`screen and (${props.hideWhen})`);
|
|
@@ -78,6 +82,12 @@ const Panel = (props) => {
|
|
|
78
82
|
size: collapsed ? 0 : size,
|
|
79
83
|
collapsed,
|
|
80
84
|
}));
|
|
85
|
+
if (data.collapsed === true) {
|
|
86
|
+
dispatch({
|
|
87
|
+
selectedComment: undefined,
|
|
88
|
+
isThereNewComments: newComment.clear(),
|
|
89
|
+
});
|
|
90
|
+
}
|
|
81
91
|
}
|
|
82
92
|
function buildStyle(direction, size) {
|
|
83
93
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Panel.js","sourceRoot":"","sources":["../../../src/components/Panel.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EACL,OAAO,EAGP,eAAe,GAChB,MAAM,0BAA0B,CAAA;AACjC,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAC1D,OAAO,MAAM,MAAM,mBAAmB,CAAA;AAEtC,OAAO,MAAgB,MAAM,eAAe,CAAA;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAMnC,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,eAAe,CAAC,CAAyB;;;aAGhE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC;;CAEhD,CAAA;AA6BD,MAAM,KAAK,GAAyB,CAAC,KAAK,EAAE,EAAE;IAC5C,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAa;QAC7C,YAAY,EAAE,IAAI;QAClB,IAAI,EAAE,IAAI;QACV,SAAS,EAAE,KAAK;QAChB,MAAM,EAAE,KAAK;KACd,CAAC,CAAA;IAEF,MAAM,aAAa,GAAG,MAAM,EAAkB,CAAA;IAC9C,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,CAAA;IAChC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"Panel.js","sourceRoot":"","sources":["../../../src/components/Panel.tsx"],"names":[],"mappings":"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"}
|
|
@@ -9,26 +9,18 @@
|
|
|
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 {
|
|
12
|
+
import { commentScroll, isHighlightComment, isThereSelector, } from '@manuscripts/body-editor';
|
|
13
13
|
import { CommentTarget, CommentWrapper, NoteBodyContainer, ReplyBodyContainer, usePermissions, } from '@manuscripts/style-guide';
|
|
14
14
|
import { buildKeyword } from '@manuscripts/transform';
|
|
15
|
-
import {
|
|
16
|
-
import React, { useCallback, useState } from 'react';
|
|
15
|
+
import { TextSelection } from 'prosemirror-state';
|
|
16
|
+
import React, { useCallback, useEffect, useState } from 'react';
|
|
17
17
|
import styled from 'styled-components';
|
|
18
18
|
import { default as useCommentOperation, useCommentLabel, } from '../../hooks/use-comment-manager';
|
|
19
19
|
import { useStore } from '../../store';
|
|
20
20
|
import * as Pattern from './CommentListPatterns';
|
|
21
21
|
import { HighlightedText } from './HighlightedText';
|
|
22
|
-
const
|
|
23
|
-
const
|
|
24
|
-
if (rect.bottom > window.innerHeight || rect.top < 150) {
|
|
25
|
-
element.scrollIntoView();
|
|
26
|
-
}
|
|
27
|
-
};
|
|
28
|
-
export const CommentList = () => {
|
|
29
|
-
const [{ editor, selectedCommentKey, newCommentID, user, collaborators, collaboratorsById, keywords, saveTrackModel, },] = useStore((store) => ({
|
|
30
|
-
editor: store.editor,
|
|
31
|
-
selectedCommentKey: store.selectedCommentKey,
|
|
22
|
+
export const CommentList = ({ editor }) => {
|
|
23
|
+
const [{ newComments, user, collaborators, collaboratorsById, keywords, saveTrackModel, },] = useStore((store) => ({
|
|
32
24
|
user: store.user,
|
|
33
25
|
collaborators: store.collaborators || new Map(),
|
|
34
26
|
collaboratorsById: store.collaboratorsById,
|
|
@@ -36,55 +28,54 @@ export const CommentList = () => {
|
|
|
36
28
|
keywords: new Map(),
|
|
37
29
|
manuscriptID: store.manuscriptID,
|
|
38
30
|
saveTrackModel: store.saveTrackModel,
|
|
39
|
-
|
|
31
|
+
newComments: store.newComments,
|
|
40
32
|
}));
|
|
41
33
|
const { state, view } = editor;
|
|
42
|
-
const selectedRef = useCallback((n) => {
|
|
43
|
-
if (n !== null) {
|
|
44
|
-
scrollIntoView(n);
|
|
45
|
-
}
|
|
46
|
-
}, []);
|
|
47
|
-
const getComment = (id) => {
|
|
48
|
-
if (!id) {
|
|
49
|
-
return;
|
|
50
|
-
}
|
|
51
|
-
const com = commentsKey.getState(state);
|
|
52
|
-
return com?.comments.get(id);
|
|
53
|
-
};
|
|
54
|
-
const setSelectedCommentID = (id) => {
|
|
55
|
-
const comment = getComment(id);
|
|
56
|
-
if (!comment || !view) {
|
|
57
|
-
return;
|
|
58
|
-
}
|
|
59
|
-
const tr = state.tr;
|
|
60
|
-
setCommentSelection(tr, comment.key, id, false);
|
|
61
|
-
if (isNodeComment(comment)) {
|
|
62
|
-
tr.setSelection(NodeSelection.create(state.doc, comment.target.pos));
|
|
63
|
-
}
|
|
64
|
-
else {
|
|
65
|
-
const range = comment.range;
|
|
66
|
-
const from = range.pos;
|
|
67
|
-
const to = from + range.size;
|
|
68
|
-
tr.setSelection(TextSelection.create(state.doc, from, to));
|
|
69
|
-
}
|
|
70
|
-
tr.scrollIntoView();
|
|
71
|
-
view.focus();
|
|
72
|
-
view.dispatch(tr);
|
|
73
|
-
};
|
|
74
34
|
const createKeyword = useCallback((name) => saveTrackModel(buildKeyword(name)), [saveTrackModel]);
|
|
75
35
|
const [commentFilter, setCommentFilter] = useState(Pattern.CommentFilter.ALL);
|
|
76
|
-
const
|
|
36
|
+
const [selectedHighlightId, setSelectedHighlightId] = useState();
|
|
37
|
+
const { comments, saveComment, setResolved, createReply, deleteComment } = useCommentOperation(view, setSelectedHighlightId);
|
|
77
38
|
const commentsLabels = useCommentLabel();
|
|
78
|
-
|
|
79
|
-
|
|
39
|
+
/**
|
|
40
|
+
* check if the selection pointing to a highlight node
|
|
41
|
+
*/
|
|
42
|
+
useEffect(() => {
|
|
43
|
+
const childCount = state.selection.$from.parent.content.childCount;
|
|
44
|
+
const nodeIndex = state.selection.$from.index();
|
|
45
|
+
if (state.selection instanceof TextSelection && childCount > nodeIndex) {
|
|
46
|
+
const nodeBeforePos = state.selection.$from.posAtIndex(nodeIndex - 1);
|
|
47
|
+
const nodeAfterPos = state.selection.$from.posAtIndex(nodeIndex + 1);
|
|
48
|
+
const nodeBeforeNode = state.doc.nodeAt(nodeBeforePos);
|
|
49
|
+
const nodeAfterNode = state.doc.nodeAt(nodeAfterPos);
|
|
50
|
+
if (nodeBeforeNode &&
|
|
51
|
+
nodeAfterNode &&
|
|
52
|
+
nodeBeforeNode.type === state.schema.nodes.highlight_marker &&
|
|
53
|
+
nodeAfterNode.type === state.schema.nodes.highlight_marker) {
|
|
54
|
+
setSelectedHighlightId(nodeAfterNode.attrs.id);
|
|
55
|
+
return;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
setSelectedHighlightId(undefined);
|
|
59
|
+
}, [state]);
|
|
60
|
+
useEffect(() => {
|
|
61
|
+
if (selectedHighlightId) {
|
|
62
|
+
commentScroll(selectedHighlightId, 'inspector', true);
|
|
63
|
+
}
|
|
64
|
+
}, [selectedHighlightId]);
|
|
65
|
+
const onFocusOut = useCallback((id, content) => {
|
|
66
|
+
if (id && newComments.has(id) && content.length < 1) {
|
|
80
67
|
deleteComment(id);
|
|
81
68
|
}
|
|
82
69
|
return true;
|
|
70
|
+
}, [deleteComment, newComments]);
|
|
71
|
+
const scrollIntoHighlight = (comment) => {
|
|
72
|
+
const commentId = isThereSelector(comment.selector)
|
|
73
|
+
? comment._id
|
|
74
|
+
: comment.target;
|
|
75
|
+
commentScroll(commentId, 'editor', isHighlightComment(comment));
|
|
76
|
+
setSelectedHighlightId(undefined);
|
|
83
77
|
};
|
|
84
|
-
const
|
|
85
|
-
const com = commentsKey.getState(state);
|
|
86
|
-
return selectedCommentKey === com?.comments.get(comment._id)?.key;
|
|
87
|
-
};
|
|
78
|
+
const isNew = (comment) => newComments.has(comment._id);
|
|
88
79
|
const can = usePermissions();
|
|
89
80
|
if (!comments.length) {
|
|
90
81
|
return React.createElement(Pattern.EmptyCommentsListPlaceholder, null);
|
|
@@ -97,11 +88,13 @@ export const CommentList = () => {
|
|
|
97
88
|
? commentData
|
|
98
89
|
: commentData.filter((note) => !note.comment.resolved);
|
|
99
90
|
return (React.createElement(CommentTarget, { key: target, isSelected: false }, selectedNoteData.map(({ comment, children }) => (React.createElement(Pattern.Thread, { key: comment._id },
|
|
100
|
-
React.createElement(NoteBodyContainer, { id:
|
|
101
|
-
|
|
102
|
-
|
|
91
|
+
React.createElement(NoteBodyContainer, { id: isThereSelector(comment.selector)
|
|
92
|
+
? comment._id
|
|
93
|
+
: comment.target, isSelected: false, isNew: isNew(comment) },
|
|
94
|
+
React.createElement(CommentWrapper, { comment: comment, createKeyword: createKeyword, deleteComment: deleteComment, getCollaborator: (id) => collaboratorsById?.get(id), getKeyword: (id) => keywords.get(id), listCollaborators: () => Array.from(collaborators.values()), listKeywords: () => [], saveComment: saveComment, scrollIntoHighlight: scrollIntoHighlight, onFocusOut: onFocusOut, handleCreateReply: createReply, can: can, currentUserId: user._id, handleSetResolved: () => setResolved(comment), isNew: isNew(comment) },
|
|
95
|
+
React.createElement(HighlightedText, { state: state, commentsLabels: commentsLabels, comment: comment, onClick: scrollIntoHighlight }))),
|
|
103
96
|
children.map((comment) => (React.createElement(ReplyBodyContainer, { key: comment._id },
|
|
104
|
-
React.createElement(CommentWrapper, { comment: comment, createKeyword: createKeyword, deleteComment: deleteComment, getCollaborator: (id) => collaboratorsById?.get(id), getKeyword: (key) => keywords.get(key), isReply: true, listCollaborators: () => Array.from(collaborators.values()), listKeywords: () => [], saveComment: saveComment, handleCreateReply: createReply, can: can, currentUserId: user._id, isNew: comment
|
|
97
|
+
React.createElement(CommentWrapper, { comment: comment, createKeyword: createKeyword, deleteComment: deleteComment, getCollaborator: (id) => collaboratorsById?.get(id), getKeyword: (key) => keywords.get(key), isReply: true, listCollaborators: () => Array.from(collaborators.values()), listKeywords: () => [], saveComment: saveComment, handleCreateReply: createReply, can: can, currentUserId: user._id, isNew: isNew(comment) })))))))));
|
|
105
98
|
}))));
|
|
106
99
|
};
|
|
107
100
|
const Container = styled(Pattern.Container) `
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommentList.js","sourceRoot":"","sources":["../../../../src/components/projects/CommentList.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;
|
|
1
|
+
{"version":3,"file":"CommentList.js","sourceRoot":"","sources":["../../../../src/components/projects/CommentList.tsx"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,7 @@ export const CommentsTab = ({ selected, editor }) => {
|
|
|
24
24
|
const can = usePermissions();
|
|
25
25
|
return (React.createElement(CommentsContainer, null,
|
|
26
26
|
config.features.commenting && (React.createElement(InspectorSection, { title: 'Comments', contentStyles: { margin: '0 25px 24px 0' } },
|
|
27
|
-
React.createElement(CommentList,
|
|
27
|
+
React.createElement(CommentList, { editor: editor }))),
|
|
28
28
|
config.features.productionNotes && (React.createElement(InspectorSection, { title: 'Notes', contentStyles: { margin: '0 25px 24px 0' } },
|
|
29
29
|
React.createElement(ManuscriptNoteList, { createKeyword: createKeyword, notes: notes || [], can: can, currentUserId: user?._id, getKeyword: getKeyword, listKeywords: listKeywords, selected: selected || null, getCollaboratorById: getCollaboratorById, listCollaborators: listCollaborators, saveModel: saveTrackModel, deleteModel: deleteModel, noteSource: 'EDITOR' })))));
|
|
30
30
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommentsTab.js","sourceRoot":"","sources":["../../../../src/components/projects/CommentsTab.tsx"],"names":[],"mappings":"AAYA,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EAClB,cAAc,GACf,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAAE,YAAY,EAAY,MAAM,wBAAwB,CAAA;AAE/D,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,MAAM,MAAM,mBAAmB,CAAA;AAEtC,OAAO,MAAM,MAAM,cAAc,CAAA;AAEjC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAE3C,MAAM,CAAC,MAAM,WAAW,GAGnB,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE;IAC5B,MAAM,CACJ,EACE,KAAK,EACL,IAAI,EACJ,aAAa,EACb,iBAAiB,EACjB,QAAQ,EACR,cAAc,EAAE,sFAAsF;IACtG,WAAW,GACZ,EACF,GAAG,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACvB,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,aAAa,EAAE,KAAK,CAAC,aAAa,IAAI,IAAI,GAAG,EAAE;QAC/C,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;QAC1C,QAAQ,EAAE,IAAI,GAAG,EAAE;QACnB,cAAc,EAAE,KAAK,CAAC,cAAc;QACpC,WAAW,EAAE,KAAK,CAAC,WAAW;KAC/B,CAAC,CAAC,CAAA;IACH,MAAM,aAAa,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,cAAc,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAA;IAE1E,MAAM,mBAAmB,GAAG,CAAC,EAAU,EAAE,EAAE,CACzC,iBAAiB,IAAI,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAEhD,MAAM,UAAU,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAEnD,MAAM,iBAAiB,GAAG,GAAkB,EAAE,CAC5C,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,CAAA;IAEpC,MAAM,YAAY,GAAG,GAAc,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAA;IAEnE,MAAM,GAAG,GAAG,cAAc,EAAE,CAAA;IAE5B,OAAO,CACL,oBAAC,iBAAiB;QACf,MAAM,CAAC,QAAQ,CAAC,UAAU,IAAI,CAC7B,oBAAC,gBAAgB,IACf,KAAK,EAAE,UAAU,EACjB,aAAa,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE;YAE1C,oBAAC,WAAW,
|
|
1
|
+
{"version":3,"file":"CommentsTab.js","sourceRoot":"","sources":["../../../../src/components/projects/CommentsTab.tsx"],"names":[],"mappings":"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"}
|
|
@@ -9,8 +9,9 @@
|
|
|
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 { getHighlightTarget, isHighlightComment, } from '@manuscripts/body-editor';
|
|
12
13
|
import { ObjectTypes } from '@manuscripts/json-schema';
|
|
13
|
-
import React from 'react';
|
|
14
|
+
import React, { useCallback } from 'react';
|
|
14
15
|
import styled from 'styled-components';
|
|
15
16
|
const Container = styled.div `
|
|
16
17
|
justify-content: space-between;
|
|
@@ -22,6 +23,10 @@ const Container = styled.div `
|
|
|
22
23
|
margin: 16px;
|
|
23
24
|
`;
|
|
24
25
|
export const HighlightedText = React.memo(({ comment, state, commentsLabels, onClick }) => {
|
|
26
|
+
const getHighlightTextColor = useCallback((comment) => !isHighlightComment(comment) ||
|
|
27
|
+
(state && getHighlightTarget(comment, state))
|
|
28
|
+
? '#ffe08b'
|
|
29
|
+
: '#f9020287', [state]);
|
|
25
30
|
const commentLabel = commentsLabels.has(comment.target)
|
|
26
31
|
? commentsLabels.get(comment.target)
|
|
27
32
|
: comment.originalText;
|
|
@@ -29,7 +34,8 @@ export const HighlightedText = React.memo(({ comment, state, commentsLabels, onC
|
|
|
29
34
|
return null;
|
|
30
35
|
}
|
|
31
36
|
return (React.createElement(Container, { style: {
|
|
32
|
-
|
|
37
|
+
// TODO: should change colour only if highlight markers are deleted?
|
|
38
|
+
backgroundColor: getHighlightTextColor(comment),
|
|
33
39
|
}, onClick: () => onClick && onClick(comment) }, commentLabel.split('\n').map((item, index) => {
|
|
34
40
|
return (React.createElement(Text, { isCitation: comment.target.includes(ObjectTypes.Citation), key: index }, item));
|
|
35
41
|
})));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HighlightedText.js","sourceRoot":"","sources":["../../../../src/components/projects/HighlightedText.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAqB,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAEzE,OAAO,KAAK,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"HighlightedText.js","sourceRoot":"","sources":["../../../../src/components/projects/HighlightedText.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EACL,kBAAkB,EAClB,kBAAkB,GACnB,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAAqB,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAEzE,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,MAAM,OAAO,CAAA;AAC1C,OAAO,MAAM,MAAM,mBAAmB,CAAA;AAEtC,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;;;;CAQ3B,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAKvB,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,EAAE,EAAE;IAC9D,MAAM,qBAAqB,GAAG,WAAW,CACvC,CAAC,OAA0B,EAAE,EAAE,CAC7B,CAAC,kBAAkB,CAAC,OAAO,CAAC;QAC5B,CAAC,KAAK,IAAI,kBAAkB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC3C,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,WAAW,EACjB,CAAC,KAAK,CAAC,CACR,CAAA;IAED,MAAM,YAAY,GAAG,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC;QACrD,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC;QACpC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAA;IAExB,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO,IAAI,CAAA;KACZ;IAED,OAAO,CACL,oBAAC,SAAS,IACR,KAAK,EAAE;YACL,oEAAoE;YACpE,eAAe,EAAE,qBAAqB,CAAC,OAAO,CAAC;SAChD,EACD,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,IAEzC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QAC5C,OAAO,CACL,oBAAC,IAAI,IACH,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,EACzD,GAAG,EAAE,KAAK,IAET,IAAI,CACA,CACR,CAAA;IACH,CAAC,CAAC,CACQ,CACb,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAyB;WACrC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ;CACzE,CAAA"}
|
|
@@ -27,11 +27,12 @@ const Inspector = ({ editor }) => {
|
|
|
27
27
|
trackModelMap: store.trackModelMap,
|
|
28
28
|
fileManagement: store.fileManagement,
|
|
29
29
|
files: store.files,
|
|
30
|
-
|
|
30
|
+
isThereNewComments: store.newComments.size,
|
|
31
|
+
selectedComment: store.selectedComment,
|
|
31
32
|
selectedSuggestionID: store.selectedSuggestionID,
|
|
32
33
|
}));
|
|
33
34
|
const { state, dispatch } = editor;
|
|
34
|
-
const comment = store.
|
|
35
|
+
const comment = store.isThereNewComments || store.selectedComment;
|
|
35
36
|
const suggestion = store.selectedSuggestionID;
|
|
36
37
|
const [tabIndex, setTabIndex] = useState(1);
|
|
37
38
|
const COMMENTS_TAB_INDEX = 1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Inspector.js","sourceRoot":"","sources":["../../../../src/components/projects/Inspector.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAA;AACpE,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AACtE,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE3D,OAAO,MAAM,MAAM,cAAc,CAAA;AAEjC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,EACL,kBAAkB,EAClB,YAAY,EACZ,gBAAgB,EAChB,iBAAiB,EACjB,aAAa,EACb,wBAAwB,GACzB,MAAM,cAAc,CAAA;AACrB,OAAO,KAAK,MAAM,UAAU,CAAA;AAC5B,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAA;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAA;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAKzC,MAAM,SAAS,GAAoB,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;IAChD,MAAM,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACnC,cAAc,EAAE,KAAK,CAAC,cAAc;QACpC,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;QACxC,aAAa,EAAE,KAAK,CAAC,aAAa;QAClC,cAAc,EAAE,KAAK,CAAC,cAAc;QACpC,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,kBAAkB,EAAE,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"Inspector.js","sourceRoot":"","sources":["../../../../src/components/projects/Inspector.tsx"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ import '@manuscripts/body-editor/styles/Editor.css';
|
|
|
13
13
|
import '@manuscripts/body-editor/styles/AdvancedEditor.css';
|
|
14
14
|
import '@manuscripts/body-editor/styles/popper.css';
|
|
15
15
|
import '@reach/tabs/styles.css';
|
|
16
|
-
import {
|
|
16
|
+
import { selectedSuggestionKey } from '@manuscripts/body-editor';
|
|
17
17
|
import { CapabilitiesProvider, useCalcPermission, usePermissions, } from '@manuscripts/style-guide';
|
|
18
18
|
import { trackChangesPluginKey } from '@manuscripts/track-changes-plugin';
|
|
19
19
|
import React, { useEffect, useLayoutEffect, useMemo } from 'react';
|
|
@@ -103,19 +103,10 @@ const ManuscriptPageView = () => {
|
|
|
103
103
|
storeDispatch,
|
|
104
104
|
getTrackModel,
|
|
105
105
|
]);
|
|
106
|
-
const selection = useMemo(() => {
|
|
107
|
-
const suggestion = selectedSuggestionKey.getState(state)?.suggestion;
|
|
108
|
-
const selection = commentsKey.getState(state)?.selection;
|
|
109
|
-
return {
|
|
110
|
-
selectedSuggestionID: suggestion?.id,
|
|
111
|
-
selectedCommentKey: selection?.key,
|
|
112
|
-
newCommentID: selection?.isNew ? selection?.id : undefined,
|
|
113
|
-
};
|
|
114
|
-
}, [state]);
|
|
115
106
|
useEffect(() => {
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
}, [storeDispatch,
|
|
107
|
+
const selection = selectedSuggestionKey.getState(state);
|
|
108
|
+
storeDispatch({ selectedSuggestionID: selection?.suggestion?.id });
|
|
109
|
+
}, [storeDispatch, state]);
|
|
119
110
|
const hasPendingSuggestions = useMemo(() => {
|
|
120
111
|
const { changeSet } = trackChangesPluginKey.getState(state) || {};
|
|
121
112
|
return changeSet && changeSet.pending.length > 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ManuscriptPageContainer.js","sourceRoot":"","sources":["../../../../src/components/projects/ManuscriptPageContainer.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,4CAA4C,CAAA;AACnD,OAAO,oDAAoD,CAAA;AAC3D,OAAO,4CAA4C,CAAA;AACnD,OAAO,wBAAwB,CAAA;AAE/B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"ManuscriptPageContainer.js","sourceRoot":"","sources":["../../../../src/components/projects/ManuscriptPageContainer.tsx"],"names":[],"mappings":"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"}
|