From 2276435fef7dd02b624366c8973634559a0513be Mon Sep 17 00:00:00 2001
From: Michael Fix <mfix@wisc.edu>
Date: Sun, 15 Apr 2018 18:28:58 -0700
Subject: [PATCH] Fix svg using Blob URLs (#332)

---
 components/Editor.js | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/components/Editor.js b/components/Editor.js
index 0804b94..3b08b2a 100644
--- a/components/Editor.js
+++ b/components/Editor.js
@@ -73,7 +73,7 @@ class Editor extends React.Component {
     this.props.onUpdate(this.state)
   }
 
-  getCarbonImage({ format, type } = { format: 'png' }) {
+  getCarbonImage({ format } = { format: 'png' }) {
     // if safari, get image from api
     if (
       navigator.userAgent.indexOf('Safari') !== -1 &&
@@ -112,15 +112,16 @@ class Editor extends React.Component {
       height
     }
 
-    if (type === 'blob')
+    if (format === 'svg') {
       return domtoimage
-        .toBlob(node, config)
-        .then(blob => window.URL.createObjectURL(blob, { type: 'image/png' }))
-
-    if (format === 'svg')
-      return domtoimage.toSvg(node, config).then(dataUrl => dataUrl.split('&nbsp;').join('&#160;'))
+        .toSvg(node, config)
+        .then(dataUrl => dataUrl.split('&nbsp;').join('&#160;'))
+        .then(uri => uri.slice(uri.indexOf(',') + 1))
+        .then(data => new Blob([data], { type: 'image/svg+xml' }))
+        .then(data => window.URL.createObjectURL(data))
+    }
 
-    return domtoimage.toPng(node, config)
+    return domtoimage.toBlob(node, config).then(blob => window.URL.createObjectURL(blob))
   }
 
   updateSetting(key, value) {
@@ -130,9 +131,7 @@ class Editor extends React.Component {
   save({ id: format = 'png' }) {
     const link = document.createElement('a')
 
-    const type = format === 'png' ? 'blob' : undefined
-
-    return this.getCarbonImage({ format, type }).then(url => {
+    return this.getCarbonImage({ format }).then(url => {
       link.download = `carbon.${format}`
       link.href = url
       document.body.appendChild(link)