Visualize Your Ideas With Code
fix(2d): wait for reused async resources (#599)
Jacob280e065fe69e
diff --git a/packages/2d/src/components/Img.ts b/packages/2d/src/components/Img.tsindex 1b34a5b1..9f5e06bf 100644--- a/packages/2d/src/components/Img.ts+++ b/packages/2d/src/components/Img.ts@@ -56,13 +56,14 @@ export class Img extends Rect {@computed()protected image(): HTMLImageElement {const src = viaProxy(this.src());- if (Img.pool[src]) {- return Img.pool[src];+ let image = Img.pool[src];+ if (!image) {+ image = document.createElement('img');+ image.crossOrigin = 'anonymous';+ image.src = src;+ Img.pool[src] = image;}- const image = document.createElement('img');- image.crossOrigin = 'anonymous';- image.src = src;if (!image.complete) {DependencyContext.collectPromise(new Promise((resolve, reject) => {@@ -71,7 +72,6 @@ export class Img extends Rect {}),);}- Img.pool[src] = image;return image;}diff --git a/packages/2d/src/components/Latex.ts b/packages/2d/src/components/Latex.tsindex c3e128e5..7271820d 100644--- a/packages/2d/src/components/Latex.ts+++ b/packages/2d/src/components/Latex.ts@@ -51,6 +51,14 @@ export class Latex extends Img {const src = `${this.tex()}::${JSON.stringify(this.options())}`;if (Latex.svgContentsPool[src]) {this.imageElement.src = Latex.svgContentsPool[src];+ if (!this.imageElement.complete) {+ DependencyContext.collectPromise(+ new Promise((resolve, reject) => {+ this.imageElement.addEventListener('load', resolve);+ this.imageElement.addEventListener('error', reject);+ }),+ );+ }return this.imageElement;}diff --git a/packages/2d/src/components/Video.ts b/packages/2d/src/components/Video.tsindex 31994c21..315a811c 100644--- a/packages/2d/src/components/Video.ts+++ b/packages/2d/src/components/Video.ts@@ -82,12 +82,13 @@ export class Video extends Rect {protected video(): HTMLVideoElement {const src = this.src();const key = `${this.key}/${src}`;- if (Video.pool[key]) {- return Video.pool[key];+ let video = Video.pool[key];+ if (!video) {+ video = document.createElement('video');+ video.src = src;+ Video.pool[key] = video;}- const video = document.createElement('video');- video.src = src;if (video.readyState < 2) {DependencyContext.collectPromise(new Promise<void>(resolve => {@@ -99,7 +100,6 @@ export class Video extends Rect {}),);}- Video.pool[key] = video;return video;}