canvas-editor-engine 2.3.15 → 2.3.17

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,13 +2196,12 @@ 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 ];
             }));
         }));
     };
-    DrawAccumulator.prototype.remove = function(id) {
+    DrawAccumulator.prototype.removePainter = function(id) {
         return __awaiter(this, void 0, void 0, (function() {
             var painter;
             return __generator(this, (function(_a) {
@@ -2214,6 +2213,25 @@ var DrawAccumulator = function() {
                         return painter.id !== id;
                     }));
                 }
+                this.drawLayersService.removePainter(id);
+                return [ 2 ];
+            }));
+        }));
+    };
+    DrawAccumulator.prototype.smoothFilter = function(painterId, smoothFilterOptions) {
+        return __awaiter(this, void 0, void 0, (function() {
+            var useStore, options, filterOptions, painter;
+            var _this = this;
+            return __generator(this, (function(_a) {
+                useStore = smoothFilterOptions.useStore, options = smoothFilterOptions.options, 
+                filterOptions = smoothFilterOptions.filterOptions;
+                painter = this.painters.find((function(painter) {
+                    return painter.id === painterId;
+                }));
+                if (!painter) return [ 2 ];
+                painter.drawService.drawSmoothImage(useStore, options, filterOptions).then((function() {
+                    _this.update();
+                }));
                 return [ 2 ];
             }));
         }));
@@ -2247,6 +2265,7 @@ 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;
@@ -2264,37 +2283,25 @@ var DrawAccumulator = function() {
             }));
         }));
     };
-    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 ];
@@ -2312,8 +2319,10 @@ var DrawAccumulator = function() {
                     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 +2347,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 +2361,6 @@ var DrawService = function() {
                             reduceData: null,
                             message: null
                         };
-                        if (!isReturnReduceData) return responseData;
                         var zeroPosition = {
                             x: 0,
                             y: 0
@@ -2368,6 +2373,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 +2384,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,29 +2402,35 @@ 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;
                 })) ];
             }));
         }));
     };
     DrawService.prototype.drawSmoothImage = function(useStore, options, filterOptions) {
-        var _this = this;
-        var filterArgs = this.getFilterArgs(useStore, options);
-        this.eventService.dispatch("loading-start");
-        if (!this.imageProcessor) {
-            throw new Error("No valid ImageProcessor instance found");
-        }
-        this.imageProcessor.vague(filterArgs, filterOptions).then((function(data) {
-            return _this.updateImageStateAfterVague(data);
-        })).finally((function() {
-            return _this.eventService.dispatch("loading-end");
+        return __awaiter(this, void 0, void 0, (function() {
+            var filterArgs;
+            var _this = this;
+            return __generator(this, (function(_a) {
+                filterArgs = this.getFilterArgs(useStore, options);
+                this.eventService.dispatch("loading-start");
+                if (!this.imageProcessor) {
+                    throw new Error("No valid ImageProcessor instance found");
+                }
+                return [ 2, this.imageProcessor.vague(filterArgs, filterOptions).then((function(data) {
+                    _this.updateImageStateAfterVague(data);
+                    return data;
+                })).finally((function() {
+                    return _this.eventService.dispatch("loading-end");
+                })) ];
+            }));
         }));
     };
     DrawService.prototype.updateImageStateAfterVague = function(data) {
@@ -2633,6 +2642,19 @@ var DrawLayersService = function() {
         this.layerList[layerIndex] = layer;
         this.appStoreRepository.store.drawLayersState.reduce("UPDATE_LAYER", layer);
     };
+    DrawLayersService.prototype.removePainter = function(id) {
+        var layerIndex = this.layerList.findIndex((function(layer) {
+            return layer.painters.find((function(painter) {
+                return painter.id === id;
+            }));
+        }));
+        if (layerIndex === -1) return;
+        this.layerList[layerIndex].painters = this.layerList[layerIndex].painters.filter((function(painter) {
+            return painter.id !== id;
+        }));
+        var layer = this.layerList[layerIndex];
+        this.appStoreRepository.store.drawLayersState.reduce("UPDATE_LAYER", layer);
+    };
     return DrawLayersService;
 }();
 

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

@@ -13,4 +13,5 @@ export default class DrawLayersService {
     getLayerById(layerId: ILayer['id']): ILayer;
     addToLayer(id: ILayer['id'], painter: IPainter): void;
     updateLayer(id: ILayer['id'], updateData?: ILayerUpdate): void;
+    removePainter(id: IPainter['id']): void;
 }

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

@@ -2,7 +2,7 @@ import AppConfig from "../config";
 import { IImageStateReduce } from "../store/image.state";
 import AppStoreRepository from "../store/storeRepository";
 import { ILayer } from "../types/draw-layers";
-import { IPainter, TDrawType } from "../types/draw-service";
+import { IPainter, ISmoothFilterOptions, TDrawType } from "../types/draw-service";
 import type { IDrawImageArgs, IDrawImageProcessor, IFilterOptions, IImageLoggingDataVague, IImageOptions } from "../types/image";
 import { Project } from "../types/project";
 import { ITempCanvasOptions } from "../types/temp-canvas";
@@ -17,7 +17,8 @@ export declare class DrawAccumulator {
     painters: IPainter[];
     constructor(appConfig: AppConfig, appStoreRepository: AppStoreRepository, eventService: EventService, drawLayersService: DrawLayersService);
     add<DrawType extends TDrawType>(layerId: ILayer['id'], drawType: DrawType, options: DrawService['options'][DrawType], initialSize: ITempCanvasOptions): Promise<void>;
-    remove(id: string): Promise<void>;
+    removePainter(id: string): Promise<void>;
+    smoothFilter(painterId: IPainter['id'], smoothFilterOptions: ISmoothFilterOptions): Promise<void>;
     private update;
     private get gradient();
     private clearCanvas;
@@ -41,15 +42,15 @@ 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;
     }>;
-    drawSmoothImage(useStore: boolean, options: IDrawImageArgs, filterOptions: IFilterOptions): void;
+    drawSmoothImage(useStore: boolean, options: IDrawImageArgs, filterOptions: IFilterOptions): Promise<IImageLoggingDataVague>;
     updateImageStateAfterVague(data: IImageLoggingDataVague): void;
     getFilterArgs(useStore: boolean, options: IDrawImageArgs): IImageOptions;
 }

package/dist/types/draw-service.d.ts

@@ -1,7 +1,13 @@
 import DrawService from "../services/draw.service";
+import { IDrawImageArgs, IFilterOptions } from "./image";
 export type TDrawType = keyof DrawService['options'];
 export interface IPainter {
     drawService: DrawService;
     drawType: TDrawType;
     id: string;
 }
+export interface ISmoothFilterOptions {
+    useStore: boolean;
+    options: IDrawImageArgs;
+    filterOptions: IFilterOptions;
+}

package/package.json

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