r4sas/tweb-i2p
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Preloader: wait progress transition complete

Browse Source 
Fix groupping discussion start bubble
This commit is contained in:
morethanwords 2021-01-12 14:33:19 +04:00
parent 9b54ce2905
commit 1099892378
4 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/components/chat/bubbles.ts
View File

@ -1599,7 +1599,12 @@ export default class ChatBubbles {
if(updatePosition) { if(updatePosition) {
this.renderMessagesQueue(message, bubble, reverse, loadPromises); this.renderMessagesQueue(message, bubble, reverse, loadPromises);
this.bubbleGroups.addBubble(bubble, message, reverse);
if(!message.pFlags.is_single) { // * Ignore 'Discussion started'
this.bubbleGroups.addBubble(bubble, message, reverse);
} else {
bubble.classList.add('is-group-last');
}
} }
return bubble; return bubble;
@ -2215,8 +2220,9 @@ export default class ChatBubbles {
savedFrom = `${this.chat.peerId}_${message.mid}`; savedFrom = `${this.chat.peerId}_${message.mid}`;
} }
if(messageWithReplies && messageWithReplies.mid === this.chat.threadId) { const isThreadStarter = messageWithReplies && messageWithReplies.mid === this.chat.threadId;
bubble.classList.add('is-thread-starter'); if(isThreadStarter) {
bubble.classList.add('is-thread-starter', 'is-group-last');
} }
if(savedFrom && this.peerId !== REPLIES_PEER_ID) { if(savedFrom && this.peerId !== REPLIES_PEER_ID) {
@ -2229,7 +2235,9 @@ export default class ChatBubbles {
bubble.classList.add(isOut ? 'is-out' : 'is-in'); bubble.classList.add(isOut ? 'is-out' : 'is-in');
if(updatePosition) { if(updatePosition) {
this.bubbleGroups.addBubble(bubble, message, reverse); if(!isThreadStarter) {
this.bubbleGroups.addBubble(bubble, message, reverse);
}
this.renderMessagesQueue(message, bubble, reverse, loadPromises); this.renderMessagesQueue(message, bubble, reverse, loadPromises);
} else { } else {

9
src/components/preloader.ts
View File

@ -71,9 +71,16 @@ export default class ProgressivePreloader {
if(tempId === this.tempId) { if(tempId === this.tempId) {
if(successfully) { if(successfully) {
this.setProgress(100); this.setProgress(100);
setTimeout(() => { // * wait for transition complete
if(tempId === this.tempId) {
this.detach();
}
}, TRANSITION_TIME * 1.25);
} else {
this.detach();
} }
this.detach();
this.promise = promise = null; this.promise = promise = null;
} }
}; };

3
src/lib/appManagers/appMessagesManager.ts
View File

@ -3213,6 +3213,9 @@ export class AppMessagesManager {
const serviceStartMessage: Message.messageService = { const serviceStartMessage: Message.messageService = {
_: 'messageService', _: 'messageService',
pFlags: {
is_single: true
} as any,
id: this.generateMessageId(message.id, true), id: this.generateMessageId(message.id, true),
date: message.date, date: message.date,
from_id: message.from_id, from_id: message.from_id,

6
src/scss/partials/_preloader.scss
View File

@ -1,3 +1,5 @@
$transition: .2s ease-in-out;
.preloader { .preloader {
&-circular { &-circular {
animation: rotate 2s linear infinite; animation: rotate 2s linear infinite;
@ -37,7 +39,7 @@
transform: scale(0); transform: scale(0);
body:not(.animation-level-0) & { body:not(.animation-level-0) & {
transition: opacity .2s ease-in-out, transform .2s ease-in-out; transition: opacity $transition, transform $transition;
} }
&.is-visible { &.is-visible {
@ -68,7 +70,7 @@
.preloader-path-new { .preloader-path-new {
stroke-dasharray: 5, 149.82; stroke-dasharray: 5, 149.82;
stroke-dashoffset: 0; stroke-dashoffset: 0;
transition: stroke-dasharray 400ms ease-in-out; transition: stroke-dasharray $transition;
stroke-linecap: round; stroke-linecap: round;
stroke: white; stroke: white;
stroke-width: 2; stroke-width: 2;