Fix select component.
This commit is contained in:
@@ -11,6 +11,7 @@ import { ApplicationCardComponent } from './core/components/application-card/app
|
|||||||
import {MatTooltipModule} from '@angular/material/tooltip';
|
import {MatTooltipModule} from '@angular/material/tooltip';
|
||||||
import { AddApplicationButtonComponent } from './core/components/add-application-button/add-application-button.component';
|
import { AddApplicationButtonComponent } from './core/components/add-application-button/add-application-button.component';
|
||||||
import { ModalComponent } from './core/components/modal/modal.component';
|
import { ModalComponent } from './core/components/modal/modal.component';
|
||||||
|
import { SelectComponent } from './core/components/select/select.component';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
declarations: [
|
declarations: [
|
||||||
@@ -21,7 +22,8 @@ import { ModalComponent } from './core/components/modal/modal.component';
|
|||||||
StatusComponent,
|
StatusComponent,
|
||||||
ApplicationCardComponent,
|
ApplicationCardComponent,
|
||||||
AddApplicationButtonComponent,
|
AddApplicationButtonComponent,
|
||||||
ModalComponent
|
ModalComponent,
|
||||||
|
SelectComponent,
|
||||||
],
|
],
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule,
|
RouterModule,
|
||||||
|
|||||||
@@ -11,11 +11,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="form-control">
|
<div class="form-control">
|
||||||
<label for="service-type">Type</label>
|
<label for="service-type">Type</label>
|
||||||
<select id="service-type" formControlName="serviceType" placeholder="Enter service type">
|
<app-select [options]="serviceTypes" optionLabel="label" (onSelection)="onServiceTypeSelection($event)"></app-select>
|
||||||
<option *ngFor="let type of serviceTypes" [value]="type.value">
|
|
||||||
{{type.label}}
|
|
||||||
</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="form-control">
|
<div class="form-control">
|
||||||
<label for="image">Image</label>
|
<label for="image">Image</label>
|
||||||
|
|||||||
@@ -47,4 +47,9 @@ export class CreateApplicationComponent implements OnInit {
|
|||||||
onCancel(): void {
|
onCancel(): void {
|
||||||
this._modalService.close();
|
this._modalService.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
onServiceTypeSelection(event: ReferentialData): void {
|
||||||
|
this.form.controls.serviceType.setValue(event.value);
|
||||||
|
console.log(event.value);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,14 @@
|
|||||||
<div class="container">
|
<div class="dropdown">
|
||||||
<select #select>
|
<button #select class="secondary" type="button" (click)="_active = !_active" (focus)="onFocus()" (blur)="onBlur()">
|
||||||
<option>Option 1</option>
|
{{!_selectedOption ? 'Select an option' : _selectedOption.label}}
|
||||||
<option>Option 2</option>
|
</button>
|
||||||
</select>
|
|
||||||
<div class="icon">
|
<div class="icon">
|
||||||
<mat-icon (click)="select.focus()">unfold_more</mat-icon>
|
<mat-icon (click)="onIconClick()">unfold_more</mat-icon>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<ul class="{{_active ? 'show' : ''}}">
|
||||||
|
<li *ngFor="let option of options" (click)="setOption(option)">
|
||||||
|
{{option.label}}
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
@@ -1,16 +1,25 @@
|
|||||||
$btn-primary-background-top: #4ca4f6;
|
@import '../../../../colors.scss';
|
||||||
$btn-primary-background-bottom: #0073f7;
|
|
||||||
|
|
||||||
$select-icon-radius: 4px;
|
$select-icon-radius: 4px;
|
||||||
|
|
||||||
.container {
|
.dropdown {
|
||||||
|
width: max-content;
|
||||||
position: relative;
|
position: relative;
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: center;
|
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
width: 100%;
|
||||||
|
|
||||||
select {
|
button {
|
||||||
|
padding-right: 35px;
|
||||||
|
border: none;
|
||||||
|
margin: 0;
|
||||||
|
box-shadow: 0px 1px 2px 1px rgba(0,0,0,0.1);
|
||||||
|
width: 100%;
|
||||||
|
justify-content: left;
|
||||||
|
|
||||||
|
&:focus {
|
||||||
|
outline: 2px solid $blue;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.icon {
|
.icon {
|
||||||
@@ -20,20 +29,51 @@ $select-icon-radius: 4px;
|
|||||||
width: 1.5rem;
|
width: 1.5rem;
|
||||||
background-image: linear-gradient($btn-primary-background-top, $btn-primary-background-bottom);
|
background-image: linear-gradient($btn-primary-background-top, $btn-primary-background-bottom);
|
||||||
color: white;
|
color: white;
|
||||||
height: 23px;
|
height: 21px;
|
||||||
top: 3px;
|
|
||||||
right: 0;
|
right: 0;
|
||||||
border-radius: 0 $select-icon-radius $select-icon-radius 0;
|
border-radius: 0 $select-icon-radius $select-icon-radius 0;
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
|
||||||
mat-icon {
|
mat-icon {
|
||||||
font-size: 19px;
|
font-size: 19px;
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
padding-right: 2px;
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
cursor: default;
|
cursor: default;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ul {
|
||||||
|
position: absolute;
|
||||||
|
top: 24px;
|
||||||
|
background-color: #fff;
|
||||||
|
border-radius: 4px;
|
||||||
|
margin: 0;
|
||||||
|
padding: .3rem 0;
|
||||||
|
min-width: 150px;
|
||||||
|
border: 1px solid #eee;
|
||||||
|
display: none;
|
||||||
|
flex-direction: column;
|
||||||
|
|
||||||
|
&.show {
|
||||||
|
display: flex;
|
||||||
|
}
|
||||||
|
|
||||||
|
li {
|
||||||
|
list-style: none;
|
||||||
|
padding: .2rem 1rem;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
background-image: linear-gradient($btn-primary-background-top, $btn-primary-background-bottom);
|
||||||
|
color: white;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,15 +1,65 @@
|
|||||||
import { Component, OnInit } from '@angular/core';
|
import { AfterViewInit, Component, ElementRef, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, ViewChild } from '@angular/core';
|
||||||
|
import { AbstractControl, FormControl } from '@angular/forms';
|
||||||
|
|
||||||
|
export interface Option {
|
||||||
|
value: any;
|
||||||
|
label: string
|
||||||
|
}
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-select',
|
selector: 'app-select',
|
||||||
templateUrl: './select.component.html',
|
templateUrl: './select.component.html',
|
||||||
styleUrls: ['./select.component.scss']
|
styleUrls: ['./select.component.scss']
|
||||||
})
|
})
|
||||||
export class SelectComponent implements OnInit {
|
export class SelectComponent implements OnChanges {
|
||||||
|
_selectedOption?: Option;
|
||||||
|
_options: Option[] = []
|
||||||
|
_active: boolean = false;
|
||||||
|
private _disableBlurEffect: boolean = false;
|
||||||
|
@Input() formControl: any;
|
||||||
|
@Input() options?: any[];
|
||||||
|
@Input() optionLabel?: string;
|
||||||
|
@ViewChild('select', {static: true}) select?: ElementRef;
|
||||||
|
@ViewChild('selectIcon', {static: true}) selectIcon?: ElementRef;
|
||||||
|
@Output() onSelection: EventEmitter<any> = new EventEmitter();
|
||||||
|
|
||||||
constructor() { }
|
constructor(
|
||||||
|
|
||||||
ngOnInit(): void {
|
) {}
|
||||||
|
|
||||||
|
ngOnChanges(changes: SimpleChanges): void {
|
||||||
|
if (this.options?.length) {
|
||||||
|
this._options = this.options.map(option => ({
|
||||||
|
value: option,
|
||||||
|
label: typeof this.optionLabel === 'undefined' ? undefined : option[this.optionLabel]
|
||||||
|
} as Option));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
onIconClick(): void {
|
||||||
|
if (this.select) {
|
||||||
|
this.select.nativeElement.focus();
|
||||||
|
this.select.nativeElement.click();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
setOption(selectedOption: Option): void {
|
||||||
|
this._selectedOption = selectedOption;
|
||||||
|
this._active = false;
|
||||||
|
this.select?.nativeElement?.focus();
|
||||||
|
this.onSelection.emit(this._selectedOption);
|
||||||
|
}
|
||||||
|
|
||||||
|
onFocus(): void {
|
||||||
|
this._disableBlurEffect = true;
|
||||||
|
window.setTimeout(() => this._disableBlurEffect = false, 150);
|
||||||
|
}
|
||||||
|
|
||||||
|
onBlur(): void {
|
||||||
|
window.setTimeout(() => {
|
||||||
|
if (!this._disableBlurEffect) {
|
||||||
|
this._active = false;
|
||||||
|
}
|
||||||
|
}, 150);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user