diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html index 3d65cdda..7b8a060a 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html @@ -6,6 +6,7 @@
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts index 52616bd7..ad591d6b 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts @@ -125,6 +125,8 @@ export class TopBarComponent implements OnInit, OnDestroy { @ViewChild('profileMenu', { static: true }) profileMenu: MatMenu; + integratedSearchWord = ''; + constructor( private store: Store, @Inject(UCAP_NATIVE_SERVICE) private nativeService: NativeService, @@ -567,19 +569,24 @@ export class TopBarComponent implements OnInit, OnDestroy { ); } - onIntegratedSearch(keyword: string) { + async onIntegratedSearch(keyword: string) { if (!keyword || keyword.trim().length === 0) { return; } - this.dialogService.open< + this.integratedSearchWord = keyword; + + const result = await this.dialogService.open< IntegratedSearchDialogComponent, IntegratedSearchDialogData, IntegratedSearchDialogResult >(IntegratedSearchDialogComponent, { data: { keyword - } + }, + restoreFocus: false }); + + this.integratedSearchWord = ''; } }