From 729379d0f8442d800a9149bc5770354072019592 Mon Sep 17 00:00:00 2001
From: leejinho <lilis7575@gmail.com>
Date: Wed, 12 Feb 2020 14:08:22 +0900
Subject: [PATCH] =?UTF-8?q?#=20=EC=8B=9C=ED=97=98=EA=B2=B0=EA=B3=BC?=
 =?UTF-8?q?=EB=B6=84=EC=84=9D=2081?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../native/components/top-bar.component.html        |  1 +
 .../layouts/native/components/top-bar.component.ts  | 13 ++++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

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 @@
   <div class="btn-area">
     <ucap-integrated-search-form
       *ngIf="!!loginRes"
+      [searchWord]="integratedSearchWord"
       (search)="onIntegratedSearch($event)"
       class="input-lineless integrated-search"
     >
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<any>,
     @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 = '';
   }
 }