Browse Source

Render photo as thumbnail if it's not fit

master
morethanwords 4 years ago
parent
commit
7ce8152f96
  1. 42
      src/components/wrappers.ts
  2. 44
      src/lib/appManagers/appMessagesManager.ts
  3. 4
      src/lib/appManagers/appPhotosManager.ts
  4. 1
      src/scss/partials/_chatBubble.scss
  5. 18
      src/scss/style.scss

42
src/components/wrappers.ts

@ -651,7 +651,7 @@ export function wrapDocument({message, withTime, fontWeight, voiceAsMusic, showS
return img; return img;
} */ } */
export function wrapPhoto({photo, message, container, boxWidth, boxHeight, withTail, isOut, lazyLoadQueue, middleware, size, withoutPreloader, loadPromises, noAutoDownload, noBlur}: { export function wrapPhoto({photo, message, container, boxWidth, boxHeight, withTail, isOut, lazyLoadQueue, middleware, size, withoutPreloader, loadPromises, noAutoDownload, noBlur, noThumb, noFadeIn}: {
photo: MyPhoto | MyDocument, photo: MyPhoto | MyDocument,
message: any, message: any,
container: HTMLElement, container: HTMLElement,
@ -666,6 +666,8 @@ export function wrapPhoto({photo, message, container, boxWidth, boxHeight, withT
loadPromises?: Promise<any>[], loadPromises?: Promise<any>[],
noAutoDownload?: boolean, noAutoDownload?: boolean,
noBlur?: boolean, noBlur?: boolean,
noThumb?: boolean,
noFadeIn?: boolean,
}) { }) {
if(!((photo as MyPhoto).sizes || (photo as MyDocument).thumbs)) { if(!((photo as MyPhoto).sizes || (photo as MyDocument).thumbs)) {
if(boxWidth && boxHeight && !size && photo._ === 'document') { if(boxWidth && boxHeight && !size && photo._ === 'document') {
@ -722,6 +724,28 @@ export function wrapPhoto({photo, message, container, boxWidth, boxHeight, withT
const thumbImage = gotThumb.image; // local scope const thumbImage = gotThumb.image; // local scope
thumbImage.classList.add('media-photo'); thumbImage.classList.add('media-photo');
container.append(thumbImage); container.append(thumbImage);
} else {
const res = wrapPhoto({
container,
message,
photo,
boxWidth: 0,
boxHeight: 0,
size,
lazyLoadQueue,
isOut,
loadPromises,
middleware,
withoutPreloader,
withTail,
noAutoDownload,
noBlur,
noThumb: true,
//noFadeIn: true
});
const thumbImage = res.images.full;
thumbImage.classList.add('media-photo', 'thumbnail');
//container.append(thumbImage);
} }
container.classList.add('media-container-fitted'); container.classList.add('media-container-fitted');
@ -735,12 +759,14 @@ export function wrapPhoto({photo, message, container, boxWidth, boxHeight, withT
cacheContext = appDownloadManager.getCacheContext(photo, size?.type); cacheContext = appDownloadManager.getCacheContext(photo, size?.type);
} }
const gotThumb = appPhotosManager.getStrippedThumbIfNeeded(photo, cacheContext, !noBlur); if(!noThumb) {
if(gotThumb) { const gotThumb = appPhotosManager.getStrippedThumbIfNeeded(photo, cacheContext, !noBlur);
loadThumbPromise = Promise.all([loadThumbPromise, gotThumb.loadPromise]); if(gotThumb) {
thumbImage = gotThumb.image; loadThumbPromise = Promise.all([loadThumbPromise, gotThumb.loadPromise]);
thumbImage.classList.add('media-photo'); thumbImage = gotThumb.image;
aspecter.append(thumbImage); thumbImage.classList.add('media-photo');
aspecter.append(thumbImage);
}
} }
// } // }
@ -748,7 +774,7 @@ export function wrapPhoto({photo, message, container, boxWidth, boxHeight, withT
//console.log('wrapPhoto downloaded:', photo, photo.downloaded, container); //console.log('wrapPhoto downloaded:', photo, photo.downloaded, container);
const needFadeIn = (thumbImage || !cacheContext.downloaded) && rootScope.settings.animationsEnabled; const needFadeIn = (thumbImage || !cacheContext.downloaded) && rootScope.settings.animationsEnabled && !noFadeIn;
if(needFadeIn) { if(needFadeIn) {
image.classList.add('fade-in'); image.classList.add('fade-in');
} }

44
src/lib/appManagers/appMessagesManager.ts

@ -109,21 +109,21 @@ export type MessagesStorage = {
export type MyMessageActionType = Message.messageService['action']['_']; export type MyMessageActionType = Message.messageService['action']['_'];
export class AppMessagesManager { export class AppMessagesManager {
public static MESSAGE_ID_INCREMENT = 0x10000; private static MESSAGE_ID_INCREMENT = 0x10000;
public static MESSAGE_ID_OFFSET = 0xFFFFFFFF; private static MESSAGE_ID_OFFSET = 0xFFFFFFFF;
public messagesStorageByPeerId: {[peerId: string]: MessagesStorage} = {}; private messagesStorageByPeerId: {[peerId: string]: MessagesStorage} = {};
public groupedMessagesStorage: {[groupId: string]: MessagesStorage} = {}; // will be used for albums public groupedMessagesStorage: {[groupId: string]: MessagesStorage} = {}; // will be used for albums
public scheduledMessagesStorage: {[peerId: string]: MessagesStorage} = {}; private scheduledMessagesStorage: {[peerId: string]: MessagesStorage} = {};
public historiesStorage: { private historiesStorage: {
[peerId: string]: HistoryStorage [peerId: string]: HistoryStorage
} = {}; } = {};
public threadsStorage: { private threadsStorage: {
[peerId: string]: { [peerId: string]: {
[threadId: string]: HistoryStorage [threadId: string]: HistoryStorage
} }
} = {}; } = {};
public searchesStorage: { private searchesStorage: {
[peerId: string]: Partial<{ [peerId: string]: Partial<{
[inputFilter in MyInputMessagesFilter]: { [inputFilter in MyInputMessagesFilter]: {
count?: number, count?: number,
@ -134,11 +134,11 @@ export class AppMessagesManager {
public pinnedMessages: {[peerId: string]: PinnedStorage} = {}; public pinnedMessages: {[peerId: string]: PinnedStorage} = {};
public threadsServiceMessagesIdsStorage: {[peerId_threadId: string]: number} = {}; public threadsServiceMessagesIdsStorage: {[peerId_threadId: string]: number} = {};
public threadsToReplies: { private threadsToReplies: {
[peerId_threadId: string]: string; [peerId_threadId: string]: string;
} = {}; } = {};
public pendingByRandomId: { private pendingByRandomId: {
[randomId: string]: { [randomId: string]: {
peerId: number, peerId: number,
tempId: number, tempId: number,
@ -146,12 +146,11 @@ export class AppMessagesManager {
storage: MessagesStorage storage: MessagesStorage
} }
} = {}; } = {};
public pendingByMessageId: {[mid: string]: string} = {}; private pendingByMessageId: {[mid: string]: string} = {};
public pendingAfterMsgs: any = {}; private pendingAfterMsgs: any = {};
public pendingTopMsgs: {[peerId: string]: number} = {}; public pendingTopMsgs: {[peerId: string]: number} = {};
public sendFilePromise: CancellablePromise<void> = Promise.resolve(); private tempNum = 0;
public tempNum = 0; private tempFinalizeCallbacks: {
public tempFinalizeCallbacks: {
[tempId: string]: { [tempId: string]: {
[callbackName: string]: Partial<{ [callbackName: string]: Partial<{
deferred: CancellablePromise<void>, deferred: CancellablePromise<void>,
@ -160,20 +159,20 @@ export class AppMessagesManager {
} }
} = {}; } = {};
public sendSmthLazyLoadQueue = new LazyLoadQueueBase(1); private sendSmthLazyLoadQueue = new LazyLoadQueueBase(1);
public needSingleMessages: {[peerId: string]: number[]} = {}; private needSingleMessages: {[peerId: string]: number[]} = {};
private fetchSingleMessagesPromise: Promise<void> = null; private fetchSingleMessagesPromise: Promise<void> = null;
public maxSeenId = 0; private maxSeenId = 0;
public migratedFromTo: {[peerId: number]: number} = {}; public migratedFromTo: {[peerId: number]: number} = {};
public migratedToFrom: {[peerId: number]: number} = {}; public migratedToFrom: {[peerId: number]: number} = {};
public newMessagesHandleTimeout = 0; private newMessagesHandleTimeout = 0;
public newMessagesToHandle: {[peerId: string]: Set<number>} = {}; private newMessagesToHandle: {[peerId: string]: Set<number>} = {};
public newDialogsHandlePromise: Promise<any>; private newDialogsHandlePromise: Promise<any>;
public newDialogsToHandle: {[peerId: string]: Dialog} = {}; private newDialogsToHandle: {[peerId: string]: Dialog} = {};
public newUpdatesAfterReloadToHandle: {[peerId: string]: Set<Update>} = {}; public newUpdatesAfterReloadToHandle: {[peerId: string]: Set<Update>} = {};
private notificationsHandlePromise = 0; private notificationsHandlePromise = 0;
@ -4371,7 +4370,8 @@ export class AppMessagesManager {
const photo = appPhotosManager.getPhoto('' + tempId); const photo = appPhotosManager.getPhoto('' + tempId);
if(/* photo._ !== 'photoEmpty' */photo) { if(/* photo._ !== 'photoEmpty' */photo) {
const newPhoto = message.media.photo as MyPhoto; const newPhoto = message.media.photo as MyPhoto;
const cacheContext = appDownloadManager.getCacheContext(newPhoto); const newPhotoSize = newPhoto.sizes[newPhoto.sizes.length - 1];
const cacheContext = appDownloadManager.getCacheContext(newPhoto, newPhotoSize.type);
const oldCacheContext = appDownloadManager.getCacheContext(photo, 'full'); const oldCacheContext = appDownloadManager.getCacheContext(photo, 'full');
Object.assign(cacheContext, oldCacheContext); Object.assign(cacheContext, oldCacheContext);

4
src/lib/appManagers/appPhotosManager.ts

@ -279,7 +279,7 @@ export class AppPhotosManager {
const sizes = (photo as MyPhoto).sizes || (photo as MyDocument).thumbs; const sizes = (photo as MyPhoto).sizes || (photo as MyDocument).thumbs;
const thumb = sizes?.length ? sizes.find(size => size._ === 'photoStrippedSize') : null; const thumb = sizes?.length ? sizes.find(size => size._ === 'photoStrippedSize') : null;
if(thumb && ('bytes' in thumb)) { if(thumb && ('bytes' in thumb)) {
return appPhotosManager.getImageFromStrippedThumb(photo, thumb as any, useBlur); return this.getImageFromStrippedThumb(photo, thumb as any, useBlur);
} }
} }
@ -407,5 +407,5 @@ export class AppPhotosManager {
} }
const appPhotosManager = new AppPhotosManager(); const appPhotosManager = new AppPhotosManager();
MOUNT_CLASS_TO.appPhotosManager = appPhotosManager; MOUNT_CLASS_TO && (MOUNT_CLASS_TO.appPhotosManager = appPhotosManager);
export default appPhotosManager; export default appPhotosManager;

1
src/scss/partials/_chatBubble.scss

@ -608,6 +608,7 @@ $bubble-margin: .25rem;
&-aspecter { &-aspecter {
position: relative; position: relative;
margin: 0 auto; margin: 0 auto;
z-index: 1;
} }
&-fitted { &-fitted {

18
src/scss/style.scss

@ -582,6 +582,16 @@ input:-webkit-autofill:active {
} }
} }
@keyframes thumbnail-fade-in-opacity {
0% {
opacity: 0;
}
to {
opacity: .8;
}
}
@keyframes fade-in-opacity { @keyframes fade-in-opacity {
0% { 0% {
opacity: 0; opacity: 0;
@ -1143,6 +1153,14 @@ middle-ellipsis-element {
} }
} }
.media-photo.thumbnail {
@include animation-level(2) {
&.fade-in {
animation: thumbnail-fade-in-opacity .2s ease-in-out forwards;
}
}
}
.media-video { .media-video {
z-index: 1; // * overflow media-photo z-index: 1; // * overflow media-photo
} }

Loading…
Cancel
Save