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

Fix chat jump animation cases

Browse Source 
Fix opening media viewer by canvas
This commit is contained in:
Eduard Kuzmenko 2022-04-26 17:35:09 +03:00
parent 434caf7191
commit 5e43bd7dcd
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1493,7 +1493,8 @@ export default class ChatBubbles {
|| target.classList.contains('album-item') || target.classList.contains('album-item')
// || isVideoComponentElement // || isVideoComponentElement
|| (target.tagName === 'VIDEO' && !bubble.classList.contains('round')) || (target.tagName === 'VIDEO' && !bubble.classList.contains('round'))
|| (documentDiv && !documentDiv.querySelector('.preloader-container'))) { || (documentDiv && !documentDiv.querySelector('.preloader-container'))
|| target.classList.contains('canvas-thumbnail')) {
const groupedItem = findUpClassName(target, 'album-item') || findUpClassName(target, 'document-container'); const groupedItem = findUpClassName(target, 'album-item') || findUpClassName(target, 'document-container');
const messageId = +(groupedItem || bubble).dataset.mid; const messageId = +(groupedItem || bubble).dataset.mid;
const message = this.chat.getMessage(messageId); const message = this.chat.getMessage(messageId);
@ -2543,8 +2544,9 @@ export default class ChatBubbles {
this.lazyLoadQueue.lock(); this.lazyLoadQueue.lock();
const haveToScrollToBubble = (topMessage && (isJump || samePeer)) || isTarget; // const haveToScrollToBubble = (topMessage && (isJump || samePeer)) || isTarget;
const fromUp = maxBubbleId > 0 && (maxBubbleId < lastMsgId || lastMsgId < 0); const haveToScrollToBubble = samePeer || (topMessage && isJump) || isTarget;
const fromUp = maxBubbleId > 0 && (!lastMsgId || maxBubbleId < lastMsgId || lastMsgId < 0);
const scrollFromDown = !fromUp && samePeer; const scrollFromDown = !fromUp && samePeer;
const scrollFromUp = !scrollFromDown && fromUp/* && (samePeer || forwardingUnread) */; const scrollFromUp = !scrollFromDown && fromUp/* && (samePeer || forwardingUnread) */;
this.willScrollOnLoad = scrollFromDown || scrollFromUp; this.willScrollOnLoad = scrollFromDown || scrollFromUp;
@ -2636,7 +2638,7 @@ export default class ChatBubbles {
scrollable.setScrollTopSilently(0); scrollable.setScrollTopSilently(0);
} }
const mountedByLastMsgId = this.getMountedBubble(lastMsgId); const mountedByLastMsgId = lastMsgId ? this.getMountedBubble(lastMsgId) : {bubble: this.getLastBubble()};
let bubble: HTMLElement = (followingUnread && this.firstUnreadBubble) || mountedByLastMsgId?.bubble; let bubble: HTMLElement = (followingUnread && this.firstUnreadBubble) || mountedByLastMsgId?.bubble;
if(!bubble?.parentElement) { if(!bubble?.parentElement) {
bubble = this.findNextMountedBubbleByMsgId(lastMsgId); bubble = this.findNextMountedBubbleByMsgId(lastMsgId);
@ -2668,6 +2670,10 @@ export default class ChatBubbles {
scrollable.setScrollTopSilently(99999); scrollable.setScrollTopSilently(99999);
} }
// if(!cached) {
this.onRenderScrollSet();
// }
this.onScroll(); this.onScroll();
const middleware = this.getMiddleware(); const middleware = this.getMiddleware();
@ -2675,9 +2681,9 @@ export default class ChatBubbles {
afterSetPromise.then(() => { // check whether list isn't full afterSetPromise.then(() => { // check whether list isn't full
scrollable.checkForTriggers(); scrollable.checkForTriggers();
if(cached) { // if(cached) {
this.onRenderScrollSet(); // this.onRenderScrollSet();
} // }
}); });
this.chat.dispatchEvent('setPeer', lastMsgId, !isJump); this.chat.dispatchEvent('setPeer', lastMsgId, !isJump);