@netless/forge-whiteboard 1.3.0-beta.1 → 1.3.1

package/dist/whiteboard.js

@@ -28051,6 +28051,8 @@ var ImageModel = class extends ElementModel {
     super(root, scope, liveCursor, isPerformanceMode);
     _defineProperty16(this, "item", null);
     _defineProperty16(this, "imageSets", void 0);
+    _defineProperty16(this, "imageElement", null);
+    _defineProperty16(this, "imageLoadVersion", 0);
     _defineProperty16(this, "clearLocalPointsWhenYPointsChange", true);
     _defineProperty16(this, "shouldUseLocalPoints", true);
     _defineProperty16(this, "localPointsPick", 4);
@@ -28061,22 +28063,44 @@ var ImageModel = class extends ElementModel {
     this.root.set(ElementModel.KEYS.shadow, "");
   }
   subDispose() {
+    this.imageLoadVersion++;
+    if (this.imageElement) {
+      this.imageElement.onload = null;
+      this.imageElement.onerror = null;
+      this.imageElement.remove();
+      this.imageElement = null;
+      return;
+    }
     const img = this.imageSets.querySelector(`[id='${this.uuid}']`);
     if (img) {
+      img.onload = null;
+      img.onerror = null;
       img.remove();
     }
   }
+  bindImageLoad(img) {
+    const loadVersion = ++this.imageLoadVersion;
+    img.onload = () => {
+      if (this.imageLoadVersion !== loadVersion || !this.item) {
+        return;
+      }
+    };
+    img.onerror = null;
+  }
   createPaperItem() {
     if (this.item) {
       return;
     }
-    if (!this.imageSets.querySelector(`[id='${this.uuid}']`)) {
-      const img = document.createElement("img");
+    let img = this.imageSets.querySelector(`[id='${this.uuid}']`);
+    if (!img) {
+      img = document.createElement("img");
       img.crossOrigin = "anonymous";
-      img.src = this.src;
       img.id = this.uuid;
       this.imageSets.appendChild(img);
     }
+    this.imageElement = img;
+    this.bindImageLoad(img);
+    img.src = this.src;
     this.item = new this.scope.Raster(this.uuid);
     const matrix = new this.scope.Matrix(this.pointsMatrix);
     this.item.matrix = matrix;
@@ -28099,8 +28123,10 @@ var ImageModel = class extends ElementModel {
   }
   onStyleKeyUpdate(key) {
     if (key === "src") {
-      const imgElement = this.imageSets.querySelector(`[id='${this.uuid}']`);
+      const imgElement = this.imageElement ?? this.imageSets.querySelector(`[id='${this.uuid}']`);
       if (imgElement) {
+        this.imageElement = imgElement;
+        this.bindImageLoad(imgElement);
         imgElement.src = this.src;
       }
     }