babylonjs-gui 5.42.2 → 5.43.1

package/babylon.gui.d.ts

@@ -2065,9 +2065,14 @@ declare module BABYLON.GUI {
         private _populateNinePatchSlicesFromImage;
         private _detectPointerOnOpaqueOnly;
         private _imageDataCache;
+        /**
+         * Cache of images to avoid loading the same image multiple times
+         */
         static SourceImgCache: Map<string, {
             img: BABYLON.IImage;
             timesUsed: number;
+            loaded: boolean;
+            waitingForLoadCallback: Array<() => void>;
         }>;
         /**
          * BABYLON.Observable notified when the content is loaded

package/babylon.gui.js

@@ -8449,14 +8449,31 @@ var Image = /** @class */ (function (_super) {
                 var cachedData = Image.SourceImgCache.get(value);
                 this._domImage = cachedData.img;
                 cachedData.timesUsed += 1;
-                this._onImageLoaded();
+                if (cachedData.loaded) {
+                    this._onImageLoaded();
+                }
+                else {
+                    cachedData.waitingForLoadCallback.push(this._onImageLoaded.bind(this));
+                }
                 return;
             }
             this._domImage = engine.createCanvasImage();
             if (value) {
-                Image.SourceImgCache.set(value, { img: this._domImage, timesUsed: 1 });
+                Image.SourceImgCache.set(value, { img: this._domImage, timesUsed: 1, loaded: false, waitingForLoadCallback: [this._onImageLoaded.bind(this)] });
             }
             this._domImage.onload = function () {
+                if (value) {
+                    var cachedData = Image.SourceImgCache.get(value);
+                    if (cachedData) {
+                        cachedData.loaded = true;
+                        for (var _i = 0, _a = cachedData.waitingForLoadCallback; _i < _a.length; _i++) {
+                            var waitingCallback = _a[_i];
+                            waitingCallback();
+                        }
+                        cachedData.waitingForLoadCallback.length = 0;
+                        return;
+                    }
+                }
                 _this._onImageLoaded();
             };
             if (value) {
@@ -8820,6 +8837,9 @@ var Image = /** @class */ (function (_super) {
         this.onSVGAttributesComputedObservable.clear();
         this._removeCacheUsage(this._source);
     };
+    /**
+     * Cache of images to avoid loading the same image multiple times
+     */
     Image.SourceImgCache = new Map();
     // Static
     /** STRETCH_NONE */