canvas-editor-engine 2.3.14 → 2.3.16

package/dist/index.mjs

@@ -2181,7 +2181,7 @@ var DrawAccumulator = function() {
     }
     DrawAccumulator.prototype.add = function(layerId, drawType, options, initialSize) {
         return __awaiter(this, void 0, void 0, (function() {
-            var id, painter, inStore;
+            var id, painter;
             return __generator(this, (function(_a) {
                 id = Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15);
                 painter = {
@@ -2196,8 +2196,7 @@ var DrawAccumulator = function() {
                     update: this.update.bind(this)
                 });
                 this.drawLayersService.addToLayer(layerId, painter);
-                inStore = true;
-                this.invokePainter(drawType, painter.drawService, inStore);
+                this.invokePainter(drawType, painter.drawService);
                 return [ 2 ];
             }));
         }));
@@ -2247,11 +2246,11 @@ var DrawAccumulator = function() {
     DrawAccumulator.prototype.clearCanvas = function() {
         var ctx = this.appConfig.canvas.getContext("2d");
         ctx.clearRect(0, 0, this.appConfig.CANVAS_SIZE.width, this.appConfig.CANVAS_SIZE.height);
+        ctx.save();
     };
     DrawAccumulator.prototype.invokePaintersOnLayers = function() {
         var _this = this;
         var stash = [];
-        var ctx = this.appConfig.canvas.getContext("2d");
         this.gradient.forEach((function(order) {
             _this.painters.forEach((function(painter) {
                 var layer = _this.drawLayersService.layerList.find((function(layer) {
@@ -2259,43 +2258,31 @@ var DrawAccumulator = function() {
                 }));
                 if (!layer) return console.warn("[invoke] Layer not found");
                 if (!stash.includes(painter) && layer.order === order) {
-                    _this.invokePainterWithTempCtx(ctx, painter.drawType, painter.drawService);
+                    _this.invokePainterWithTempCtx(painter.drawType, painter.drawService);
                     stash.push(painter);
                 }
             }));
         }));
     };
-    DrawAccumulator.prototype.invokePainter = function(drawType_1, painter_1) {
-        return __awaiter(this, arguments, void 0, (function(drawType, painter, inStore) {
-            var _a, reduceData, message, isAddToStore, _b, reduceData, message, isAddToStore;
-            if (inStore === void 0) {
-                inStore = false;
-            }
-            return __generator(this, (function(_c) {
-                switch (_c.label) {
+    DrawAccumulator.prototype.invokePainter = function(drawType, painter) {
+        return __awaiter(this, void 0, void 0, (function() {
+            return __generator(this, (function(_a) {
+                switch (_a.label) {
                   case 0:
                     if (!(drawType === "image")) return [ 3, 2 ];
-                    return [ 4, painter.drawImage(inStore) ];
+                    return [ 4, painter.drawImage() ];
 
                   case 1:
-                    _a = _c.sent(), reduceData = _a.reduceData, message = _a.message;
-                    isAddToStore = !!reduceData && !!message && inStore;
-                    if (isAddToStore) {
-                        this.appStoreRepository.store.imageState.reduce(reduceData, message);
-                    }
+                    _a.sent();
                     return [ 3, 4 ];
 
                   case 2:
                     if (!(drawType === "project")) return [ 3, 4 ];
-                    return [ 4, painter.drawProject(inStore) ];
+                    return [ 4, painter.drawProject() ];
 
                   case 3:
-                    _b = _c.sent(), reduceData = _b.reduceData, message = _b.message;
-                    isAddToStore = !!reduceData && !!message && inStore;
-                    if (isAddToStore) {
-                        this.appStoreRepository.store.imageState.reduce(reduceData, message);
-                    }
-                    _c.label = 4;
+                    _a.sent();
+                    _a.label = 4;
 
                   case 4:
                     return [ 2 ];
@@ -2303,17 +2290,20 @@ var DrawAccumulator = function() {
             }));
         }));
     };
-    DrawAccumulator.prototype.invokePainterWithTempCtx = function(ctx, drawType, painter) {
+    DrawAccumulator.prototype.invokePainterWithTempCtx = function(drawType, painter) {
         return __awaiter(this, void 0, void 0, (function() {
-            var imageData, x, y;
+            var imageData, ctx, x, y;
             return __generator(this, (function(_a) {
                 imageData = painter.tempCanvas.getImageData();
+                ctx = this.appConfig.canvas.getContext("2d");
                 if (drawType === "image") {
                     x = painter.options.image.drawImageArgs.position.x;
                     y = painter.options.image.drawImageArgs.position.y;
                     ctx.putImageData(imageData, x, y);
+                    ctx.save();
                 } else if (drawType === "project") {
                     ctx.putImageData(imageData, 0, 0);
+                    ctx.save();
                 }
                 return [ 2 ];
             }));
@@ -2338,12 +2328,9 @@ var DrawService = function() {
         this.options[drawType] = options;
     };
     DrawService.prototype.drawImage = function() {
-        return __awaiter(this, arguments, void 0, (function(isReturnReduceData) {
+        return __awaiter(this, void 0, void 0, (function() {
             var _a, src, drawImageArgs, ctx;
             var _this = this;
-            if (isReturnReduceData === void 0) {
-                isReturnReduceData = false;
-            }
             return __generator(this, (function(_b) {
                 switch (_b.label) {
                   case 0:
@@ -2355,7 +2342,6 @@ var DrawService = function() {
                             reduceData: null,
                             message: null
                         };
-                        if (!isReturnReduceData) return responseData;
                         var zeroPosition = {
                             x: 0,
                             y: 0
@@ -2368,6 +2354,7 @@ var DrawService = function() {
                             size: _this.appConfig.CANVAS_SIZE
                         };
                         responseData.message = "Image loaded";
+                        _this.appStoreRepository.store.imageState.reduce(responseData.reduceData, responseData.message);
                         return responseData;
                     })) ];
 
@@ -2378,12 +2365,9 @@ var DrawService = function() {
         }));
     };
     DrawService.prototype.drawProject = function() {
-        return __awaiter(this, arguments, void 0, (function(isReturnReduceData) {
+        return __awaiter(this, void 0, void 0, (function() {
             var project, ctx, imageData, position, size;
             var _this = this;
-            if (isReturnReduceData === void 0) {
-                isReturnReduceData = false;
-            }
             return __generator(this, (function(_a) {
                 project = this.options.project;
                 ctx = this.tempCanvas.ctx;
@@ -2399,13 +2383,13 @@ var DrawService = function() {
                         reduceData: null,
                         message: null
                     };
-                    if (!isReturnReduceData) return responseData;
                     responseData.reduceData = {
                         tempImageData: imageData,
                         position,
                         size
                     };
                     responseData.message = "Project loaded";
+                    _this.appStoreRepository.store.imageState.reduce(responseData.reduceData, responseData.message);
                     return responseData;
                 })) ];
             }));

package/dist/services/draw.service.d.ts

@@ -41,11 +41,11 @@ export default class DrawService {
     tempCanvas: TempCanvas;
     constructor(appConfig: AppConfig, appStoreRepository: AppStoreRepository, eventService: EventService);
     bindOptions<DrawType extends TDrawType>(drawType: DrawType, options: DrawService['options'][DrawType]): void;
-    drawImage(isReturnReduceData?: boolean): Promise<{
+    drawImage(): Promise<{
         reduceData: IImageStateReduce | null;
         message: string | null;
     }>;
-    drawProject(isReturnReduceData?: boolean): Promise<{
+    drawProject(): Promise<{
         reduceData: IImageStateReduce | null;
         message: string | null;
     }>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "canvas-editor-engine",
-  "version": "2.3.14",
+  "version": "2.3.16",
   "description": "CanvasEditorEngine library, use: [typescript] [canvas]",
   "main": "dist/index.mjs",
   "types": "dist/index.d.ts",