diff --git a/projects/editor/src/app/components/unit-view/page-view/canvas/canvas-element-overlay.ts b/projects/editor/src/app/components/unit-view/page-view/canvas/canvas-element-overlay.ts index 5ab8645bee2f4842310bb8e1a7c04bd7f342360b..bcaac7371b067847f8b2e97bca572ab36a772107 100644 --- a/projects/editor/src/app/components/unit-view/page-view/canvas/canvas-element-overlay.ts +++ b/projects/editor/src/app/components/unit-view/page-view/canvas/canvas-element-overlay.ts @@ -5,8 +5,7 @@ import { ViewChild, ViewContainerRef } from '@angular/core'; import { forkJoin, Subject } from 'rxjs'; -import { flatMap, mergeMap, take, takeUntil } from 'rxjs/operators'; -// eslint-disable-next-line import/no-cycle +import { take, takeUntil } from 'rxjs/operators'; import { UnitService } from '../../../../unit.service'; import { UnitPageSection, UnitUIElement } from '../../../../../../../common/unit'; import * as ComponentUtils from '../../../../../../../common/component-utils'; @@ -14,7 +13,6 @@ import { FormElementComponent } from '../../../../../../../common/form-element-c import { ValueChangeElement } from '../../../../../../../common/form'; import { ElementComponent } from '../../../../../../../common/element-component.directive'; import { SelectionService } from '../../../../selection.service'; -import { setClassMetadata } from '@angular/core/src/r3_symbols'; @Directive() export abstract class CanvasElementOverlay { diff --git a/projects/editor/src/app/components/unit-view/page-view/canvas/static-canvas-overlay.component.ts b/projects/editor/src/app/components/unit-view/page-view/canvas/static-canvas-overlay.component.ts index 6927c91b087b1b95fb3fc8e4f62c81ee755b9201..23f46f44793452ecfa1b352dee2414dd8c53e9d2 100644 --- a/projects/editor/src/app/components/unit-view/page-view/canvas/static-canvas-overlay.component.ts +++ b/projects/editor/src/app/components/unit-view/page-view/canvas/static-canvas-overlay.component.ts @@ -24,7 +24,7 @@ import { CanvasElementOverlay } from './canvas-element-overlay'; [style.width.%]="100" [style.height.%]="100"> <div class="resizeHandle" - cdkDrag (cdkDragStarted)="dragStart()" (cdkDragMoved)="resizeElement($event)" + cdkDrag (cdkDragStarted)="resizeDragStart()" (cdkDragMoved)="resizeElement($event)" [style.right.px]="-1" [style.bottom.px]="-7" [style.z-index]="5"> @@ -49,13 +49,21 @@ export class StaticCanvasOverlayComponent extends CanvasElementOverlay { private oldX: number = 0; private oldY: number = 0; - dragStart(): void { + resizeDragStart(): void { this.oldX = this.element.width; this.oldY = this.element.height; } resizeElement(event: CdkDragMove): void { - this.unitService.updateElementProperty(this.selectionService.getSelectedElements(), 'width', Math.max(this.oldX + event.distance.x, 0)); - this.unitService.updateElementProperty(this.selectionService.getSelectedElements(), 'height', Math.max(this.oldY + event.distance.y, 0)); + this.unitService.updateElementProperty( + this.selectionService.getSelectedElements(), + 'width', + Math.max(this.oldX + event.distance.x, 0) + ); + this.unitService.updateElementProperty( + this.selectionService.getSelectedElements(), + 'height', + Math.max(this.oldY + event.distance.y, 0) + ); } } diff --git a/projects/editor/src/app/components/unit-view/page-view/properties/properties.component.ts b/projects/editor/src/app/components/unit-view/page-view/properties/properties.component.ts index 4aa4874c9f0481f17fd3df9ee15b549cfe4e798c..d5eadc74369f971317695bf572c533ceb7f04fa2 100644 --- a/projects/editor/src/app/components/unit-view/page-view/properties/properties.component.ts +++ b/projects/editor/src/app/components/unit-view/page-view/properties/properties.component.ts @@ -1,8 +1,7 @@ import { Component } from '@angular/core'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; -import { UnitService } from '../../../../unit.service'; -import { UnitPage, UnitPageSection, UnitUIElement } from '../../../../../../../common/unit'; +import { UnitPage } from '../../../../../../../common/unit'; import { SelectionService } from '../../../../selection.service'; @Component({ @@ -18,9 +17,7 @@ import { SelectionService } from '../../../../selection.service'; ] }) export class PropertiesComponent { - selectedElements: UnitUIElement[] = []; selectedPage!: UnitPage; - selectedPageSection!: UnitPageSection; expandElementView: boolean = false; private ngUnsubscribe = new Subject<void>();