@manuscripts/article-editor 3.1.13 → 3.1.14
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/EditorApp.js +8 -1
- package/dist/cjs/EditorApp.js.map +1 -1
- package/dist/cjs/components/Page.js +1 -1
- package/dist/cjs/components/Page.js.map +1 -1
- package/dist/cjs/components/comments/CommentActions.js +4 -4
- package/dist/cjs/components/comments/CommentActions.js.map +1 -1
- package/dist/cjs/components/comments/CommentBody.js +3 -3
- package/dist/cjs/components/comments/CommentBody.js.map +1 -1
- package/dist/cjs/quarterback/QuarterbackStepsExchanger.js +20 -10
- package/dist/cjs/quarterback/QuarterbackStepsExchanger.js.map +1 -1
- package/dist/cjs/store/StoreContext.js +0 -3
- package/dist/cjs/store/StoreContext.js.map +1 -1
- package/dist/es/EditorApp.js +9 -2
- package/dist/es/EditorApp.js.map +1 -1
- package/dist/es/components/Page.js +1 -1
- package/dist/es/components/Page.js.map +1 -1
- package/dist/es/components/comments/CommentActions.js +4 -4
- package/dist/es/components/comments/CommentActions.js.map +1 -1
- package/dist/es/components/comments/CommentBody.js +3 -3
- package/dist/es/components/comments/CommentBody.js.map +1 -1
- package/dist/es/quarterback/QuarterbackStepsExchanger.js +20 -10
- package/dist/es/quarterback/QuarterbackStepsExchanger.js.map +1 -1
- package/dist/es/store/StoreContext.js +1 -4
- package/dist/es/store/StoreContext.js.map +1 -1
- package/dist/types/quarterback/QuarterbackStepsExchanger.d.ts +2 -0
- package/dist/types/quarterback/api/document.d.ts +7 -42
- package/dist/types/quarterback/api/methods.d.ts +1 -1
- package/package.json +3 -3
package/dist/cjs/EditorApp.js
CHANGED
@@ -54,8 +54,14 @@ const PlaceholderWrapper = styled_components_1.default.div `
|
|
54
54
|
const EditorApp = ({ manuscriptID, projectID, permittedActions, fileManagement, files, authToken, observer, }) => {
|
55
55
|
const userID = (0, user_1.getCurrentUserId)();
|
56
56
|
const [store, setStore] = (0, react_1.useState)();
|
57
|
+
const loadedRef = (0, react_1.useRef)(false);
|
58
|
+
const observerSubscribed = (0, react_1.useRef)(false);
|
57
59
|
(0, react_1.useEffect)(() => {
|
58
60
|
// implement remount for the store if component is retriggered
|
61
|
+
if (loadedRef.current) {
|
62
|
+
return;
|
63
|
+
}
|
64
|
+
loadedRef.current = true;
|
59
65
|
(0, store_1.createStore)([
|
60
66
|
new store_1.BasicSource(fileManagement, projectID, manuscriptID, files, permittedActions, userID || '', authToken || ''),
|
61
67
|
new PsSource_1.default(files),
|
@@ -72,9 +78,10 @@ const EditorApp = ({ manuscriptID, projectID, permittedActions, fileManagement,
|
|
72
78
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
73
79
|
}, [manuscriptID, projectID]);
|
74
80
|
(0, react_1.useEffect)(() => {
|
75
|
-
if (!observer) {
|
81
|
+
if (!observer || observerSubscribed.current || !store) {
|
76
82
|
return;
|
77
83
|
}
|
84
|
+
observerSubscribed.current = true;
|
78
85
|
store?.subscribe((s) => observer.onUpdate(s));
|
79
86
|
observer.state.current = {
|
80
87
|
get: () => store?.getState(),
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"EditorApp.js","sourceRoot":"","sources":["../../src/EditorApp.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAYA,+
|
1
|
+
{"version":3,"file":"EditorApp.js","sourceRoot":"","sources":["../../src/EditorApp.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAYA,+CAA4E;AAC5E,0EAAsC;AAEtC,4CAAwC;AACxC,4GAAmF;AACnF,uFAAmF;AACnF,qCAA6C;AAC7C,wEAA+C;AAC/C,mCAMgB;AAuBhB,MAAM,OAAO,GAAG,2BAAM,CAAC,GAAG,CAAA;;;;;;;;CAQzB,CAAA;AAED,MAAM,kBAAkB,GAAG,2BAAM,CAAC,GAAG,CAAA;;;;;;;CAOpC,CAAA;AAED,MAAM,SAAS,GAA6B,CAAC,EAC3C,YAAY,EACZ,SAAS,EACT,gBAAgB,EAChB,cAAc,EACd,KAAK,EACL,SAAS,EACT,QAAQ,GACT,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,IAAA,uBAAgB,GAAE,CAAA;IAEjC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,GAAgB,CAAA;IAElD,MAAM,SAAS,GAAG,IAAA,cAAM,EAAU,KAAK,CAAC,CAAA;IACxC,MAAM,kBAAkB,GAAG,IAAA,cAAM,EAAU,KAAK,CAAC,CAAA;IAEjD,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,8DAA8D;QAC9D,IAAI,SAAS,CAAC,OAAO,EAAE;YACrB,OAAM;SACP;QACD,SAAS,CAAC,OAAO,GAAG,IAAI,CAAA;QACxB,IAAA,mBAAW,EAAC;YACV,IAAI,mBAAW,CACb,cAAc,EACd,SAAS,EACT,YAAY,EACZ,KAAK,EACL,gBAAgB,EAChB,MAAM,IAAI,EAAE,EACZ,SAAS,IAAI,EAAE,CAChB;YACD,IAAI,kBAAQ,CAAC,KAAK,CAAC;SACpB,CAAC;aACC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;YACd,QAAQ,CAAC,KAAK,CAAC,CAAA;QACjB,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAClB,CAAC,CAAC,CAAA;QACJ,OAAO,GAAG,EAAE;YACV,KAAK,EAAE,OAAO,EAAE,CAAA;QAClB,CAAC,CAAA;QACD,uDAAuD;IACzD,CAAC,EAAE,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC,CAAA;IAE7B,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,CAAC,QAAQ,IAAI,kBAAkB,CAAC,OAAO,IAAI,CAAC,KAAK,EAAE;YACrD,OAAM;SACP;QACD,kBAAkB,CAAC,OAAO,GAAG,IAAI,CAAA;QACjC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;QAC7C,QAAQ,CAAC,KAAK,CAAC,OAAO,GAAG;YACvB,GAAG,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE;YAC5B,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAc,CAAC;SACnD,CAAA;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAA;IAErB,OAAO,KAAK,CAAC,CAAC,CAAC,CACb,8BAAC,4BAAoB,IAAC,KAAK,EAAE,KAAK;QAChC,8BAAC,WAAI;YACH,8BAAC,OAAO;gBACN,8BAAC,iCAAuB,OAAG,CACnB,CACL,CACc,CACxB,CAAC,CAAC,CAAC,CACF,8BAAC,kBAAkB;QACjB,8BAAC,6CAAqB,OAAG,CACN,CACtB,CAAA;AACH,CAAC,CAAA;AAED,kBAAe,SAAS,CAAA"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"Page.js","sourceRoot":"","sources":["../../../src/components/Page.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;;;;AAEH,kDAAyB;AACzB,0EAAsC;AAEtC,oCAAmC;AAEtB,QAAA,IAAI,GAAG,2BAAM,CAAC,IAAI,CAAA;;;;;sBAKT,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO;;;;;;;;CAQrE,CAAA;AAEY,QAAA,QAAQ,GAAG,IAAA,2BAAM,EAAC,YAAI,CAAC,CAAA;;;;;CAKnC,CAAA;AAED,MAAM,aAAa,GAAG,2BAAM,CAAC,GAAG,CAAA;;;;;;WAMrB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;iBACpC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;CACvD,CAAA;AAEM,MAAM,IAAI,GAA4C,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC5E,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,GAAG,IAAA,gBAAQ,EAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC3C,SAAS,EAAE,KAAK,CAAC,SAAS;KAC3B,CAAC,CAAC,CAAA;IAEH,IAAI,CAAC,SAAS,EAAE;QACd,
|
1
|
+
{"version":3,"file":"Page.js","sourceRoot":"","sources":["../../../src/components/Page.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;;;;AAEH,kDAAyB;AACzB,0EAAsC;AAEtC,oCAAmC;AAEtB,QAAA,IAAI,GAAG,2BAAM,CAAC,IAAI,CAAA;;;;;sBAKT,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO;;;;;;;;CAQrE,CAAA;AAEY,QAAA,QAAQ,GAAG,IAAA,2BAAM,EAAC,YAAI,CAAC,CAAA;;;;;CAKnC,CAAA;AAED,MAAM,aAAa,GAAG,2BAAM,CAAC,GAAG,CAAA;;;;;;WAMrB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;iBACpC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;CACvD,CAAA;AAEM,MAAM,IAAI,GAA4C,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC5E,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,GAAG,IAAA,gBAAQ,EAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC3C,SAAS,EAAE,KAAK,CAAC,SAAS;KAC3B,CAAC,CAAC,CAAA;IAEH,IAAI,CAAC,SAAS,EAAE;QACd,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAA;KAChE;IAED,OAAO,8BAAC,aAAa,QAAE,QAAQ,CAAiB,CAAA;AAClD,CAAC,CAAA;AAVY,QAAA,IAAI,QAUhB"}
|
@@ -49,11 +49,11 @@ const CommentActions = ({ comment, isResolveEnabled, isActionsEnabled, onEdit, o
|
|
49
49
|
return (react_1.default.createElement(react_1.default.Fragment, null,
|
50
50
|
isResolveEnabled && (react_1.default.createElement(CommentResolveButton_1.CommentResolveButton, { comment: comment, onClick: toggleResolve })),
|
51
51
|
isActionsEnabled && (react_1.default.createElement(style_guide_1.DropdownContainer, { ref: wrapperRef },
|
52
|
-
react_1.default.createElement(exports.ActionsIcon, { onClick: toggleOpen },
|
52
|
+
react_1.default.createElement(exports.ActionsIcon, { "data-cy": "comment-dropdown-trigger", onClick: toggleOpen },
|
53
53
|
react_1.default.createElement(style_guide_1.DotsIcon, null)),
|
54
|
-
isOpen && (react_1.default.createElement(style_guide_1.DropdownList, { direction: 'right', width: 125, onClick: toggleOpen },
|
55
|
-
react_1.default.createElement(exports.CommentAction, { onClick: onEdit }, "Edit"),
|
56
|
-
react_1.default.createElement(exports.CommentAction, { onClick: onDelete }, "Delete")))))));
|
54
|
+
isOpen && (react_1.default.createElement(style_guide_1.DropdownList, { "data-cy": "comment-dropdown", direction: 'right', width: 125, onClick: toggleOpen },
|
55
|
+
react_1.default.createElement(exports.CommentAction, { "data-cy": "comment-edit", onClick: onEdit }, "Edit"),
|
56
|
+
react_1.default.createElement(exports.CommentAction, { "data-cy": "comment-delete", onClick: onDelete }, "Delete")))))));
|
57
57
|
};
|
58
58
|
exports.CommentActions = CommentActions;
|
59
59
|
//# sourceMappingURL=CommentActions.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"CommentActions.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentActions.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;;;;AAGH,0DAKiC;AACjC,kDAAyB;AACzB,0EAAsC;AAEtC,iEAA6D;AAEhD,QAAA,WAAW,GAAG,2BAAM,CAAC,MAAM,CAAA;;;;;;;;;;;;CAYvC,CAAA;AAEY,QAAA,aAAa,GAAG,2BAAM,CAAC,GAAG,CAAA;iBACtB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;;;;WAI7C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;;;;;;CAMpD,CAAA;AAWM,MAAM,cAAc,GAAkC,CAAC,EAC5D,OAAO,EACP,gBAAgB,EAChB,gBAAgB,EAChB,MAAM,EACN,QAAQ,EACR,aAAa,GACd,EAAE,EAAE;IACH,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,IAAA,yBAAW,GAAE,CAAA;IAExD,OAAO,CACL;QACG,gBAAgB,IAAI,CACnB,8BAAC,2CAAoB,IAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAI,CACnE;QACA,gBAAgB,IAAI,CACnB,8BAAC,+BAAiB,IAAC,GAAG,EAAE,UAAU;YAChC,8BAAC,mBAAW,
|
1
|
+
{"version":3,"file":"CommentActions.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentActions.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;;;;AAGH,0DAKiC;AACjC,kDAAyB;AACzB,0EAAsC;AAEtC,iEAA6D;AAEhD,QAAA,WAAW,GAAG,2BAAM,CAAC,MAAM,CAAA;;;;;;;;;;;;CAYvC,CAAA;AAEY,QAAA,aAAa,GAAG,2BAAM,CAAC,GAAG,CAAA;iBACtB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;;;;WAI7C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;;;;;;CAMpD,CAAA;AAWM,MAAM,cAAc,GAAkC,CAAC,EAC5D,OAAO,EACP,gBAAgB,EAChB,gBAAgB,EAChB,MAAM,EACN,QAAQ,EACR,aAAa,GACd,EAAE,EAAE;IACH,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,IAAA,yBAAW,GAAE,CAAA;IAExD,OAAO,CACL;QACG,gBAAgB,IAAI,CACnB,8BAAC,2CAAoB,IAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAI,CACnE;QACA,gBAAgB,IAAI,CACnB,8BAAC,+BAAiB,IAAC,GAAG,EAAE,UAAU;YAChC,8BAAC,mBAAW,eAAS,0BAA0B,EAAC,OAAO,EAAE,UAAU;gBACjE,8BAAC,sBAAQ,OAAG,CACA;YACb,MAAM,IAAI,CACT,8BAAC,0BAAY,eACH,kBAAkB,EAC1B,SAAS,EAAE,OAAO,EAClB,KAAK,EAAE,GAAG,EACV,OAAO,EAAE,UAAU;gBAEnB,8BAAC,qBAAa,eAAS,cAAc,EAAC,OAAO,EAAE,MAAM,WAErC;gBAChB,8BAAC,qBAAa,eAAS,gBAAgB,EAAC,OAAO,EAAE,QAAQ,aAEzC,CACH,CAChB,CACiB,CACrB,CACA,CACJ,CAAA;AACH,CAAC,CAAA;AAvCY,QAAA,cAAc,kBAuC1B"}
|
@@ -86,12 +86,12 @@ const CommentBody = ({ comment, isEditing, onSave, onCancel, onSelect, }) => {
|
|
86
86
|
editor.current = e;
|
87
87
|
}, []);
|
88
88
|
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, { ref: ref, defaultValue: comment.node.attrs.contents }),
|
90
|
-
react_1.default.createElement(EditorActions,
|
89
|
+
react_1.default.createElement(CommentEditor, { "data-cy": "comment-editor", ref: ref, defaultValue: comment.node.attrs.contents }),
|
90
|
+
react_1.default.createElement(EditorActions, { "data-cy": "comment-actions" },
|
91
91
|
react_1.default.createElement(style_guide_1.SecondaryButton, { onClick: onCancel }, "Cancel"),
|
92
92
|
react_1.default.createElement(style_guide_1.PrimaryButton, { onClick: handleSave }, "Save")))) : (react_1.default.createElement(react_1.default.Fragment, null,
|
93
93
|
react_1.default.createElement(CommentContent, { onClick: onSelect },
|
94
|
-
react_1.default.createElement(CommentViewer,
|
94
|
+
react_1.default.createElement(CommentViewer, { "data-cy": "comment-text" }, comment.node.attrs.contents))))));
|
95
95
|
};
|
96
96
|
exports.CommentBody = CommentBody;
|
97
97
|
//# sourceMappingURL=CommentBody.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"CommentBody.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentBody.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAYA,0DAIiC;AACjC,+CAAkD;AAClD,0EAAsC;AAEtC,MAAM,cAAc,GAAG,2BAAM,CAAC,GAAG,CAAA;;CAEhC,CAAA;AAED,MAAM,aAAa,GAAG,2BAAM,CAAC,QAAQ,CAAA;;iBAEpB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;WAC7C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;YACzC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;CAoB/C,CAAA;AAED,MAAM,aAAa,GAAG,2BAAM,CAAC,GAAG,CAAA;;;iBAGf,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;;;WAG7C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;YACzC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC;CAC/C,CAAA;AAED,MAAM,aAAa,GAAG,IAAA,2BAAM,EAAC,yBAAW,CAAC,CAAA;;;;CAIxC,CAAA;AAUM,MAAM,WAAW,GAA+B,CAAC,EACtD,OAAO,EACP,SAAS,EACT,MAAM,EACN,QAAQ,EACR,QAAQ,GACT,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,IAAA,cAAM,EAA6B,IAAI,CAAC,CAAA;IAEvD,MAAM,UAAU,GAAG,GAAG,EAAE;QACtB,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;SAC7B;IACH,CAAC,CAAA;IAED,MAAM,GAAG,GAAG,IAAA,mBAAW,EAAC,CAAC,CAA6B,EAAE,EAAE;QACxD,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,KAAK,CAAC,EAAE;YAC7B,CAAC,CAAC,KAAK,EAAE,CAAA;SACV;QACD,MAAM,CAAC,OAAO,GAAG,CAAC,CAAA;IACpB,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,OAAO,CACL,8DACG,SAAS,CAAC,CAAC,CAAC,CACX;QACE,8BAAC,aAAa,
|
1
|
+
{"version":3,"file":"CommentBody.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentBody.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAYA,0DAIiC;AACjC,+CAAkD;AAClD,0EAAsC;AAEtC,MAAM,cAAc,GAAG,2BAAM,CAAC,GAAG,CAAA;;CAEhC,CAAA;AAED,MAAM,aAAa,GAAG,2BAAM,CAAC,QAAQ,CAAA;;iBAEpB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;WAC7C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;YACzC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;CAoB/C,CAAA;AAED,MAAM,aAAa,GAAG,2BAAM,CAAC,GAAG,CAAA;;;iBAGf,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;;;WAG7C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;YACzC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC;CAC/C,CAAA;AAED,MAAM,aAAa,GAAG,IAAA,2BAAM,EAAC,yBAAW,CAAC,CAAA;;;;CAIxC,CAAA;AAUM,MAAM,WAAW,GAA+B,CAAC,EACtD,OAAO,EACP,SAAS,EACT,MAAM,EACN,QAAQ,EACR,QAAQ,GACT,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,IAAA,cAAM,EAA6B,IAAI,CAAC,CAAA;IAEvD,MAAM,UAAU,GAAG,GAAG,EAAE;QACtB,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;SAC7B;IACH,CAAC,CAAA;IAED,MAAM,GAAG,GAAG,IAAA,mBAAW,EAAC,CAAC,CAA6B,EAAE,EAAE;QACxD,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,KAAK,CAAC,EAAE;YAC7B,CAAC,CAAC,KAAK,EAAE,CAAA;SACV;QACD,MAAM,CAAC,OAAO,GAAG,CAAC,CAAA;IACpB,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,OAAO,CACL,8DACG,SAAS,CAAC,CAAC,CAAC,CACX;QACE,8BAAC,aAAa,eACJ,gBAAgB,EACxB,GAAG,EAAE,GAAG,EACR,YAAY,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,GAC1B;QACjB,8BAAC,aAAa,eAAS,iBAAiB;YACtC,8BAAC,6BAAe,IAAC,OAAO,EAAE,QAAQ,aAA0B;YAC5D,8BAAC,2BAAa,IAAC,OAAO,EAAE,UAAU,WAAsB,CAC1C,CACf,CACJ,CAAC,CAAC,CAAC,CACF;QACE,8BAAC,cAAc,IAAC,OAAO,EAAE,QAAQ;YAC/B,8BAAC,aAAa,eAAS,cAAc,IAClC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CACd,CACD,CAChB,CACJ,CACA,CACJ,CAAA;AACH,CAAC,CAAA;AA/CY,QAAA,WAAW,eA+CvB"}
|
@@ -46,6 +46,8 @@ class QuarterbackStepsExchanger extends body_editor_1.CollabProvider {
|
|
46
46
|
return QuarterbackStepsExchanger._instance;
|
47
47
|
}
|
48
48
|
super();
|
49
|
+
this.reconcileAttempts = 0;
|
50
|
+
this.reconcileAttemptsMax = 20;
|
49
51
|
QuarterbackStepsExchanger._instance = this;
|
50
52
|
this.applySteps = applySteps;
|
51
53
|
this.docId = docId;
|
@@ -62,7 +64,7 @@ class QuarterbackStepsExchanger extends body_editor_1.CollabProvider {
|
|
62
64
|
}
|
63
65
|
const steps = this.hydrateSteps(jsonSteps);
|
64
66
|
if (steps.length) {
|
65
|
-
this.newStepsListener(
|
67
|
+
this.newStepsListener();
|
66
68
|
}
|
67
69
|
});
|
68
70
|
}
|
@@ -79,13 +81,26 @@ class QuarterbackStepsExchanger extends body_editor_1.CollabProvider {
|
|
79
81
|
stepsJSON.push(step.toJSON());
|
80
82
|
});
|
81
83
|
this.currentVersion = version;
|
82
|
-
this.flushImmediate = this.debounce(() => {
|
83
|
-
this.applySteps(this.projectId, this.docId, {
|
84
|
+
this.flushImmediate = this.debounce(async () => {
|
85
|
+
const result = await this.applySteps(this.projectId, this.docId, {
|
84
86
|
steps: stepsJSON,
|
85
87
|
version,
|
86
88
|
clientID,
|
87
89
|
});
|
88
|
-
|
90
|
+
if (result &&
|
91
|
+
'err' in result &&
|
92
|
+
'code' in result &&
|
93
|
+
result.code === 409 &&
|
94
|
+
this.reconcileAttempts < this.reconcileAttemptsMax) {
|
95
|
+
// debugger
|
96
|
+
console.warn('Attempting Reconciliation');
|
97
|
+
this.newStepsListener();
|
98
|
+
this.reconcileAttempts++;
|
99
|
+
}
|
100
|
+
else {
|
101
|
+
this.reconcileAttempts = 0;
|
102
|
+
}
|
103
|
+
}, 1200, flush, () => {
|
89
104
|
this.throttlingControl(false);
|
90
105
|
});
|
91
106
|
if (!flush) {
|
@@ -116,12 +131,7 @@ const stepsExchanger = (docId, projectId, lastVersion, authToken, throttlingCont
|
|
116
131
|
if (!isAuthed) {
|
117
132
|
return;
|
118
133
|
}
|
119
|
-
const applySteps = async (projectId, docId, payload) =>
|
120
|
-
const resp = await docApi.applySteps(projectId, docId, authToken, payload);
|
121
|
-
if ('data' in resp) {
|
122
|
-
return resp.data;
|
123
|
-
}
|
124
|
-
};
|
134
|
+
const applySteps = async (projectId, docId, payload) => docApi.applySteps(projectId, docId, authToken, payload);
|
125
135
|
const getStepsSince = async (projectId, docId, version) => {
|
126
136
|
const resp = await docApi.stepsSince(projectId, docId, version, authToken);
|
127
137
|
if ('data' in resp) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"QuarterbackStepsExchanger.js","sourceRoot":"","sources":["../../../src/quarterback/QuarterbackStepsExchanger.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;GAUG;AACH,0DAAyD;AACzD,sDAA+C;AAC/C,iEAA4C;AAE5C,sEAAmE;AACnE,uDAAwC;
|
1
|
+
{"version":3,"file":"QuarterbackStepsExchanger.js","sourceRoot":"","sources":["../../../src/quarterback/QuarterbackStepsExchanger.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;GAUG;AACH,0DAAyD;AACzD,sDAA+C;AAC/C,iEAA4C;AAE5C,sEAAmE;AACnE,uDAAwC;AAQxC,MAAM,yBAA0B,SAAQ,4BAAc;IA8BpD,YACE,KAAa,EACb,SAAiB,EACjB,eAAuB,EACvB,UAAmD,EACnD,aAAyD,EACzD,aAIS,EACT,SAAiB,EACjB,iBAAoC;QAEpC,IAAI,yBAAyB,CAAC,SAAS,EAAE;YACvC,OAAO,yBAAyB,CAAC,SAAS,CAAA;SAC3C;QACD,KAAK,EAAE,CAAA;QApBT,sBAAiB,GAAG,CAAC,CAAA;QACrB,yBAAoB,GAAG,EAAE,CAAA;QAoBvB,yBAAyB,CAAC,SAAS,GAAG,IAAI,CAAA;QAC1C,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAE1B,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;QAE1C,IAAI,CAAC,cAAc,GAAG,eAAe,CAAA;QACrC,IAAI,CAAC,QAAQ,GAAG,IAAA,kCAAgB,GAAE,CAAA;QAClC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;QAElC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC1C,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QAE1D,aAAa,CAAC,SAAS,EAAE,KAAK,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE;YAChE,IAAI,CAAC,SAAS,EAAE;gBACd,OAAM;aACP;YACD,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAA;YAC1C,IAAI,KAAK,CAAC,MAAM,EAAE;gBAChB,IAAI,CAAC,gBAAgB,EAAE,CAAA;aACxB;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,OAAO;QACL,yBAAyB,CAAC,SAAS,GAAG,IAAI,CAAA;IAC5C,CAAC;IAED,YAAY,CAAC,SAAoB;QAC/B,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,CAAU,EAAE,EAAE,CAAC,4BAAI,CAAC,QAAQ,CAAC,kBAAM,EAAE,CAAC,CAAC,CAAW,CAAA;IAC1E,CAAC;IAED,KAAK,CAAC,SAAS,CACb,OAAe,EACf,KAAa,EACb,QAAgB,EAChB,KAAK,GAAG,KAAK;QAEb,iCAAiC;QACjC,MAAM,SAAS,GAAc,EAAE,CAAA;QAC/B,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACrB,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAA;QAC/B,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,cAAc,GAAG,OAAO,CAAA;QAE7B,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,QAAQ,CACjC,KAAK,IAAI,EAAE;YACT,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,EAAE;gBAC/D,KAAK,EAAE,SAAS;gBAChB,OAAO;gBACP,QAAQ;aACT,CAAC,CAAA;YACF,IACE,MAAM;gBACN,KAAK,IAAI,MAAM;gBACf,MAAM,IAAI,MAAM;gBAChB,MAAM,CAAC,IAAI,KAAK,GAAG;gBACnB,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,oBAAoB,EAClD;gBACA,WAAW;gBACX,OAAO,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAA;gBACzC,IAAI,CAAC,gBAAgB,EAAE,CAAA;gBACvB,IAAI,CAAC,iBAAiB,EAAE,CAAA;aACzB;iBAAM;gBACL,IAAI,CAAC,iBAAiB,GAAG,CAAC,CAAA;aAC3B;QACH,CAAC,EACD,IAAI,EACJ,KAAK,EACL,GAAG,EAAE;YACH,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAA;QAC/B,CAAC,CACF,CAAA;QAED,IAAI,CAAC,KAAK,EAAE;YACV,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAA;SAC7B;QAED,OAAO,OAAO,CAAC,OAAO,EAAE,CAAA;IAC1B,CAAC;IAED,WAAW;QACT,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,cAAc,EAAE,CAAA;IAC9C,CAAC;IAED,UAAU,CAAC,QAA4C;QACrD,IAAI,CAAC,gBAAgB,GAAG,QAAQ,CAAA;IAClC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,OAAe;QAC9B,uDAAuD;QACvD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;QACzE,IAAI,GAAG,EAAE;YACP,OAAO;gBACL,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC;gBACnC,SAAS,EAAE,GAAG,CAAC,SAAS;gBACxB,OAAO,EAAE,GAAG,CAAC,OAAO;aACrB,CAAA;SACF;QACD,OAAM;IACR,CAAC;CACF;AAEM,MAAM,cAAc,GAAG,CAC5B,KAAa,EACb,SAAiB,EACjB,WAAmB,EACnB,SAAiB,EACjB,iBAAoC,EACpC,QAAQ,GAAG,IAAI,EACf,EAAE;IACF,IAAI,CAAC,QAAQ,EAAE;QACb,OAAM;KACP;IACD,MAAM,UAAU,GAAG,KAAK,EACtB,SAAiB,EACjB,KAAa,EACb,OAAqB,EACrB,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;IAE5D,MAAM,aAAa,GAAG,KAAK,EACzB,SAAiB,EACjB,KAAa,EACb,OAAe,EACf,EAAE;QACF,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,CAAC,CAAA;QAC1E,IAAI,MAAM,IAAI,IAAI,EAAE;YAClB,OAAO,IAAI,CAAC,IAAI,CAAA;SACjB;IACH,CAAC,CAAA;IAED,OAAO,IAAI,yBAAyB,CAClC,KAAK,EACL,SAAS,EACT,WAAW,EACX,UAAU,EACV,aAAa,EACb,MAAM,CAAC,iBAAiB,EACxB,SAAS,EACT,iBAAiB,CAClB,CAAA;AACH,CAAC,CAAA;AAtCY,QAAA,cAAc,kBAsC1B;AACD,kBAAe,yBAAyB,CAAA"}
|
@@ -45,9 +45,6 @@ const createStore = async (sources) => {
|
|
45
45
|
};
|
46
46
|
exports.createStore = createStore;
|
47
47
|
const GenericStoreProvider = ({ children, store }) => {
|
48
|
-
(0, react_1.useEffect)(() => {
|
49
|
-
return () => store.unmount();
|
50
|
-
}, [store]);
|
51
48
|
if (store) {
|
52
49
|
return (react_1.default.createElement(GenericStoreContext.Provider, { value: store }, store.state?.doc ? children : react_1.default.createElement("p", null, "Project was not found")));
|
53
50
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"StoreContext.js","sourceRoot":"","sources":["../../../src/store/StoreContext.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;GAUG;AACH,+
|
1
|
+
{"version":3,"file":"StoreContext.js","sourceRoot":"","sources":["../../../src/store/StoreContext.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;GAUG;AACH,+CAAwD;AAExD,wBAAyD;AAEzD,MAAM,mBAAmB,GAAG,IAAA,qBAAa,EAAe,IAAI,eAAY,EAAE,CAAC,CAAA;AAEpE,MAAM,WAAW,GAAG,KAAK,EAAE,OAAkC,EAAE,EAAE;IACtE,MAAM,KAAK,GAAG,IAAI,eAAY,EAAE,CAAA;IAChC,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACzB,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAJY,QAAA,WAAW,eAIvB;AAOM,MAAM,oBAAoB,GAAoB,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE;IAC3E,IAAI,KAAK,EAAE;QACT,OAAO,CACL,8BAAC,mBAAmB,CAAC,QAAQ,IAAC,KAAK,EAAE,KAAK,IACvC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,iEAA4B,CAC9B,CAChC,CAAA;KACF;IACD,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AATY,QAAA,oBAAoB,wBAShC;AAEM,MAAM,eAAe,GAAG,GAAG,EAAE,CAAC,IAAA,kBAAU,EAAC,mBAAmB,CAAC,CAAA;AAAvD,QAAA,eAAe,mBAAwC"}
|
package/dist/es/EditorApp.js
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
import React, { useEffect, useState } from 'react';
|
1
|
+
import React, { useEffect, useRef, useState } from 'react';
|
2
2
|
import styled from 'styled-components';
|
3
3
|
import { Page } from './components/Page';
|
4
4
|
import ManuscriptPageContainer from './components/projects/ManuscriptPageContainer';
|
@@ -26,8 +26,14 @@ const PlaceholderWrapper = styled.div `
|
|
26
26
|
const EditorApp = ({ manuscriptID, projectID, permittedActions, fileManagement, files, authToken, observer, }) => {
|
27
27
|
const userID = getCurrentUserId();
|
28
28
|
const [store, setStore] = useState();
|
29
|
+
const loadedRef = useRef(false);
|
30
|
+
const observerSubscribed = useRef(false);
|
29
31
|
useEffect(() => {
|
30
32
|
// implement remount for the store if component is retriggered
|
33
|
+
if (loadedRef.current) {
|
34
|
+
return;
|
35
|
+
}
|
36
|
+
loadedRef.current = true;
|
31
37
|
createStore([
|
32
38
|
new BasicSource(fileManagement, projectID, manuscriptID, files, permittedActions, userID || '', authToken || ''),
|
33
39
|
new PsSource(files),
|
@@ -44,9 +50,10 @@ const EditorApp = ({ manuscriptID, projectID, permittedActions, fileManagement,
|
|
44
50
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
45
51
|
}, [manuscriptID, projectID]);
|
46
52
|
useEffect(() => {
|
47
|
-
if (!observer) {
|
53
|
+
if (!observer || observerSubscribed.current || !store) {
|
48
54
|
return;
|
49
55
|
}
|
56
|
+
observerSubscribed.current = true;
|
50
57
|
store?.subscribe((s) => observer.onUpdate(s));
|
51
58
|
observer.state.current = {
|
52
59
|
get: () => store?.getState(),
|
package/dist/es/EditorApp.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"EditorApp.js","sourceRoot":"","sources":["../../src/EditorApp.tsx"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,EAAoB,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;
|
1
|
+
{"version":3,"file":"EditorApp.js","sourceRoot":"","sources":["../../src/EditorApp.tsx"],"names":[],"mappings":"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"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"Page.js","sourceRoot":"","sources":["../../../src/components/Page.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,MAAM,MAAM,mBAAmB,CAAA;AAEtC,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAEnC,MAAM,CAAC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAA;;;;;sBAKT,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO;;;;;;;;CAQrE,CAAA;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,CAAA;;;;;CAKnC,CAAA;AAED,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;;WAMrB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;iBACpC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;CACvD,CAAA;AAED,MAAM,CAAC,MAAM,IAAI,GAA4C,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC5E,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC3C,SAAS,EAAE,KAAK,CAAC,SAAS;KAC3B,CAAC,CAAC,CAAA;IAEH,IAAI,CAAC,SAAS,EAAE;QACd,
|
1
|
+
{"version":3,"file":"Page.js","sourceRoot":"","sources":["../../../src/components/Page.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,MAAM,MAAM,mBAAmB,CAAA;AAEtC,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAEnC,MAAM,CAAC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAA;;;;;sBAKT,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO;;;;;;;;CAQrE,CAAA;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,CAAA;;;;;CAKnC,CAAA;AAED,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;;WAMrB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;iBACpC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;CACvD,CAAA;AAED,MAAM,CAAC,MAAM,IAAI,GAA4C,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC5E,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC3C,SAAS,EAAE,KAAK,CAAC,SAAS;KAC3B,CAAC,CAAC,CAAA;IAEH,IAAI,CAAC,SAAS,EAAE;QACd,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAA;KAChE;IAED,OAAO,oBAAC,aAAa,QAAE,QAAQ,CAAiB,CAAA;AAClD,CAAC,CAAA"}
|
@@ -43,10 +43,10 @@ export const CommentActions = ({ comment, isResolveEnabled, isActionsEnabled, on
|
|
43
43
|
return (React.createElement(React.Fragment, null,
|
44
44
|
isResolveEnabled && (React.createElement(CommentResolveButton, { comment: comment, onClick: toggleResolve })),
|
45
45
|
isActionsEnabled && (React.createElement(DropdownContainer, { ref: wrapperRef },
|
46
|
-
React.createElement(ActionsIcon, { onClick: toggleOpen },
|
46
|
+
React.createElement(ActionsIcon, { "data-cy": "comment-dropdown-trigger", onClick: toggleOpen },
|
47
47
|
React.createElement(DotsIcon, null)),
|
48
|
-
isOpen && (React.createElement(DropdownList, { direction: 'right', width: 125, onClick: toggleOpen },
|
49
|
-
React.createElement(CommentAction, { onClick: onEdit }, "Edit"),
|
50
|
-
React.createElement(CommentAction, { onClick: onDelete }, "Delete")))))));
|
48
|
+
isOpen && (React.createElement(DropdownList, { "data-cy": "comment-dropdown", direction: 'right', width: 125, onClick: toggleOpen },
|
49
|
+
React.createElement(CommentAction, { "data-cy": "comment-edit", onClick: onEdit }, "Edit"),
|
50
|
+
React.createElement(CommentAction, { "data-cy": "comment-delete", onClick: onDelete }, "Delete")))))));
|
51
51
|
};
|
52
52
|
//# sourceMappingURL=CommentActions.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"CommentActions.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentActions.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,EACL,QAAQ,EACR,iBAAiB,EACjB,YAAY,EACZ,WAAW,GACZ,MAAM,0BAA0B,CAAA;AACjC,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,MAAM,MAAM,mBAAmB,CAAA;AAEtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAE7D,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAA;;;;;;;;;;;;CAYvC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAA;iBACtB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;;;;WAI7C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;;;;;;CAMpD,CAAA;AAWD,MAAM,CAAC,MAAM,cAAc,GAAkC,CAAC,EAC5D,OAAO,EACP,gBAAgB,EAChB,gBAAgB,EAChB,MAAM,EACN,QAAQ,EACR,aAAa,GACd,EAAE,EAAE;IACH,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,WAAW,EAAE,CAAA;IAExD,OAAO,CACL;QACG,gBAAgB,IAAI,CACnB,oBAAC,oBAAoB,IAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAI,CACnE;QACA,gBAAgB,IAAI,CACnB,oBAAC,iBAAiB,IAAC,GAAG,EAAE,UAAU;YAChC,oBAAC,WAAW,
|
1
|
+
{"version":3,"file":"CommentActions.js","sourceRoot":"","sources":["../../../../src/components/comments/CommentActions.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,EACL,QAAQ,EACR,iBAAiB,EACjB,YAAY,EACZ,WAAW,GACZ,MAAM,0BAA0B,CAAA;AACjC,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,MAAM,MAAM,mBAAmB,CAAA;AAEtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAE7D,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAA;;;;;;;;;;;;CAYvC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAA;iBACtB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;;;;WAI7C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;;;;;;CAMpD,CAAA;AAWD,MAAM,CAAC,MAAM,cAAc,GAAkC,CAAC,EAC5D,OAAO,EACP,gBAAgB,EAChB,gBAAgB,EAChB,MAAM,EACN,QAAQ,EACR,aAAa,GACd,EAAE,EAAE;IACH,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,WAAW,EAAE,CAAA;IAExD,OAAO,CACL;QACG,gBAAgB,IAAI,CACnB,oBAAC,oBAAoB,IAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,GAAI,CACnE;QACA,gBAAgB,IAAI,CACnB,oBAAC,iBAAiB,IAAC,GAAG,EAAE,UAAU;YAChC,oBAAC,WAAW,eAAS,0BAA0B,EAAC,OAAO,EAAE,UAAU;gBACjE,oBAAC,QAAQ,OAAG,CACA;YACb,MAAM,IAAI,CACT,oBAAC,YAAY,eACH,kBAAkB,EAC1B,SAAS,EAAE,OAAO,EAClB,KAAK,EAAE,GAAG,EACV,OAAO,EAAE,UAAU;gBAEnB,oBAAC,aAAa,eAAS,cAAc,EAAC,OAAO,EAAE,MAAM,WAErC;gBAChB,oBAAC,aAAa,eAAS,gBAAgB,EAAC,OAAO,EAAE,QAAQ,aAEzC,CACH,CAChB,CACiB,CACrB,CACA,CACJ,CAAA;AACH,CAAC,CAAA"}
|
@@ -57,11 +57,11 @@ export const CommentBody = ({ comment, isEditing, onSave, onCancel, onSelect, })
|
|
57
57
|
editor.current = e;
|
58
58
|
}, []);
|
59
59
|
return (React.createElement(React.Fragment, null, isEditing ? (React.createElement(React.Fragment, null,
|
60
|
-
React.createElement(CommentEditor, { ref: ref, defaultValue: comment.node.attrs.contents }),
|
61
|
-
React.createElement(EditorActions,
|
60
|
+
React.createElement(CommentEditor, { "data-cy": "comment-editor", ref: ref, defaultValue: comment.node.attrs.contents }),
|
61
|
+
React.createElement(EditorActions, { "data-cy": "comment-actions" },
|
62
62
|
React.createElement(SecondaryButton, { onClick: onCancel }, "Cancel"),
|
63
63
|
React.createElement(PrimaryButton, { onClick: handleSave }, "Save")))) : (React.createElement(React.Fragment, null,
|
64
64
|
React.createElement(CommentContent, { onClick: onSelect },
|
65
|
-
React.createElement(CommentViewer,
|
65
|
+
React.createElement(CommentViewer, { "data-cy": "comment-text" }, comment.node.attrs.contents))))));
|
66
66
|
};
|
67
67
|
//# sourceMappingURL=CommentBody.js.map
|
@@ -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,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;AAClD,OAAO,MAAM,MAAM,mBAAmB,CAAA;AAEtC,MAAM,cAAc,GAAG,MAAM,CAAC,GAAG,CAAA;;CAEhC,CAAA;AAED,MAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAA;;iBAEpB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;WAC7C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;YACzC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;CAoB/C,CAAA;AAED,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAA;;;iBAGf,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;;;WAG7C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;YACzC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC;CAC/C,CAAA;AAED,MAAM,aAAa,GAAG,MAAM,CAAC,WAAW,CAAC,CAAA;;;;CAIxC,CAAA;AAUD,MAAM,CAAC,MAAM,WAAW,GAA+B,CAAC,EACtD,OAAO,EACP,SAAS,EACT,MAAM,EACN,QAAQ,EACR,QAAQ,GACT,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,MAAM,CAA6B,IAAI,CAAC,CAAA;IAEvD,MAAM,UAAU,GAAG,GAAG,EAAE;QACtB,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;SAC7B;IACH,CAAC,CAAA;IAED,MAAM,GAAG,GAAG,WAAW,CAAC,CAAC,CAA6B,EAAE,EAAE;QACxD,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,KAAK,CAAC,EAAE;YAC7B,CAAC,CAAC,KAAK,EAAE,CAAA;SACV;QACD,MAAM,CAAC,OAAO,GAAG,CAAC,CAAA;IACpB,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,OAAO,CACL,0CACG,SAAS,CAAC,CAAC,CAAC,CACX;QACE,oBAAC,aAAa,
|
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,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;AAClD,OAAO,MAAM,MAAM,mBAAmB,CAAA;AAEtC,MAAM,cAAc,GAAG,MAAM,CAAC,GAAG,CAAA;;CAEhC,CAAA;AAED,MAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAA;;iBAEpB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;WAC7C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;YACzC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;CAoB/C,CAAA;AAED,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAA;;;iBAGf,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI;;;WAG7C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO;YACzC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC;CAC/C,CAAA;AAED,MAAM,aAAa,GAAG,MAAM,CAAC,WAAW,CAAC,CAAA;;;;CAIxC,CAAA;AAUD,MAAM,CAAC,MAAM,WAAW,GAA+B,CAAC,EACtD,OAAO,EACP,SAAS,EACT,MAAM,EACN,QAAQ,EACR,QAAQ,GACT,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,MAAM,CAA6B,IAAI,CAAC,CAAA;IAEvD,MAAM,UAAU,GAAG,GAAG,EAAE;QACtB,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;SAC7B;IACH,CAAC,CAAA;IAED,MAAM,GAAG,GAAG,WAAW,CAAC,CAAC,CAA6B,EAAE,EAAE;QACxD,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,KAAK,CAAC,EAAE;YAC7B,CAAC,CAAC,KAAK,EAAE,CAAA;SACV;QACD,MAAM,CAAC,OAAO,GAAG,CAAC,CAAA;IACpB,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,OAAO,CACL,0CACG,SAAS,CAAC,CAAC,CAAC,CACX;QACE,oBAAC,aAAa,eACJ,gBAAgB,EACxB,GAAG,EAAE,GAAG,EACR,YAAY,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,GAC1B;QACjB,oBAAC,aAAa,eAAS,iBAAiB;YACtC,oBAAC,eAAe,IAAC,OAAO,EAAE,QAAQ,aAA0B;YAC5D,oBAAC,aAAa,IAAC,OAAO,EAAE,UAAU,WAAsB,CAC1C,CACf,CACJ,CAAC,CAAC,CAAC,CACF;QACE,oBAAC,cAAc,IAAC,OAAO,EAAE,QAAQ;YAC/B,oBAAC,aAAa,eAAS,cAAc,IAClC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CACd,CACD,CAChB,CACJ,CACA,CACJ,CAAA;AACH,CAAC,CAAA"}
|
@@ -20,6 +20,8 @@ class QuarterbackStepsExchanger extends CollabProvider {
|
|
20
20
|
return QuarterbackStepsExchanger._instance;
|
21
21
|
}
|
22
22
|
super();
|
23
|
+
this.reconcileAttempts = 0;
|
24
|
+
this.reconcileAttemptsMax = 20;
|
23
25
|
QuarterbackStepsExchanger._instance = this;
|
24
26
|
this.applySteps = applySteps;
|
25
27
|
this.docId = docId;
|
@@ -36,7 +38,7 @@ class QuarterbackStepsExchanger extends CollabProvider {
|
|
36
38
|
}
|
37
39
|
const steps = this.hydrateSteps(jsonSteps);
|
38
40
|
if (steps.length) {
|
39
|
-
this.newStepsListener(
|
41
|
+
this.newStepsListener();
|
40
42
|
}
|
41
43
|
});
|
42
44
|
}
|
@@ -53,13 +55,26 @@ class QuarterbackStepsExchanger extends CollabProvider {
|
|
53
55
|
stepsJSON.push(step.toJSON());
|
54
56
|
});
|
55
57
|
this.currentVersion = version;
|
56
|
-
this.flushImmediate = this.debounce(() => {
|
57
|
-
this.applySteps(this.projectId, this.docId, {
|
58
|
+
this.flushImmediate = this.debounce(async () => {
|
59
|
+
const result = await this.applySteps(this.projectId, this.docId, {
|
58
60
|
steps: stepsJSON,
|
59
61
|
version,
|
60
62
|
clientID,
|
61
63
|
});
|
62
|
-
|
64
|
+
if (result &&
|
65
|
+
'err' in result &&
|
66
|
+
'code' in result &&
|
67
|
+
result.code === 409 &&
|
68
|
+
this.reconcileAttempts < this.reconcileAttemptsMax) {
|
69
|
+
// debugger
|
70
|
+
console.warn('Attempting Reconciliation');
|
71
|
+
this.newStepsListener();
|
72
|
+
this.reconcileAttempts++;
|
73
|
+
}
|
74
|
+
else {
|
75
|
+
this.reconcileAttempts = 0;
|
76
|
+
}
|
77
|
+
}, 1200, flush, () => {
|
63
78
|
this.throttlingControl(false);
|
64
79
|
});
|
65
80
|
if (!flush) {
|
@@ -90,12 +105,7 @@ export const stepsExchanger = (docId, projectId, lastVersion, authToken, throttl
|
|
90
105
|
if (!isAuthed) {
|
91
106
|
return;
|
92
107
|
}
|
93
|
-
const applySteps = async (projectId, docId, payload) =>
|
94
|
-
const resp = await docApi.applySteps(projectId, docId, authToken, payload);
|
95
|
-
if ('data' in resp) {
|
96
|
-
return resp.data;
|
97
|
-
}
|
98
|
-
};
|
108
|
+
const applySteps = async (projectId, docId, payload) => docApi.applySteps(projectId, docId, authToken, payload);
|
99
109
|
const getStepsSince = async (projectId, docId, version) => {
|
100
110
|
const resp = await docApi.stepsSince(projectId, docId, version, authToken);
|
101
111
|
if ('data' in resp) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"QuarterbackStepsExchanger.js","sourceRoot":"","sources":["../../../src/quarterback/QuarterbackStepsExchanger.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAC/C,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAA;AAE5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAA;AACnE,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAA;
|
1
|
+
{"version":3,"file":"QuarterbackStepsExchanger.js","sourceRoot":"","sources":["../../../src/quarterback/QuarterbackStepsExchanger.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 React, { createContext, useContext
|
12
|
+
import React, { createContext, useContext } from 'react';
|
13
13
|
import { GenericStore } from '.';
|
14
14
|
const GenericStoreContext = createContext(new GenericStore());
|
15
15
|
export const createStore = async (sources) => {
|
@@ -18,9 +18,6 @@ export const createStore = async (sources) => {
|
|
18
18
|
return store;
|
19
19
|
};
|
20
20
|
export const GenericStoreProvider = ({ children, store }) => {
|
21
|
-
useEffect(() => {
|
22
|
-
return () => store.unmount();
|
23
|
-
}, [store]);
|
24
21
|
if (store) {
|
25
22
|
return (React.createElement(GenericStoreContext.Provider, { value: store }, store.state?.doc ? children : React.createElement("p", null, "Project was not found")));
|
26
23
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"StoreContext.js","sourceRoot":"","sources":["../../../src/store/StoreContext.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,KAAK,EAAE,EAAE,aAAa,EAAE,UAAU,EAAE,
|
1
|
+
{"version":3,"file":"StoreContext.js","sourceRoot":"","sources":["../../../src/store/StoreContext.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,KAAK,EAAE,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AAExD,OAAO,EAAE,YAAY,EAA2B,MAAM,GAAG,CAAA;AAEzD,MAAM,mBAAmB,GAAG,aAAa,CAAe,IAAI,YAAY,EAAE,CAAC,CAAA;AAE3E,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAAE,OAAkC,EAAE,EAAE;IACtE,MAAM,KAAK,GAAG,IAAI,YAAY,EAAE,CAAA;IAChC,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACzB,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAOD,MAAM,CAAC,MAAM,oBAAoB,GAAoB,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE;IAC3E,IAAI,KAAK,EAAE;QACT,OAAO,CACL,oBAAC,mBAAmB,CAAC,QAAQ,IAAC,KAAK,EAAE,KAAK,IACvC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,uDAA4B,CAC9B,CAChC,CAAA;KACF;IACD,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,GAAG,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAA"}
|
@@ -26,6 +26,8 @@ declare class QuarterbackStepsExchanger extends CollabProvider {
|
|
26
26
|
throttlingControl: ThrottlingControl;
|
27
27
|
debounce: ReturnType<typeof saveWithDebounce>;
|
28
28
|
throttleState: boolean;
|
29
|
+
reconcileAttempts: number;
|
30
|
+
reconcileAttemptsMax: number;
|
29
31
|
constructor(docId: string, projectId: string, startingVersion: number, applySteps: QuarterbackStepsExchanger['applySteps'], getStepsSince: QuarterbackStepsExchanger['getStepsSince'], listenToSteps: (projectId: string, docId: string, listener: (version: number, steps: unknown[], clientIDs: number[]) => void) => void, authToken: string, throttlingControl: ThrottlingControl);
|
30
32
|
destroy(): void;
|
31
33
|
hydrateSteps(jsonSteps: unknown[]): Step[];
|
@@ -10,46 +10,11 @@
|
|
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
12
|
import { AppliedStepsResponse, ICreateDocRequest, IUpdateDocumentRequest, ManuscriptDocWithSnapshots, StepsPayload, StepsSinceResponse, TransformerVersion } from '../types';
|
13
|
-
export declare const getDocument: (projectID: string, manuscriptID: string, authToken: string) => Promise<
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
export declare const
|
20
|
-
err: string;
|
21
|
-
code: number;
|
22
|
-
} | {
|
23
|
-
data: ManuscriptDocWithSnapshots;
|
24
|
-
}>;
|
25
|
-
export declare const getTransformVersion: (authToken: string) => Promise<{
|
26
|
-
err: string;
|
27
|
-
code: number;
|
28
|
-
} | {
|
29
|
-
data: TransformerVersion;
|
30
|
-
}>;
|
31
|
-
export declare const updateDocument: (projectID: string, manuscriptID: string, authToken: string, payload: IUpdateDocumentRequest) => Promise<{
|
32
|
-
err: string;
|
33
|
-
code: number;
|
34
|
-
} | {
|
35
|
-
data: boolean;
|
36
|
-
}>;
|
37
|
-
export declare const deleteDocument: (projectID: string, manuscriptID: string, authToken: string) => Promise<{
|
38
|
-
err: string;
|
39
|
-
code: number;
|
40
|
-
} | {
|
41
|
-
data: boolean;
|
42
|
-
}>;
|
43
|
-
export declare const applySteps: (projectId: string, docId: string, authToken: string, payload: StepsPayload) => Promise<{
|
44
|
-
err: string;
|
45
|
-
code: number;
|
46
|
-
} | {
|
47
|
-
data: AppliedStepsResponse;
|
48
|
-
}>;
|
49
|
-
export declare const stepsSince: (projectId: string, docId: string, version: number, authToken: string) => Promise<{
|
50
|
-
err: string;
|
51
|
-
code: number;
|
52
|
-
} | {
|
53
|
-
data: StepsSinceResponse;
|
54
|
-
}>;
|
13
|
+
export declare const getDocument: (projectID: string, manuscriptID: string, authToken: string) => Promise<import("./methods").Maybe<ManuscriptDocWithSnapshots>>;
|
14
|
+
export declare const createDocument: (payload: ICreateDocRequest, authToken: string) => Promise<import("./methods").Maybe<ManuscriptDocWithSnapshots>>;
|
15
|
+
export declare const getTransformVersion: (authToken: string) => Promise<import("./methods").Maybe<TransformerVersion>>;
|
16
|
+
export declare const updateDocument: (projectID: string, manuscriptID: string, authToken: string, payload: IUpdateDocumentRequest) => Promise<import("./methods").Maybe<boolean>>;
|
17
|
+
export declare const deleteDocument: (projectID: string, manuscriptID: string, authToken: string) => Promise<import("./methods").Maybe<boolean>>;
|
18
|
+
export declare const applySteps: (projectId: string, docId: string, authToken: string, payload: StepsPayload) => Promise<import("./methods").Maybe<AppliedStepsResponse>>;
|
19
|
+
export declare const stepsSince: (projectId: string, docId: string, version: number, authToken: string) => Promise<import("./methods").Maybe<StepsSinceResponse>>;
|
55
20
|
export declare const listenStepUpdates: (projectID: string, manuscriptID: string, dataListener: (version: number, steps: unknown[], clientIDs: number[]) => void) => void;
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@manuscripts/article-editor",
|
3
|
-
"version": "3.1.
|
3
|
+
"version": "3.1.14",
|
4
4
|
"license": "CPAL-1.0",
|
5
5
|
"description": "React components for editing and viewing manuscripts",
|
6
6
|
"repository": "github:Atypon-OpenSource/manuscripts-article-editor",
|
@@ -35,7 +35,7 @@
|
|
35
35
|
"@fontsource/lato": "^4.5.10",
|
36
36
|
"@fontsource/pt-sans": "^4.5.11",
|
37
37
|
"@fontsource/pt-serif": "^4.5.11",
|
38
|
-
"@manuscripts/body-editor": "2.0.
|
38
|
+
"@manuscripts/body-editor": "2.0.20",
|
39
39
|
"@manuscripts/json-schema": "2.2.10",
|
40
40
|
"@manuscripts/library": "1.3.11",
|
41
41
|
"@manuscripts/style-guide": "2.0.5",
|
@@ -108,4 +108,4 @@
|
|
108
108
|
"resolutions": {
|
109
109
|
"@types/react": "^18.3.1"
|
110
110
|
}
|
111
|
-
}
|
111
|
+
}
|