Fix Safari export not including custom fonts [#42]

davidje13 · Jan 22, 2018 · 8344ab2 · 8344ab2
1 parent 326168b
commit 8344ab2
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/lib/sequence-diagram.js b/lib/sequence-diagram.js
@@ -5839,14 +5839,23 @@ define('sequence/Exporter',[],() => {
 				document.body.appendChild(safariHackaround);
 			}
 
-			img.addEventListener('load', () => {
+			const render = () => {
 				this.canvas.width = width;
 				this.canvas.height = height;
 				this.context.drawImage(img, 0, 0);
 				if(safariHackaround) {
 					document.body.removeChild(safariHackaround);
 				}
 				this.canvas.toBlob(callback, 'image/png');
+			};
+
+			img.addEventListener('load', () => {
+				if(safariHackaround) {
+					// Wait for custom fonts to load (Safari takes a moment)
+					setTimeout(render, 50);
+				} else {
+					render();
+				}
 			}, {once: true});
 
 			img.src = this.getSVGURL(renderer, {width, height});

diff --git a/lib/sequence-diagram.min.js b/lib/sequence-diagram.min.js
diff --git a/scripts/sequence/Exporter.js b/scripts/sequence/Exporter.js
@@ -80,14 +80,23 @@ define(() => {
 				document.body.appendChild(safariHackaround);
 			}
 
-			img.addEventListener('load', () => {
+			const render = () => {
 				this.canvas.width = width;
 				this.canvas.height = height;
 				this.context.drawImage(img, 0, 0);
 				if(safariHackaround) {
 					document.body.removeChild(safariHackaround);
 				}
 				this.canvas.toBlob(callback, 'image/png');
+			};
+
+			img.addEventListener('load', () => {
+				if(safariHackaround) {
+					// Wait for custom fonts to load (Safari takes a moment)
+					setTimeout(render, 50);
+				} else {
+					render();
+				}
 			}, {once: true});
 
 			img.src = this.getSVGURL(renderer, {width, height});