From f8c717551e9d3df9fd704c822fd46b45bdb4d7c0 Mon Sep 17 00:00:00 2001
From: richard-loafle <44828666+richard-loafle@users.noreply.github.com>
Date: Thu, 30 Jan 2020 17:46:32 +0900
Subject: [PATCH] cdk-virtual-scroll-viewport is removed

---
 .../left-sidenav/organization.component.html          | 11 +++++------
 .../components/left-sidenav/organization.component.ts | 11 +++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.html
index ae9341a2..0c77d7da 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.html
@@ -62,14 +62,14 @@
       </div>
     </div>
     <div *ngIf="!isShowSearch" class="search-list">
-      <cdk-virtual-scroll-viewport
-        itemSize="60"
-        #cvsvDeptUser
+      <virtual-scroller
+        #vsDeptUser
+        [items]="selectedDepartmentUserInfoList"
         perfectScrollbar
         fxFlexFill
       >
         <ucap-profile-user-list-item
-          *cdkVirtualFor="let userInfo of selectedDepartmentUserInfoList"
+          *ngFor="let userInfo of vsDeptUser.viewPortItems"
           [userInfo]="userInfo"
           [sessionVerinfo]="sessionVerinfo"
           [selectedUserList]="selectedUserList"
@@ -85,7 +85,7 @@
           matTooltipPosition="after"
         >
         </ucap-profile-user-list-item>
-      </cdk-virtual-scroll-viewport>
+      </virtual-scroller>
     </div>
     <div *ngIf="isShowSearch" class="search-result">
       <virtual-scroller
@@ -95,7 +95,6 @@
         fxFlexFill
       >
         <ucap-profile-user-list-item
-          style="height: 60px;"
           *ngFor="let userInfo of vsDeptSearchUser.viewPortItems"
           [userInfo]="userInfo"
           [checkable]="userInfo.seq !== loginRes.userSeq"
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 6ae7a8b2..7d32a927 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
@@ -119,8 +119,8 @@ export class OrganizationComponent
   @Output()
   sendSms = new EventEmitter<string>();
 
-  @ViewChild('cvsvDeptUser', { static: false })
-  cvsvDeptUser: CdkVirtualScrollViewport;
+  @ViewChild('vsDeptUser', { static: false })
+  private vsDeptUser: VirtualScrollerComponent;
 
   @ViewChild('vsDeptSearchUser', { static: false })
   private vsDeptSearchUser: VirtualScrollerComponent;
@@ -206,8 +206,8 @@ export class OrganizationComponent
           this.selectedDepartmentUserInfoList = list;
         }),
         tap(() => {
-          if (!!this.cvsvDeptUser) {
-            this.cvsvDeptUser.scrollToOffset(0);
+          if (!!this.vsDeptUser) {
+            this.vsDeptUser.scrollToIndex(0);
           }
           if (!!this.psDirectiveRef) {
             this.psDirectiveRef.update();
@@ -252,14 +252,13 @@ export class OrganizationComponent
 
   ngAfterViewChecked(): void {
     if (
-      !!this.cvsvDeptUser &&
+      !!this.vsDeptUser &&
       !!this.selectedDepartmentUserInfoList &&
       this.selectedDepartmentUserInfoList.length > 0 &&
       !this.isInitList &&
       this.isVisible
     ) {
       this.isInitList = true;
-      this.cvsvDeptUser.checkViewportSize();
     }
   }