diff --git a/src/app/cdk/deep-select-input/deep-select-input.module.ts b/src/app/cdk/deep-select-input/deep-select-input.module.ts index 72f22f74a..901003b68 100644 --- a/src/app/cdk/deep-select-input/deep-select-input.module.ts +++ b/src/app/cdk/deep-select-input/deep-select-input.module.ts @@ -12,6 +12,7 @@ import { import { MatMenuModule } from '@angular/material/menu' import { MatButtonModule } from '@angular/material/button' import { MatLegacyInputModule } from '@angular/material/legacy-input' +import { MatIconModule } from '@angular/material/icon' @NgModule({ declarations: [DeepSelectInputComponent], @@ -23,6 +24,7 @@ import { MatLegacyInputModule } from '@angular/material/legacy-input' SharedModule, MatLegacyMenuModule, MatLegacyInputModule, + MatIconModule, ], exports: [DeepSelectInputComponent], }) diff --git a/src/app/cdk/deep-select-input/deep-select-input/deep-select-input.component.html b/src/app/cdk/deep-select-input/deep-select-input/deep-select-input.component.html index 57e7e9f27..ae9f53d12 100644 --- a/src/app/cdk/deep-select-input/deep-select-input/deep-select-input.component.html +++ b/src/app/cdk/deep-select-input/deep-select-input/deep-select-input.component.html @@ -5,17 +5,18 @@ (click)="clickHoverMenuTrigger.openMenu()" > + arrow_drop_down Select a work type diff --git a/src/app/cdk/deep-select-input/deep-select-input/deep-select-input.component.scss b/src/app/cdk/deep-select-input/deep-select-input/deep-select-input.component.scss index 4d6c9b130..ed4590f09 100644 --- a/src/app/cdk/deep-select-input/deep-select-input/deep-select-input.component.scss +++ b/src/app/cdk/deep-select-input/deep-select-input/deep-select-input.component.scss @@ -102,3 +102,7 @@ button.mat-button-wrap-text:not(.mobile):not(.secondaryItem) { .not-selectable-label { padding: 0 16px; } + +input{ + cursor: pointer; +} diff --git a/src/app/cdk/deep-select-input/deep-select-input/deep-select-input.component.ts b/src/app/cdk/deep-select-input/deep-select-input/deep-select-input.component.ts index 6d347fbaa..7aa0fd52b 100644 --- a/src/app/cdk/deep-select-input/deep-select-input/deep-select-input.component.ts +++ b/src/app/cdk/deep-select-input/deep-select-input/deep-select-input.component.ts @@ -50,7 +50,9 @@ export class DeepSelectInputComponent implements ControlValueAccessor { @Input() formControlRef: FormControl @ViewChild('clickHoverMenuTrigger') clickHoverMenuTrigger: MatMenuTrigger @ViewChild('matMenu') matMenu: MatMenuTrigger + @Input('aria-label') ariaLabel = 'Deep select input' selectItemLabel = $localize`:@@works.pleaseSelectWork:Please select a work type` + ariaLabelWorkType = $localize`:@@works.workType:Work type` subMenus: { [key: string]: any } = {} selectedItem: DeepSelectMenu diff --git a/src/app/record/components/work-form/work-form/work-form.component.html b/src/app/record/components/work-form/work-form/work-form.component.html index b5eb13c92..a4c99a33c 100644 --- a/src/app/record/components/work-form/work-form/work-form.component.html +++ b/src/app/record/components/work-form/work-form/work-form.component.html @@ -42,6 +42,7 @@ [menu]="workTypeMenu" [formControlRef]="workTypeControl" formControlName="workType" + [aria-label]="ariaLabelWork" > diff --git a/src/app/record/components/work-form/work-form/work-form.component.scss b/src/app/record/components/work-form/work-form/work-form.component.scss index 9b2d2793f..f911c8306 100644 --- a/src/app/record/components/work-form/work-form/work-form.component.scss +++ b/src/app/record/components/work-form/work-form/work-form.component.scss @@ -97,3 +97,11 @@ app-deep-select-input { width: 100%; max-width: 402px; } + +:host { + ::ng-deep { + .mat-form-field-appearance-outline .mat-select-arrow-wrapper { + transform: none; + } + } +}