canvas-editor-engine 2.3.71 → 2.3.73

package/dist/index.mjs

@@ -2659,7 +2659,8 @@ var DrawLayersService = function() {
 }();
 
 var Painter = function() {
-    function Painter(drawLayersService, createModel) {
+    function Painter(canvasComponent, drawLayersService, createModel) {
+        this.canvasComponent = canvasComponent;
         this.drawLayersService = drawLayersService;
         this.drawService = createModel.drawService;
         this.drawType = createModel.drawType;
@@ -2670,7 +2671,56 @@ var Painter = function() {
             view: new Date,
             digital: Date.now()
         };
+        this.subscribeOnCanvas();
     }
+    Painter.prototype.subscribeOnCanvas = function() {
+        var _this = this;
+        this.canvasComponent.subscribe("mousedown", (function() {
+            _this.focusTimer = setTimeout((function() {
+                _this.focusPainter();
+            }), 800);
+        }));
+        this.canvasComponent.subscribe("mouseup", (function() {
+            _this.blurPainter();
+            _this.focusTimer = null;
+        }));
+        this.canvasComponent.subscribe("mousemove", (function(event, cursorPosition) {
+            if (!_this.isFocused) return;
+            var x = cursorPosition.x, y = cursorPosition.y;
+            var size = _this.drawService.options.image.drawImageArgs.size;
+            var condition = size && size !== "initial";
+            var position = {
+                x: condition ? x - size.width / 2 : x,
+                y: condition ? y - size.height / 2 : y
+            };
+            _this.changePainterPosition(position);
+        }));
+    };
+    Painter.prototype.focusPainter = function() {
+        this.isFocused = true;
+    };
+    Painter.prototype.blurPainter = function() {
+        this.isFocused = false;
+    };
+    Painter.prototype.selectPainter = function() {
+        this.isSelected = true;
+    };
+    Painter.prototype.unselectPainter = function() {
+        this.isSelected = false;
+    };
+    Painter.prototype.changePainterPosition = function(position) {
+        return __awaiter(this, void 0, void 0, (function() {
+            var _this = this;
+            return __generator(this, (function(_a) {
+                return [ 2, new Promise((function(resolve, reject) {
+                    if (!position) return reject(false);
+                    _this.drawService.options.image.drawImageArgs.position = position;
+                    _this.drawLayersService.updatePainterData(_this);
+                    resolve(true);
+                })) ];
+            }));
+        }));
+    };
     Painter.prototype.putPainter = function(painter) {
         return __awaiter(this, void 0, void 0, (function() {
             var _this = this;
@@ -2740,11 +2790,12 @@ function createDynamicPainterStore() {
 }
 
 var DrawAccumulatorService = function() {
-    function DrawAccumulatorService(appConfig, appStoreRepository, eventService, drawLayersService) {
+    function DrawAccumulatorService(appConfig, appStoreRepository, eventService, drawLayersService, canvasComponent) {
         this.appConfig = appConfig;
         this.appStoreRepository = appStoreRepository;
         this.eventService = eventService;
         this.drawLayersService = drawLayersService;
+        this.canvasComponent = canvasComponent;
         this.painters = createDynamicPainterStore();
     }
     DrawAccumulatorService.prototype.add = function(layerId, drawType, options, initialSize) {
@@ -2752,7 +2803,7 @@ var DrawAccumulatorService = function() {
             var id, painter;
             return __generator(this, (function(_a) {
                 id = Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15);
-                painter = new Painter(this.drawLayersService, {
+                painter = new Painter(this.canvasComponent, this.drawLayersService, {
                     drawService: new DrawService(this.appConfig, this.appStoreRepository, this.eventService),
                     name: "Painter ".concat(id),
                     drawType,
@@ -3112,7 +3163,7 @@ var WebComponent = function(_super) {
         this.pullProjectService = new PullProjectService(this.throughHistoryService, this.appStoreRepository);
         this.drawService = new DrawService(this.appConfig, this.appStoreRepository, this.eventService);
         this.drawLayersService = new DrawLayersService(this.appStoreRepository);
-        this.drawAccumulatorService = new DrawAccumulatorService(this.appConfig, this.appStoreRepository, this.eventService, this.drawLayersService);
+        this.drawAccumulatorService = new DrawAccumulatorService(this.appConfig, this.appStoreRepository, this.eventService, this.drawLayersService, this.canvasComponent);
         this.downloadService = new DownloadService(this.canvasComponent);
         var _a = this.canvasComponent.getComponent(), canvasTemplate = _a.canvasTemplate, canvasStyle = _a.canvasStyle;
         this.canvasElement = this.webComponentWrapper.editorWrap.add(canvasTemplate, canvasStyle);

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

@@ -1,7 +1,8 @@
+import CanvasComponent from "../components/canvas.component";
 import AppConfig from "../config";
 import AppStoreRepository from "../store/storeRepository";
 import { ILayer, ILayerUpdate, IUpdateLayerOptions } from "../types/draw-layers";
-import { IPainter, ISmoothFilterOptions, TDrawType } from "../types/draw-service";
+import { ISmoothFilterOptions, TDrawType } from "../types/draw-service";
 import { ITempCanvasOptions } from "../types/temp-canvas";
 import Painter from "../utils/painter";
 import DrawLayersService from "./draw-layers.service";
@@ -12,14 +13,15 @@ export default class DrawAccumulatorService {
     private appStoreRepository;
     private eventService;
     private drawLayersService;
+    private canvasComponent;
     painters: Painter[];
-    constructor(appConfig: AppConfig, appStoreRepository: AppStoreRepository, eventService: EventService, drawLayersService: DrawLayersService);
+    constructor(appConfig: AppConfig, appStoreRepository: AppStoreRepository, eventService: EventService, drawLayersService: DrawLayersService, canvasComponent: CanvasComponent);
     add<DrawType extends TDrawType>(layerId: ILayer['id'], drawType: DrawType, options: DrawService['options'][DrawType], initialSize: ITempCanvasOptions): Promise<void>;
     getPainterById(painterId: string): Painter;
     removePainter(painterId: string): Promise<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>;
+    renamePainter(painterId: Painter['id'], name: Painter['name']): void;
+    smoothFilter(painterId: Painter['id'], smoothFilterOptions: ISmoothFilterOptions): Promise<void>;
     renameLayer(id: ILayer["id"], newName: ILayerUpdate['name']): Promise<void>;
     removeLayer(layerId: ILayer['id']): Promise<void>;
     changeLayerOrder(layerId: ILayer['id'], options: IUpdateLayerOptions): void;

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

@@ -1,6 +1,5 @@
 import AppStoreRepository from "../store/storeRepository";
 import { ILayer, ILayerUpdate, IUpdateLayerOptions } from "../types/draw-layers";
-import { IPainter } from "../types/draw-service";
 import Painter from "../utils/painter";
 export default class DrawLayersService {
     private appStoreRepository;
@@ -8,15 +7,15 @@ export default class DrawLayersService {
     constructor(appStoreRepository: AppStoreRepository);
     addLayer(layerOptions?: {
         layerName?: string;
-        painter?: IPainter;
+        painter?: Painter;
     }): ILayer;
     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;
+    getLayerByPainterId(painterId: Painter['id']): ILayer;
+    addToLayer(id: ILayer['id'], painter: Painter): void;
     updateLayer(id: ILayer['id'], updateData?: ILayerUpdate): Promise<unknown>;
-    removePainter(id: IPainter['id']): void;
+    removePainter(id: Painter['id']): void;
     updatePainterData(painter: Painter): void;
     removeLayer(id: ILayer['id']): Promise<unknown>;
     /**

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

@@ -1,7 +1,7 @@
-import { IPainter } from "./draw-service";
+import Painter from "../utils/painter";
 export interface ILayer {
     id: string;
-    painters: IPainter[];
+    painters: Painter[];
     order: number;
     name: string;
 }

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

@@ -1,7 +1,8 @@
 import DrawService from "../services/draw.service";
+import Painter from "../utils/painter";
 import { IDrawImageArgs, IFilterOptions } from "./image";
 export type TDrawType = keyof DrawService['options'];
-export interface IPainter {
+export interface ICreatePainter {
     drawService: DrawService;
     drawType: TDrawType;
     id: string;
@@ -9,8 +10,8 @@ export interface IPainter {
     order?: number;
 }
 export interface IPutPainter {
-    name?: IPainter['name'];
-    order?: IPainter['order'];
+    name?: Painter['name'];
+    order?: Painter['order'];
 }
 export interface ISmoothFilterOptions {
     useStore: boolean;

package/dist/utils/painter.d.ts

@@ -1,7 +1,10 @@
+import CanvasComponent from "../components/canvas.component";
 import DrawLayersService from "../services/draw-layers.service";
 import DrawService from "../services/draw.service";
-import { IPainter, IPutPainter, TDrawType } from "../types/draw-service";
+import { ICreatePainter, IPutPainter, TDrawType } from "../types/draw-service";
+import { IPosition } from "../types/general";
 export default class Painter {
+    private canvasComponent;
     private drawLayersService;
     drawService: DrawService;
     drawType: TDrawType;
@@ -12,6 +15,15 @@ export default class Painter {
         view: Date;
         digital: number;
     };
-    constructor(drawLayersService: DrawLayersService, createModel: IPainter);
+    isFocused: boolean;
+    isSelected: boolean;
+    private focusTimer;
+    constructor(canvasComponent: CanvasComponent, drawLayersService: DrawLayersService, createModel: ICreatePainter);
+    private subscribeOnCanvas;
+    focusPainter(): void;
+    blurPainter(): void;
+    selectPainter(): void;
+    unselectPainter(): void;
+    changePainterPosition(position: IPosition): Promise<unknown>;
     putPainter(painter: IPutPainter): Promise<unknown>;
 }

package/package.json

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