diff --git a/searchPages/searchUtils/advancedSearchForm.component.html b/searchPages/searchUtils/advancedSearchForm.component.html index 530475f7..192957d9 100644 --- a/searchPages/searchUtils/advancedSearchForm.component.html +++ b/searchPages/searchUtils/advancedSearchForm.component.html @@ -175,14 +175,14 @@
+ [searchInputClass]="'inner background'" [placeholder]="formPlaceholderText" (searchEmitter)="simpleKeywordChanged()">
+ [searchInputClass]="'inner background'" [placeholder]="formPlaceholderText" (searchEmitter)="simpleKeywordChanged()"> diff --git a/sharedComponents/navigationBar.component.html b/sharedComponents/navigationBar.component.html index 49ae59f2..0822d168 100644 --- a/sharedComponents/navigationBar.component.html +++ b/sharedComponents/navigationBar.component.html @@ -171,7 +171,7 @@
diff --git a/sharedComponents/search-input/search-input.component.ts b/sharedComponents/search-input/search-input.component.ts index 818da42a..f2ae486e 100644 --- a/sharedComponents/search-input/search-input.component.ts +++ b/sharedComponents/search-input/search-input.component.ts @@ -1,4 +1,5 @@ import { + AfterViewInit, ChangeDetectorRef, Component, ElementRef, @@ -10,7 +11,6 @@ import { ViewChild } from '@angular/core'; import {AbstractControl} from '@angular/forms'; -import {MatAutocompleteTrigger} from '@angular/material/autocomplete'; import {InputComponent} from "../input/input.component"; import {ClickEvent} from "../../utils/click/click-outside-or-esc.directive"; @@ -33,7 +33,7 @@ import {ClickEvent} from "../../utils/click/click-outside-or-esc.directive";
- +
@@ -44,7 +44,7 @@ import {ClickEvent} from "../../utils/click/click-outside-or-esc.directive";
` }) -export class SearchInputComponent implements OnInit { +export class SearchInputComponent implements OnInit, AfterViewInit { @Input() disabled: boolean = false; @Input() searchInputClass: string = 'inner'; @Input() iconPosition: 'left' | 'right' = 'right'; @@ -59,6 +59,7 @@ export class SearchInputComponent implements OnInit { @ViewChild('input') input: InputComponent; public expanded: boolean = true; public initialized: boolean = false; + public ratio: number = 1; constructor(private cdr: ChangeDetectorRef) { } @@ -86,6 +87,10 @@ export class SearchInputComponent implements OnInit { this.initialized = true; } + ngAfterViewInit() { + this.ratio = Number.parseFloat(getComputedStyle(this.searchInput.nativeElement).getPropertyValue('--search-input-icon-ratio')); + } + expand(value: boolean) { this.expanded = value; this.cdr.detectChanges(); @@ -118,32 +123,4 @@ export class SearchInputComponent implements OnInit { get hidden(): boolean { return !this.expanded && (!this.searchControl?.value && !this.value); } - - /** @deprecated all*/ - @Input() - showSearch: boolean = true; - @Input() - control: AbstractControl; - @Input() - loading: boolean = false; - @Input() - selected: any; - @Input() - list: any = null; - @Input() - colorClass: string = 'portal-color'; - @Input() - bordered: boolean = false; - @Input() - toggleTitle: string = 'search'; - @ViewChild(MatAutocompleteTrigger) trigger: MatAutocompleteTrigger; - @Output() - resetEmitter: EventEmitter = new EventEmitter(); - @Output() - closeEmitter: EventEmitter = new EventEmitter(); - - /** @deprecated*/ - closeSearch() { - - } }