build: update build

kmkzt · May 28, 2019 · e8aac55 · e8aac55
1 parent 5eefde8
commit e8aac55
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 4 deletions.
diff --git a/docs/main.bundle.js b/docs/main.bundle.js
diff --git a/docs/main.bundle.js.map b/docs/main.bundle.js.map
diff --git a/lib/SvgDrawing.js b/lib/SvgDrawing.js
@@ -12,6 +12,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 import Two from 'two.js';
+import { svgFormatting } from './utils/svgFormatting';
 var SvgDrawing = (function (_super) {
     __extends(SvgDrawing, _super);
     function SvgDrawing(params) {
@@ -42,9 +43,10 @@ var SvgDrawing = (function (_super) {
     }
     SvgDrawing.prototype.toSvgXml = function () {
         var domElement = this.renderer.domElement;
+        var svgElement = svgFormatting(domElement.outerHTML);
         if (!domElement)
             return null;
-        return "<svg version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"" + this.width + "\" height=\"" + this.height + "\" viewBox=\"0 0 " + this.width + " " + this.height + "\">" + domElement.innerHTML + "</svg>";
+        return "<svg version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"" + this.width + "\" height=\"" + this.height + "\" viewBox=\"0 0 " + this.width + " " + this.height + "\">" + svgElement.innerHTML + "</svg>";
     };
     SvgDrawing.prototype.toSvgBase64 = function () {
         var svgXml = this.toSvgXml();

diff --git a/lib/index.min.js b/lib/index.min.js
diff --git a/lib/utils/svgFormatting.d.ts b/lib/utils/svgFormatting.d.ts
@@ -0,0 +1 @@
+export declare const svgFormatting: (svgString: string) => SVGSVGElement;
diff --git a/lib/utils/svgFormatting.js b/lib/utils/svgFormatting.js
@@ -0,0 +1,19 @@
+export var svgFormatting = function (svgString) {
+    var parser = new DOMParser();
+    var doc = parser.parseFromString(svgString, 'image/svg+xml');
+    var svgEle = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
+    var originSvgEle = doc.querySelector('svg');
+    if (!originSvgEle)
+        return svgEle;
+    ['width', 'height', 'viewBox'].map(function (attr) {
+        var attrValue = originSvgEle.getAttribute(attr);
+        if (attrValue)
+            svgEle.setAttribute(attr, attrValue);
+    });
+    var pathEle = doc.querySelectorAll('path');
+    pathEle.forEach(function (path) {
+        path.removeAttribute('transform');
+        svgEle.appendChild(path);
+    });
+    return svgEle;
+};
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export declare const svgFormatting: (svgString: string) => SVGSVGElement;