@manuscripts/article-editor 3.1.15-LEAN-3840.0 → 3.1.16-LEAN-3858.1
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/comments/CommentBody.js +5 -2
- package/dist/cjs/components/comments/CommentBody.js.map +1 -1
- package/dist/cjs/components/comments/CommentThread.js +15 -3
- package/dist/cjs/components/comments/CommentThread.js.map +1 -1
- package/dist/es/components/comments/CommentBody.js +6 -3
- package/dist/es/components/comments/CommentBody.js.map +1 -1
- package/dist/es/components/comments/CommentThread.js +16 -4
- package/dist/es/components/comments/CommentThread.js.map +1 -1
- package/package.json +5 -5
|
@@ -85,11 +85,14 @@ const CommentBody = ({ comment, isEditing, onSave, onCancel, onSelect, }) => {
|
|
|
85
85
|
}
|
|
86
86
|
editor.current = e;
|
|
87
87
|
}, []);
|
|
88
|
+
const [value, setValue] = (0, react_1.useState)(editor.current?.value || '');
|
|
89
|
+
const disableSaveButton = (0, react_1.useMemo)(() => !value.length || comment.node.attrs.contents === value, [comment.node.attrs.contents, value]);
|
|
90
|
+
const onTextChange = (e) => setValue(e.target.value);
|
|
88
91
|
return (react_1.default.createElement(react_1.default.Fragment, null, isEditing ? (react_1.default.createElement(react_1.default.Fragment, null,
|
|
89
|
-
react_1.default.createElement(CommentEditor, { "data-cy": "comment-editor", ref: ref, defaultValue: comment.node.attrs.contents }),
|
|
92
|
+
react_1.default.createElement(CommentEditor, { "data-cy": "comment-editor", ref: ref, defaultValue: comment.node.attrs.contents, onChange: onTextChange, onBlur: (event) => !event.target.value.length && onCancel() }),
|
|
90
93
|
react_1.default.createElement(EditorActions, { "data-cy": "comment-actions" },
|
|
91
94
|
react_1.default.createElement(style_guide_1.SecondaryButton, { onClick: onCancel }, "Cancel"),
|
|
92
|
-
react_1.default.createElement(style_guide_1.PrimaryButton, { onClick: handleSave }, "Save")))) : (react_1.default.createElement(react_1.default.Fragment, null,
|
|
95
|
+
react_1.default.createElement(style_guide_1.PrimaryButton, { onClick: handleSave, disabled: disableSaveButton }, "Save")))) : (react_1.default.createElement(react_1.default.Fragment, null,
|
|
93
96
|
react_1.default.createElement(CommentContent, { onClick: onSelect },
|
|
94
97
|
react_1.default.createElement(CommentViewer, { "data-cy": "comment-text" }, comment.node.attrs.contents))))));
|
|
95
98
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommentBody.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentBody.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAYA,0DAIiC;AACjC,+
|
|
1
|
+
{"version":3,"file":"CommentBody.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentBody.tsx"],"names":[],"mappings":"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"}
|
|
@@ -51,12 +51,18 @@ const CommentMetadata = styled_components_1.default.div `
|
|
|
51
51
|
padding-right: 8px;
|
|
52
52
|
`;
|
|
53
53
|
const CommentAuthor = styled_components_1.default.div `
|
|
54
|
+
display: flex;
|
|
54
55
|
color: #353535;
|
|
55
56
|
font-weight: 400;
|
|
56
57
|
max-width: 200px;
|
|
57
58
|
white-space: nowrap;
|
|
58
59
|
overflow: hidden;
|
|
59
60
|
text-overflow: ellipsis;
|
|
61
|
+
width: 100%;
|
|
62
|
+
|
|
63
|
+
svg {
|
|
64
|
+
padding-right: 10px;
|
|
65
|
+
}
|
|
60
66
|
`;
|
|
61
67
|
const CommentTarget = styled_components_1.default.div `
|
|
62
68
|
font-size: 14px;
|
|
@@ -91,7 +97,7 @@ exports.CommentThread = (0, react_1.forwardRef)((props, ref) => {
|
|
|
91
97
|
const isActionsEnabled = isOwn
|
|
92
98
|
? can.handleOwnComments
|
|
93
99
|
: can.handleOthersComments;
|
|
94
|
-
const [isEditing, setEditing] = (0, react_1.useState)(
|
|
100
|
+
const [isEditing, setEditing] = (0, react_1.useState)(tree.isNew);
|
|
95
101
|
const handleEdit = () => setEditing(true);
|
|
96
102
|
const handleSave = (contents) => {
|
|
97
103
|
onSave({
|
|
@@ -102,6 +108,9 @@ exports.CommentThread = (0, react_1.forwardRef)((props, ref) => {
|
|
|
102
108
|
};
|
|
103
109
|
const handleCancel = () => {
|
|
104
110
|
setEditing(false);
|
|
111
|
+
if (tree.isNew) {
|
|
112
|
+
onDelete(tree.comment.node.attrs.id);
|
|
113
|
+
}
|
|
105
114
|
};
|
|
106
115
|
const handleToggleResolve = () => {
|
|
107
116
|
onSave({
|
|
@@ -111,9 +120,12 @@ exports.CommentThread = (0, react_1.forwardRef)((props, ref) => {
|
|
|
111
120
|
};
|
|
112
121
|
return (react_1.default.createElement(Container, { "data-cy": "comment", isSelected: isSelected, ref: ref },
|
|
113
122
|
react_1.default.createElement(CommentHeader, { "data-cy": "comment-header" },
|
|
114
|
-
authorName && react_1.default.createElement(style_guide_1.AvatarIcon, { width: 20, height: 20 }),
|
|
115
123
|
react_1.default.createElement(CommentMetadata, null,
|
|
116
|
-
react_1.default.createElement(CommentAuthor, null, authorName
|
|
124
|
+
react_1.default.createElement(CommentAuthor, null, authorName ? (react_1.default.createElement(react_1.default.Fragment, null,
|
|
125
|
+
react_1.default.createElement(style_guide_1.AvatarIcon, { width: 20, height: 20 }),
|
|
126
|
+
react_1.default.createElement(CommentAuthor, null, authorName))) : (react_1.default.createElement(react_1.default.Fragment, null,
|
|
127
|
+
react_1.default.createElement(style_guide_1.SystemUserAvatarIcon, { width: 20, height: 20 }),
|
|
128
|
+
react_1.default.createElement(CommentAuthor, null, "System")))),
|
|
117
129
|
timestamp && react_1.default.createElement(Timestamp, { date: timestamp * 1000 })),
|
|
118
130
|
react_1.default.createElement(CommentActions_1.CommentActions, { comment: tree.comment, isResolveEnabled: isResolveEnabled, isActionsEnabled: isActionsEnabled, onDelete: () => onDelete(tree.comment.node.attrs.id), onEdit: handleEdit, toggleResolve: handleToggleResolve })),
|
|
119
131
|
tree.comment.node.attrs.originalText && (react_1.default.createElement(CommentTarget, null, tree.comment.node.attrs.originalText)),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommentThread.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentThread.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAYA,
|
|
1
|
+
{"version":3,"file":"CommentThread.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentThread.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ButtonGroup, PrimaryButton, SecondaryButton, } from '@manuscripts/style-guide';
|
|
2
|
-
import React, { useCallback, useRef } from 'react';
|
|
2
|
+
import React, { useCallback, useMemo, useRef, useState, } from 'react';
|
|
3
3
|
import styled from 'styled-components';
|
|
4
4
|
const CommentContent = styled.div `
|
|
5
5
|
cursor: pointer;
|
|
@@ -56,11 +56,14 @@ export const CommentBody = ({ comment, isEditing, onSave, onCancel, onSelect, })
|
|
|
56
56
|
}
|
|
57
57
|
editor.current = e;
|
|
58
58
|
}, []);
|
|
59
|
+
const [value, setValue] = useState(editor.current?.value || '');
|
|
60
|
+
const disableSaveButton = useMemo(() => !value.length || comment.node.attrs.contents === value, [comment.node.attrs.contents, value]);
|
|
61
|
+
const onTextChange = (e) => setValue(e.target.value);
|
|
59
62
|
return (React.createElement(React.Fragment, null, isEditing ? (React.createElement(React.Fragment, null,
|
|
60
|
-
React.createElement(CommentEditor, { "data-cy": "comment-editor", ref: ref, defaultValue: comment.node.attrs.contents }),
|
|
63
|
+
React.createElement(CommentEditor, { "data-cy": "comment-editor", ref: ref, defaultValue: comment.node.attrs.contents, onChange: onTextChange, onBlur: (event) => !event.target.value.length && onCancel() }),
|
|
61
64
|
React.createElement(EditorActions, { "data-cy": "comment-actions" },
|
|
62
65
|
React.createElement(SecondaryButton, { onClick: onCancel }, "Cancel"),
|
|
63
|
-
React.createElement(PrimaryButton, { onClick: handleSave }, "Save")))) : (React.createElement(React.Fragment, null,
|
|
66
|
+
React.createElement(PrimaryButton, { onClick: handleSave, disabled: disableSaveButton }, "Save")))) : (React.createElement(React.Fragment, null,
|
|
64
67
|
React.createElement(CommentContent, { onClick: onSelect },
|
|
65
68
|
React.createElement(CommentViewer, { "data-cy": "comment-text" }, comment.node.attrs.contents))))));
|
|
66
69
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommentBody.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentBody.tsx"],"names":[],"mappings":"AAYA,OAAO,EACL,WAAW,EACX,aAAa,EACb,eAAe,GAChB,MAAM,0BAA0B,CAAA;AACjC,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"CommentBody.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentBody.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { AvatarIcon, RelativeDate, usePermissions, } from '@manuscripts/style-guide';
|
|
1
|
+
import { AvatarIcon, RelativeDate, SystemUserAvatarIcon, usePermissions, } from '@manuscripts/style-guide';
|
|
2
2
|
import React, { forwardRef, useState } from 'react';
|
|
3
3
|
import styled from 'styled-components';
|
|
4
4
|
import { buildAuthorName, getAuthorID } from '../../lib/comments';
|
|
@@ -22,12 +22,18 @@ const CommentMetadata = styled.div `
|
|
|
22
22
|
padding-right: 8px;
|
|
23
23
|
`;
|
|
24
24
|
const CommentAuthor = styled.div `
|
|
25
|
+
display: flex;
|
|
25
26
|
color: #353535;
|
|
26
27
|
font-weight: 400;
|
|
27
28
|
max-width: 200px;
|
|
28
29
|
white-space: nowrap;
|
|
29
30
|
overflow: hidden;
|
|
30
31
|
text-overflow: ellipsis;
|
|
32
|
+
width: 100%;
|
|
33
|
+
|
|
34
|
+
svg {
|
|
35
|
+
padding-right: 10px;
|
|
36
|
+
}
|
|
31
37
|
`;
|
|
32
38
|
const CommentTarget = styled.div `
|
|
33
39
|
font-size: 14px;
|
|
@@ -62,7 +68,7 @@ export const CommentThread = forwardRef((props, ref) => {
|
|
|
62
68
|
const isActionsEnabled = isOwn
|
|
63
69
|
? can.handleOwnComments
|
|
64
70
|
: can.handleOthersComments;
|
|
65
|
-
const [isEditing, setEditing] = useState(
|
|
71
|
+
const [isEditing, setEditing] = useState(tree.isNew);
|
|
66
72
|
const handleEdit = () => setEditing(true);
|
|
67
73
|
const handleSave = (contents) => {
|
|
68
74
|
onSave({
|
|
@@ -73,6 +79,9 @@ export const CommentThread = forwardRef((props, ref) => {
|
|
|
73
79
|
};
|
|
74
80
|
const handleCancel = () => {
|
|
75
81
|
setEditing(false);
|
|
82
|
+
if (tree.isNew) {
|
|
83
|
+
onDelete(tree.comment.node.attrs.id);
|
|
84
|
+
}
|
|
76
85
|
};
|
|
77
86
|
const handleToggleResolve = () => {
|
|
78
87
|
onSave({
|
|
@@ -82,9 +91,12 @@ export const CommentThread = forwardRef((props, ref) => {
|
|
|
82
91
|
};
|
|
83
92
|
return (React.createElement(Container, { "data-cy": "comment", isSelected: isSelected, ref: ref },
|
|
84
93
|
React.createElement(CommentHeader, { "data-cy": "comment-header" },
|
|
85
|
-
authorName && React.createElement(AvatarIcon, { width: 20, height: 20 }),
|
|
86
94
|
React.createElement(CommentMetadata, null,
|
|
87
|
-
React.createElement(CommentAuthor, null, authorName
|
|
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")))),
|
|
88
100
|
timestamp && React.createElement(Timestamp, { date: timestamp * 1000 })),
|
|
89
101
|
React.createElement(CommentActions, { comment: tree.comment, isResolveEnabled: isResolveEnabled, isActionsEnabled: isActionsEnabled, onDelete: () => onDelete(tree.comment.node.attrs.id), onEdit: handleEdit, toggleResolve: handleToggleResolve })),
|
|
90
102
|
tree.comment.node.attrs.originalText && (React.createElement(CommentTarget, null, tree.comment.node.attrs.originalText)),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommentThread.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentThread.tsx"],"names":[],"mappings":"AAYA,OAAO,EACL,UAAU,EACV,YAAY,EACZ,cAAc,GACf,MAAM,0BAA0B,CAAA;AACjC,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AACnD,OAAO,MAAM,MAAM,mBAAmB,CAAA;AAEtC,OAAO,EAAE,eAAe,EAAe,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAC9E,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAE3C,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAA0B;;sBAEhC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;sBACrD,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;;;CAG1E,CAAA;AAED,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAA;;;CAG/B,CAAA;AAED,MAAM,eAAe,GAAG,MAAM,CAAC,GAAG,CAAA;;;;CAIjC,CAAA;AAED,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAA
|
|
1
|
+
{"version":3,"file":"CommentThread.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentThread.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@manuscripts/article-editor",
|
|
3
|
-
"version": "3.1.
|
|
3
|
+
"version": "3.1.16-LEAN-3858.1",
|
|
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,11 +35,11 @@
|
|
|
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.0.
|
|
38
|
+
"@manuscripts/body-editor": "2.0.23-LEAN-3858.0",
|
|
39
39
|
"@manuscripts/json-schema": "2.2.10",
|
|
40
40
|
"@manuscripts/library": "1.3.11",
|
|
41
|
-
"@manuscripts/style-guide": "2.0.
|
|
42
|
-
"@manuscripts/track-changes-plugin": "1.7.
|
|
41
|
+
"@manuscripts/style-guide": "2.0.6-LEAN-3858.0",
|
|
42
|
+
"@manuscripts/track-changes-plugin": "1.7.17",
|
|
43
43
|
"@manuscripts/transform": "2.3.24",
|
|
44
44
|
"prosemirror-utils": "^0.9.6",
|
|
45
45
|
"@popperjs/core": "^2.11.8",
|
|
@@ -108,4 +108,4 @@
|
|
|
108
108
|
"resolutions": {
|
|
109
109
|
"@types/react": "^18.3.1"
|
|
110
110
|
}
|
|
111
|
-
}
|
|
111
|
+
}
|