From e87b27a4fa3082ff2ff38f663cad5e5f891d2888 Mon Sep 17 00:00:00 2001
From: leejinho <lilis7575@gmail.com>
Date: Wed, 12 Feb 2020 16:27:12 +0900
Subject: [PATCH] =?UTF-8?q?#=20=EC=9D=B4=EC=8A=88=EC=B2=98=EB=A6=AC=20243?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../messenger/components/left-side.component.html   |  4 +++-
 .../components/left-sidenav/chat.component.ts       | 13 +++++++++----
 .../left-sidenav/organization.component.ts          |  1 +
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.html
index fe8d3d01..291f6aa0 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.html
@@ -16,7 +16,9 @@
       class="left-side-tabs-contents"
       [style.display]="MainMenu.Chat === currentTabLable ? 'block' : 'none'"
     >
-      <app-layout-chat-left-sidenav-chat></app-layout-chat-left-sidenav-chat>
+      <app-layout-chat-left-sidenav-chat
+        [isVisible]="currentTabLable === MainMenu.Chat"
+      ></app-layout-chat-left-sidenav-chat>
     </div>
     <div
       #tabs
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.ts
index 59012b13..37d1af8c 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.ts
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.ts
@@ -37,6 +37,7 @@ import { FormGroup, FormBuilder } from '@angular/forms';
 import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling';
 import { PerfectScrollbarDirective } from 'ngx-perfect-scrollbar';
 import { TranslateService } from '@ngx-translate/core';
+import { VirtualScrollerComponent } from 'ngx-virtual-scroller';
 
 @Component({
   selector: 'app-layout-chat-left-sidenav-chat',
@@ -48,8 +49,8 @@ export class ChatComponent implements OnInit, OnDestroy, AfterViewChecked {
   @Input()
   isVisible = true;
 
-  @ViewChild('cvsvChatList', { static: false })
-  cvsvChatList: CdkVirtualScrollViewport;
+  @ViewChild('vsChatRoomList', { static: false })
+  private vsChatRoomList: VirtualScrollerComponent;
 
   @ViewChild(PerfectScrollbarDirective, { static: false })
   psDirectiveRef?: PerfectScrollbarDirective;
@@ -192,14 +193,18 @@ export class ChatComponent implements OnInit, OnDestroy, AfterViewChecked {
 
   ngAfterViewChecked(): void {
     if (
-      !!this.cvsvChatList &&
+      !!this.vsChatRoomList &&
       !!this.roomList &&
       this.roomList.length > 0 &&
       !this.isInitList &&
       this.isVisible
     ) {
       this.isInitList = true;
-      this.cvsvChatList.checkViewportSize();
+      this.vsChatRoomList.refresh();
+
+      if (!!this.psDirectiveRef) {
+        this.psDirectiveRef.update();
+      }
     }
   }
 
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts
index 115985fd..0027d837 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts
@@ -298,6 +298,7 @@ export class OrganizationComponent
       this.isVisible
     ) {
       this.isInitList = true;
+      this.vsDeptUser.refresh();
     }
   }