canvas-editor-engine 2.3.44 → 2.3.46

package/dist/index.mjs

@@ -2457,6 +2457,13 @@ var DrawLayersService = function() {
             return layer.id === layerId;
         }));
     };
+    DrawLayersService.prototype.getLayerByPainterId = function(painterId) {
+        return this.layerList.find((function(layer) {
+            return layer.painters.find((function(painter) {
+                return painter.id === painterId;
+            }));
+        }));
+    };
     DrawLayersService.prototype.addToLayer = function(id, painter) {
         var layerIndex = this.layerList.findIndex((function(layer) {
             return layer.id === id;
@@ -2595,17 +2602,37 @@ var Painter = function() {
         this.drawType = createModel.drawType;
         this.id = createModel.id;
         this.name = createModel.name;
+        this.order = (createModel === null || createModel === void 0 ? void 0 : createModel.order) || null;
+        this.createdAt = {
+            view: new Date,
+            digital: Date.now()
+        };
     }
     Painter.prototype.putPainter = function(painter) {
-        var isUpdated = false;
-        if (painter.name) {
-            this.name = painter.name;
-            isUpdated = true;
-        }
-        if (isUpdated) {
-            console.log("Painter maybe updated:", this);
-            this.drawLayersService.updatePainterData(this);
-        }
+        return __awaiter(this, void 0, void 0, (function() {
+            var _this = this;
+            return __generator(this, (function(_a) {
+                return [ 2, new Promise((function(resolve, reject) {
+                    var isUpdated = false;
+                    if (painter === null || painter === void 0 ? void 0 : painter.name) {
+                        _this.name = painter.name;
+                        isUpdated = true;
+                    }
+                    if (painter === null || painter === void 0 ? void 0 : painter.order) {
+                        _this.order = painter.order;
+                        isUpdated = true;
+                    }
+                    if (isUpdated) {
+                        _this.drawLayersService.updatePainterData(_this);
+                        resolve(true);
+                        return true;
+                    } else {
+                        reject(false);
+                        return false;
+                    }
+                })) ];
+            }));
+        }));
     };
     return Painter;
 }();
@@ -2674,7 +2701,6 @@ var DrawAccumulatorService = function() {
                     object: painter,
                     update: this.update.bind(this)
                 });
-                console.log(this.painters);
                 this.drawLayersService.addToLayer(layerId, painter);
                 this.invokePainter(drawType, painter.drawService);
                 return [ 2 ];
@@ -2682,16 +2708,11 @@ var DrawAccumulatorService = function() {
         }));
     };
     DrawAccumulatorService.prototype.getPainterById = function(painterId) {
-        return __awaiter(this, void 0, void 0, (function() {
-            var painter;
-            return __generator(this, (function(_a) {
-                painter = this.painters.find((function(painter) {
-                    return painter.id === painterId;
-                }));
-                if (!painter) throw new Error("Painter not found");
-                return [ 2, painter ];
-            }));
+        var painter = this.painters.find((function(painter) {
+            return painter.id === painterId;
         }));
+        if (!painter) throw new Error("Painter not found");
+        return painter;
     };
     DrawAccumulatorService.prototype.removePainter = function(painterId) {
         return __awaiter(this, void 0, void 0, (function() {
@@ -2728,17 +2749,29 @@ var DrawAccumulatorService = function() {
             }));
         }));
     };
+    DrawAccumulatorService.prototype.changePainterOrder = function(painterId, order) {
+        var _this = this;
+        var painter = this.painters.find((function(painter) {
+            return painter.id === painterId;
+        }));
+        if (!painter) return console.error("Painter not found");
+        painter.putPainter({
+            order
+        }).then((function() {
+            _this.update();
+        }));
+    };
     DrawAccumulatorService.prototype.renamePainter = function(painterId, name) {
+        var _this = this;
         var painter = this.painters.find((function(painter) {
             return painter.id === painterId;
         }));
-        if (painter) {
-            painter.putPainter({
-                name
-            });
-        } else {
-            console.error("Painter not found");
-        }
+        if (!painter) return console.error("Painter not found");
+        painter.putPainter({
+            name
+        }).then((function() {
+            _this.update();
+        }));
     };
     DrawAccumulatorService.prototype.smoothFilter = function(painterId, smoothFilterOptions) {
         return __awaiter(this, void 0, void 0, (function() {
@@ -2801,7 +2834,7 @@ var DrawAccumulatorService = function() {
             }));
         }));
     };
-    DrawAccumulatorService.prototype.updateLayerOrder = function(layerId, options) {
+    DrawAccumulatorService.prototype.changeLayerOrder = function(layerId, options) {
         var _this = this;
         this.drawLayersService.changeLayerOrder(layerId, options).then((function(res) {
             if (res.status === "success") {

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

@@ -15,13 +15,14 @@ export default class DrawAccumulatorService {
     painters: Painter[];
     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>;
-    getPainterById(painterId: string): Promise<Painter>;
+    getPainterById(painterId: string): Painter;
     removePainter(painterId: string): Promise<void>;
-    renamePainter(painterId: IPainter['id'], name: string): void;
+    changePainterOrder(painterId: Painter['id'], order: Painter['order']): void;
+    renamePainter(painterId: IPainter['id'], name: IPainter['name']): void;
     smoothFilter(painterId: IPainter['id'], smoothFilterOptions: ISmoothFilterOptions): Promise<void>;
     renameLayer(id: ILayer["id"], newName: ILayerUpdate['name']): Promise<void>;
     removeLayer(layerId: ILayer['id']): Promise<void>;
-    updateLayerOrder(layerId: ILayer['id'], options: IUpdateLayerOptions): void;
+    changeLayerOrder(layerId: ILayer['id'], options: IUpdateLayerOptions): void;
     private update;
     private get gradient();
     private clearCanvas;

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

@@ -13,6 +13,7 @@ export default class DrawLayersService {
     getLayerByOrder(order: number): ILayer;
     getLayersByOrder(order: number): ILayer[];
     getLayerById(layerId: ILayer['id']): ILayer;
+    getLayerByPainterId(painterId: IPainter['id']): ILayer;
     addToLayer(id: ILayer['id'], painter: IPainter): void;
     updateLayer(id: ILayer['id'], updateData?: ILayerUpdate): Promise<unknown>;
     removePainter(id: IPainter['id']): void;

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

@@ -6,9 +6,11 @@ export interface IPainter {
     drawType: TDrawType;
     id: string;
     name: string;
+    order?: number;
 }
 export interface IPutPainter {
-    name?: string;
+    name?: IPainter['name'];
+    order?: IPainter['order'];
 }
 export interface ISmoothFilterOptions {
     useStore: boolean;

package/dist/utils/painter.d.ts

@@ -7,6 +7,11 @@ export default class Painter {
     drawType: TDrawType;
     id: string;
     name: string;
+    order: number | null;
+    createdAt: {
+        view: Date;
+        digital: number;
+    };
     constructor(drawLayersService: DrawLayersService, createModel: IPainter);
-    putPainter(painter: IPutPainter): void;
+    putPainter(painter: IPutPainter): Promise<unknown>;
 }

package/package.json

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