From ffb79c7de003a58091c1e142255cb2526be30660 Mon Sep 17 00:00:00 2001 From: leejinho Date: Mon, 16 Dec 2019 08:58:33 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B0=B8=EC=A1=B0=EA=B4=80=EA=B3=84=20?= =?UTF-8?q?=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/messages.component.html | 1 + .../messenger/components/messages.component.ts | 3 +++ .../components/sticker-selector.component.ts | 17 ++++++++--------- 3 files changed, 12 insertions(+), 9 deletions(-) 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 2d7b9239..91fbc75b 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 @@ -200,6 +200,7 @@ 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 6acc57af..2e95f086 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 @@ -1125,4 +1125,7 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit { ]); } } + getStickerHistory(): string[] { + return this.localStorageService.get(KEY_STICKER_HISTORY); + } } 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 c698c493..b2e221f1 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 @@ -1,12 +1,10 @@ -import { Component, OnInit, Output, EventEmitter } from '@angular/core'; +import { Component, OnInit, Output, EventEmitter, Input } from '@angular/core'; import { StickerInfo, StickerFilesInfo, StickerUtil, StickerMap } from '@ucap-webmessenger/core'; -import { LocalStorageService } from '@ucap-webmessenger/web-storage'; -import { KEY_STICKER_HISTORY } from '@app/types'; @Component({ selector: 'ucap-sticker-selector', @@ -14,6 +12,9 @@ import { KEY_STICKER_HISTORY } from '@app/types'; styleUrls: ['./sticker-selector.component.scss'] }) export class StickerSelectorComponent implements OnInit { + @Input() + stickerHistory: string[] = []; + @Output() selectedSticker = new EventEmitter(); @@ -24,7 +25,7 @@ export class StickerSelectorComponent implements OnInit { currentTabIndex: number; - constructor(private localStorageService: LocalStorageService) {} + constructor() {} ngOnInit() { this.stickerInfoList = StickerUtil.getStickerInfoList(); @@ -54,11 +55,9 @@ export class StickerSelectorComponent implements OnInit { getStickerInfos(stickerInfo: StickerInfo) { if (stickerInfo.index === '00') { const rtnArray: StickerFilesInfo[] = []; - const history = this.localStorageService.get( - KEY_STICKER_HISTORY - ); - if (!!history && history.length > 0) { - history.forEach(sticker => { + + if (!!this.stickerHistory && this.stickerHistory.length > 0) { + this.stickerHistory.forEach(sticker => { const arr: string[] = sticker.split('_'); if (arr.length === 2) { const sInfo: StickerInfo[] = StickerMap.filter(