Merge branch 'test-pr-transform' into ts-proto

src/controls.actions.js

@@ -32,10 +32,8 @@
 
   function fireEvent(eventName, options) {
     var target = options.transform.target,
-        canvas = target.canvas,
-        canvasOptions = fabric.util.object.clone(options);
-    canvasOptions.target = target;
-    canvas && canvas.fire('object:' + eventName, canvasOptions);
+        canvas = target.canvas;
+    canvas && canvas.fire('object:' + eventName, Object.assign({}, options, { target: target }));
     target.fire(eventName, options);
   }
 

src/filters/blendimage_filter.class.ts

@@ -238,9 +238,7 @@ export class BlendImage extends fabric.Image.filters.BaseFilter {
    */
   fabric.Image.filters.BlendImage.fromObject = function(object) {
     return fabric.Image.fromObject(object.image).then(function(image) {
-      var options = fabric.util.object.clone(object);
-      options.image = image;
-      return new fabric.Image.filters.BlendImage(options);
+      return new fabric.Image.filters.BlendImage(Object.assign({}, object, { image: image }));
     });
   };
 

src/gradient.class.ts

@@ -72,8 +72,6 @@
   }
   /* _FROM_SVG_END_ */
 
-  var clone = fabric.util.object.clone;
-
   /**
    * Gradient class
    * @class fabric.Gradient
@@ -219,8 +217,8 @@ export class Gradient {
      * @return {String} SVG representation of an gradient (linear/radial)
      */
     toSVG(object, options) {
-      var coords = clone(this.coords, true), i, len, options = options || {},
-          markup, commonAttributes, colorStops = clone(this.colorStops, true),
+      var coords = this.coords, i, len, options = options || {},
+          markup, commonAttributes, colorStops = this.colorStops,
           needsSwap = coords.r1 > coords.r2,
           transform = this.gradientTransform ? this.gradientTransform.concat() : fabric.iMatrix.concat(),
           offsetX = -this.offsetX, offsetY = -this.offsetY,
@@ -321,7 +319,7 @@ export class Gradient {
      * @return {CanvasGradient}
      */
     toLive(ctx) {
-      var gradient, coords = fabric.util.object.clone(this.coords), i, len;
+      var gradient, coords = this.coords, i, len;
 
       if (!this.type) {
         return;

src/mixins/animation.mixin.ts

@@ -166,12 +166,7 @@ export function ObjectAnimationMixinGenerator(Klass) {
 
     to = to.toString();
 
-    if (!options) {
-      options = { };
-    }
-    else {
-      options = fabric.util.object.clone(options);
-    }
+    options = Object.assign({}, options);
 
     if (~property.indexOf('.')) {
       propPair = property.split('.');

src/mixins/canvas_serialization.mixin.ts

@@ -30,7 +30,7 @@ export function StaticCanvasSerializationMixinGenerator(Klass) {
     // serialize if it wasn't already
     var serialized = (typeof json === 'string')
       ? JSON.parse(json)
-      : fabric.util.object.clone(json);
+      : Object.assign({}, json);
 
     var _this = this,
         renderOnAddRemove = this.renderOnAddRemove;

src/mixins/itext_behavior.mixin.ts

@@ -1,8 +1,5 @@
 //@ts-nocheck
 
-
-  var clone = fabric.util.object.clone;
-
 
 export function ITextBehaviorMixinGenerator(Klass) {
   return class ITextBehaviorMixin extends Klass {
@@ -716,7 +713,7 @@ export function ITextBehaviorMixinGenerator(Klass) {
     shiftLineStyles(lineIndex, offset) {
       // shift all line styles by offset upward or downward
       // do not clone deep. we need new array, not new style objects
-      var clonedStyles = clone(this.styles);
+      var clonedStyles = Object.assign({}, this.styles);
       for (var line in this.styles) {
         var numericLine = parseInt(line, 10);
         if (numericLine > lineIndex) {
@@ -785,10 +782,10 @@ export function ITextBehaviorMixinGenerator(Klass) {
       // we clone current char style onto the next (otherwise empty) line
       while (qty > 0) {
         if (copiedStyle && copiedStyle[qty - 1]) {
-          this.styles[lineIndex + qty] = { 0: clone(copiedStyle[qty - 1]) };
+          this.styles[lineIndex + qty] = { 0: Object.assign({}, copiedStyle[qty - 1]) };
         }
         else if (currentCharStyle) {
-          this.styles[lineIndex + qty] = { 0: clone(currentCharStyle) };
+          this.styles[lineIndex + qty] = { 0: Object.assign({}, currentCharStyle) };
         }
         else {
           delete this.styles[lineIndex + qty];
@@ -809,8 +806,8 @@ export function ITextBehaviorMixinGenerator(Klass) {
       if (!this.styles) {
         this.styles = {};
       }
-      var currentLineStyles       = this.styles[lineIndex],
-          currentLineStylesCloned = currentLineStyles ? clone(currentLineStyles) : {};
+      var currentLineStyles = this.styles[lineIndex],
+          currentLineStylesCloned = currentLineStyles ? Object.assign({}, currentLineStyles) : {};
 
       quantity || (quantity = 1);
       // shift all char styles by quantity forward
@@ -834,7 +831,7 @@ export function ITextBehaviorMixinGenerator(Klass) {
           if (!this.styles[lineIndex]) {
             this.styles[lineIndex] = {};
           }
-          this.styles[lineIndex][charIndex + quantity] = clone(copiedStyle[quantity]);
+          this.styles[lineIndex][charIndex + quantity] = Object.assign({}, copiedStyle[quantity]);
         }
         return;
       }
@@ -843,7 +840,7 @@ export function ITextBehaviorMixinGenerator(Klass) {
       }
       var newStyle = currentLineStyles[charIndex ? charIndex - 1 : 1];
       while (newStyle && quantity--) {
-        this.styles[lineIndex][charIndex + quantity] = clone(newStyle);
+        this.styles[lineIndex][charIndex + quantity] = Object.assign({}, newStyle);
       }
     }
 

src/mixins/itext_key_behavior.mixin.ts

@@ -53,7 +53,7 @@ export function ITextKeyBehaviorMixinGenerator(Klass) {
    * your prototype.
    * the map change will affect all Instances unless you need for only some text Instances
    * in that case you have to clone this object and assign your Instance.
-   * this.keysMap = fabric.util.object.clone(this.keysMap);
+   * this.keysMap = Object.assign({}, this.keysMap);
    * The function must be in fabric.Itext.prototype.myFunction And will receive event as args[0]
    */
   keysMap = {

src/parser.js

@@ -8,8 +8,6 @@
    */
 
   var fabric = global.fabric || (global.fabric = { }),
-      extend = fabric.util.object.extend,
-      clone = fabric.util.object.clone,
       toFixed = fabric.util.toFixed,
       parseUnit = fabric.util.parseUnit,
       multiplyTransformMatrices = fabric.util.multiplyTransformMatrices,
@@ -742,7 +740,7 @@
         delete fabric.cssRules[svgUid];
         delete fabric.clipPaths[svgUid];
       }
-    }, clone(options), reviver, parsingOptions);
+    }, Object.assign({}, options), reviver, parsingOptions);
   };
 
   function recursivelyParseGradientsXlink(doc, gradient) {
@@ -773,7 +771,7 @@
       fabric.reNum +
     '(?:px|cm|mm|em|pt|pc|in)*)(?:\\/(normal|' + fabric.reNum + '))?\\s+(.*)');
 
-  extend(fabric, {
+  fabric.util.object.extend(fabric, {
     /**
      * Parses a short font declaration, building adding its properties to a style object
      * @static
@@ -876,11 +874,11 @@
       }, { });
       // add values parsed from style, which take precedence over attributes
       // (see: http://www.w3.org/TR/SVG/styling.html#UsingPresentationAttributes)
-      var cssAttrs = extend(
+      var cssAttrs = Object.assign(
         getGlobalStylesForElement(element, svgUid),
         fabric.parseStyleAttribute(element)
       );
-      ownAttributes = extend(
+      ownAttributes = Object.assign(
         ownAttributes,
         cssAttrs
       );
@@ -902,7 +900,7 @@
       if (normalizedStyle && normalizedStyle.font) {
         fabric.parseFontDeclaration(normalizedStyle.font, normalizedStyle);
       }
-      var mergedAttrs = extend(parentAttributes, normalizedStyle);
+      var mergedAttrs = Object.assign(parentAttributes, normalizedStyle);
       return fabric.svgValidParentsRegEx.test(element.nodeName) ? mergedAttrs : _setStrokeFillOpacity(mergedAttrs);
     },
 
@@ -1026,10 +1024,10 @@
               return;
             }
             if (allRules[_rule]) {
-              fabric.util.object.extend(allRules[_rule], ruleObj);
+              Object.assign(allRules[_rule], ruleObj);
             }
             else {
-              allRules[_rule] = fabric.util.object.clone(ruleObj);
+              allRules[_rule] = Object.assign({}, ruleObj);
             }
           });
         });

src/shapes/group.class.ts

@@ -9,8 +9,7 @@
       transformPoint = fabric.util.transformPoint,
       applyTransformToObject = fabric.util.applyTransformToObject,
       degreesToRadians = fabric.util.degreesToRadians,
-      clone = fabric.util.object.clone,
-      extend = fabric.util.object.extend;
+      clone = fabric.util.object.clone;
 
 
 
@@ -182,7 +181,7 @@ export class Group extends fabric.Collection {
      * @private
      */
     __objectMonitor(opt) {
-      this._applyLayoutStrategy(extend(clone(opt), {
+      this._applyLayoutStrategy(Object.assign({}, opt, {
         type: 'object_modified'
       }));
       this._set('dirty', true);

src/shapes/image.class.ts

@@ -679,7 +679,7 @@ export class Image extends fabric.Object {
    * @returns {Promise<fabric.Image>}
    */
   fabric.Image.fromObject = function(_object) {
-    var object = fabric.util.object.clone(_object),
+    var object = Object.assign({}, _object),
         filters = object.filters,
         resizeFilter = object.resizeFilter;
     // the generic enliving will fail on filters for now

src/shapes/rect.class.ts

@@ -3,8 +3,7 @@
 
   'use strict';
 
-  var fabric = global.fabric || (global.fabric = { }),
-      extend = fabric.util.object.extend;
+  var fabric = global.fabric || (global.fabric = { });
 
 
 
@@ -165,7 +164,7 @@ export class Rect extends fabric.Object {
     parsedAttributes.top  = parsedAttributes.top  || 0;
     parsedAttributes.height  = parsedAttributes.height || 0;
     parsedAttributes.width  = parsedAttributes.width || 0;
-    var rect = new fabric.Rect(extend((options ? fabric.util.object.clone(options) : { }), parsedAttributes));
+    var rect = new fabric.Rect(Object.assign({}, options, parsedAttributes));
     rect.visible = rect.visible && rect.width > 0 && rect.height > 0;
     callback(rect);
   };

src/shapes/text.class.ts

@@ -1647,7 +1647,7 @@ export class Text extends fabric.Object {
 
     var parsedAttributes = fabric.parseAttributes(element, fabric.Text.ATTRIBUTE_NAMES),
         parsedAnchor = parsedAttributes.textAnchor || 'left';
-    options = fabric.util.object.extend((options ? clone(options) : { }), parsedAttributes);
+    options = Object.assign({}, options, parsedAttributes);
 
     options.top = options.top || 0;
     options.left = options.left || 0;

src/util/animate.js

@@ -1,8 +1,5 @@
 (function () {
 
-  var extend = fabric.util.object.extend,
-      clone = fabric.util.object.clone;
-
   /**
    * 
    * @typedef {Object} AnimationOptions
@@ -157,7 +154,7 @@
           return index > -1 && fabric.runningAnimations.splice(index, 1)[0];
         };
 
-    context = extend(clone(options), {
+    context = Object.assign({}, options, {
       cancel: function () {
         cancel = true;
         return removeFromRegistry();

src/util/animate_color.js

@@ -33,7 +33,7 @@
         originalOnChange = options.onChange;
     options = options || {};
 
-    return fabric.util.animate(fabric.util.object.extend(options, {
+    return fabric.util.animate(Object.assign(options, {
       duration: duration || 500,
       startValue: startColor,
       endValue: endColor,