add history.shouldCreateEntry resolver (#1622)

This commit is contained in:
David Luzar 2020-05-23 07:26:59 +02:00 committed by GitHub
parent 22f7945c70
commit d2ae18995c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 1349 additions and 3449 deletions

View file

@ -276,12 +276,23 @@ class App extends React.Component<any, AppState> {
if (res.commitToHistory) {
history.resumeRecording();
}
this.setState((state) => ({
...res.appState,
editingElement: editingElement || res.appState?.editingElement || null,
isCollaborating: state.isCollaborating,
collaborators: state.collaborators,
}));
this.setState(
(state) => ({
...res.appState,
editingElement:
editingElement || res.appState?.editingElement || null,
isCollaborating: state.isCollaborating,
collaborators: state.collaborators,
}),
() => {
if (res.syncHistory) {
history.setCurrentState(
this.state,
globalSceneState.getElementsIncludingDeleted(),
);
}
},
);
}
});