react-design-editor 0.0.58 → 0.0.60

package/lib/handlers/Handler.d.ts

@@ -326,7 +326,8 @@ declare class Handler implements HandlerOptions {
      * Set the image
      * @param {FabricImage} obj
      * @param {(File | string)} [source]
-     * @param {boolean} [keepSize]
+     * @param {boolean} [keepSize] Keep size of previous Image
+     * @param {fabric.IImageOptions} [options]
      * @returns
      */
     setImage: (obj: FabricImage, source?: File | string, keepSize?: boolean, options?: fabric.IImageOptions) => Promise<FabricImage>;
@@ -334,6 +335,7 @@ declare class Handler implements HandlerOptions {
      * Set image by id
      * @param {string} id
      * @param {*} source
+     * @param {boolean} [keepSize] Keep size of previous Image
      * @returns
      */
     setImageById: (id: string, source: any, keepSize?: boolean) => Promise<fabric.Object & fabric.IObjectOptions & {
@@ -375,10 +377,10 @@ declare class Handler implements HandlerOptions {
      *
      * @param {SvgObject} obj
      * @param {(File | string)} [source]
-     * @param {boolean} [setSvg]
-     * @param {boolean} [keepSize]
+     * @param {boolean} [keepSize] Keep size of previous SVG
+     * @param {boolean} [xmlString] XML string
      */
-    setSvg: (obj: SvgObject, source?: File | string, isPath?: boolean, keepSize?: boolean) => Promise<SvgObject>;
+    setSvg: (obj: SvgObject, source?: File | string, keepSize?: boolean, xmlString?: boolean) => Promise<SvgObject>;
     /**
      * Set visible
      * @param {boolean} [visible]

package/lib/handlers/Handler.js

@@ -331,7 +331,8 @@ class Handler {
          * Set the image
          * @param {FabricImage} obj
          * @param {(File | string)} [source]
-         * @param {boolean} [keepSize]
+         * @param {boolean} [keepSize] Keep size of previous Image
+         * @param {fabric.IImageOptions} [options]
          * @returns
          */
         this.setImage = (obj, source, keepSize, options) => {
@@ -379,6 +380,7 @@ class Handler {
          * Set image by id
          * @param {string} id
          * @param {*} source
+         * @param {boolean} [keepSize] Keep size of previous Image
          * @returns
          */
         this.setImageById = (id, source, keepSize) => {
@@ -390,10 +392,10 @@ class Handler {
          *
          * @param {SvgObject} obj
          * @param {(File | string)} [source]
-         * @param {boolean} [setSvg]
-         * @param {boolean} [keepSize]
+         * @param {boolean} [keepSize] Keep size of previous SVG
+         * @param {boolean} [xmlString] XML string
          */
-        this.setSvg = (obj, source, isPath, keepSize) => {
+        this.setSvg = (obj, source, keepSize, xmlString) => {
             return new Promise(resolve => {
                 if (!source) {
                     resolve(obj.loadSvg({ src: './images/sample/chiller.svg', loadType: 'file', keepSize }));
@@ -404,7 +406,7 @@ class Handler {
                     reader.onload = () => resolve(obj.loadSvg({ src: reader.result, loadType: 'file', keepSize }));
                 }
                 else {
-                    resolve(obj.loadSvg({ src: source, loadType: isPath ? 'svg' : 'file', keepSize }));
+                    resolve(obj.loadSvg({ src: source, loadType: xmlString ? 'svg' : 'file', keepSize }));
                 }
             });
         };

package/lib/objects/Svg.d.ts

@@ -6,6 +6,12 @@ export type SvgObject = (FabricGroup | FabricObject) & {
 };
 export interface SvgOption extends FabricObjectOption {
     src?: string;
+    /**
+     *
+     * @deprecated
+     * @type {*}
+     */
+    svg?: any;
     loadType?: 'file' | 'svg';
     keepSize?: boolean;
 }

package/lib/objects/Svg.js

@@ -56,15 +56,15 @@ const Svg = fabric_1.fabric.util.createClass(fabric_1.fabric.Group, {
         return this;
     },
     loadSvg(option) {
-        const { src, loadType, fill, stroke } = option;
+        const { src, svg, loadType, fill, stroke } = option;
         return new Promise(resolve => {
             if (loadType === 'svg') {
-                fabric_1.fabric.loadSVGFromString(src, (objects, options) => {
+                fabric_1.fabric.loadSVGFromString(svg || src, (objects, options) => {
                     resolve(this.addSvgElements(objects, { ...options, fill, stroke }));
                 });
             }
             else {
-                fabric_1.fabric.loadSVGFromURL(src, (objects, options) => {
+                fabric_1.fabric.loadSVGFromURL(svg || src, (objects, options) => {
                     resolve(this.addSvgElements(objects, { ...options, fill, stroke }));
                 });
             }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "react-design-editor",
-	"version": "0.0.58",
+	"version": "0.0.60",
 	"description": "Design Editor Tools with React.js + ant.design + fabric.js",
 	"main": "dist/react-design-editor.min.js",
 	"typings": "lib/index.d.ts",