diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts index cdb1d2a26..2260320fa 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.ts +++ b/src/app/pages/chat/group-messages/group-messages.page.ts @@ -49,6 +49,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { capturedImage:any; capturedImageTitle:any; attendees: EventPerson[] = []; + scrollToBottomBtn = false; @ViewChild('scrollMe') private myScrollContainer: ElementRef; @@ -103,17 +104,24 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { window.addEventListener('scroll', this.scrollChangeCallback, true); } - onContentScrolled(e) { + onContentScrolled(e) { this.startPosition = e.srcElement.scrollTop; let scroll = e.srcElement.scrollTop; + let windowHeight = e.srcElement.scrollHeight; + let containerHeight = windowHeight - 596.59997558594; + if (scroll > this.currentPosition) { - //this.showButton = false; //alert('BOTTOM'); } else { - //this.showButton = true; //alert('UP'); this.scrollingOnce = false; } + if((containerHeight - 100) > scroll){ + this.scrollToBottomBtn = true; + } + else{ + this.scrollToBottomBtn = false; + } this.currentPosition = scroll; } @@ -130,6 +138,12 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { } catch(err) { } } + scrollToBottomClicked(): void { + try { + this.myScrollContainer.nativeElement.scrollTop = this.myScrollContainer.nativeElement.scrollHeight; + } catch(err) { } + } + getRoomInfo(){ this.showLoader = true; this.chatService.getRoomInfo(this.roomId).subscribe(room=>{ diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html index 9c38399f3..e68add79b 100644 --- a/src/app/pages/chat/messages/messages.page.html +++ b/src/app/pages/chat/messages/messages.page.html @@ -74,6 +74,11 @@ + + + + + diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index d9ac2fbfb..43b522488 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -45,6 +45,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { private scrollChangeCallback: () => void; currentPosition: any; startPosition: number; + scrollToBottomBtn = false; attendees: EventPerson[] = []; constructor( @@ -122,23 +123,41 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { } catch(err) { } } + scrollToBottomClicked(): void { + try { + this.myScrollContainer.nativeElement.scrollTop = this.myScrollContainer.nativeElement.scrollHeight; + } catch(err) { } + } + ngAfterViewInit() { this.scrollChangeCallback = () => this.onContentScrolled(event); window.addEventListener('scroll', this.scrollChangeCallback, true); } - onContentScrolled(e) { + onContentScrolled(e) { this.startPosition = e.srcElement.scrollTop; let scroll = e.srcElement.scrollTop; + let windowHeight = e.srcElement.scrollHeight; + let containerHeight = windowHeight - 596.59997558594; + console.log(this.startPosition); + console.log(windowHeight); + + if (scroll > this.currentPosition) { - //this.showButton = false; //alert('BOTTOM'); } else { - //this.showButton = true; //alert('UP'); this.scrollingOnce = false; } + if((containerHeight - 100) > scroll){ + this.scrollToBottomBtn = true; + } + else{ + this.scrollToBottomBtn = false; + } this.currentPosition = scroll; + console.log(this.currentPosition); + } ngOnDestroy() { diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html index 2ee87572b..8f0f48428 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.html +++ b/src/app/shared/chat/group-messages/group-messages.page.html @@ -98,6 +98,22 @@ + + + + + + diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts index acd1760d4..878cc8e52 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/shared/chat/group-messages/group-messages.page.ts @@ -54,6 +54,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe private scrollChangeCallback: () => void; currentPosition: any; startPosition: number; + scrollToBottomBtn = false; @Input() roomId:string; @Output() closeAllDesktopComponents:EventEmitter = new EventEmitter(); @@ -158,20 +159,35 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe } catch(err) { } } + scrollToBottomClicked(): void { + try { + this.myScrollContainer.nativeElement.scrollTop = this.myScrollContainer.nativeElement.scrollHeight; + } catch(err) { } + } + ngAfterViewInit() { this.scrollChangeCallback = () => this.onContentScrolled(event); window.addEventListener('scroll', this.scrollChangeCallback, true); } - onContentScrolled(e) { + onContentScrolled(e) { this.startPosition = e.srcElement.scrollTop; let scroll = e.srcElement.scrollTop; + let windowHeight = e.srcElement.scrollHeight; + let containerHeight = windowHeight - 454.199951171875; + if (scroll > this.currentPosition) { - //this.showButton = false; + //alert('BOTTOM'); } else { - //this.showButton = true; + //alert('UP'); this.scrollingOnce = false; } + if((containerHeight - 100) > scroll){ + this.scrollToBottomBtn = true; + } + else{ + this.scrollToBottomBtn = false; + } this.currentPosition = scroll; } diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index 6727cbe35..6ef6bbcb5 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -31,8 +31,18 @@ - - + + + + + + + Apagar mensagem + + + {{msg.u.name}} {{showDateDuration(msg._updatedAt)}} @@ -69,6 +79,22 @@ + + + + + +