marcel/excalidraw
1
0
Fork 0
mirror of https://github.com/excalidraw/excalidraw.git synced 2025-09-15 13:30:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: image-related fixes (#4147)

Browse Source 
* flush queues on portal close

* fix mouse broadcast race condition

* stop mutating image elements when updating status

to fix race condition when closing/opening collab room

* check `files` when resolving `LayerUI`

* fix displaying AbortError
This commit is contained in:
David Luzar
2021-10-30 23:40:35 +02:00
committed by GitHub
parent d6d629f416
commit c61f95a327
7 changed files with 33 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/excalidraw-app/collab/CollabWrapper.tsx
View File

@@ -60,7 +60,7 @@ import {
isImageElement,
isInitializedImageElement,
} from "../../element/typeChecks";
import { mutateElement } from "../../element/mutateElement";
import { newElementWith } from "../../element/mutateElement";
import {
ReconciledElements,
reconcileElements as _reconcileElements,
@@ -241,6 +241,9 @@ class CollabWrapper extends PureComponent<Props, CollabState> {
};
closePortal = () => {
this.queueBroadcastAllElements.cancel();
this.loadImageFiles.cancel();
this.saveCollabRoomToFirebase();
if (window.confirm(t("alerts.collabStopOverridePrompt"))) {
window.history.pushState({}, APP_NAME, window.location.origin);
@@ -253,7 +256,7 @@ class CollabWrapper extends PureComponent<Props, CollabState> {
.getSceneElementsIncludingDeleted()
.map((element) => {
if (isImageElement(element) && element.status === "saved") {
return mutateElement(element, { status: "pending" }, false);
return newElementWith(element, { status: "pending" });
}
return element;
});
@@ -351,11 +354,7 @@ class CollabWrapper extends PureComponent<Props, CollabState> {
} else {
const elements = this.excalidrawAPI.getSceneElements().map((element) => {
if (isImageElement(element) && element.status === "saved") {
return mutateElement(
element,
{ status: "pending" },
/* informMutation */ false,
);
return newElementWith(element, { status: "pending" });
}
return element;
});