sambruk/excalidraw
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: ensure we do not stop laser update prematurely (#7100)

Browse Source
This commit is contained in:
David Luzar 2023-10-06 12:00:35 +02:00 committed by GitHub
parent 2e61926a6b
commit a249f332a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/components/LaserTool/LaserPathManager.ts
View File

@ -91,7 +91,7 @@ export class LaserPathManager {
private collaboratorsState: Map<string, CollabolatorState> = new Map(); private collaboratorsState: Map<string, CollabolatorState> = new Map();
private rafId: number | undefined; private rafId: number | undefined;
private lastUpdate = 0; private isDrawing = false;
private container: SVGSVGElement | undefined; private container: SVGSVGElement | undefined;
constructor(private app: App) { constructor(private app: App) {
@ -100,7 +100,7 @@ export class LaserPathManager {
destroy() { destroy() {
this.stop(); this.stop();
this.lastUpdate = 0; this.isDrawing = false;
this.ownState = instantiateCollabolatorState(); this.ownState = instantiateCollabolatorState();
this.collaboratorsState = new Map(); this.collaboratorsState = new Map();
} }
@ -127,7 +127,7 @@ export class LaserPathManager {
} }
private updatePath(state: CollabolatorState) { private updatePath(state: CollabolatorState) {
this.lastUpdate = performance.now(); this.isDrawing = true;
if (!this.isRunning) { if (!this.isRunning) {
this.start(); this.start();
@ -160,7 +160,7 @@ export class LaserPathManager {
this.updateCollabolatorsState(); this.updateCollabolatorsState();
if (performance.now() - this.lastUpdate < DECAY_TIME * 2) { if (this.isDrawing) {
this.update(); this.update();
} else { } else {
this.isRunning = false; this.isRunning = false;
@ -250,6 +250,8 @@ export class LaserPathManager {
return; return;
} }
let somePathsExist = false;
for (const [key, state] of this.collaboratorsState.entries()) { for (const [key, state] of this.collaboratorsState.entries()) {
if (!this.app.state.collaborators.has(key)) { if (!this.app.state.collaborators.has(key)) {
state.svg.remove(); state.svg.remove();
@ -269,6 +271,10 @@ export class LaserPathManager {
paths += ` ${this.draw(state.currentPath)}`; paths += ` ${this.draw(state.currentPath)}`;
} }
if (paths.trim()) {
somePathsExist = true;
}
state.svg.setAttribute("d", paths); state.svg.setAttribute("d", paths);
state.svg.setAttribute("fill", getClientColor(key)); state.svg.setAttribute("fill", getClientColor(key));
} }
@ -287,7 +293,17 @@ export class LaserPathManager {
paths += ` ${this.draw(this.ownState.currentPath)}`; paths += ` ${this.draw(this.ownState.currentPath)}`;
} }
paths = paths.trim();
if (paths) {
somePathsExist = true;
}
this.ownState.svg.setAttribute("d", paths); this.ownState.svg.setAttribute("d", paths);
this.ownState.svg.setAttribute("fill", "red"); this.ownState.svg.setAttribute("fill", "red");
if (!somePathsExist) {
this.isDrawing = false;
}
} }
} }