fix a bug in the 'draw' event

emilefokkema · Mar 15, 2024 · a0e29c3 · a0e29c3
1 parent 8d9e351
commit a0e29c3
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/src/animation-frame-drawing-iteration-provider.ts b/src/animation-frame-drawing-iteration-provider.ts
@@ -2,7 +2,7 @@ import {DrawingIterationProvider} from "./interfaces/drawing-iteration-provider"
 
 export class AnimationFrameDrawingIterationProvider implements DrawingIterationProvider{
     private animationFrameRequested: boolean = false;
-    public provideDrawingIteration(draw: () => void): void {
+    public provideDrawingIteration(draw: () => boolean): void {
         if(this.animationFrameRequested){
             return;
         }

diff --git a/src/drawing-iteration-provider-with-callback.ts b/src/drawing-iteration-provider-with-callback.ts
@@ -8,10 +8,13 @@ export class DrawingIterationProviderWithCallback implements DrawingIterationPro
     constructor(private readonly drawingIterationProvider: DrawingIterationProvider){
 
     }
-    public provideDrawingIteration(draw: () => void): void{
+    public provideDrawingIteration(draw: () => boolean): void{
         this.drawingIterationProvider.provideDrawingIteration(() => {
-            draw();
-            this._drawHappened.dispatch();
+            const didDraw = draw();
+            if(didDraw){
+                this._drawHappened.dispatch();
+            }
+            return didDraw;
         });
     }
 }
diff --git a/src/infinite-canvas-viewbox.ts b/src/infinite-canvas-viewbox.ts
@@ -134,13 +134,14 @@ export class InfiniteCanvasViewBox implements ViewBox{
 				this.rectangleManager.measure();
 			}
 			if(!this.rectangleManager.rectangle){
-				return;
+				return false;
 			}
 			this.context.restore();
 			this.context.save();
 			this.context.clearRect(0, 0, this.width, this.height);
 			this.setInitialTransformation();
 			this.instructionSet.execute(this.context, this.rectangleManager.rectangle);
+			return true;
 		});
 	}
 	private setInitialTransformation(): void{

diff --git a/src/interfaces/drawing-iteration-provider.ts b/src/interfaces/drawing-iteration-provider.ts
@@ -1,3 +1,3 @@
 export interface DrawingIterationProvider{
-    provideDrawingIteration(draw: () => void): void;
+    provideDrawingIteration(draw: () => boolean): void;
 }
diff --git a/src/lockable-drawing-iteration-provider.ts b/src/lockable-drawing-iteration-provider.ts
@@ -2,7 +2,7 @@ import { DrawingIterationProvider } from "./interfaces/drawing-iteration-provide
 import { DrawingLock } from "./drawing-lock";
 
 export class LockableDrawingIterationProvider implements DrawingIterationProvider{
-    private _draw: () => void;
+    private _draw: () => boolean;
     private _locks: DrawingLock[] = [];
     constructor(private readonly drawingIterationProvider: DrawingIterationProvider){
 
@@ -14,7 +14,7 @@ export class LockableDrawingIterationProvider implements DrawingIterationProvide
             this.drawingIterationProvider.provideDrawingIteration(this._draw);
         }
     }
-    public provideDrawingIteration(draw: () => void): void{
+    public provideDrawingIteration(draw: () => boolean): void{
         if(this._locks.length){
             this._draw = draw;
         }else{