From 910f14ea4ec311cf88e16b6b26d83ba731b4b7a0 Mon Sep 17 00:00:00 2001
From: ShaMan123 <shacharnen@gmail.com>
Date: Tue, 27 Apr 2021 07:41:41 +0300
Subject: [PATCH] patch canvas serialization

---
 src/mixins/eraser_brush.mixin.js | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/mixins/eraser_brush.mixin.js b/src/mixins/eraser_brush.mixin.js
index 87b9cda950c..7ce118ffe2b 100644
--- a/src/mixins/eraser_brush.mixin.js
+++ b/src/mixins/eraser_brush.mixin.js
@@ -1,5 +1,6 @@
 (function () {
   var __setBgOverlayColor = fabric.StaticCanvas.prototype.__setBgOverlayColor;
+  var ___setBgOverlay = fabric.StaticCanvas.prototype.__setBgOverlay;
   fabric.util.object.extend(fabric.StaticCanvas.prototype, {
     backgroundColor: undefined,
     overlayColor: undefined,
@@ -8,7 +9,7 @@
      * patches {@link CommonMethods#_initGradient}
      * @private
      * @param {'bakground'|'overlay'} property
-     * @param {(String|fabric.Pattern)} color Color or pattern
+     * @param {(String|fabric.Pattern|fabric.Rect)} color Color or pattern or rect
      * @param {Function} callback Callback to invoke when color is set
      * @param {Object} options
      * @return {fabric.Canvas} instance
@@ -24,6 +25,7 @@
         }, options));
         callback && callback(_this[property]);
       }
+
       __setBgOverlayColor.call(this, property, color, cb);
       //  invoke cb in case of gradient
       //  see {@link CommonMethods#_initGradient}
@@ -33,6 +35,29 @@
       return this;
     },
 
+    /**
+     * patch serialization
+     * background/overlay properties could be objects if parsed by this mixin or could be legacy values
+     * @private
+     * @param {String} property Property to set (backgroundImage, overlayImage, backgroundColor, overlayColor)
+     * @param {(Object|String)} value Value to set
+     * @param {Object} loaded Set loaded property to true if property is set
+     * @param {Object} callback Callback function to invoke after property is set
+     */
+    __setBgOverlay: function (property, value, loaded, callback) {
+      var _this = this;
+
+      if ((property === 'backgroundColor' || property === 'overlayColor') && (value && typeof value === 'object' && value.type === 'rect')) {
+        fabric.util.enlivenObjects([value], function (enlivedObject) {
+          _this[property] = enlivedObject[0];
+          loaded[property] = true;
+          callback && callback();
+        });
+      } else {
+        ___setBgOverlay.call(this, property, value, loaded, callback);
+      }
+    },
+
     /**
      * @private
      * @param {CanvasRenderingContext2D} ctx Context to render on