@manuscripts/article-editor 4.7.25 → 4.7.27
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/api/Api.js +24 -9
- package/dist/cjs/api/Api.js.map +1 -1
- package/dist/cjs/api/StepsExchanger.js +162 -20
- package/dist/cjs/api/StepsExchanger.js.map +1 -1
- package/dist/cjs/components/projects/ManuscriptPageContainer.js +15 -7
- package/dist/cjs/components/projects/ManuscriptPageContainer.js.map +1 -1
- package/dist/cjs/hooks/use-create-editor.js +28 -1
- package/dist/cjs/hooks/use-create-editor.js.map +1 -1
- package/dist/es/api/Api.js +24 -9
- package/dist/es/api/Api.js.map +1 -1
- package/dist/es/api/StepsExchanger.js +160 -19
- package/dist/es/api/StepsExchanger.js.map +1 -1
- package/dist/es/components/projects/ManuscriptPageContainer.js +11 -3
- package/dist/es/components/projects/ManuscriptPageContainer.js.map +1 -1
- package/dist/es/hooks/use-create-editor.js +28 -1
- package/dist/es/hooks/use-create-editor.js.map +1 -1
- package/dist/types/api/Api.d.ts +1 -3
- package/dist/types/api/StepsExchanger.d.ts +18 -3
- package/package.json +5 -5
package/dist/cjs/api/Api.js
CHANGED
|
@@ -88,15 +88,30 @@ class Api {
|
|
|
88
88
|
name,
|
|
89
89
|
});
|
|
90
90
|
this.getDocument = (projectID, manuscriptID) => this.get(`doc/${projectID}/manuscript/${manuscriptID}`);
|
|
91
|
-
this.sendSteps = (projectID, manuscriptID, data) =>
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
}
|
|
99
|
-
|
|
91
|
+
this.sendSteps = async (projectID, manuscriptID, data, signal) => {
|
|
92
|
+
try {
|
|
93
|
+
const result = await this.instance.post(`doc/${projectID}/manuscript/${manuscriptID}/steps`, {
|
|
94
|
+
...data,
|
|
95
|
+
steps: data.steps.map((s) => s.toJSON()),
|
|
96
|
+
}, { signal });
|
|
97
|
+
return result.data;
|
|
98
|
+
}
|
|
99
|
+
catch (e) {
|
|
100
|
+
const axiosError = e;
|
|
101
|
+
if (axiosError.name === 'AbortError' ||
|
|
102
|
+
axiosError.code === 'ERR_CANCELED' ||
|
|
103
|
+
axiosError.message === 'canceled') {
|
|
104
|
+
console.log('Request was aborted');
|
|
105
|
+
return {
|
|
106
|
+
error: 'aborted',
|
|
107
|
+
};
|
|
108
|
+
}
|
|
109
|
+
const error = axiosError.response?.status === 409 ? 'conflict' : axiosError.message;
|
|
110
|
+
return {
|
|
111
|
+
error: error,
|
|
112
|
+
};
|
|
113
|
+
}
|
|
114
|
+
};
|
|
100
115
|
this.getStepsSince = (projectID, manuscriptID, version) => this.get(`doc/${projectID}/manuscript/${manuscriptID}/version/${version}`);
|
|
101
116
|
this.listenToSteps = (projectID, manuscriptID, listener) => {
|
|
102
117
|
const config = (0, config_1.getConfig)();
|
package/dist/cjs/api/Api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Api.js","sourceRoot":"","sources":["../../../src/api/Api.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Api.js","sourceRoot":"","sources":["../../../src/api/Api.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.StepsExchanger = exports.ObservableBoolean = void 0;
|
|
3
|
+
exports.StepsExchanger = exports.ObservableBoolean = exports.ObservableString = 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
|
*
|
|
@@ -16,19 +16,41 @@ const body_editor_1 = require("@manuscripts/body-editor");
|
|
|
16
16
|
const transform_1 = require("@manuscripts/transform");
|
|
17
17
|
const prosemirror_transform_1 = require("prosemirror-transform");
|
|
18
18
|
const savingUtilities_1 = require("./savingUtilities");
|
|
19
|
-
const MAX_ATTEMPTS =
|
|
19
|
+
const MAX_ATTEMPTS = 10;
|
|
20
20
|
const THROTTLING_INTERVAL = 1200;
|
|
21
|
+
const REQUEST_TIMEOUT_MS = 10000;
|
|
22
|
+
class ObservableString {
|
|
23
|
+
constructor() {
|
|
24
|
+
this.value = 'idle';
|
|
25
|
+
this.sub = undefined;
|
|
26
|
+
this.savingTimeout = undefined;
|
|
27
|
+
}
|
|
28
|
+
setValue(value) {
|
|
29
|
+
if (this.value !== value) {
|
|
30
|
+
this.value = value;
|
|
31
|
+
this.sub?.(value);
|
|
32
|
+
if (this.savingTimeout) {
|
|
33
|
+
clearTimeout(this.savingTimeout);
|
|
34
|
+
this.savingTimeout = undefined;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
onChange(sub) {
|
|
39
|
+
this.sub = sub;
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
exports.ObservableString = ObservableString;
|
|
21
43
|
class ObservableBoolean {
|
|
22
44
|
constructor() {
|
|
23
45
|
this.value = false;
|
|
24
|
-
this.
|
|
46
|
+
this.sub = undefined;
|
|
25
47
|
}
|
|
26
48
|
setValue(value) {
|
|
27
49
|
this.value = value;
|
|
28
|
-
this.
|
|
50
|
+
this.sub?.(value);
|
|
29
51
|
}
|
|
30
52
|
onChange(sub) {
|
|
31
|
-
this.
|
|
53
|
+
this.sub = sub;
|
|
32
54
|
}
|
|
33
55
|
}
|
|
34
56
|
exports.ObservableBoolean = ObservableBoolean;
|
|
@@ -40,36 +62,121 @@ class StepsExchanger extends body_editor_1.CollabProvider {
|
|
|
40
62
|
}
|
|
41
63
|
super();
|
|
42
64
|
this.attempt = 0;
|
|
65
|
+
this.handleOnline = () => {
|
|
66
|
+
console.log('Connection recovered. Going back online.');
|
|
67
|
+
this.saveStatus.setValue('idle');
|
|
68
|
+
this.start();
|
|
69
|
+
// Trigger sync to check for queued steps
|
|
70
|
+
if (this.newStepsListener) {
|
|
71
|
+
this.newStepsListener();
|
|
72
|
+
}
|
|
73
|
+
};
|
|
74
|
+
this.handleOffline = () => {
|
|
75
|
+
console.log('Connection lost. Going offline.');
|
|
76
|
+
// Abort any pending request when going offline
|
|
77
|
+
if (this.abortController) {
|
|
78
|
+
this.abortController.abort();
|
|
79
|
+
this.abortController = undefined;
|
|
80
|
+
}
|
|
81
|
+
if (this.timeoutId) {
|
|
82
|
+
clearTimeout(this.timeoutId);
|
|
83
|
+
this.timeoutId = undefined;
|
|
84
|
+
}
|
|
85
|
+
this.saveStatus.setValue('offline');
|
|
86
|
+
this.closeConnection();
|
|
87
|
+
};
|
|
43
88
|
this.stopped = true;
|
|
44
89
|
this.projectID = projectID;
|
|
45
90
|
this.manuscriptID = manuscriptID;
|
|
46
91
|
this.currentVersion = currentVersion;
|
|
47
92
|
this.isThrottling = new ObservableBoolean();
|
|
93
|
+
this.saveStatus = new ObservableString();
|
|
48
94
|
this.debounce = (0, savingUtilities_1.saveWithDebounce)();
|
|
49
95
|
this.api = api;
|
|
50
|
-
this.start();
|
|
51
96
|
this.updateStoreVersion = updateStoreVersion;
|
|
97
|
+
// Initialize closeConnection as no-op to ensure it's always defined
|
|
98
|
+
// eslint-disable-next-line @typescript-eslint/no-empty-function
|
|
99
|
+
this.closeConnection = () => { };
|
|
100
|
+
if (!navigator.onLine) {
|
|
101
|
+
this.saveStatus.setValue('offline');
|
|
102
|
+
}
|
|
103
|
+
else {
|
|
104
|
+
this.start();
|
|
105
|
+
}
|
|
106
|
+
this.addNetworkListeners();
|
|
52
107
|
this.stop = this.stop.bind(this);
|
|
53
108
|
StepsExchanger.instance = this;
|
|
54
109
|
}
|
|
110
|
+
addNetworkListeners() {
|
|
111
|
+
window.addEventListener('online', this.handleOnline);
|
|
112
|
+
window.addEventListener('offline', this.handleOffline);
|
|
113
|
+
}
|
|
114
|
+
removeNetworkListeners() {
|
|
115
|
+
window.removeEventListener('online', this.handleOnline);
|
|
116
|
+
window.removeEventListener('offline', this.handleOffline);
|
|
117
|
+
}
|
|
55
118
|
async sendSteps(version, steps, clientID, flush = false) {
|
|
56
119
|
this.flushImmediately = this.debounce(async () => {
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
clientID,
|
|
61
|
-
});
|
|
62
|
-
if (response.error === 'conflict' && this.attempt < MAX_ATTEMPTS) {
|
|
63
|
-
console.warn('Retrying');
|
|
64
|
-
this.newStepsListener();
|
|
65
|
-
this.attempt++;
|
|
120
|
+
// Abort any pending request before starting a new one
|
|
121
|
+
if (this.abortController) {
|
|
122
|
+
this.abortController.abort();
|
|
66
123
|
}
|
|
67
|
-
|
|
68
|
-
|
|
124
|
+
if (this.timeoutId) {
|
|
125
|
+
clearTimeout(this.timeoutId);
|
|
69
126
|
}
|
|
70
|
-
|
|
127
|
+
this.saveStatus.setValue('saving');
|
|
128
|
+
// Create new AbortController for this request
|
|
129
|
+
this.abortController = new AbortController();
|
|
130
|
+
this.timeoutId = setTimeout(() => {
|
|
131
|
+
this.abortController?.abort();
|
|
132
|
+
}, REQUEST_TIMEOUT_MS);
|
|
133
|
+
try {
|
|
134
|
+
const response = await this.api.sendSteps(this.projectID, this.manuscriptID, {
|
|
135
|
+
steps: steps,
|
|
136
|
+
version,
|
|
137
|
+
clientID,
|
|
138
|
+
}, this.abortController.signal);
|
|
139
|
+
if (this.timeoutId) {
|
|
140
|
+
clearTimeout(this.timeoutId);
|
|
141
|
+
this.timeoutId = undefined;
|
|
142
|
+
}
|
|
143
|
+
if (response.error === 'conflict') {
|
|
144
|
+
if (this.attempt < MAX_ATTEMPTS) {
|
|
145
|
+
this.newStepsListener();
|
|
146
|
+
this.attempt++;
|
|
147
|
+
}
|
|
148
|
+
else {
|
|
149
|
+
this.saveStatus.setValue('failed');
|
|
150
|
+
this.attempt = 0;
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
else if (response.error === 'aborted') {
|
|
154
|
+
this.saveStatus.setValue(navigator.onLine ? 'failed' : 'offline');
|
|
155
|
+
this.attempt = 0;
|
|
156
|
+
}
|
|
157
|
+
else if (response.error) {
|
|
158
|
+
console.error('Failed to send steps', response.error);
|
|
159
|
+
this.saveStatus.setValue('failed');
|
|
160
|
+
this.attempt = 0;
|
|
161
|
+
}
|
|
162
|
+
else {
|
|
163
|
+
this.saveStatus.setValue('saved');
|
|
164
|
+
this.attempt = 0;
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
catch (error) {
|
|
168
|
+
if (this.timeoutId) {
|
|
169
|
+
clearTimeout(this.timeoutId);
|
|
170
|
+
this.timeoutId = undefined;
|
|
171
|
+
}
|
|
172
|
+
// Handle other errors (abort is now handled via error response)
|
|
173
|
+
console.warn('Failed to send steps', error);
|
|
174
|
+
this.saveStatus.setValue('failed');
|
|
71
175
|
this.attempt = 0;
|
|
72
176
|
}
|
|
177
|
+
finally {
|
|
178
|
+
this.abortController = undefined;
|
|
179
|
+
}
|
|
73
180
|
}, THROTTLING_INTERVAL, flush, () => this.isThrottling.setValue(false));
|
|
74
181
|
if (!flush) {
|
|
75
182
|
this.isThrottling.setValue(true);
|
|
@@ -80,6 +187,7 @@ class StepsExchanger extends body_editor_1.CollabProvider {
|
|
|
80
187
|
this.currentVersion = version;
|
|
81
188
|
this.updateStoreVersion(version);
|
|
82
189
|
if (steps.length) {
|
|
190
|
+
//TODO send steps to listener
|
|
83
191
|
this.newStepsListener();
|
|
84
192
|
}
|
|
85
193
|
}
|
|
@@ -87,12 +195,43 @@ class StepsExchanger extends body_editor_1.CollabProvider {
|
|
|
87
195
|
if (this.stopped === false) {
|
|
88
196
|
return;
|
|
89
197
|
}
|
|
90
|
-
|
|
91
|
-
this.
|
|
198
|
+
// Abort any pending request before restarting
|
|
199
|
+
if (this.abortController) {
|
|
200
|
+
this.abortController.abort();
|
|
201
|
+
this.abortController = undefined;
|
|
202
|
+
}
|
|
203
|
+
if (this.timeoutId) {
|
|
204
|
+
clearTimeout(this.timeoutId);
|
|
205
|
+
this.timeoutId = undefined;
|
|
206
|
+
}
|
|
207
|
+
// Close any existing connection before starting a new one to avoid duplicate listeners
|
|
208
|
+
if (this.closeConnection) {
|
|
209
|
+
this.closeConnection();
|
|
210
|
+
}
|
|
211
|
+
if (navigator.onLine) {
|
|
212
|
+
this.closeConnection = this.api.listenToSteps(this.projectID, this.manuscriptID, (version, steps, clientIDs) => this.receiveSteps(version, steps, clientIDs));
|
|
213
|
+
this.stopped = false;
|
|
214
|
+
}
|
|
215
|
+
else {
|
|
216
|
+
// No-op function when offline - connection cannot be established
|
|
217
|
+
// eslint-disable-next-line @typescript-eslint/no-empty-function
|
|
218
|
+
this.closeConnection = () => { };
|
|
219
|
+
this.stopped = true;
|
|
220
|
+
}
|
|
92
221
|
}
|
|
93
222
|
stop() {
|
|
94
223
|
this.stopped = true;
|
|
224
|
+
// Abort any pending request
|
|
225
|
+
if (this.abortController) {
|
|
226
|
+
this.abortController.abort();
|
|
227
|
+
this.abortController = undefined;
|
|
228
|
+
}
|
|
229
|
+
if (this.timeoutId) {
|
|
230
|
+
clearTimeout(this.timeoutId);
|
|
231
|
+
this.timeoutId = undefined;
|
|
232
|
+
}
|
|
95
233
|
this.closeConnection();
|
|
234
|
+
this.removeNetworkListeners();
|
|
96
235
|
}
|
|
97
236
|
flush() {
|
|
98
237
|
this.flushImmediately && this.flushImmediately();
|
|
@@ -110,6 +249,9 @@ class StepsExchanger extends body_editor_1.CollabProvider {
|
|
|
110
249
|
}
|
|
111
250
|
}
|
|
112
251
|
async stepsSince(version) {
|
|
252
|
+
if (this.saveStatus.value === 'offline') {
|
|
253
|
+
return;
|
|
254
|
+
}
|
|
113
255
|
const response = await this.api.getStepsSince(this.projectID, this.manuscriptID, version);
|
|
114
256
|
if (response) {
|
|
115
257
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StepsExchanger.js","sourceRoot":"","sources":["../../../src/api/StepsExchanger.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;GAUG;AACH,0DAAyD;AACzD,sDAA+C;AAC/C,iEAA4C;AAG5C,uDAAoD;AAEpD,MAAM,YAAY,GAAG,EAAE,CAAA;AACvB,MAAM,mBAAmB,GAAG,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"StepsExchanger.js","sourceRoot":"","sources":["../../../src/api/StepsExchanger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.ManuscriptMenusContainerInner = exports.ManuscriptMenusContainer = void 0;
|
|
2
7
|
/*!
|
|
3
8
|
* 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.
|
|
4
9
|
*
|
|
@@ -10,11 +15,6 @@
|
|
|
10
15
|
*
|
|
11
16
|
* All portions of the code written by Atypon Systems LLC are Copyright (c) 2025 Atypon Systems LLC. All Rights Reserved.
|
|
12
17
|
*/
|
|
13
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
14
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
15
|
-
};
|
|
16
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.ManuscriptMenusContainerInner = exports.ManuscriptMenusContainer = void 0;
|
|
18
18
|
require("@manuscripts/body-editor/styles/Editor.css");
|
|
19
19
|
require("@manuscripts/body-editor/styles/AdvancedEditor.css");
|
|
20
20
|
require("@manuscripts/body-editor/styles/popper.css");
|
|
@@ -58,9 +58,10 @@ const ManuscriptPageContainer = () => {
|
|
|
58
58
|
const ManuscriptPageView = () => {
|
|
59
59
|
const can = (0, capabilities_1.usePermissions)();
|
|
60
60
|
const [isTrackingChangesVisible, toggleTrackingChangesVisibility] = (0, use_tracking_visibility_1.useTrackingVisibility)();
|
|
61
|
-
const [{ isViewingMode, isComparingMode }] = (0, store_1.useStore)((store) => ({
|
|
61
|
+
const [{ isViewingMode, isComparingMode, savingProcess }] = (0, store_1.useStore)((store) => ({
|
|
62
62
|
isViewingMode: store.isViewingMode,
|
|
63
63
|
isComparingMode: store.isComparingMode,
|
|
64
|
+
savingProcess: store.savingProcess,
|
|
64
65
|
}));
|
|
65
66
|
const showTrackChangesToggle = !can.editWithoutTracking && !isViewingMode;
|
|
66
67
|
const isTrackingVisible = (showTrackChangesToggle && isTrackingChangesVisible) || isComparingMode;
|
|
@@ -73,7 +74,9 @@ const ManuscriptPageView = () => {
|
|
|
73
74
|
react_1.default.createElement(EditorContainer_1.EditorHeader, { "data-cy": "editor-header" },
|
|
74
75
|
react_1.default.createElement(exports.ManuscriptMenusContainer, null,
|
|
75
76
|
react_1.default.createElement(exports.ManuscriptMenusContainerInner, null,
|
|
76
|
-
react_1.default.createElement(
|
|
77
|
+
react_1.default.createElement(MenusWrapper, null,
|
|
78
|
+
react_1.default.createElement(ManuscriptMenus_1.ManuscriptMenus, null),
|
|
79
|
+
savingProcess && react_1.default.createElement(style_guide_1.SaveStatus, { status: savingProcess }))),
|
|
77
80
|
showTrackChangesToggle && (react_1.default.createElement(react_1.default.Fragment, null,
|
|
78
81
|
react_1.default.createElement(Label, null, "Show tracked changes"),
|
|
79
82
|
react_1.default.createElement(style_guide_1.IconButton, { defaultColor: true, onClick: toggleTrackingChangesVisibility, "aria-label": isTrackingChangesVisible
|
|
@@ -116,6 +119,11 @@ exports.ManuscriptMenusContainerInner = styled_components_1.default.div `
|
|
|
116
119
|
${(props) => props.theme.grid.unit * 15}px;
|
|
117
120
|
box-sizing: border-box;
|
|
118
121
|
`;
|
|
122
|
+
const MenusWrapper = styled_components_1.default.div `
|
|
123
|
+
display: flex;
|
|
124
|
+
align-items: center;
|
|
125
|
+
gap: ${(props) => props.theme.grid.unit * 2}px;
|
|
126
|
+
`;
|
|
119
127
|
const PageWrapper = styled_components_1.default.div `
|
|
120
128
|
position: relative;
|
|
121
129
|
display: flex;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ManuscriptPageContainer.js","sourceRoot":"","sources":["../../../../src/components/projects/ManuscriptPageContainer.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ManuscriptPageContainer.js","sourceRoot":"","sources":["../../../../src/components/projects/ManuscriptPageContainer.tsx"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,7 @@ const store_1 = require("../store");
|
|
|
23
23
|
const theme_1 = require("../theme/theme");
|
|
24
24
|
const use_compare_documents_1 = require("./use-compare-documents");
|
|
25
25
|
const use_inspector_tabs_context_1 = require("./use-inspector-tabs-context");
|
|
26
|
+
const SAVE_INDICATOR_DISPLAY_TIME_MS = 3000;
|
|
26
27
|
const useCreateEditor = () => {
|
|
27
28
|
const [{ doc, initialDocVersion, projectID, manuscriptID, user, fileManagement, style, locale, languages, sectionCategories, isViewingMode, hiddenNodeTypes, }, dispatch, getState,] = (0, store_1.useStore)((store) => ({
|
|
28
29
|
doc: store.doc,
|
|
@@ -42,6 +43,9 @@ const useCreateEditor = () => {
|
|
|
42
43
|
const { comparedDoc, isComparingMode } = (0, use_compare_documents_1.useCompareDocuments)();
|
|
43
44
|
(0, react_1.useEffect)(() => {
|
|
44
45
|
dispatch({ isComparingMode });
|
|
46
|
+
if (isComparingMode) {
|
|
47
|
+
dispatch({ savingProcess: undefined });
|
|
48
|
+
}
|
|
45
49
|
}, [isComparingMode, dispatch]);
|
|
46
50
|
const updateVersion = (v) => dispatch({ initialDocVersion: v });
|
|
47
51
|
const stepsExchanger = (0, react_1.useMemo)(() => {
|
|
@@ -58,10 +62,33 @@ const useCreateEditor = () => {
|
|
|
58
62
|
preventUnload: value,
|
|
59
63
|
});
|
|
60
64
|
});
|
|
65
|
+
let savedTimeout = null;
|
|
66
|
+
stepsExchanger.saveStatus.onChange((status) => {
|
|
67
|
+
if (status === 'idle') {
|
|
68
|
+
dispatch({ savingProcess: undefined });
|
|
69
|
+
}
|
|
70
|
+
else {
|
|
71
|
+
dispatch({ savingProcess: status });
|
|
72
|
+
}
|
|
73
|
+
if (savedTimeout) {
|
|
74
|
+
clearTimeout(savedTimeout);
|
|
75
|
+
savedTimeout = null;
|
|
76
|
+
}
|
|
77
|
+
if (status === 'saved' || status === 'failed') {
|
|
78
|
+
savedTimeout = setTimeout(() => {
|
|
79
|
+
dispatch({ savingProcess: undefined });
|
|
80
|
+
}, SAVE_INDICATOR_DISPLAY_TIME_MS);
|
|
81
|
+
}
|
|
82
|
+
});
|
|
61
83
|
dispatch({
|
|
62
84
|
beforeUnload: () => stepsExchanger.flush(),
|
|
63
85
|
});
|
|
64
|
-
return () =>
|
|
86
|
+
return () => {
|
|
87
|
+
if (savedTimeout) {
|
|
88
|
+
clearTimeout(savedTimeout);
|
|
89
|
+
}
|
|
90
|
+
stepsExchanger.stop();
|
|
91
|
+
};
|
|
65
92
|
}
|
|
66
93
|
}, [dispatch, stepsExchanger]);
|
|
67
94
|
const getCapabilities = (0, react_1.useMemo)(() => (project, user, permittedActions) => (0, capabilities_1.getCapabilities)(project, user, undefined, permittedActions, isViewingMode), [isViewingMode]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-create-editor.js","sourceRoot":"","sources":["../../../src/hooks/use-create-editor.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;GAUG;AACH,0DAAoD;AAEpD,iCAA0C;AAC1C,uDAA2D;AAE3D,oCAAmC;AACnC,
|
|
1
|
+
{"version":3,"file":"use-create-editor.js","sourceRoot":"","sources":["../../../src/hooks/use-create-editor.ts"],"names":[],"mappings":"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"}
|
package/dist/es/api/Api.js
CHANGED
|
@@ -82,15 +82,30 @@ export class Api {
|
|
|
82
82
|
name,
|
|
83
83
|
});
|
|
84
84
|
this.getDocument = (projectID, manuscriptID) => this.get(`doc/${projectID}/manuscript/${manuscriptID}`);
|
|
85
|
-
this.sendSteps = (projectID, manuscriptID, data) =>
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
}
|
|
93
|
-
|
|
85
|
+
this.sendSteps = async (projectID, manuscriptID, data, signal) => {
|
|
86
|
+
try {
|
|
87
|
+
const result = await this.instance.post(`doc/${projectID}/manuscript/${manuscriptID}/steps`, {
|
|
88
|
+
...data,
|
|
89
|
+
steps: data.steps.map((s) => s.toJSON()),
|
|
90
|
+
}, { signal });
|
|
91
|
+
return result.data;
|
|
92
|
+
}
|
|
93
|
+
catch (e) {
|
|
94
|
+
const axiosError = e;
|
|
95
|
+
if (axiosError.name === 'AbortError' ||
|
|
96
|
+
axiosError.code === 'ERR_CANCELED' ||
|
|
97
|
+
axiosError.message === 'canceled') {
|
|
98
|
+
console.log('Request was aborted');
|
|
99
|
+
return {
|
|
100
|
+
error: 'aborted',
|
|
101
|
+
};
|
|
102
|
+
}
|
|
103
|
+
const error = axiosError.response?.status === 409 ? 'conflict' : axiosError.message;
|
|
104
|
+
return {
|
|
105
|
+
error: error,
|
|
106
|
+
};
|
|
107
|
+
}
|
|
108
|
+
};
|
|
94
109
|
this.getStepsSince = (projectID, manuscriptID, version) => this.get(`doc/${projectID}/manuscript/${manuscriptID}/version/${version}`);
|
|
95
110
|
this.listenToSteps = (projectID, manuscriptID, listener) => {
|
|
96
111
|
const config = getConfig();
|
package/dist/es/api/Api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Api.js","sourceRoot":"","sources":["../../../src/api/Api.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Api.js","sourceRoot":"","sources":["../../../src/api/Api.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,19 +13,40 @@ import { CollabProvider } from '@manuscripts/body-editor';
|
|
|
13
13
|
import { schema } from '@manuscripts/transform';
|
|
14
14
|
import { Step } from 'prosemirror-transform';
|
|
15
15
|
import { saveWithDebounce } from './savingUtilities';
|
|
16
|
-
const MAX_ATTEMPTS =
|
|
16
|
+
const MAX_ATTEMPTS = 10;
|
|
17
17
|
const THROTTLING_INTERVAL = 1200;
|
|
18
|
+
const REQUEST_TIMEOUT_MS = 10000;
|
|
19
|
+
export class ObservableString {
|
|
20
|
+
constructor() {
|
|
21
|
+
this.value = 'idle';
|
|
22
|
+
this.sub = undefined;
|
|
23
|
+
this.savingTimeout = undefined;
|
|
24
|
+
}
|
|
25
|
+
setValue(value) {
|
|
26
|
+
if (this.value !== value) {
|
|
27
|
+
this.value = value;
|
|
28
|
+
this.sub?.(value);
|
|
29
|
+
if (this.savingTimeout) {
|
|
30
|
+
clearTimeout(this.savingTimeout);
|
|
31
|
+
this.savingTimeout = undefined;
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
onChange(sub) {
|
|
36
|
+
this.sub = sub;
|
|
37
|
+
}
|
|
38
|
+
}
|
|
18
39
|
export class ObservableBoolean {
|
|
19
40
|
constructor() {
|
|
20
41
|
this.value = false;
|
|
21
|
-
this.
|
|
42
|
+
this.sub = undefined;
|
|
22
43
|
}
|
|
23
44
|
setValue(value) {
|
|
24
45
|
this.value = value;
|
|
25
|
-
this.
|
|
46
|
+
this.sub?.(value);
|
|
26
47
|
}
|
|
27
48
|
onChange(sub) {
|
|
28
|
-
this.
|
|
49
|
+
this.sub = sub;
|
|
29
50
|
}
|
|
30
51
|
}
|
|
31
52
|
export class StepsExchanger extends CollabProvider {
|
|
@@ -36,36 +57,121 @@ export class StepsExchanger extends CollabProvider {
|
|
|
36
57
|
}
|
|
37
58
|
super();
|
|
38
59
|
this.attempt = 0;
|
|
60
|
+
this.handleOnline = () => {
|
|
61
|
+
console.log('Connection recovered. Going back online.');
|
|
62
|
+
this.saveStatus.setValue('idle');
|
|
63
|
+
this.start();
|
|
64
|
+
// Trigger sync to check for queued steps
|
|
65
|
+
if (this.newStepsListener) {
|
|
66
|
+
this.newStepsListener();
|
|
67
|
+
}
|
|
68
|
+
};
|
|
69
|
+
this.handleOffline = () => {
|
|
70
|
+
console.log('Connection lost. Going offline.');
|
|
71
|
+
// Abort any pending request when going offline
|
|
72
|
+
if (this.abortController) {
|
|
73
|
+
this.abortController.abort();
|
|
74
|
+
this.abortController = undefined;
|
|
75
|
+
}
|
|
76
|
+
if (this.timeoutId) {
|
|
77
|
+
clearTimeout(this.timeoutId);
|
|
78
|
+
this.timeoutId = undefined;
|
|
79
|
+
}
|
|
80
|
+
this.saveStatus.setValue('offline');
|
|
81
|
+
this.closeConnection();
|
|
82
|
+
};
|
|
39
83
|
this.stopped = true;
|
|
40
84
|
this.projectID = projectID;
|
|
41
85
|
this.manuscriptID = manuscriptID;
|
|
42
86
|
this.currentVersion = currentVersion;
|
|
43
87
|
this.isThrottling = new ObservableBoolean();
|
|
88
|
+
this.saveStatus = new ObservableString();
|
|
44
89
|
this.debounce = saveWithDebounce();
|
|
45
90
|
this.api = api;
|
|
46
|
-
this.start();
|
|
47
91
|
this.updateStoreVersion = updateStoreVersion;
|
|
92
|
+
// Initialize closeConnection as no-op to ensure it's always defined
|
|
93
|
+
// eslint-disable-next-line @typescript-eslint/no-empty-function
|
|
94
|
+
this.closeConnection = () => { };
|
|
95
|
+
if (!navigator.onLine) {
|
|
96
|
+
this.saveStatus.setValue('offline');
|
|
97
|
+
}
|
|
98
|
+
else {
|
|
99
|
+
this.start();
|
|
100
|
+
}
|
|
101
|
+
this.addNetworkListeners();
|
|
48
102
|
this.stop = this.stop.bind(this);
|
|
49
103
|
StepsExchanger.instance = this;
|
|
50
104
|
}
|
|
105
|
+
addNetworkListeners() {
|
|
106
|
+
window.addEventListener('online', this.handleOnline);
|
|
107
|
+
window.addEventListener('offline', this.handleOffline);
|
|
108
|
+
}
|
|
109
|
+
removeNetworkListeners() {
|
|
110
|
+
window.removeEventListener('online', this.handleOnline);
|
|
111
|
+
window.removeEventListener('offline', this.handleOffline);
|
|
112
|
+
}
|
|
51
113
|
async sendSteps(version, steps, clientID, flush = false) {
|
|
52
114
|
this.flushImmediately = this.debounce(async () => {
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
clientID,
|
|
57
|
-
});
|
|
58
|
-
if (response.error === 'conflict' && this.attempt < MAX_ATTEMPTS) {
|
|
59
|
-
console.warn('Retrying');
|
|
60
|
-
this.newStepsListener();
|
|
61
|
-
this.attempt++;
|
|
115
|
+
// Abort any pending request before starting a new one
|
|
116
|
+
if (this.abortController) {
|
|
117
|
+
this.abortController.abort();
|
|
62
118
|
}
|
|
63
|
-
|
|
64
|
-
|
|
119
|
+
if (this.timeoutId) {
|
|
120
|
+
clearTimeout(this.timeoutId);
|
|
65
121
|
}
|
|
66
|
-
|
|
122
|
+
this.saveStatus.setValue('saving');
|
|
123
|
+
// Create new AbortController for this request
|
|
124
|
+
this.abortController = new AbortController();
|
|
125
|
+
this.timeoutId = setTimeout(() => {
|
|
126
|
+
this.abortController?.abort();
|
|
127
|
+
}, REQUEST_TIMEOUT_MS);
|
|
128
|
+
try {
|
|
129
|
+
const response = await this.api.sendSteps(this.projectID, this.manuscriptID, {
|
|
130
|
+
steps: steps,
|
|
131
|
+
version,
|
|
132
|
+
clientID,
|
|
133
|
+
}, this.abortController.signal);
|
|
134
|
+
if (this.timeoutId) {
|
|
135
|
+
clearTimeout(this.timeoutId);
|
|
136
|
+
this.timeoutId = undefined;
|
|
137
|
+
}
|
|
138
|
+
if (response.error === 'conflict') {
|
|
139
|
+
if (this.attempt < MAX_ATTEMPTS) {
|
|
140
|
+
this.newStepsListener();
|
|
141
|
+
this.attempt++;
|
|
142
|
+
}
|
|
143
|
+
else {
|
|
144
|
+
this.saveStatus.setValue('failed');
|
|
145
|
+
this.attempt = 0;
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
else if (response.error === 'aborted') {
|
|
149
|
+
this.saveStatus.setValue(navigator.onLine ? 'failed' : 'offline');
|
|
150
|
+
this.attempt = 0;
|
|
151
|
+
}
|
|
152
|
+
else if (response.error) {
|
|
153
|
+
console.error('Failed to send steps', response.error);
|
|
154
|
+
this.saveStatus.setValue('failed');
|
|
155
|
+
this.attempt = 0;
|
|
156
|
+
}
|
|
157
|
+
else {
|
|
158
|
+
this.saveStatus.setValue('saved');
|
|
159
|
+
this.attempt = 0;
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
catch (error) {
|
|
163
|
+
if (this.timeoutId) {
|
|
164
|
+
clearTimeout(this.timeoutId);
|
|
165
|
+
this.timeoutId = undefined;
|
|
166
|
+
}
|
|
167
|
+
// Handle other errors (abort is now handled via error response)
|
|
168
|
+
console.warn('Failed to send steps', error);
|
|
169
|
+
this.saveStatus.setValue('failed');
|
|
67
170
|
this.attempt = 0;
|
|
68
171
|
}
|
|
172
|
+
finally {
|
|
173
|
+
this.abortController = undefined;
|
|
174
|
+
}
|
|
69
175
|
}, THROTTLING_INTERVAL, flush, () => this.isThrottling.setValue(false));
|
|
70
176
|
if (!flush) {
|
|
71
177
|
this.isThrottling.setValue(true);
|
|
@@ -76,6 +182,7 @@ export class StepsExchanger extends CollabProvider {
|
|
|
76
182
|
this.currentVersion = version;
|
|
77
183
|
this.updateStoreVersion(version);
|
|
78
184
|
if (steps.length) {
|
|
185
|
+
//TODO send steps to listener
|
|
79
186
|
this.newStepsListener();
|
|
80
187
|
}
|
|
81
188
|
}
|
|
@@ -83,12 +190,43 @@ export class StepsExchanger extends CollabProvider {
|
|
|
83
190
|
if (this.stopped === false) {
|
|
84
191
|
return;
|
|
85
192
|
}
|
|
86
|
-
|
|
87
|
-
this.
|
|
193
|
+
// Abort any pending request before restarting
|
|
194
|
+
if (this.abortController) {
|
|
195
|
+
this.abortController.abort();
|
|
196
|
+
this.abortController = undefined;
|
|
197
|
+
}
|
|
198
|
+
if (this.timeoutId) {
|
|
199
|
+
clearTimeout(this.timeoutId);
|
|
200
|
+
this.timeoutId = undefined;
|
|
201
|
+
}
|
|
202
|
+
// Close any existing connection before starting a new one to avoid duplicate listeners
|
|
203
|
+
if (this.closeConnection) {
|
|
204
|
+
this.closeConnection();
|
|
205
|
+
}
|
|
206
|
+
if (navigator.onLine) {
|
|
207
|
+
this.closeConnection = this.api.listenToSteps(this.projectID, this.manuscriptID, (version, steps, clientIDs) => this.receiveSteps(version, steps, clientIDs));
|
|
208
|
+
this.stopped = false;
|
|
209
|
+
}
|
|
210
|
+
else {
|
|
211
|
+
// No-op function when offline - connection cannot be established
|
|
212
|
+
// eslint-disable-next-line @typescript-eslint/no-empty-function
|
|
213
|
+
this.closeConnection = () => { };
|
|
214
|
+
this.stopped = true;
|
|
215
|
+
}
|
|
88
216
|
}
|
|
89
217
|
stop() {
|
|
90
218
|
this.stopped = true;
|
|
219
|
+
// Abort any pending request
|
|
220
|
+
if (this.abortController) {
|
|
221
|
+
this.abortController.abort();
|
|
222
|
+
this.abortController = undefined;
|
|
223
|
+
}
|
|
224
|
+
if (this.timeoutId) {
|
|
225
|
+
clearTimeout(this.timeoutId);
|
|
226
|
+
this.timeoutId = undefined;
|
|
227
|
+
}
|
|
91
228
|
this.closeConnection();
|
|
229
|
+
this.removeNetworkListeners();
|
|
92
230
|
}
|
|
93
231
|
flush() {
|
|
94
232
|
this.flushImmediately && this.flushImmediately();
|
|
@@ -106,6 +244,9 @@ export class StepsExchanger extends CollabProvider {
|
|
|
106
244
|
}
|
|
107
245
|
}
|
|
108
246
|
async stepsSince(version) {
|
|
247
|
+
if (this.saveStatus.value === 'offline') {
|
|
248
|
+
return;
|
|
249
|
+
}
|
|
109
250
|
const response = await this.api.getStepsSince(this.projectID, this.manuscriptID, version);
|
|
110
251
|
if (response) {
|
|
111
252
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StepsExchanger.js","sourceRoot":"","sources":["../../../src/api/StepsExchanger.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;AAG5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAEpD,MAAM,YAAY,GAAG,EAAE,CAAA;AACvB,MAAM,mBAAmB,GAAG,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"StepsExchanger.js","sourceRoot":"","sources":["../../../src/api/StepsExchanger.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;AAG5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAEpD,MAAM,YAAY,GAAG,EAAE,CAAA;AACvB,MAAM,mBAAmB,GAAG,IAAI,CAAA;AAChC,MAAM,kBAAkB,GAAG,KAAK,CAAA;AAKhC,MAAM,OAAO,gBAAgB;IAA7B;QACE,UAAK,GAAe,MAAM,CAAA;QAElB,QAAG,GAAyC,SAAS,CAAA;QACrD,kBAAa,GAA8C,SAAS,CAAA;IAiB9E,CAAC;IAfC,QAAQ,CAAC,KAAiB;QACxB,IAAI,IAAI,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;YACzB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;YAClB,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAA;YAEjB,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;gBACvB,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;gBAChC,IAAI,CAAC,aAAa,GAAG,SAAS,CAAA;YAChC,CAAC;QACH,CAAC;IACH,CAAC;IAED,QAAQ,CAAC,GAA6B;QACpC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;IAChB,CAAC;CACF;AAED,MAAM,OAAO,iBAAiB;IAA9B;QACE,UAAK,GAAG,KAAK,CAAA;QAEL,QAAG,GAAsC,SAAS,CAAA;IAU5D,CAAC;IARC,QAAQ,CAAC,KAAc;QACrB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAA;IACnB,CAAC;IAED,QAAQ,CAAC,GAA0B;QACjC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;IAChB,CAAC;CACF;AAED,MAAM,OAAO,cAAe,SAAQ,cAAc;IAehD,YACE,SAAiB,EACjB,YAAoB,EACpB,cAAsB,EACtB,GAAQ,EACR,kBAA6C;QAE7C,IAAI,cAAc,CAAC,QAAQ,EAAE,CAAC;YAC5B,cAAc,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAA;YAC/B,OAAO,cAAc,CAAC,QAAQ,CAAA;QAChC,CAAC;QAED,KAAK,EAAE,CAAA;QAhBT,YAAO,GAAG,CAAC,CAAA;QAoDH,iBAAY,GAAG,GAAG,EAAE;YAC1B,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAA;YACvD,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;YAChC,IAAI,CAAC,KAAK,EAAE,CAAA;YACZ,yCAAyC;YACzC,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBAC1B,IAAI,CAAC,gBAAgB,EAAE,CAAA;YACzB,CAAC;QACH,CAAC,CAAA;QAEO,kBAAa,GAAG,GAAG,EAAE;YAC3B,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAA;YAC9C,+CAA+C;YAC/C,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;gBACzB,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;gBAC5B,IAAI,CAAC,eAAe,GAAG,SAAS,CAAA;YAClC,CAAC;YACD,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;gBACnB,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;gBAC5B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;YAC5B,CAAC;YACD,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;YACnC,IAAI,CAAC,eAAe,EAAE,CAAA;QACxB,CAAC,CAAA;QAkGD,YAAO,GAAG,IAAI,CAAA;QA3JZ,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;QAChC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;QACpC,IAAI,CAAC,YAAY,GAAG,IAAI,iBAAiB,EAAE,CAAA;QAC3C,IAAI,CAAC,UAAU,GAAG,IAAI,gBAAgB,EAAE,CAAA;QACxC,IAAI,CAAC,QAAQ,GAAG,gBAAgB,EAAE,CAAA;QAClC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAA;QAC5C,oEAAoE;QACpE,gEAAgE;QAChE,IAAI,CAAC,eAAe,GAAG,GAAG,EAAE,GAAE,CAAC,CAAA;QAE/B,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;YACtB,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;QACrC,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,KAAK,EAAE,CAAA;QACd,CAAC;QAED,IAAI,CAAC,mBAAmB,EAAE,CAAA;QAC1B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEhC,cAAc,CAAC,QAAQ,GAAG,IAAI,CAAA;IAChC,CAAC;IAEO,mBAAmB;QACzB,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,IAAI,CAAC,YAAY,CAAC,CAAA;QACpD,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC,CAAA;IACxD,CAAC;IAEO,sBAAsB;QAC5B,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,IAAI,CAAC,YAAY,CAAC,CAAA;QACvD,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC,CAAA;IAC3D,CAAC;IA2BD,KAAK,CAAC,SAAS,CACb,OAAe,EACf,KAAa,EACb,QAAgB,EAChB,KAAK,GAAG,KAAK;QAGb,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,QAAQ,CACnC,KAAK,IAAI,EAAE;YACT,sDAAsD;YACtD,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;gBACzB,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;YAC9B,CAAC;YACD,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;gBACnB,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YAC9B,CAAC;YAED,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;YAElC,8CAA8C;YAC9C,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;YAC5C,IAAI,CAAC,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC/B,IAAI,CAAC,eAAe,EAAE,KAAK,EAAE,CAAA;YAC/B,CAAC,EAAE,kBAAkB,CAAC,CAAA;YAEtB,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,SAAS,CACvC,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,YAAY,EACjB;oBACE,KAAK,EAAE,KAAK;oBACZ,OAAO;oBACP,QAAQ;iBACT,EACD,IAAI,CAAC,eAAe,CAAC,MAAM,CAC5B,CAAA;gBAED,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;oBACnB,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;oBAC5B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;gBAC5B,CAAC;gBAED,IAAI,QAAQ,CAAC,KAAK,KAAK,UAAU,EAAE,CAAC;oBAClC,IAAI,IAAI,CAAC,OAAO,GAAG,YAAY,EAAE,CAAC;wBAChC,IAAI,CAAC,gBAAgB,EAAE,CAAA;wBACvB,IAAI,CAAC,OAAO,EAAE,CAAA;oBAChB,CAAC;yBAAM,CAAC;wBACN,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;wBAClC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAA;oBAClB,CAAC;gBACH,CAAC;qBAAM,IAAI,QAAQ,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;oBACxC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;oBACjE,IAAI,CAAC,OAAO,GAAG,CAAC,CAAA;gBAClB,CAAC;qBAAM,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;oBAC1B,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAA;oBACrD,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;oBAClC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAA;gBAClB,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;oBACjC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAA;gBAClB,CAAC;YACH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;oBACnB,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;oBAC5B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;gBAC5B,CAAC;gBACD,gEAAgE;gBAChE,OAAO,CAAC,IAAI,CAAC,sBAAsB,EAAE,KAAK,CAAC,CAAA;gBAC3C,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;gBAClC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAA;YAClB,CAAC;oBAAS,CAAC;gBACT,IAAI,CAAC,eAAe,GAAG,SAAS,CAAA;YAClC,CAAC;QACH,CAAC,EACD,mBAAmB,EACnB,KAAK,EACL,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,CACxC,CAAA;QAED,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QAClC,CAAC;QAED,OAAO,OAAO,CAAC,OAAO,EAAE,CAAA;IAC1B,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,OAAe,EAAE,KAAgB,EAAE,SAAmB;QACvE,IAAI,CAAC,cAAc,GAAG,OAAO,CAAA;QAC7B,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAA;QAEhC,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACjB,6BAA6B;YAC7B,IAAI,CAAC,gBAAgB,EAAE,CAAA;QACzB,CAAC;IACH,CAAC;IAID,KAAK;QACH,IAAI,IAAI,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;YAC3B,OAAM;QACR,CAAC;QAED,8CAA8C;QAC9C,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YACzB,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;YAC5B,IAAI,CAAC,eAAe,GAAG,SAAS,CAAA;QAClC,CAAC;QACD,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YAC5B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC5B,CAAC;QAED,uFAAuF;QACvF,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YACzB,IAAI,CAAC,eAAe,EAAE,CAAA;QACxB,CAAC;QAED,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;YACrB,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAC3C,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,YAAY,EACjB,CAAC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,CAC5B,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,KAAK,EAAE,SAAS,CAAC,CAC/C,CAAA;YACD,IAAI,CAAC,OAAO,GAAG,KAAK,CAAA;QACtB,CAAC;aAAM,CAAC;YACN,iEAAiE;YACjE,gEAAgE;YAChE,IAAI,CAAC,eAAe,GAAG,GAAG,EAAE,GAAE,CAAC,CAAA;YAC/B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QACrB,CAAC;IACH,CAAC;IAED,IAAI;QACF,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QAEnB,4BAA4B;QAC5B,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YACzB,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;YAC5B,IAAI,CAAC,eAAe,GAAG,SAAS,CAAA;QAClC,CAAC;QACD,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YAC5B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC5B,CAAC;QAED,IAAI,CAAC,eAAe,EAAE,CAAA;QACtB,IAAI,CAAC,sBAAsB,EAAE,CAAA;IAC/B,CAAC;IAED,KAAK;QACH,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAA;IAClD,CAAC;IAED,UAAU,CAAC,QAA4C;QACrD,IAAI,CAAC,KAAK,EAAE,CAAA;QACZ,IAAI,CAAC,gBAAgB,GAAG,QAAQ,CAAA;IAClC,CAAC;IAED,WAAW;QACT,6DAA6D;QAC7D,IAAI,cAAc,CAAC,QAAQ,EAAE,CAAC;YAC5B,cAAc,CAAC,QAAQ,CAAC,gBAAgB,GAAG,GAAG,EAAE;gBAC9C,OAAO,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAA;YAC7D,CAAC,CAAA;QACH,CAAC;IACH,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,OAAe;QAC9B,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YACxC,OAAM;QACR,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,aAAa,CAC3C,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,YAAY,EACjB,OAAO,CACR,CAAA;QAED,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO;gBACL,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;gBAC1D,SAAS,EAAE,QAAQ,CAAC,SAAS;gBAC7B,OAAO,EAAE,QAAQ,CAAC,OAAO;aAC1B,CAAA;QACH,CAAC;IACH,CAAC;CACF"}
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
import '@manuscripts/body-editor/styles/Editor.css';
|
|
13
13
|
import '@manuscripts/body-editor/styles/AdvancedEditor.css';
|
|
14
14
|
import '@manuscripts/body-editor/styles/popper.css';
|
|
15
|
-
import { IconButton, SliderOffIcon, SliderOnIcon, } from '@manuscripts/style-guide';
|
|
15
|
+
import { IconButton, SaveStatus, SliderOffIcon, SliderOnIcon, } from '@manuscripts/style-guide';
|
|
16
16
|
import React from 'react';
|
|
17
17
|
import styled from 'styled-components';
|
|
18
18
|
import { useGlobalKeyboardShortcuts } from '../../hooks/use-global-keyboard-shortcuts';
|
|
@@ -52,9 +52,10 @@ const ManuscriptPageContainer = () => {
|
|
|
52
52
|
const ManuscriptPageView = () => {
|
|
53
53
|
const can = usePermissions();
|
|
54
54
|
const [isTrackingChangesVisible, toggleTrackingChangesVisibility] = useTrackingVisibility();
|
|
55
|
-
const [{ isViewingMode, isComparingMode }] = useStore((store) => ({
|
|
55
|
+
const [{ isViewingMode, isComparingMode, savingProcess }] = useStore((store) => ({
|
|
56
56
|
isViewingMode: store.isViewingMode,
|
|
57
57
|
isComparingMode: store.isComparingMode,
|
|
58
|
+
savingProcess: store.savingProcess,
|
|
58
59
|
}));
|
|
59
60
|
const showTrackChangesToggle = !can.editWithoutTracking && !isViewingMode;
|
|
60
61
|
const isTrackingVisible = (showTrackChangesToggle && isTrackingChangesVisible) || isComparingMode;
|
|
@@ -67,7 +68,9 @@ const ManuscriptPageView = () => {
|
|
|
67
68
|
React.createElement(EditorHeader, { "data-cy": "editor-header" },
|
|
68
69
|
React.createElement(ManuscriptMenusContainer, null,
|
|
69
70
|
React.createElement(ManuscriptMenusContainerInner, null,
|
|
70
|
-
React.createElement(
|
|
71
|
+
React.createElement(MenusWrapper, null,
|
|
72
|
+
React.createElement(ManuscriptMenus, null),
|
|
73
|
+
savingProcess && React.createElement(SaveStatus, { status: savingProcess }))),
|
|
71
74
|
showTrackChangesToggle && (React.createElement(React.Fragment, null,
|
|
72
75
|
React.createElement(Label, null, "Show tracked changes"),
|
|
73
76
|
React.createElement(IconButton, { defaultColor: true, onClick: toggleTrackingChangesVisibility, "aria-label": isTrackingChangesVisible
|
|
@@ -110,6 +113,11 @@ export const ManuscriptMenusContainerInner = styled.div `
|
|
|
110
113
|
${(props) => props.theme.grid.unit * 15}px;
|
|
111
114
|
box-sizing: border-box;
|
|
112
115
|
`;
|
|
116
|
+
const MenusWrapper = styled.div `
|
|
117
|
+
display: flex;
|
|
118
|
+
align-items: center;
|
|
119
|
+
gap: ${(props) => props.theme.grid.unit * 2}px;
|
|
120
|
+
`;
|
|
113
121
|
const PageWrapper = styled.div `
|
|
114
122
|
position: relative;
|
|
115
123
|
display: flex;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ManuscriptPageContainer.js","sourceRoot":"","sources":["../../../../src/components/projects/ManuscriptPageContainer.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;
|
|
1
|
+
{"version":3,"file":"ManuscriptPageContainer.js","sourceRoot":"","sources":["../../../../src/components/projects/ManuscriptPageContainer.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,4CAA4C,CAAA;AACnD,OAAO,oDAAoD,CAAA;AAC3D,OAAO,4CAA4C,CAAA;AACnD,OAAO,EACL,UAAU,EACV,UAAU,EACV,aAAa,EACb,YAAY,GACb,MAAM,0BAA0B,CAAA;AACjC,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,MAAM,MAAM,mBAAmB,CAAA;AAEtC,OAAO,EAAE,0BAA0B,EAAE,MAAM,2CAA2C,CAAA;AACtF,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAC3E,OAAO,EACL,oBAAoB,EACpB,iBAAiB,EACjB,cAAc,GACf,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAChD,OAAO,gBAAgB,MAAM,qBAAqB,CAAA;AAClD,OAAO,EACL,UAAU,EACV,eAAe,EACf,oBAAoB,EACpB,YAAY,GACb,MAAM,mBAAmB,CAAA;AAC1B,OAAO,aAAa,MAAM,iBAAiB,CAAA;AAC3C,OAAO,SAAS,MAAM,aAAa,CAAA;AACnC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,iBAAiB,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAEzD,MAAM,uBAAuB,GAAa,GAAG,EAAE;IAC7C,mCAAmC;IACnC,0BAA0B,EAAE,CAAA;IAE5B,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAE,aAAa,EAAE,CAAC,GAAG,QAAQ,CACnE,CAAC,KAAK,EAAE,EAAE;QACR,OAAO;YACL,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;YACxC,aAAa,EAAE,KAAK,CAAC,aAAa;SACnC,CAAA;IACH,CAAC,CACF,CAAA;IAED,MAAM,GAAG,GAAG,iBAAiB,CAAC;QAC5B,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,OAAO;QAChB,gBAAgB;QAChB,aAAa;KACd,CAAC,CAAA;IAEF,OAAO,CACL,oBAAC,oBAAoB,IAAC,GAAG,EAAE,GAAG;QAC5B,oBAAC,kBAAkB,OAAG,CACD,CACxB,CAAA;AACH,CAAC,CAAA;AAED,MAAM,kBAAkB,GAAa,GAAG,EAAE;IACxC,MAAM,GAAG,GAAG,cAAc,EAAE,CAAA;IAC5B,MAAM,CAAC,wBAAwB,EAAE,+BAA+B,CAAC,GAC/D,qBAAqB,EAAE,CAAA;IAEzB,MAAM,CAAC,EAAE,aAAa,EAAE,eAAe,EAAE,aAAa,EAAE,CAAC,GAAG,QAAQ,CAClE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACV,aAAa,EAAE,KAAK,CAAC,aAAa;QAClC,eAAe,EAAE,KAAK,CAAC,eAAe;QACtC,aAAa,EAAE,KAAK,CAAC,aAAa;KACnC,CAAC,CACH,CAAA;IAED,MAAM,sBAAsB,GAAG,CAAC,GAAG,CAAC,mBAAmB,IAAI,CAAC,aAAa,CAAA;IACzE,MAAM,iBAAiB,GACrB,CAAC,sBAAsB,IAAI,wBAAwB,CAAC,IAAI,eAAe,CAAA;IAEzE,OAAO,CACL,oBAAC,OAAO,IAAC,SAAS,EAAE,GAAG,iBAAiB,IAAI,kBAAkB,EAAE;QAC9D,oBAAC,iBAAiB,eAAS,oBAAoB,GAAG;QAClD,oBAAC,WAAW;YACV,oBAAC,IAAI,eAAS,aAAa;gBACzB,oBAAC,eAAe;oBACd,oBAAC,oBAAoB;wBACnB,oBAAC,YAAY,eAAS,eAAe;4BACnC,oBAAC,wBAAwB;gCACvB,oBAAC,6BAA6B;oCAC5B,oBAAC,YAAY;wCACX,oBAAC,eAAe,OAAG;wCAClB,aAAa,IAAI,oBAAC,UAAU,IAAC,MAAM,EAAE,aAAa,GAAI,CAC1C,CACe;gCAE/B,sBAAsB,IAAI,CACzB;oCACE,oBAAC,KAAK,+BAA6B;oCACnC,oBAAC,UAAU,IACT,YAAY,EAAE,IAAI,EAClB,OAAO,EAAE,+BAA+B,gBAEtC,wBAAwB;4CACtB,CAAC,CAAC,sBAAsB;4CACxB,CAAC,CAAC,sBAAsB,IAG3B,wBAAwB,CAAC,CAAC,CAAC,CAC1B,oBAAC,YAAY,OAAG,CACjB,CAAC,CAAC,CAAC,CACF,oBAAC,aAAa,OAAG,CAClB,CACU,CACZ,CACJ,CACwB;4BAC1B,GAAG,CAAC,gBAAgB,IAAI,oBAAC,iBAAiB,OAAG;4BAC9C,oBAAC,aAAa,OAAG,CACJ;wBACf,oBAAC,UAAU,IAAC,SAAS,EAAC,aAAa;4BACjC,oBAAC,kBAAkB;gCACjB,oBAAC,aAAa,OAAG,CACE,CACV,CACQ,CACP,CACb;YACP,oBAAC,SAAS,eAAS,WAAW,GAAG;YACjC,oBAAC,gBAAgB,OAAG,CACR,CACN,CACX,CAAA;AACH,CAAC,CAAA;AAED,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAA;;;CAGvB,CAAA;AACD,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;;;;CAQzB,CAAA;AACD,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,CAAC,GAAG,CAAA;;;;sBAI5B,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS;CACvE,CAAA;AACD,MAAM,CAAC,MAAM,6BAA6B,GAAG,MAAM,CAAC,GAAG,CAAA;;eAExC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc;;aAE5C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC;MAC3C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC;MACpC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI;MAChC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,EAAE;;CAE1C,CAAA;AAED,MAAM,YAAY,GAAG,MAAM,CAAC,GAAG,CAAA;;;SAGtB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC;CAC5C,CAAA;AAED,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;CAK7B,CAAA;AAED,eAAe,uBAAuB,CAAA"}
|
|
@@ -20,6 +20,7 @@ import { useStore } from '../store';
|
|
|
20
20
|
import { theme } from '../theme/theme';
|
|
21
21
|
import { useCompareDocuments } from './use-compare-documents';
|
|
22
22
|
import { useInspectorTabsContext } from './use-inspector-tabs-context';
|
|
23
|
+
const SAVE_INDICATOR_DISPLAY_TIME_MS = 3000;
|
|
23
24
|
export const useCreateEditor = () => {
|
|
24
25
|
const [{ doc, initialDocVersion, projectID, manuscriptID, user, fileManagement, style, locale, languages, sectionCategories, isViewingMode, hiddenNodeTypes, }, dispatch, getState,] = useStore((store) => ({
|
|
25
26
|
doc: store.doc,
|
|
@@ -39,6 +40,9 @@ export const useCreateEditor = () => {
|
|
|
39
40
|
const { comparedDoc, isComparingMode } = useCompareDocuments();
|
|
40
41
|
useEffect(() => {
|
|
41
42
|
dispatch({ isComparingMode });
|
|
43
|
+
if (isComparingMode) {
|
|
44
|
+
dispatch({ savingProcess: undefined });
|
|
45
|
+
}
|
|
42
46
|
}, [isComparingMode, dispatch]);
|
|
43
47
|
const updateVersion = (v) => dispatch({ initialDocVersion: v });
|
|
44
48
|
const stepsExchanger = useMemo(() => {
|
|
@@ -55,10 +59,33 @@ export const useCreateEditor = () => {
|
|
|
55
59
|
preventUnload: value,
|
|
56
60
|
});
|
|
57
61
|
});
|
|
62
|
+
let savedTimeout = null;
|
|
63
|
+
stepsExchanger.saveStatus.onChange((status) => {
|
|
64
|
+
if (status === 'idle') {
|
|
65
|
+
dispatch({ savingProcess: undefined });
|
|
66
|
+
}
|
|
67
|
+
else {
|
|
68
|
+
dispatch({ savingProcess: status });
|
|
69
|
+
}
|
|
70
|
+
if (savedTimeout) {
|
|
71
|
+
clearTimeout(savedTimeout);
|
|
72
|
+
savedTimeout = null;
|
|
73
|
+
}
|
|
74
|
+
if (status === 'saved' || status === 'failed') {
|
|
75
|
+
savedTimeout = setTimeout(() => {
|
|
76
|
+
dispatch({ savingProcess: undefined });
|
|
77
|
+
}, SAVE_INDICATOR_DISPLAY_TIME_MS);
|
|
78
|
+
}
|
|
79
|
+
});
|
|
58
80
|
dispatch({
|
|
59
81
|
beforeUnload: () => stepsExchanger.flush(),
|
|
60
82
|
});
|
|
61
|
-
return () =>
|
|
83
|
+
return () => {
|
|
84
|
+
if (savedTimeout) {
|
|
85
|
+
clearTimeout(savedTimeout);
|
|
86
|
+
}
|
|
87
|
+
stepsExchanger.stop();
|
|
88
|
+
};
|
|
62
89
|
}
|
|
63
90
|
}, [dispatch, stepsExchanger]);
|
|
64
91
|
const getCapabilities = useMemo(() => (project, user, permittedActions) => getActionCapabilities(project, user, undefined, permittedActions, isViewingMode), [isViewingMode]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-create-editor.js","sourceRoot":"","sources":["../../../src/hooks/use-create-editor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AAEpD,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAC1C,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAE3D,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACnC,OAAO,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"use-create-editor.js","sourceRoot":"","sources":["../../../src/hooks/use-create-editor.ts"],"names":[],"mappings":"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"}
|
package/dist/types/api/Api.d.ts
CHANGED
|
@@ -37,9 +37,7 @@ export declare class Api {
|
|
|
37
37
|
getSnapshot: (snapshotID: string) => Promise<ManuscriptSnapshot | undefined>;
|
|
38
38
|
createSnapshot: (projectID: string, manuscriptID: string, name: string) => Promise<CreateSnapshotResponse>;
|
|
39
39
|
getDocument: (projectID: string, manuscriptID: string) => Promise<ManuscriptDoc | undefined>;
|
|
40
|
-
sendSteps: (projectID: string, manuscriptID: string, data: SendStepsPayload) => Promise<SendStepsResponse
|
|
41
|
-
error: string;
|
|
42
|
-
}>;
|
|
40
|
+
sendSteps: (projectID: string, manuscriptID: string, data: SendStepsPayload, signal?: AbortSignal) => Promise<SendStepsResponse>;
|
|
43
41
|
getStepsSince: (projectID: string, manuscriptID: string, version: number) => Promise<StepsSinceResponse | undefined>;
|
|
44
42
|
listenToSteps: (projectID: string, manuscriptID: string, listener: StepsListener) => () => void;
|
|
45
43
|
}
|
|
@@ -13,12 +13,20 @@ import { CollabProvider } from '@manuscripts/body-editor';
|
|
|
13
13
|
import { Step } from 'prosemirror-transform';
|
|
14
14
|
import { Api } from './Api';
|
|
15
15
|
import { saveWithDebounce } from './savingUtilities';
|
|
16
|
-
export type Subscription = (value:
|
|
16
|
+
export type Subscription<T> = (value: T) => void;
|
|
17
|
+
export type SaveStatus = 'saving' | 'saved' | 'offline' | 'failed' | 'idle';
|
|
18
|
+
export declare class ObservableString {
|
|
19
|
+
value: SaveStatus;
|
|
20
|
+
private sub;
|
|
21
|
+
private savingTimeout;
|
|
22
|
+
setValue(value: SaveStatus): void;
|
|
23
|
+
onChange(sub: Subscription<SaveStatus>): void;
|
|
24
|
+
}
|
|
17
25
|
export declare class ObservableBoolean {
|
|
18
26
|
value: boolean;
|
|
19
|
-
private
|
|
27
|
+
private sub;
|
|
20
28
|
setValue(value: boolean): void;
|
|
21
|
-
onChange(sub: Subscription): void;
|
|
29
|
+
onChange(sub: Subscription<boolean>): void;
|
|
22
30
|
}
|
|
23
31
|
export declare class StepsExchanger extends CollabProvider {
|
|
24
32
|
private static instance;
|
|
@@ -30,8 +38,15 @@ export declare class StepsExchanger extends CollabProvider {
|
|
|
30
38
|
updateStoreVersion: (version: number) => void;
|
|
31
39
|
closeConnection: () => void;
|
|
32
40
|
isThrottling: ObservableBoolean;
|
|
41
|
+
saveStatus: ObservableString;
|
|
33
42
|
attempt: number;
|
|
43
|
+
private abortController?;
|
|
44
|
+
private timeoutId?;
|
|
34
45
|
constructor(projectID: string, manuscriptID: string, currentVersion: number, api: Api, updateStoreVersion: (version: number) => void);
|
|
46
|
+
private addNetworkListeners;
|
|
47
|
+
private removeNetworkListeners;
|
|
48
|
+
private handleOnline;
|
|
49
|
+
private handleOffline;
|
|
35
50
|
sendSteps(version: number, steps: Step[], clientID: string, flush?: boolean): Promise<void>;
|
|
36
51
|
receiveSteps(version: number, steps: unknown[], clientIDs: number[]): Promise<void>;
|
|
37
52
|
stopped: boolean;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@manuscripts/article-editor",
|
|
3
|
-
"version": "4.7.
|
|
3
|
+
"version": "4.7.27",
|
|
4
4
|
"license": "CPAL-1.0",
|
|
5
5
|
"description": "React components for editing and viewing manuscripts",
|
|
6
6
|
"repository": "github:Atypon-OpenSource/manuscripts-article-editor",
|
|
@@ -32,10 +32,10 @@
|
|
|
32
32
|
"@fontsource/pt-sans": "5.2.5",
|
|
33
33
|
"@fontsource/pt-serif": "5.2.5",
|
|
34
34
|
"@headlessui/react": "2.2.3",
|
|
35
|
-
"@manuscripts/body-editor": "3.7.
|
|
35
|
+
"@manuscripts/body-editor": "3.7.24",
|
|
36
36
|
"@manuscripts/json-schema": "2.2.12",
|
|
37
|
-
"@manuscripts/style-guide": "3.3.
|
|
38
|
-
"@manuscripts/track-changes-plugin": "2.2.
|
|
37
|
+
"@manuscripts/style-guide": "3.3.12",
|
|
38
|
+
"@manuscripts/track-changes-plugin": "2.2.3",
|
|
39
39
|
"@manuscripts/transform": "4.3.12",
|
|
40
40
|
"@popperjs/core": "2.11.8",
|
|
41
41
|
"axios": "1.11.0",
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"prosemirror-state": "1.4.3",
|
|
50
50
|
"prosemirror-transform": "1.10.4",
|
|
51
51
|
"prosemirror-utils": "1.2.2",
|
|
52
|
-
"prosemirror-view": "1.
|
|
52
|
+
"prosemirror-view": "1.41.0",
|
|
53
53
|
"react": "19.2.0",
|
|
54
54
|
"react-dnd": "16.0.1",
|
|
55
55
|
"react-dnd-html5-backend": "16.0.1",
|