Album sizes in percents for resize

src/components/popupNewMedia.ts

@@ -8,7 +8,7 @@ import { PopupElement } from "./popup";
 import { ripple } from "./ripple";
 import Scrollable from "./scrollable";
 import { toast } from "./toast";
-import { wrapDocument } from "./wrappers";
+import { prepareAlbum, wrapDocument } from "./wrappers";
 
 type SendFileParams = Partial<{
   file: File,
@@ -256,27 +256,15 @@ export default class PopupNewMedia extends PopupElement {
         if(willAttach.sendFileDetails.length > 1) {
           container.classList.add('is-album');
 
-          const layouter = new Layouter(willAttach.sendFileDetails.map(o => ({w: o.width, h: o.height})), 380, 100, 4);
+          this.mediaContainer.append(...results);
-          const layout = layouter.layout();
 
-          for(const {geometry, sides} of layout) {
+          prepareAlbum({
-            const div = results.shift();
+            container: this.mediaContainer,
-
+            items: willAttach.sendFileDetails.map(o => ({w: o.width, h: o.height})),
-            div.style.width = geometry.width + 'px';
+            maxWidth: 380,
-            div.style.height = geometry.height + 'px';
+            minWidth: 100,
-            div.style.top = geometry.y + 'px';
+            spacing: 4
-            div.style.left = geometry.x + 'px';
+          });
-
-            if(sides & RectPart.Right) {
-              this.mediaContainer.style.width = geometry.width + geometry.x + 'px';
-            }
-
-            if(sides & RectPart.Bottom) {
-              this.mediaContainer.style.height = geometry.height + geometry.y + 'px';
-            }
-
-            this.mediaContainer.append(div);
-          }
 
           //console.log('chatInput album layout:', layout);
         } else {

src/components/wrappers.ts

@@ -29,7 +29,7 @@ const MAX_VIDEO_AUTOPLAY_SIZE = 50 * 1024 * 1024; // 50 MB
 
 export function wrapVideo({doc, container, message, boxWidth, boxHeight, withTail, isOut, middleware, lazyLoadQueue, noInfo, group}: {
   doc: MyDocument, 
-  container?: HTMLDivElement, 
+  container?: HTMLElement, 
   message?: any, 
   boxWidth?: number, 
   boxHeight?: number, 
@@ -414,7 +414,7 @@ export function wrapAudio(doc: MyDocument, withTime = false, mid?: number): HTML
   return elem;
 }
 
-function wrapMediaWithTail(photo: MyPhoto | MyDocument, message: {mid: number, message: string}, container: HTMLDivElement, boxWidth: number, boxHeight: number, isOut: boolean) {
+function wrapMediaWithTail(photo: MyPhoto | MyDocument, message: {mid: number, message: string}, container: HTMLElement, boxWidth: number, boxHeight: number, isOut: boolean) {
   const svg = document.createElementNS("http://www.w3.org/2000/svg", "svg");
   svg.classList.add('bubble__media-container', isOut ? 'is-out' : 'is-in');
   
@@ -469,7 +469,7 @@ function wrapMediaWithTail(photo: MyPhoto | MyDocument, message: {mid: number, m
   return img;
 }
 
-export function wrapPhoto(photo: MyPhoto | MyDocument, message: any, container: HTMLDivElement, boxWidth = mediaSizes.active.regular.width, boxHeight = mediaSizes.active.regular.height, withTail: boolean, isOut: boolean, lazyLoadQueue: LazyLoadQueue, middleware: () => boolean, size: PhotoSize = null) {
+export function wrapPhoto(photo: MyPhoto | MyDocument, message: any, container: HTMLElement, boxWidth = mediaSizes.active.regular.width, boxHeight = mediaSizes.active.regular.height, withTail: boolean, isOut: boolean, lazyLoadQueue: LazyLoadQueue, middleware: () => boolean, size: PhotoSize = null) {
   let image: HTMLImageElement;
   if(withTail) {
     image = wrapMediaWithTail(photo, message, container, boxWidth, boxHeight, isOut);
@@ -729,58 +729,43 @@ export function wrapReply(title: string, subtitle: string, message?: any) {
   return replyContainer.container;
 }
 
-export function wrapAlbum({groupID, attachmentDiv, middleware, uploading, lazyLoadQueue, isOut}: {
+export function prepareAlbum(options: {
-  groupID: string, 
+  container: HTMLElement,
-  attachmentDiv: HTMLElement,
+  items: {w: number, h: number}[],
-  middleware?: () => boolean,
+  maxWidth: number,
-  lazyLoadQueue?: LazyLoadQueue,
+  minWidth: number,
-  uploading?: boolean,
+  spacing: number,
-  isOut: boolean
+  maxHeight?: number,
+  forMedia?: true
 }) {
-  const items: {size: PhotoSize.photoSize, media: any, message: any}[] = [];
+  const layouter = new Layouter(options.items, options.maxWidth, options.minWidth, options.spacing, options.maxHeight);
+  const layout = layouter.layout();
 
-  // !higher msgID will be the FIRST in album
+  const widthItem = layout.find(item => item.sides & RectPart.Right);
-  const storage = appMessagesManager.getMidsByAlbum(groupID);
+  const width = widthItem.geometry.width + widthItem.geometry.x;
-  for(const mid of storage) {
-    const m = appMessagesManager.getMessage(mid);
-    const media = m.media.photo || m.media.document;
 
-    const size: any = media._ == 'photo' ? appPhotosManager.choosePhotoSize(media, 480, 480) : {w: media.w, h: media.h};
+  const heightItem = layout.find(item => item.sides & RectPart.Bottom);
-    items.push({size, media, message: m});
+  const height = heightItem.geometry.height + heightItem.geometry.y;
-  }
-
-  const spacing = 2;
-  const layouter = new Layouter(items.map(i => ({w: i.size.w, h: i.size.h})), mediaSizes.active.album.width, 100, spacing);
-  const layout = layouter.layout();
-  //console.log('layout:', layout, items.map(i => ({w: i.size.w, h: i.size.h})));
 
-  /* let borderRadius = window.getComputedStyle(realParent).getPropertyValue('border-radius');
+  const container = options.container;
-  let brSplitted = fillPropertyValue(borderRadius); */
+  container.style.width = width + 'px';
+  container.style.height = height + 'px';
+  const children = container.children;
 
-  for(const {geometry, sides} of layout) {
+  layout.forEach(({geometry, sides}, idx) => {
-    const item = items.shift();
+    let div: HTMLElement;
-    if(!item) {
+    div = children[idx] as HTMLElement;
-      console.error('no item for layout!');
+    if(!div) {
-      continue;
+      div = document.createElement('div');
+      container.append(div);
     }
 
-    const {size, media, message} = item;
-    const div = document.createElement('div');
     div.classList.add('album-item');
-    div.dataset.mid = message.mid;
 
-    div.style.width = geometry.width + 'px';
+    div.style.width = (geometry.width / width * 100) + '%';
-    div.style.height = geometry.height + 'px';
+    div.style.height = (geometry.height / height * 100) + '%';
-    div.style.top = geometry.y + 'px';
+    div.style.top = (geometry.y / height * 100) + '%';
-    div.style.left = geometry.x + 'px';
+    div.style.left = (geometry.x / width * 100) + '%';
-
-    if(sides & RectPart.Right) {
-      attachmentDiv.style.width = geometry.width + geometry.x + 'px';
-    }
-
-    if(sides & RectPart.Bottom) {
-      attachmentDiv.style.height = geometry.height + geometry.y + 'px';
-    }
 
     if(sides & RectPart.Left && sides & RectPart.Top) {
       div.style.borderTopLeftRadius = 'inherit';
@@ -798,9 +783,62 @@ export function wrapAlbum({groupID, attachmentDiv, middleware, uploading, lazyLo
       div.style.borderBottomRightRadius = 'inherit';
     }
 
-    const mediaDiv = document.createElement('div');
+    if(options.forMedia) {
-    mediaDiv.classList.add('album-item-media');
+      const mediaDiv = document.createElement('div');
+      mediaDiv.classList.add('album-item-media');
+  
+      div.append(mediaDiv);
+    }
+
+    // @ts-ignore
+    //div.style.backgroundColor = '#' + Math.floor(Math.random() * (2 ** 24 - 1)).toString(16).padStart(6, '0');
+  });
+
+  /* if(options.forMedia) {
+    layout.forEach((_, i) => {
+      const mediaDiv = document.createElement('div');
+      mediaDiv.classList.add('album-item-media');
+  
+      options.container.children[i].append(mediaDiv);
+    });
+  } */
+}
+
+export function wrapAlbum({groupID, attachmentDiv, middleware, uploading, lazyLoadQueue, isOut}: {
+  groupID: string, 
+  attachmentDiv: HTMLElement,
+  middleware?: () => boolean,
+  lazyLoadQueue?: LazyLoadQueue,
+  uploading?: boolean,
+  isOut: boolean
+}) {
+  const items: {size: PhotoSize.photoSize, media: any, message: any}[] = [];
 
+  // !higher msgID will be the FIRST in album
+  const storage = appMessagesManager.getMidsByAlbum(groupID);
+  for(const mid of storage) {
+    const m = appMessagesManager.getMessage(mid);
+    const media = m.media.photo || m.media.document;
+
+    const size: any = media._ == 'photo' ? appPhotosManager.choosePhotoSize(media, 480, 480) : {w: media.w, h: media.h};
+    items.push({size, media, message: m});
+  }
+
+  prepareAlbum({
+    container: attachmentDiv,
+    items: items.map(i => ({w: i.size.w, h: i.size.h})),
+    maxWidth: mediaSizes.active.album.width,
+    minWidth: 100,
+    spacing: 2,
+    forMedia: true
+  });
+
+  items.forEach((item, idx) => {
+    const {size, media, message} = item;
+
+    const div = attachmentDiv.children[idx] as HTMLElement;
+    div.dataset.mid = '' + message.mid;
+    const mediaDiv = div.firstElementChild as HTMLElement;
     if(media._ == 'photo') {
       wrapPhoto(
         media,
@@ -827,13 +865,7 @@ export function wrapAlbum({groupID, attachmentDiv, middleware, uploading, lazyLo
         middleware
       });
     }
-
+  });
-    // @ts-ignore
-    //div.style.backgroundColor = '#' + Math.floor(Math.random() * (2 ** 24 - 1)).toString(16).padStart(6, '0');
-
-    div.append(mediaDiv);
-    attachmentDiv.append(div);
-  }
 }
 
 export function wrapPoll(pollID: string, mid: number) {