WIP feat: replace ng2-select2 => ngx-select-ex (#706)
* feat: replace ng2-select2 => ngx-select-ex * feat: style the ngrx-select * feat: replace secondary role select2 * feat: replace Select2OptionData => SelectOptionData * feat: replace select2 => ngx-select in macro-tab component * feat: replace select2 => ngx-select in keymap-tab component * feat: fix styles * chore: remove select2 from dependencies * fix: macro editor overflow * fix: set the same font size for the toggle button * fix: overflow * chore: use @ert78gb/ngx-select-ex version of ngx-select-ex
This commit is contained in:
committed by
László Monda
parent
cfc0af9655
commit
15df8d7129
@@ -8,10 +8,11 @@
|
||||
<icon *ngIf="deletable" name="trash" (click)="deleteAction()"></icon>
|
||||
</div>
|
||||
<div class="list-group-item macro-action-editor__container"
|
||||
[@toggler]="((editable && editing) || newItem) ? 'active' : 'inactive'">
|
||||
<macro-action-editor
|
||||
[macroAction]="macroAction"
|
||||
(cancel)="cancelEdit()"
|
||||
(save)="saveEditedAction($event)">
|
||||
</macro-action-editor>
|
||||
</div>
|
||||
[@toggler]="((editable && editing) || newItem) ? 'active' : 'inactive'"
|
||||
[style.overflow]="overflow">
|
||||
<macro-action-editor
|
||||
[macroAction]="macroAction"
|
||||
(cancel)="cancelEdit()"
|
||||
(save)="saveEditedAction($event)">
|
||||
</macro-action-editor>
|
||||
</div>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
@import '../../../../styles/variables';
|
||||
|
||||
:host {
|
||||
overflow: hidden;
|
||||
overflow: visible;
|
||||
display: block;
|
||||
|
||||
&.macro-item:first-of-type {
|
||||
|
||||
@@ -45,6 +45,7 @@ export class MacroItemComponent implements OnInit, OnChanges {
|
||||
iconName: string;
|
||||
editing: boolean;
|
||||
newItem: boolean = false;
|
||||
overflow = 'hidden';
|
||||
|
||||
constructor(private mapper: MapperService) { }
|
||||
|
||||
@@ -53,6 +54,7 @@ export class MacroItemComponent implements OnInit, OnChanges {
|
||||
if (!this.macroAction) {
|
||||
this.editing = true;
|
||||
this.newItem = true;
|
||||
this.overflow = 'visible';
|
||||
}
|
||||
}
|
||||
|
||||
@@ -65,6 +67,7 @@ export class MacroItemComponent implements OnInit, OnChanges {
|
||||
saveEditedAction(editedAction: MacroAction): void {
|
||||
this.macroAction = editedAction;
|
||||
this.editing = false;
|
||||
this.overflow = 'hidden';
|
||||
this.updateView();
|
||||
this.save.emit(editedAction);
|
||||
}
|
||||
@@ -77,10 +80,12 @@ export class MacroItemComponent implements OnInit, OnChanges {
|
||||
|
||||
this.editing = true;
|
||||
this.edit.emit();
|
||||
this.setOverflow('visible');
|
||||
}
|
||||
|
||||
cancelEdit(): void {
|
||||
this.editing = false;
|
||||
this.overflow = 'hidden';
|
||||
this.cancel.emit();
|
||||
}
|
||||
|
||||
@@ -202,4 +207,12 @@ export class MacroItemComponent implements OnInit, OnChanges {
|
||||
});
|
||||
this.title += selectedButtonLabels.join(', ');
|
||||
}
|
||||
|
||||
private setOverflow(value: string): void {
|
||||
// tslint:disable: align
|
||||
setTimeout(() => {
|
||||
this.overflow = value;
|
||||
}, 600);
|
||||
// tslint:enable: align
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user