Skip to content
Snippets Groups Projects
Commit a794be96 authored by rhenck's avatar rhenck
Browse files

[editor] Improve code style

parent d5ec7417
No related branches found
No related tags found
No related merge requests found
......@@ -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 {
......
......@@ -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)
);
}
}
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>();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment