From fee7aa70b035639557996ad64fae42934cf51fc3 Mon Sep 17 00:00:00 2001 From: Richard Park Date: Fri, 11 Oct 2019 17:52:00 +0900 Subject: [PATCH] content projection is applied --- .../left-sidenav/group.component.html | 13 ++++++-- .../left-sidenav/group.component.ts | 3 +- .../components/expansion-panel.component.html | 33 +++++++++++++++---- .../components/expansion-panel.component.ts | 11 ++++++- 4 files changed, 50 insertions(+), 10 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.html index 9c1da020..27942a51 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.html @@ -36,8 +36,17 @@
- + + +
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts index ca7d0830..364817b3 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts @@ -144,7 +144,8 @@ export class GroupComponent implements OnInit { } onSelectBuddy(buddy: UserInfo) { - this.store.dispatch(ChatStore.selectedRoom({ roomSeq: String(buddy.seq) })); + // this.store.dispatch(ChatStore.selectedRoom({ roomSeq: String(buddy.seq) })); + this.logger.debug('onSelectBuddy', buddy); } onKeyDownEnterOrganizationTenantSearch(params: { diff --git a/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.html b/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.html index f2608e58..6448fcf7 100644 --- a/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.html +++ b/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.html @@ -5,9 +5,20 @@ - - + + + + + + @@ -16,9 +27,19 @@ - - + + + + + diff --git a/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.ts b/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.ts index fa5823dc..d5de689d 100644 --- a/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.ts +++ b/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.ts @@ -4,13 +4,16 @@ import { Input, Output, EventEmitter, - ViewChild + ViewChild, + ContentChild, + TemplateRef } from '@angular/core'; import { ucapAnimations } from '@ucap-webmessenger/ui'; import { GroupDetailData, UserInfo } from '@ucap-webmessenger/protocol-sync'; import { MatAccordion } from '@angular/material'; +import { ExpansionPanelItemDirective } from '../directives/expansion-panel-item.directive'; @Component({ selector: 'ucap-group-expansion-panel', @@ -28,6 +31,12 @@ export class ExpansionPanelComponent implements OnInit { @Output() selectBuddy = new EventEmitter(); + @ContentChild(ExpansionPanelItemDirective, { + read: TemplateRef, + static: true + }) + expansionPanelItemTemplateRef: TemplateRef; + @ViewChild('groupAccordion', { static: true }) groupAccordion: MatAccordion; constructor() {}