From ccc88e194e9940a9ca914975fc5d9087d843e424 Mon Sep 17 00:00:00 2001 From: leejinho Date: Mon, 23 Dec 2019 15:23:15 +0900 Subject: [PATCH] =?UTF-8?q?=EC=8A=A4=ED=8B=B0=EC=BB=A4=20=EB=8B=AB?= =?UTF-8?q?=EA=B8=B0=20=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=EC=B6=94=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layouts/messenger/components/messages.component.html | 1 + .../app/layouts/messenger/components/messages.component.ts | 4 ++++ .../src/lib/components/sticker-selector.component.ts | 7 +++++++ 3 files changed, 12 insertions(+) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html index bf6b7dcd..fd16cfc2 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.html @@ -234,6 +234,7 @@ #stickerSelector [stickerHistory]="getStickerHistory()" (selectedSticker)="onSelectedSticker($event)" + (closeSticker)="onShowToggleStickerSelector()" class="sticker-selector-zone" >
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts index ca55a0e8..6c6fa996 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts @@ -341,6 +341,10 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit { this.selectedSticker = undefined; this.firstcheckReadHere = true; + + if (!!this.chatForm) { + this.chatForm.replyForm.reset(); + } } get _roomUserInfos() { diff --git a/projects/ucap-webmessenger-ui/src/lib/components/sticker-selector.component.ts b/projects/ucap-webmessenger-ui/src/lib/components/sticker-selector.component.ts index b2e221f1..92b0ae0d 100644 --- a/projects/ucap-webmessenger-ui/src/lib/components/sticker-selector.component.ts +++ b/projects/ucap-webmessenger-ui/src/lib/components/sticker-selector.component.ts @@ -18,6 +18,9 @@ export class StickerSelectorComponent implements OnInit { @Output() selectedSticker = new EventEmitter(); + @Output() + closeSticker = new EventEmitter(); + stickerBasePath = 'assets/sticker/'; stickerInfoList: StickerInfo[] = []; stickerFileInfoList: StickerFilesInfo[] = []; @@ -87,4 +90,8 @@ export class StickerSelectorComponent implements OnInit { this.currentSticker = sticker; this.selectedSticker.emit(sticker); } + + onClickClose() { + this.closeSticker.emit(); + } }