@manuscripts/article-editor 3.6.7-LEAN-4102.0 → 3.6.7-LEAN-4077.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/components/track-changes/TrackChangesPanel.js +7 -7
- package/dist/cjs/components/track-changes/TrackChangesPanel.js.map +1 -1
- package/dist/cjs/components/track-changes/suggestion-list/Suggestion.js +4 -4
- package/dist/cjs/components/track-changes/suggestion-list/Suggestion.js.map +1 -1
- package/dist/cjs/components/track-changes/suggestion-list/SuggestionActions.js +3 -4
- package/dist/cjs/components/track-changes/suggestion-list/SuggestionActions.js.map +1 -1
- package/dist/cjs/components/track-changes/suggestion-list/SuggestionList.js +3 -3
- package/dist/cjs/components/track-changes/suggestion-list/SuggestionList.js.map +1 -1
- package/dist/cjs/components/track-changes/suggestion-list/SuggestionSnippet.js +2 -6
- package/dist/cjs/components/track-changes/suggestion-list/SuggestionSnippet.js.map +1 -1
- package/dist/cjs/components/track-changes/utils.js +14 -18
- package/dist/cjs/components/track-changes/utils.js.map +1 -1
- package/dist/cjs/lib/change-handlers.js +1 -15
- package/dist/cjs/lib/change-handlers.js.map +1 -1
- package/dist/es/components/track-changes/TrackChangesPanel.js +8 -8
- package/dist/es/components/track-changes/TrackChangesPanel.js.map +1 -1
- package/dist/es/components/track-changes/suggestion-list/Suggestion.js +4 -4
- package/dist/es/components/track-changes/suggestion-list/Suggestion.js.map +1 -1
- package/dist/es/components/track-changes/suggestion-list/SuggestionActions.js +3 -4
- package/dist/es/components/track-changes/suggestion-list/SuggestionActions.js.map +1 -1
- package/dist/es/components/track-changes/suggestion-list/SuggestionList.js +3 -3
- package/dist/es/components/track-changes/suggestion-list/SuggestionList.js.map +1 -1
- package/dist/es/components/track-changes/suggestion-list/SuggestionSnippet.js +3 -7
- package/dist/es/components/track-changes/suggestion-list/SuggestionSnippet.js.map +1 -1
- package/dist/es/components/track-changes/utils.js +15 -19
- package/dist/es/components/track-changes/utils.js.map +1 -1
- package/dist/es/lib/change-handlers.js +0 -13
- package/dist/es/lib/change-handlers.js.map +1 -1
- package/dist/types/components/track-changes/suggestion-list/Suggestion.d.ts +2 -2
- package/dist/types/components/track-changes/suggestion-list/SuggestionActions.d.ts +4 -4
- package/dist/types/components/track-changes/suggestion-list/SuggestionList.d.ts +5 -5
- package/dist/types/components/track-changes/suggestion-list/SuggestionSnippet.d.ts +2 -2
- package/dist/types/components/track-changes/utils.d.ts +3 -3
- package/dist/types/lib/change-handlers.d.ts +1 -2
- package/package.json +5 -5
@@ -53,18 +53,18 @@ const TrackChangesPanel = () => {
|
|
53
53
|
trackState: store.trackState,
|
54
54
|
selectedSuggestionID: store.selectedSuggestionID,
|
55
55
|
}));
|
56
|
-
const handleSelect = (0, react_1.useCallback)((
|
57
|
-
(0, utils_1.setSelectedSuggestion)(
|
56
|
+
const handleSelect = (0, react_1.useCallback)((suggestion) => {
|
57
|
+
(0, utils_1.setSelectedSuggestion)(suggestion, getState);
|
58
58
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
59
59
|
}, []);
|
60
60
|
const execCmd = (0, use_exec_cmd_1.default)();
|
61
61
|
const { changeSet } = trackState || {};
|
62
|
-
const handleAccept = (0, react_1.useCallback)((
|
63
|
-
(0, utils_1.setChangeStatus)(
|
62
|
+
const handleAccept = (0, react_1.useCallback)((change) => {
|
63
|
+
(0, utils_1.setChangeStatus)(change, track_changes_plugin_1.CHANGE_STATUS.accepted, execCmd);
|
64
64
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
65
65
|
}, []);
|
66
|
-
const handleReject = (0, react_1.useCallback)((
|
67
|
-
(0, utils_1.setChangeStatus)(
|
66
|
+
const handleReject = (0, react_1.useCallback)((change) => {
|
67
|
+
(0, utils_1.setChangeStatus)(change, track_changes_plugin_1.CHANGE_STATUS.rejected, execCmd);
|
68
68
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
69
69
|
}, []);
|
70
70
|
const handleAcceptAll = (0, react_1.useCallback)(() => {
|
@@ -79,7 +79,7 @@ const TrackChangesPanel = () => {
|
|
79
79
|
return (react_1.default.createElement(react_1.default.Fragment, null,
|
80
80
|
react_1.default.createElement(SnapshotsDropdown_1.SnapshotsDropdown, null),
|
81
81
|
react_1.default.createElement(SortByDropdown_1.SortByDropdown, { sortBy: sortBy, setSortBy: setSortBy }),
|
82
|
-
react_1.default.createElement(SuggestionList_1.SuggestionList, { type: "all", changes: changeSet?.
|
82
|
+
react_1.default.createElement(SuggestionList_1.SuggestionList, { type: "all", changes: changeSet?.pending.filter((c) => c.dataTracked.operation !== track_changes_plugin_1.CHANGE_OPERATION.reference) || [], selectionID: selectedSuggestionID, title: "Suggestions", sortBy: sortBy, onAccept: handleAccept, onReject: handleReject, onAcceptAll: changeSet?.pending.length ? handleAcceptAll : undefined, onSelect: handleSelect })));
|
83
83
|
};
|
84
84
|
exports.TrackChangesPanel = TrackChangesPanel;
|
85
85
|
//# sourceMappingURL=TrackChangesPanel.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"TrackChangesPanel.js","sourceRoot":"","sources":["../../../../src/components/track-changes/TrackChangesPanel.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,
|
1
|
+
{"version":3,"file":"TrackChangesPanel.js","sourceRoot":"","sources":["../../../../src/components/track-changes/TrackChangesPanel.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,4EAM0C;AAC1C,+CAAoD;AAEpD,4EAAiD;AACjD,uCAAsC;AACtC,sEAAkE;AAClE,qDAAiD;AACjD,qEAAiE;AACjE,mCAAgE;AAEzD,MAAM,iBAAiB,GAAa,GAAG,EAAE;IAC9C,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAA,gBAAQ,EAAC,YAAY,CAAC,CAAA;IAElD,MAAM,CAAC,EAAE,UAAU,EAAE,oBAAoB,EAAE,EAAE,CAAC,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,EAClE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACV,iFAAiF;QACjF,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,oBAAoB,EAAE,KAAK,CAAC,oBAAoB;KACjD,CAAC,CACH,CAAA;IAED,MAAM,YAAY,GAAG,IAAA,mBAAW,EAAC,CAAC,UAAyB,EAAE,EAAE;QAC7D,IAAA,6BAAqB,EAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;QAC3C,uDAAuD;IACzD,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,MAAM,OAAO,GAAG,IAAA,sBAAU,GAAE,CAAA;IAE5B,MAAM,EAAE,SAAS,EAAE,GAAG,UAAU,IAAI,EAAE,CAAA;IAEtC,MAAM,YAAY,GAAG,IAAA,mBAAW,EAAC,CAAC,MAAqB,EAAE,EAAE;QACzD,IAAA,uBAAe,EAAC,MAAM,EAAE,oCAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;QACxD,uDAAuD;IACzD,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,MAAM,YAAY,GAAG,IAAA,mBAAW,EAAC,CAAC,MAAqB,EAAE,EAAE;QACzD,IAAA,uBAAe,EAAC,MAAM,EAAE,oCAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;QACxD,uDAAuD;IACzD,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,MAAM,eAAe,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QACvC,MAAM,UAAU,GAAG,QAAQ,EAAE,CAAC,UAAU,CAAA;QACxC,IAAI,CAAC,UAAU,EAAE;YACf,OAAM;SACP;QACD,MAAM,GAAG,GAAG,gCAAS,CAAC,gBAAgB,CAAC,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;QACpE,OAAO,CAAC,oCAAa,CAAC,iBAAiB,CAAC,oCAAa,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAA;QACrE,uDAAuD;IACzD,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,OAAO,CACL;QACE,8BAAC,qCAAiB,OAAG;QACrB,8BAAC,+BAAc,IAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,GAAI;QACxD,8BAAC,+BAAc,IACb,IAAI,EAAC,KAAK,EACV,OAAO,EACL,SAAS,EAAE,OAAO,CAAC,MAAM,CACvB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,SAAS,KAAK,uCAAgB,CAAC,SAAS,CAC9D,IAAI,EAAE,EAET,WAAW,EAAE,oBAAoB,EACjC,KAAK,EAAC,aAAa,EACnB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,YAAY,EACtB,QAAQ,EAAE,YAAY,EACtB,WAAW,EAAE,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS,EACpE,QAAQ,EAAE,YAAY,GACtB,CACD,CACJ,CAAA;AACH,CAAC,CAAA;AA7DY,QAAA,iBAAiB,qBA6D7B"}
|
@@ -49,7 +49,7 @@ const scrollIntoView = (element) => {
|
|
49
49
|
element.scrollIntoView();
|
50
50
|
}
|
51
51
|
};
|
52
|
-
const Suggestion = ({
|
52
|
+
const Suggestion = ({ suggestion, isSelected, onAccept, onReject, onSelect, }) => {
|
53
53
|
const wrapperRef = (0, react_1.useRef)(null);
|
54
54
|
const [trackModalVisible, setModalVisible] = (0, react_1.useState)(false);
|
55
55
|
const handleClick = (e) => {
|
@@ -66,10 +66,10 @@ const Suggestion = ({ suggestions, isSelected, onAccept, onReject, onSelect, })
|
|
66
66
|
}, [isSelected]);
|
67
67
|
return (react_1.default.createElement(Wrapper, { "data-cy": "suggestion", isFocused: isSelected, ref: wrapperRef },
|
68
68
|
react_1.default.createElement(FocusHandle, { href: "#", onClick: handleClick },
|
69
|
-
react_1.default.createElement(SuggestionSnippet_1.SuggestionSnippet, {
|
69
|
+
react_1.default.createElement(SuggestionSnippet_1.SuggestionSnippet, { suggestion: suggestion })),
|
70
70
|
react_1.default.createElement(Actions, null,
|
71
|
-
react_1.default.createElement(SuggestionActions_1.default, {
|
72
|
-
trackModalVisible && (react_1.default.createElement(TrackModal_1.default, { ref: wrapperRef, isVisible: trackModalVisible, changeId:
|
71
|
+
react_1.default.createElement(SuggestionActions_1.default, { suggestion: suggestion, handleAccept: onAccept, handleReject: onReject })),
|
72
|
+
trackModalVisible && (react_1.default.createElement(TrackModal_1.default, { ref: wrapperRef, isVisible: trackModalVisible, changeId: suggestion.id, setVisible: setModalVisible }))));
|
73
73
|
};
|
74
74
|
exports.Suggestion = Suggestion;
|
75
75
|
const Actions = styled_components_1.default.div `
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"Suggestion.js","sourceRoot":"","sources":["../../../../../src/components/track-changes/suggestion-list/Suggestion.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGH,+CAA0D;AAC1D,0EAAsC;AAEtC,+DAAsC;AACtC,4EAAmD;AACnD,2DAAuD;AAEvD,MAAM,cAAc,GAAG,CAAC,OAAoB,EAAE,EAAE;IAC9C,MAAM,IAAI,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAA;IAC5C,IAAI,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,WAAW,IAAI,IAAI,CAAC,GAAG,GAAG,GAAG,EAAE;QACtD,OAAO,CAAC,cAAc,EAAE,CAAA;KACzB;AACH,CAAC,CAAA;AAUM,MAAM,UAAU,GAAoB,CAAC,EAC1C,
|
1
|
+
{"version":3,"file":"Suggestion.js","sourceRoot":"","sources":["../../../../../src/components/track-changes/suggestion-list/Suggestion.tsx"],"names":[],"mappings":"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"}
|
@@ -44,12 +44,11 @@ const react_1 = __importStar(require("react"));
|
|
44
44
|
const styled_components_1 = __importDefault(require("styled-components"));
|
45
45
|
const store_1 = require("../../../store");
|
46
46
|
const Icons_1 = require("./Icons");
|
47
|
-
const SuggestionAction = ({
|
47
|
+
const SuggestionAction = ({ suggestion, handleAccept, handleReject, }) => {
|
48
48
|
const [{ user }] = (0, store_1.useStore)((store) => ({
|
49
49
|
user: store.user,
|
50
50
|
}));
|
51
51
|
const can = (0, style_guide_1.usePermissions)();
|
52
|
-
const suggestion = suggestions[0];
|
53
52
|
const canRejectOwnSuggestion = (0, react_1.useMemo)(() => {
|
54
53
|
if (can.handleSuggestion ||
|
55
54
|
(can.rejectOwnSuggestion &&
|
@@ -63,11 +62,11 @@ const SuggestionAction = ({ suggestions, handleAccept, handleReject, }) => {
|
|
63
62
|
const approveTooltip = 'approve-tooltip' + '-' + suggestion.id;
|
64
63
|
return (react_1.default.createElement(Actions, { "data-cy": "suggestion-actions" },
|
65
64
|
canRejectOwnSuggestion && (react_1.default.createElement(Container, null,
|
66
|
-
react_1.default.createElement(exports.Action, { type: "button", onClick: () => handleReject(
|
65
|
+
react_1.default.createElement(exports.Action, { type: "button", onClick: () => handleReject(suggestion), "aria-pressed": false, "data-tooltip-id": rejectTooltip },
|
67
66
|
react_1.default.createElement(Icons_1.Reject, { color: "#353535" })),
|
68
67
|
react_1.default.createElement(style_guide_1.Tooltip, { id: rejectTooltip, place: "bottom" }, "Reject"))),
|
69
68
|
can.handleSuggestion && (react_1.default.createElement(Container, null,
|
70
|
-
react_1.default.createElement(exports.Action, { type: "button", onClick: () => handleAccept(
|
69
|
+
react_1.default.createElement(exports.Action, { type: "button", onClick: () => handleAccept(suggestion), "aria-pressed": false, "data-tip": true, "data-tooltip-id": approveTooltip },
|
71
70
|
react_1.default.createElement(Icons_1.Accept, { color: "#353535" })),
|
72
71
|
react_1.default.createElement(style_guide_1.Tooltip, { id: approveTooltip, place: "bottom" }, "Approve")))));
|
73
72
|
};
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"SuggestionActions.js","sourceRoot":"","sources":["../../../../../src/components/track-changes/suggestion-list/SuggestionActions.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;GAUG;AACH,0DAAkE;AAClE,
|
1
|
+
{"version":3,"file":"SuggestionActions.js","sourceRoot":"","sources":["../../../../../src/components/track-changes/suggestion-list/SuggestionActions.tsx"],"names":[],"mappings":"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"}
|
@@ -9,13 +9,13 @@ const styled_components_1 = __importDefault(require("styled-components"));
|
|
9
9
|
const InspectorSection_1 = require("../../InspectorSection");
|
10
10
|
const Suggestion_1 = require("./Suggestion");
|
11
11
|
const SuggestionList = ({ changes, selectionID, title, type, sortBy, onAccept, onReject, onAcceptAll, onSelect, }) => {
|
12
|
-
const changesByDate = (a, b) => b
|
13
|
-
const changesByContext = (a, b) => a
|
12
|
+
const changesByDate = (a, b) => b.dataTracked.updatedAt - a.dataTracked.updatedAt;
|
13
|
+
const changesByContext = (a, b) => a.from - b.from;
|
14
14
|
const sortedChanges = changes
|
15
15
|
.slice()
|
16
16
|
.sort(sortBy === 'Date' ? changesByDate : changesByContext);
|
17
17
|
return (react_1.default.createElement(InspectorSection_1.InspectorSection, { title: title.concat(changes.length ? ` (${changes.length})` : ''), approveAll: onAcceptAll, fixed: true },
|
18
|
-
react_1.default.createElement(List, { "data-cy": "suggestions-list", "data-cy-type": type }, sortedChanges.map((c) => (react_1.default.createElement(Suggestion_1.Suggestion, { key: c
|
18
|
+
react_1.default.createElement(List, { "data-cy": "suggestions-list", "data-cy-type": type }, sortedChanges.map((c) => (react_1.default.createElement(Suggestion_1.Suggestion, { key: c.id, suggestion: c, isSelected: selectionID === c.id, onAccept: () => onAccept(c), onReject: () => onReject(c), onSelect: () => onSelect && onSelect(c) }))))));
|
19
19
|
};
|
20
20
|
exports.SuggestionList = SuggestionList;
|
21
21
|
const List = styled_components_1.default.ul `
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"SuggestionList.js","sourceRoot":"","sources":["../../../../../src/components/track-changes/suggestion-list/SuggestionList.tsx"],"names":[],"mappings":";;;;;;AAYA,kDAAyB;AACzB,0EAAsC;AAEtC,6DAAyD;AACzD,6CAAyC;AAclC,MAAM,cAAc,GAAkC,CAAC,EAC5D,OAAO,EACP,WAAW,EACX,KAAK,EACL,IAAI,EACJ,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,WAAW,EACX,QAAQ,GACT,EAAE,EAAE;IACH,MAAM,aAAa,GAAG,CAAC,
|
1
|
+
{"version":3,"file":"SuggestionList.js","sourceRoot":"","sources":["../../../../../src/components/track-changes/suggestion-list/SuggestionList.tsx"],"names":[],"mappings":";;;;;;AAYA,kDAAyB;AACzB,0EAAsC;AAEtC,6DAAyD;AACzD,6CAAyC;AAclC,MAAM,cAAc,GAAkC,CAAC,EAC5D,OAAO,EACP,WAAW,EACX,KAAK,EACL,IAAI,EACJ,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,WAAW,EACX,QAAQ,GACT,EAAE,EAAE;IACH,MAAM,aAAa,GAAG,CAAC,CAAgB,EAAE,CAAgB,EAAE,EAAE,CAC3D,CAAC,CAAC,WAAW,CAAC,SAAS,GAAG,CAAC,CAAC,WAAW,CAAC,SAAS,CAAA;IAEnD,MAAM,gBAAgB,GAAG,CAAC,CAAgB,EAAE,CAAgB,EAAE,EAAE,CAC9D,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAA;IAEjB,MAAM,aAAa,GAAG,OAAO;SAC1B,KAAK,EAAE;SACP,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAA;IAE7D,OAAO,CACL,8BAAC,mCAAgB,IACf,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EACjE,UAAU,EAAE,WAAW,EACvB,KAAK,EAAE,IAAI;QAEX,8BAAC,IAAI,eAAS,kBAAkB,kBAAe,IAAI,IAChD,aAAa,CAAC,GAAG,CAAC,CAAC,CAAgB,EAAE,EAAE,CAAC,CACvC,8BAAC,uBAAU,IACT,GAAG,EAAE,CAAC,CAAC,EAAE,EACT,UAAU,EAAE,CAAC,EACb,UAAU,EAAE,WAAW,KAAK,CAAC,CAAC,EAAE,EAChC,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,EAC3B,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,EAC3B,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,IAAI,QAAQ,CAAC,CAAC,CAAC,GACvC,CACH,CAAC,CACG,CACU,CACpB,CAAA;AACH,CAAC,CAAA;AAzCY,QAAA,cAAc,kBAyC1B;AAED,MAAM,IAAI,GAAG,2BAAM,CAAC,EAAE,CAAA;;;;;CAKrB,CAAA"}
|
@@ -44,21 +44,17 @@ const styled_components_1 = __importDefault(require("styled-components"));
|
|
44
44
|
const change_handlers_1 = require("../../../lib/change-handlers");
|
45
45
|
const store_1 = require("../../../store");
|
46
46
|
const SnippetContent_1 = __importDefault(require("./SnippetContent"));
|
47
|
-
const SuggestionSnippet = ({
|
47
|
+
const SuggestionSnippet = ({ suggestion, }) => {
|
48
48
|
const [{ doc, view }] = (0, store_1.useStore)((store) => ({
|
49
49
|
view: store.view,
|
50
50
|
doc: store.doc,
|
51
51
|
}));
|
52
52
|
const [snippet, setSnippet] = (0, react_1.useState)(null);
|
53
|
-
const suggestion = suggestions[0];
|
54
53
|
const { dataTracked } = suggestion;
|
55
54
|
(0, react_1.useEffect)(() => {
|
56
55
|
let newSnippet = null;
|
57
56
|
if (view) {
|
58
|
-
if (
|
59
|
-
newSnippet = (0, change_handlers_1.handleGroupChanges)(suggestions, view, doc, dataTracked);
|
60
|
-
}
|
61
|
-
else if (track_changes_plugin_1.ChangeSet.isTextChange(suggestion)) {
|
57
|
+
if (track_changes_plugin_1.ChangeSet.isTextChange(suggestion)) {
|
62
58
|
newSnippet = (0, change_handlers_1.handleTextChange)(suggestion, view.state);
|
63
59
|
}
|
64
60
|
else if (track_changes_plugin_1.ChangeSet.isNodeChange(suggestion) ||
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"SuggestionSnippet.js","sourceRoot":"","sources":["../../../../../src/components/track-changes/suggestion-list/SuggestionSnippet.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;GAUG;AACH,
|
1
|
+
{"version":3,"file":"SuggestionSnippet.js","sourceRoot":"","sources":["../../../../../src/components/track-changes/suggestion-list/SuggestionSnippet.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;GAUG;AACH,4EAA4E;AAC5E,+CAAkD;AAClD,0EAAsC;AAEtC,kEAIqC;AACrC,0CAAyC;AACzC,sEAA6C;AAQtC,MAAM,iBAAiB,GAA4C,CAAC,EACzE,UAAU,GACX,EAAE,EAAE;IACH,MAAM,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,GAAG,IAAA,gBAAQ,EAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC3C,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,GAAG,EAAE,KAAK,CAAC,GAAG;KACf,CAAC,CAAC,CAAA;IACH,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,IAAA,gBAAQ,EAAqB,IAAI,CAAC,CAAA;IAChE,MAAM,EAAE,WAAW,EAAE,GAAG,UAAU,CAAA;IAElC,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,UAAU,GAAuB,IAAI,CAAA;QACzC,IAAI,IAAI,EAAE;YACR,IAAI,gCAAS,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE;gBACtC,UAAU,GAAG,IAAA,kCAAgB,EAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;aACtD;iBAAM,IACL,gCAAS,CAAC,YAAY,CAAC,UAAU,CAAC;gBAClC,gCAAS,CAAC,gBAAgB,CAAC,UAAU,CAAC,EACtC;gBACA,UAAU,GAAG,IAAA,kCAAgB,EAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;aACtD;iBAAM;gBACL,UAAU,GAAG,IAAA,qCAAmB,GAAE,CAAA;aACnC;YAED,UAAU,CAAC,UAAU,CAAC,CAAA;SACvB;QACD,uDAAuD;IACzD,CAAC,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,CAAA;IAE3B,OAAO,CACL,8BAAC,WAAW;QACV;YACE,8BAAC,SAAS,IAAC,KAAK,EAAE,WAAW,CAAC,SAAS;gBACpC,OAAO,EAAE,SAAS;oBACT;YACZ,8BAAC,QAAQ,QAAE,OAAO,EAAE,QAAQ,CAAY;YACxC,8BAAC,wBAAc,IAAC,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,EAAE,GAAI,CAClD,CACS,CACf,CAAA;AACH,CAAC,CAAA;AAxCY,QAAA,iBAAiB,qBAwC7B;AAED,MAAM,WAAW,GAAG,2BAAM,CAAC,GAAG,CAAA;eACf,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK;iBACpC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM;;;;WAInD,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;;;;;;CAMpD,CAAA;AAED,MAAM,SAAS,GAAG,2BAAM,CAAC,IAAI,CAAmB;;;;;;;WAOrC,CAAC,KAAK,EAAE,EAAE;IACjB,QAAQ,KAAK,CAAC,KAAK,EAAE;QACnB,KAAK,QAAQ,CAAC;QACd,KAAK,gBAAgB;YACnB,OAAO,SAAS,CAAA;QAClB,KAAK,QAAQ;YACX,OAAO,SAAS,CAAA;QAClB,KAAK,YAAY,CAAC;QAClB,KAAK,WAAW;YACd,OAAO,SAAS,CAAA;QAClB;YACE,OAAO,SAAS,CAAA;KACnB;AACH,CAAC;CACF,CAAA;AAED,MAAM,QAAQ,GAAG,2BAAM,CAAC,IAAI,CAAA;;;;;;;CAO3B,CAAA"}
|
@@ -12,38 +12,34 @@
|
|
12
12
|
*/
|
13
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
14
14
|
exports.setChangeStatus = exports.setSelectedSuggestion = 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 prosemirror_state_1 = require("prosemirror-state");
|
18
|
-
const setSelectedSuggestion = (
|
17
|
+
const setSelectedSuggestion = (suggestion, getState) => {
|
19
18
|
const editor = getState().editor;
|
20
19
|
const state = editor.state;
|
21
20
|
const view = editor.view;
|
22
21
|
const tr = state.tr;
|
23
|
-
if (
|
24
|
-
|
25
|
-
}
|
26
|
-
else if (suggestions[0].type === 'text-change') {
|
27
|
-
const pos = suggestions[0].to;
|
22
|
+
if (suggestion.type === 'text-change') {
|
23
|
+
const pos = suggestion.to;
|
28
24
|
tr.setSelection(prosemirror_state_1.TextSelection.create(state.doc, pos, pos));
|
29
25
|
}
|
30
26
|
else {
|
31
|
-
tr.setSelection(prosemirror_state_1.NodeSelection.create(state.doc,
|
27
|
+
tr.setSelection(prosemirror_state_1.NodeSelection.create(state.doc, suggestion.from));
|
32
28
|
}
|
33
29
|
view?.focus();
|
34
30
|
view?.dispatch(tr.scrollIntoView());
|
35
31
|
};
|
36
32
|
exports.setSelectedSuggestion = setSelectedSuggestion;
|
37
|
-
const setChangeStatus = (
|
38
|
-
const ids = [];
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
}
|
46
|
-
}
|
33
|
+
const setChangeStatus = (change, status, execCmd) => {
|
34
|
+
const ids = [change.id];
|
35
|
+
if (change.type === 'node-change' &&
|
36
|
+
!((change.dataTracked.operation === track_changes_plugin_1.CHANGE_OPERATION.node_split ||
|
37
|
+
change.dataTracked.operation === track_changes_plugin_1.CHANGE_OPERATION.wrap_with_node) &&
|
38
|
+
status === track_changes_plugin_1.CHANGE_STATUS.rejected)) {
|
39
|
+
change.children.forEach((child) => {
|
40
|
+
ids.push(child.id);
|
41
|
+
});
|
42
|
+
}
|
47
43
|
execCmd(track_changes_plugin_1.trackCommands.setChangeStatuses(status, ids));
|
48
44
|
};
|
49
45
|
exports.setChangeStatus = setChangeStatus;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/components/track-changes/utils.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;AAEH,
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/components/track-changes/utils.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;AAEH,4EAK0C;AAC1C,yDAAyE;AAKlE,MAAM,qBAAqB,GAAG,CACnC,UAAyB,EACzB,QAAqB,EACrB,EAAE;IACF,MAAM,MAAM,GAAG,QAAQ,EAAE,CAAC,MAAM,CAAA;IAChC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAA;IAC1B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAA;IACxB,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,CAAA;IACnB,IAAI,UAAU,CAAC,IAAI,KAAK,aAAa,EAAE;QACrC,MAAM,GAAG,GAAG,UAAU,CAAC,EAAE,CAAA;QACzB,EAAE,CAAC,YAAY,CAAC,iCAAa,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAA;KAC3D;SAAM;QACL,EAAE,CAAC,YAAY,CAAC,iCAAa,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,CAAA;KAClE;IAED,IAAI,EAAE,KAAK,EAAE,CAAA;IACb,IAAI,EAAE,QAAQ,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC,CAAA;AACrC,CAAC,CAAA;AAjBY,QAAA,qBAAqB,yBAiBjC;AAEM,MAAM,eAAe,GAAG,CAC7B,MAAqB,EACrB,MAAqB,EACrB,OAAsD,EACtD,EAAE;IACF,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IACvB,IACE,MAAM,CAAC,IAAI,KAAK,aAAa;QAC7B,CAAC,CACC,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,KAAK,uCAAgB,CAAC,UAAU;YAC3D,MAAM,CAAC,WAAW,CAAC,SAAS,KAAK,uCAAgB,CAAC,cAAc,CAAC;YACnE,MAAM,KAAK,oCAAa,CAAC,QAAQ,CAClC,EACD;QACA,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAChC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QACpB,CAAC,CAAC,CAAA;KACH;IACD,OAAO,CAAC,oCAAa,CAAC,iBAAiB,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAA;AACvD,CAAC,CAAA;AAnBY,QAAA,eAAe,mBAmB3B"}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.handleUnknownChange = exports.
|
3
|
+
exports.handleUnknownChange = exports.handleNodeChange = exports.handleTextChange = 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,7 +13,6 @@ exports.handleUnknownChange = exports.handleGroupChanges = exports.handleNodeCha
|
|
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 track_changes_plugin_1 = require("@manuscripts/track-changes-plugin");
|
17
16
|
const transform_1 = require("@manuscripts/transform");
|
18
17
|
const node_content_retriever_1 = require("./node-content-retriever");
|
19
18
|
const tracking_1 = require("./tracking");
|
@@ -121,19 +120,6 @@ const handleNodeChange = (suggestion, state) => {
|
|
121
120
|
}
|
122
121
|
};
|
123
122
|
exports.handleNodeChange = handleNodeChange;
|
124
|
-
const handleGroupChanges = (suggestions, view, doc, dataTracked) => {
|
125
|
-
return {
|
126
|
-
operation: (0, tracking_1.changeOperationAlias)(dataTracked.operation),
|
127
|
-
nodeName: 'Text',
|
128
|
-
content: suggestions
|
129
|
-
.map((change) => track_changes_plugin_1.ChangeSet.isTextChange(change)
|
130
|
-
? (0, exports.handleTextChange)(change, view.state)
|
131
|
-
: (0, exports.handleNodeChange)(change, view.state))
|
132
|
-
.map((c) => c?.nodeName === 'inline_equation' ? ` ${c.content} ` : c?.content)
|
133
|
-
.join(''),
|
134
|
-
};
|
135
|
-
};
|
136
|
-
exports.handleGroupChanges = handleGroupChanges;
|
137
123
|
const handleUnknownChange = () => {
|
138
124
|
return {
|
139
125
|
operation: '',
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"change-handlers.js","sourceRoot":"","sources":["../../../src/lib/change-handlers.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;GAUG;AACH,0DAKiC;
|
1
|
+
{"version":3,"file":"change-handlers.js","sourceRoot":"","sources":["../../../src/lib/change-handlers.ts"],"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) 2019 Atypon Systems LLC. All Rights Reserved.
|
11
11
|
*/
|
12
|
-
import { CHANGE_STATUS, ChangeSet, trackCommands, } from '@manuscripts/track-changes-plugin';
|
12
|
+
import { CHANGE_OPERATION, CHANGE_STATUS, ChangeSet, trackCommands, } from '@manuscripts/track-changes-plugin';
|
13
13
|
import React, { useCallback, useState } from 'react';
|
14
14
|
import useExecCmd from '../../hooks/use-exec-cmd';
|
15
15
|
import { useStore } from '../../store';
|
@@ -24,18 +24,18 @@ export const TrackChangesPanel = () => {
|
|
24
24
|
trackState: store.trackState,
|
25
25
|
selectedSuggestionID: store.selectedSuggestionID,
|
26
26
|
}));
|
27
|
-
const handleSelect = useCallback((
|
28
|
-
setSelectedSuggestion(
|
27
|
+
const handleSelect = useCallback((suggestion) => {
|
28
|
+
setSelectedSuggestion(suggestion, getState);
|
29
29
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
30
30
|
}, []);
|
31
31
|
const execCmd = useExecCmd();
|
32
32
|
const { changeSet } = trackState || {};
|
33
|
-
const handleAccept = useCallback((
|
34
|
-
setChangeStatus(
|
33
|
+
const handleAccept = useCallback((change) => {
|
34
|
+
setChangeStatus(change, CHANGE_STATUS.accepted, execCmd);
|
35
35
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
36
36
|
}, []);
|
37
|
-
const handleReject = useCallback((
|
38
|
-
setChangeStatus(
|
37
|
+
const handleReject = useCallback((change) => {
|
38
|
+
setChangeStatus(change, CHANGE_STATUS.rejected, execCmd);
|
39
39
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
40
40
|
}, []);
|
41
41
|
const handleAcceptAll = useCallback(() => {
|
@@ -50,6 +50,6 @@ export const TrackChangesPanel = () => {
|
|
50
50
|
return (React.createElement(React.Fragment, null,
|
51
51
|
React.createElement(SnapshotsDropdown, null),
|
52
52
|
React.createElement(SortByDropdown, { sortBy: sortBy, setSortBy: setSortBy }),
|
53
|
-
React.createElement(SuggestionList, { type: "all", changes: changeSet?.
|
53
|
+
React.createElement(SuggestionList, { type: "all", changes: changeSet?.pending.filter((c) => c.dataTracked.operation !== CHANGE_OPERATION.reference) || [], selectionID: selectedSuggestionID, title: "Suggestions", sortBy: sortBy, onAccept: handleAccept, onReject: handleReject, onAcceptAll: changeSet?.pending.length ? handleAcceptAll : undefined, onSelect: handleSelect })));
|
54
54
|
};
|
55
55
|
//# sourceMappingURL=TrackChangesPanel.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"TrackChangesPanel.js","sourceRoot":"","sources":["../../../../src/components/track-changes/TrackChangesPanel.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EACL,aAAa,EACb,SAAS,
|
1
|
+
{"version":3,"file":"TrackChangesPanel.js","sourceRoot":"","sources":["../../../../src/components/track-changes/TrackChangesPanel.tsx"],"names":[],"mappings":"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"}
|
@@ -20,7 +20,7 @@ const scrollIntoView = (element) => {
|
|
20
20
|
element.scrollIntoView();
|
21
21
|
}
|
22
22
|
};
|
23
|
-
export const Suggestion = ({
|
23
|
+
export const Suggestion = ({ suggestion, isSelected, onAccept, onReject, onSelect, }) => {
|
24
24
|
const wrapperRef = useRef(null);
|
25
25
|
const [trackModalVisible, setModalVisible] = useState(false);
|
26
26
|
const handleClick = (e) => {
|
@@ -37,10 +37,10 @@ export const Suggestion = ({ suggestions, isSelected, onAccept, onReject, onSele
|
|
37
37
|
}, [isSelected]);
|
38
38
|
return (React.createElement(Wrapper, { "data-cy": "suggestion", isFocused: isSelected, ref: wrapperRef },
|
39
39
|
React.createElement(FocusHandle, { href: "#", onClick: handleClick },
|
40
|
-
React.createElement(SuggestionSnippet, {
|
40
|
+
React.createElement(SuggestionSnippet, { suggestion: suggestion })),
|
41
41
|
React.createElement(Actions, null,
|
42
|
-
React.createElement(SuggestionActions, {
|
43
|
-
trackModalVisible && (React.createElement(TrackModal, { ref: wrapperRef, isVisible: trackModalVisible, changeId:
|
42
|
+
React.createElement(SuggestionActions, { suggestion: suggestion, handleAccept: onAccept, handleReject: onReject })),
|
43
|
+
trackModalVisible && (React.createElement(TrackModal, { ref: wrapperRef, isVisible: trackModalVisible, changeId: suggestion.id, setVisible: setModalVisible }))));
|
44
44
|
};
|
45
45
|
const Actions = styled.div `
|
46
46
|
visibility: hidden;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"Suggestion.js","sourceRoot":"","sources":["../../../../../src/components/track-changes/suggestion-list/Suggestion.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAC1D,OAAO,MAAM,MAAM,mBAAmB,CAAA;AAEtC,OAAO,UAAU,MAAM,eAAe,CAAA;AACtC,OAAO,iBAAiB,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD,MAAM,cAAc,GAAG,CAAC,OAAoB,EAAE,EAAE;IAC9C,MAAM,IAAI,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAA;IAC5C,IAAI,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,WAAW,IAAI,IAAI,CAAC,GAAG,GAAG,GAAG,EAAE;QACtD,OAAO,CAAC,cAAc,EAAE,CAAA;KACzB;AACH,CAAC,CAAA;AAUD,MAAM,CAAC,MAAM,UAAU,GAAoB,CAAC,EAC1C,
|
1
|
+
{"version":3,"file":"Suggestion.js","sourceRoot":"","sources":["../../../../../src/components/track-changes/suggestion-list/Suggestion.tsx"],"names":[],"mappings":"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"}
|
@@ -15,12 +15,11 @@ import React, { useMemo } from 'react';
|
|
15
15
|
import styled from 'styled-components';
|
16
16
|
import { useStore } from '../../../store';
|
17
17
|
import { Accept, Reject } from './Icons';
|
18
|
-
const SuggestionAction = ({
|
18
|
+
const SuggestionAction = ({ suggestion, handleAccept, handleReject, }) => {
|
19
19
|
const [{ user }] = useStore((store) => ({
|
20
20
|
user: store.user,
|
21
21
|
}));
|
22
22
|
const can = usePermissions();
|
23
|
-
const suggestion = suggestions[0];
|
24
23
|
const canRejectOwnSuggestion = useMemo(() => {
|
25
24
|
if (can.handleSuggestion ||
|
26
25
|
(can.rejectOwnSuggestion &&
|
@@ -34,11 +33,11 @@ const SuggestionAction = ({ suggestions, handleAccept, handleReject, }) => {
|
|
34
33
|
const approveTooltip = 'approve-tooltip' + '-' + suggestion.id;
|
35
34
|
return (React.createElement(Actions, { "data-cy": "suggestion-actions" },
|
36
35
|
canRejectOwnSuggestion && (React.createElement(Container, null,
|
37
|
-
React.createElement(Action, { type: "button", onClick: () => handleReject(
|
36
|
+
React.createElement(Action, { type: "button", onClick: () => handleReject(suggestion), "aria-pressed": false, "data-tooltip-id": rejectTooltip },
|
38
37
|
React.createElement(Reject, { color: "#353535" })),
|
39
38
|
React.createElement(Tooltip, { id: rejectTooltip, place: "bottom" }, "Reject"))),
|
40
39
|
can.handleSuggestion && (React.createElement(Container, null,
|
41
|
-
React.createElement(Action, { type: "button", onClick: () => handleAccept(
|
40
|
+
React.createElement(Action, { type: "button", onClick: () => handleAccept(suggestion), "aria-pressed": false, "data-tip": true, "data-tooltip-id": approveTooltip },
|
42
41
|
React.createElement(Accept, { color: "#353535" })),
|
43
42
|
React.createElement(Tooltip, { id: approveTooltip, place: "bottom" }, "Approve")))));
|
44
43
|
};
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"SuggestionActions.js","sourceRoot":"","sources":["../../../../../src/components/track-changes/suggestion-list/SuggestionActions.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAClE,OAAO,EAAE,aAAa,
|
1
|
+
{"version":3,"file":"SuggestionActions.js","sourceRoot":"","sources":["../../../../../src/components/track-changes/suggestion-list/SuggestionActions.tsx"],"names":[],"mappings":"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"}
|
@@ -3,13 +3,13 @@ import styled from 'styled-components';
|
|
3
3
|
import { InspectorSection } from '../../InspectorSection';
|
4
4
|
import { Suggestion } from './Suggestion';
|
5
5
|
export const SuggestionList = ({ changes, selectionID, title, type, sortBy, onAccept, onReject, onAcceptAll, onSelect, }) => {
|
6
|
-
const changesByDate = (a, b) => b
|
7
|
-
const changesByContext = (a, b) => a
|
6
|
+
const changesByDate = (a, b) => b.dataTracked.updatedAt - a.dataTracked.updatedAt;
|
7
|
+
const changesByContext = (a, b) => a.from - b.from;
|
8
8
|
const sortedChanges = changes
|
9
9
|
.slice()
|
10
10
|
.sort(sortBy === 'Date' ? changesByDate : changesByContext);
|
11
11
|
return (React.createElement(InspectorSection, { title: title.concat(changes.length ? ` (${changes.length})` : ''), approveAll: onAcceptAll, fixed: true },
|
12
|
-
React.createElement(List, { "data-cy": "suggestions-list", "data-cy-type": type }, sortedChanges.map((c) => (React.createElement(Suggestion, { key: c
|
12
|
+
React.createElement(List, { "data-cy": "suggestions-list", "data-cy-type": type }, sortedChanges.map((c) => (React.createElement(Suggestion, { key: c.id, suggestion: c, isSelected: selectionID === c.id, onAccept: () => onAccept(c), onReject: () => onReject(c), onSelect: () => onSelect && onSelect(c) }))))));
|
13
13
|
};
|
14
14
|
const List = styled.ul `
|
15
15
|
list-style: none;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"SuggestionList.js","sourceRoot":"","sources":["../../../../../src/components/track-changes/suggestion-list/SuggestionList.tsx"],"names":[],"mappings":"AAYA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,MAAM,MAAM,mBAAmB,CAAA;AAEtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAczC,MAAM,CAAC,MAAM,cAAc,GAAkC,CAAC,EAC5D,OAAO,EACP,WAAW,EACX,KAAK,EACL,IAAI,EACJ,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,WAAW,EACX,QAAQ,GACT,EAAE,EAAE;IACH,MAAM,aAAa,GAAG,CAAC,
|
1
|
+
{"version":3,"file":"SuggestionList.js","sourceRoot":"","sources":["../../../../../src/components/track-changes/suggestion-list/SuggestionList.tsx"],"names":[],"mappings":"AAYA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,MAAM,MAAM,mBAAmB,CAAA;AAEtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAczC,MAAM,CAAC,MAAM,cAAc,GAAkC,CAAC,EAC5D,OAAO,EACP,WAAW,EACX,KAAK,EACL,IAAI,EACJ,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,WAAW,EACX,QAAQ,GACT,EAAE,EAAE;IACH,MAAM,aAAa,GAAG,CAAC,CAAgB,EAAE,CAAgB,EAAE,EAAE,CAC3D,CAAC,CAAC,WAAW,CAAC,SAAS,GAAG,CAAC,CAAC,WAAW,CAAC,SAAS,CAAA;IAEnD,MAAM,gBAAgB,GAAG,CAAC,CAAgB,EAAE,CAAgB,EAAE,EAAE,CAC9D,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAA;IAEjB,MAAM,aAAa,GAAG,OAAO;SAC1B,KAAK,EAAE;SACP,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAA;IAE7D,OAAO,CACL,oBAAC,gBAAgB,IACf,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EACjE,UAAU,EAAE,WAAW,EACvB,KAAK,EAAE,IAAI;QAEX,oBAAC,IAAI,eAAS,kBAAkB,kBAAe,IAAI,IAChD,aAAa,CAAC,GAAG,CAAC,CAAC,CAAgB,EAAE,EAAE,CAAC,CACvC,oBAAC,UAAU,IACT,GAAG,EAAE,CAAC,CAAC,EAAE,EACT,UAAU,EAAE,CAAC,EACb,UAAU,EAAE,WAAW,KAAK,CAAC,CAAC,EAAE,EAChC,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,EAC3B,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,EAC3B,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ,IAAI,QAAQ,CAAC,CAAC,CAAC,GACvC,CACH,CAAC,CACG,CACU,CACpB,CAAA;AACH,CAAC,CAAA;AAED,MAAM,IAAI,GAAG,MAAM,CAAC,EAAE,CAAA;;;;;CAKrB,CAAA"}
|
@@ -12,24 +12,20 @@
|
|
12
12
|
import { ChangeSet } from '@manuscripts/track-changes-plugin';
|
13
13
|
import React, { useEffect, useState } from 'react';
|
14
14
|
import styled from 'styled-components';
|
15
|
-
import {
|
15
|
+
import { handleNodeChange, handleTextChange, handleUnknownChange, } from '../../../lib/change-handlers';
|
16
16
|
import { useStore } from '../../../store';
|
17
17
|
import SnippetContent from './SnippetContent';
|
18
|
-
export const SuggestionSnippet = ({
|
18
|
+
export const SuggestionSnippet = ({ suggestion, }) => {
|
19
19
|
const [{ doc, view }] = useStore((store) => ({
|
20
20
|
view: store.view,
|
21
21
|
doc: store.doc,
|
22
22
|
}));
|
23
23
|
const [snippet, setSnippet] = useState(null);
|
24
|
-
const suggestion = suggestions[0];
|
25
24
|
const { dataTracked } = suggestion;
|
26
25
|
useEffect(() => {
|
27
26
|
let newSnippet = null;
|
28
27
|
if (view) {
|
29
|
-
if (
|
30
|
-
newSnippet = handleGroupChanges(suggestions, view, doc, dataTracked);
|
31
|
-
}
|
32
|
-
else if (ChangeSet.isTextChange(suggestion)) {
|
28
|
+
if (ChangeSet.isTextChange(suggestion)) {
|
33
29
|
newSnippet = handleTextChange(suggestion, view.state);
|
34
30
|
}
|
35
31
|
else if (ChangeSet.isNodeChange(suggestion) ||
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"SuggestionSnippet.js","sourceRoot":"","sources":["../../../../../src/components/track-changes/suggestion-list/SuggestionSnippet.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,EAAE,SAAS,
|
1
|
+
{"version":3,"file":"SuggestionSnippet.js","sourceRoot":"","sources":["../../../../../src/components/track-changes/suggestion-list/SuggestionSnippet.tsx"],"names":[],"mappings":"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"}
|
@@ -9,37 +9,33 @@
|
|
9
9
|
*
|
10
10
|
* All portions of the code written by Atypon Systems LLC are Copyright (c) 2022 Atypon Systems LLC. All Rights Reserved.
|
11
11
|
*/
|
12
|
-
import {
|
13
|
-
import { trackCommands, } from '@manuscripts/track-changes-plugin';
|
12
|
+
import { CHANGE_OPERATION, CHANGE_STATUS, trackCommands, } from '@manuscripts/track-changes-plugin';
|
14
13
|
import { NodeSelection, TextSelection } from 'prosemirror-state';
|
15
|
-
export const setSelectedSuggestion = (
|
14
|
+
export const setSelectedSuggestion = (suggestion, getState) => {
|
16
15
|
const editor = getState().editor;
|
17
16
|
const state = editor.state;
|
18
17
|
const view = editor.view;
|
19
18
|
const tr = state.tr;
|
20
|
-
if (
|
21
|
-
|
22
|
-
}
|
23
|
-
else if (suggestions[0].type === 'text-change') {
|
24
|
-
const pos = suggestions[0].to;
|
19
|
+
if (suggestion.type === 'text-change') {
|
20
|
+
const pos = suggestion.to;
|
25
21
|
tr.setSelection(TextSelection.create(state.doc, pos, pos));
|
26
22
|
}
|
27
23
|
else {
|
28
|
-
tr.setSelection(NodeSelection.create(state.doc,
|
24
|
+
tr.setSelection(NodeSelection.create(state.doc, suggestion.from));
|
29
25
|
}
|
30
26
|
view?.focus();
|
31
27
|
view?.dispatch(tr.scrollIntoView());
|
32
28
|
};
|
33
|
-
export const setChangeStatus = (
|
34
|
-
const ids = [];
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
}
|
42
|
-
}
|
29
|
+
export const setChangeStatus = (change, status, execCmd) => {
|
30
|
+
const ids = [change.id];
|
31
|
+
if (change.type === 'node-change' &&
|
32
|
+
!((change.dataTracked.operation === CHANGE_OPERATION.node_split ||
|
33
|
+
change.dataTracked.operation === CHANGE_OPERATION.wrap_with_node) &&
|
34
|
+
status === CHANGE_STATUS.rejected)) {
|
35
|
+
change.children.forEach((child) => {
|
36
|
+
ids.push(child.id);
|
37
|
+
});
|
38
|
+
}
|
43
39
|
execCmd(trackCommands.setChangeStatuses(status, ids));
|
44
40
|
};
|
45
41
|
//# sourceMappingURL=utils.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/components/track-changes/utils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/components/track-changes/utils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EACL,gBAAgB,EAChB,aAAa,EACb,aAAa,GAEd,MAAM,mCAAmC,CAAA;AAC1C,OAAO,EAAW,aAAa,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAKzE,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,UAAyB,EACzB,QAAqB,EACrB,EAAE;IACF,MAAM,MAAM,GAAG,QAAQ,EAAE,CAAC,MAAM,CAAA;IAChC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAA;IAC1B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAA;IACxB,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,CAAA;IACnB,IAAI,UAAU,CAAC,IAAI,KAAK,aAAa,EAAE;QACrC,MAAM,GAAG,GAAG,UAAU,CAAC,EAAE,CAAA;QACzB,EAAE,CAAC,YAAY,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAA;KAC3D;SAAM;QACL,EAAE,CAAC,YAAY,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,CAAA;KAClE;IAED,IAAI,EAAE,KAAK,EAAE,CAAA;IACb,IAAI,EAAE,QAAQ,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC,CAAA;AACrC,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,MAAqB,EACrB,MAAqB,EACrB,OAAsD,EACtD,EAAE;IACF,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IACvB,IACE,MAAM,CAAC,IAAI,KAAK,aAAa;QAC7B,CAAC,CACC,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,KAAK,gBAAgB,CAAC,UAAU;YAC3D,MAAM,CAAC,WAAW,CAAC,SAAS,KAAK,gBAAgB,CAAC,cAAc,CAAC;YACnE,MAAM,KAAK,aAAa,CAAC,QAAQ,CAClC,EACD;QACA,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAChC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QACpB,CAAC,CAAC,CAAA;KACH;IACD,OAAO,CAAC,aAAa,CAAC,iBAAiB,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAA;AACvD,CAAC,CAAA"}
|
@@ -10,7 +10,6 @@
|
|
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
12
|
import { affiliationLabel, authorLabel, } from '@manuscripts/body-editor';
|
13
|
-
import { ChangeSet, } from '@manuscripts/track-changes-plugin';
|
14
13
|
import { nodeNames, schema, } from '@manuscripts/transform';
|
15
14
|
import { NodeTextContentRetriever } from './node-content-retriever';
|
16
15
|
import { changeOperationAlias } from './tracking';
|
@@ -116,18 +115,6 @@ export const handleNodeChange = (suggestion, state) => {
|
|
116
115
|
};
|
117
116
|
}
|
118
117
|
};
|
119
|
-
export const handleGroupChanges = (suggestions, view, doc, dataTracked) => {
|
120
|
-
return {
|
121
|
-
operation: changeOperationAlias(dataTracked.operation),
|
122
|
-
nodeName: 'Text',
|
123
|
-
content: suggestions
|
124
|
-
.map((change) => ChangeSet.isTextChange(change)
|
125
|
-
? handleTextChange(change, view.state)
|
126
|
-
: handleNodeChange(change, view.state))
|
127
|
-
.map((c) => c?.nodeName === 'inline_equation' ? ` ${c.content} ` : c?.content)
|
128
|
-
.join(''),
|
129
|
-
};
|
130
|
-
};
|
131
118
|
export const handleUnknownChange = () => {
|
132
119
|
return {
|
133
120
|
operation: '',
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"change-handlers.js","sourceRoot":"","sources":["../../../src/lib/change-handlers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,EAEL,gBAAgB,EAChB,WAAW,GAEZ,MAAM,0BAA0B,CAAA;
|
1
|
+
{"version":3,"file":"change-handlers.js","sourceRoot":"","sources":["../../../src/lib/change-handlers.ts"],"names":[],"mappings":"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"}
|
@@ -9,10 +9,10 @@
|
|
9
9
|
*
|
10
10
|
* All portions of the code written by Atypon Systems LLC are Copyright (c) 2022 Atypon Systems LLC. All Rights Reserved.
|
11
11
|
*/
|
12
|
-
import {
|
12
|
+
import { TrackedChange } from '@manuscripts/track-changes-plugin';
|
13
13
|
import React from 'react';
|
14
14
|
interface Props {
|
15
|
-
|
15
|
+
suggestion: TrackedChange;
|
16
16
|
isSelected: boolean;
|
17
17
|
onAccept: () => void;
|
18
18
|
onReject: () => void;
|
@@ -1,9 +1,9 @@
|
|
1
|
-
import {
|
1
|
+
import { TrackedChange } from '@manuscripts/track-changes-plugin';
|
2
2
|
import React from 'react';
|
3
3
|
interface Props {
|
4
|
-
|
5
|
-
handleAccept: (c:
|
6
|
-
handleReject: (c:
|
4
|
+
suggestion: TrackedChange;
|
5
|
+
handleAccept: (c: TrackedChange) => void;
|
6
|
+
handleReject: (c: TrackedChange) => void;
|
7
7
|
}
|
8
8
|
declare const SuggestionAction: React.FC<Props>;
|
9
9
|
export default SuggestionAction;
|
@@ -9,17 +9,17 @@
|
|
9
9
|
*
|
10
10
|
* All portions of the code written by Atypon Systems LLC are Copyright (c) 2022 Atypon Systems LLC. All Rights Reserved.
|
11
11
|
*/
|
12
|
-
import {
|
12
|
+
import { TrackedChange } from '@manuscripts/track-changes-plugin';
|
13
13
|
import React from 'react';
|
14
14
|
export interface SuggestionListProps {
|
15
|
-
changes:
|
15
|
+
changes: TrackedChange[];
|
16
16
|
selectionID?: string;
|
17
17
|
title: string;
|
18
18
|
type: string;
|
19
19
|
sortBy: string;
|
20
|
-
onAccept(change:
|
21
|
-
onReject(change:
|
20
|
+
onAccept(change: TrackedChange): void;
|
21
|
+
onReject(change: TrackedChange): void;
|
22
22
|
onAcceptAll?(): void;
|
23
|
-
onSelect?(change:
|
23
|
+
onSelect?(change: TrackedChange): void;
|
24
24
|
}
|
25
25
|
export declare const SuggestionList: React.FC<SuggestionListProps>;
|
@@ -9,8 +9,8 @@
|
|
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 {
|
12
|
+
import { TrackedChange } from '@manuscripts/track-changes-plugin';
|
13
13
|
import React from 'react';
|
14
14
|
export declare const SuggestionSnippet: React.FC<{
|
15
|
-
|
15
|
+
suggestion: TrackedChange;
|
16
16
|
}>;
|
@@ -9,9 +9,9 @@
|
|
9
9
|
*
|
10
10
|
* All portions of the code written by Atypon Systems LLC are Copyright (c) 2022 Atypon Systems LLC. All Rights Reserved.
|
11
11
|
*/
|
12
|
-
import { CHANGE_STATUS,
|
12
|
+
import { CHANGE_STATUS, TrackedChange } from '@manuscripts/track-changes-plugin';
|
13
13
|
import { Command } from 'prosemirror-state';
|
14
14
|
import { EditorView } from 'prosemirror-view';
|
15
15
|
import { state } from '../../store';
|
16
|
-
export declare const setSelectedSuggestion: (
|
17
|
-
export declare const setChangeStatus: (
|
16
|
+
export declare const setSelectedSuggestion: (suggestion: TrackedChange, getState: () => state) => void;
|
17
|
+
export declare const setChangeStatus: (change: TrackedChange, status: CHANGE_STATUS, execCmd: (cmd: Command, hookView?: EditorView) => void) => void;
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import { NodeAttrChange, NodeChange,
|
1
|
+
import { NodeAttrChange, NodeChange, TextChange } from '@manuscripts/track-changes-plugin';
|
2
2
|
import { ManuscriptEditorState } from '@manuscripts/transform';
|
3
3
|
interface SnippetData {
|
4
4
|
operation: string;
|
@@ -7,6 +7,5 @@ interface SnippetData {
|
|
7
7
|
}
|
8
8
|
export declare const handleTextChange: (suggestion: TextChange, state: ManuscriptEditorState) => SnippetData | null;
|
9
9
|
export declare const handleNodeChange: (suggestion: NodeChange | NodeAttrChange, state: ManuscriptEditorState) => SnippetData | null;
|
10
|
-
export declare const handleGroupChanges: (suggestions: RootChange, view: any, doc: any, dataTracked: any) => SnippetData | null;
|
11
10
|
export declare const handleUnknownChange: () => SnippetData;
|
12
11
|
export {};
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@manuscripts/article-editor",
|
3
|
-
"version": "3.6.7-LEAN-
|
3
|
+
"version": "3.6.7-LEAN-4077.0",
|
4
4
|
"license": "CPAL-1.0",
|
5
5
|
"description": "React components for editing and viewing manuscripts",
|
6
6
|
"repository": "github:Atypon-OpenSource/manuscripts-article-editor",
|
@@ -35,12 +35,12 @@
|
|
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.6.36-LEAN-
|
38
|
+
"@manuscripts/body-editor": "2.6.36-LEAN-4077.1",
|
39
39
|
"@manuscripts/json-schema": "2.2.11",
|
40
40
|
"@manuscripts/library": "1.3.11",
|
41
|
-
"@manuscripts/style-guide": "2.0.
|
42
|
-
"@manuscripts/track-changes-plugin": "1.8.
|
43
|
-
"@manuscripts/transform": "3.0.
|
41
|
+
"@manuscripts/style-guide": "2.0.28-LEAN-4077.0",
|
42
|
+
"@manuscripts/track-changes-plugin": "1.8.5",
|
43
|
+
"@manuscripts/transform": "3.0.27-LEAN-4077.0",
|
44
44
|
"@popperjs/core": "^2.11.8",
|
45
45
|
"@types/use-sync-external-store": "^0.0.6",
|
46
46
|
"autotrack": "^2.4.1",
|