From 045e71fac7caf598666b3d4feac131a6db5b2c1a Mon Sep 17 00:00:00 2001
From: Alexander Platov <alexander.platov@hardcoreeng.com>
Date: Thu, 27 Jun 2024 10:05:28 +0300
Subject: [PATCH] Fixed File Preview (#5923)

Signed-off-by: Alexander Platov <alexander.platov@hardcoreeng.com>
---
 .../src/components/FilePreview.svelte         | 10 +++++++---
 .../src/components/FilePreviewPopup.svelte    |  2 +-
 packages/theme/styles/dialogs.scss            |  3 +++
 .../ui/src/components/CircleButton.svelte     |  2 +-
 .../src/components/viewer/ImageViewer.svelte  | 19 ++++++++-----------
 .../src/components/viewer/PDFViewer.svelte    | 13 ++++++++++---
 .../src/components/viewer/VideoViewer.svelte  |  8 +++++++-
 7 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/packages/presentation/src/components/FilePreview.svelte b/packages/presentation/src/components/FilePreview.svelte
index 31a8f8ccc4..2c63670a3f 100644
--- a/packages/presentation/src/components/FilePreview.svelte
+++ b/packages/presentation/src/components/FilePreview.svelte
@@ -27,6 +27,7 @@
   export let name: string
   export let metadata: BlobMetadata | undefined
   export let props: Record<string, any> = {}
+  export let fit: boolean = false
 
   let download: HTMLAnchorElement
   let parentWidth: number
@@ -44,6 +45,7 @@
     pT: FilePreviewExtension | undefined,
     mD: BlobMetadata | undefined
   ): void => {
+    if (fit) return
     if (pT === undefined || mD?.originalWidth === undefined || mD?.originalHeight === undefined) {
       minHeight = undefined
       return
@@ -72,13 +74,15 @@
     minHeight = scale === 1 ? fHeight : mHeight
   }
   $: updateHeight(parentWidth, parentHeight, previewType, metadata)
+  $: audio = previewType && Array.isArray(previewType) && previewType[0].contentType === 'audio/*'
   $: srcRef = getBlobSrcFor(file, name)
 </script>
 
 <div
   use:resizeObserver={(element) => (parentWidth = element.clientWidth)}
-  class="content flex-col items-center w-full h-full"
-  style:min-height={`${minHeight ?? 0}px`}
+  class="content w-full h-full"
+  class:flex-center={fit && !audio}
+  style:min-height={fit ? '100%' : `${minHeight ?? 0}px`}
 >
   {#await srcRef then src}
     {#if src === ''}
@@ -88,7 +92,7 @@
     {:else if previewType !== undefined}
       <Component
         is={previewType.component}
-        props={{ value: file, name, contentType: file.contentType, metadata, ...props }}
+        props={{ value: file, name, contentType: file.contentType, metadata, ...props, fit }}
       />
     {:else}
       <div class="centered flex-col flex-gap-3">
diff --git a/packages/presentation/src/components/FilePreviewPopup.svelte b/packages/presentation/src/components/FilePreviewPopup.svelte
index 655d4d1b86..ddcf2cad2b 100644
--- a/packages/presentation/src/components/FilePreviewPopup.svelte
+++ b/packages/presentation/src/components/FilePreviewPopup.svelte
@@ -102,7 +102,7 @@
   </svelte:fragment>
 
   {#if blob !== undefined}
-    <FilePreview file={blob} {name} {metadata} {props} />
+    <FilePreview file={blob} {name} {metadata} {props} fit />
   {/if}
 </Dialog>
 
diff --git a/packages/theme/styles/dialogs.scss b/packages/theme/styles/dialogs.scss
index 1201bea902..e94e82b2b1 100644
--- a/packages/theme/styles/dialogs.scss
+++ b/packages/theme/styles/dialogs.scss
@@ -338,6 +338,9 @@
     min-height: 0;
 
     &.rounded { border-radius: 0 0 .5rem .5rem; }
+    &:has(audio) {
+      flex-grow: 0;
+    }
   }
 
   .footer {
diff --git a/packages/ui/src/components/CircleButton.svelte b/packages/ui/src/components/CircleButton.svelte
index 689b37c421..a53e382259 100644
--- a/packages/ui/src/components/CircleButton.svelte
+++ b/packages/ui/src/components/CircleButton.svelte
@@ -54,7 +54,7 @@
   {#if $$slots.content}
     <slot name="content" />
   {:else if icon}
-    <div class="content">
+    <div class="flex-center content">
       <Icon {icon} size={'full'} />
     </div>
   {/if}
diff --git a/plugins/view-resources/src/components/viewer/ImageViewer.svelte b/plugins/view-resources/src/components/viewer/ImageViewer.svelte
index d21abd7179..2d8742d71f 100644
--- a/plugins/view-resources/src/components/viewer/ImageViewer.svelte
+++ b/plugins/view-resources/src/components/viewer/ImageViewer.svelte
@@ -19,23 +19,20 @@
   export let value: Blob | Ref<Blob>
   export let name: string
   export let metadata: BlobMetadata | undefined
+  export let fit: boolean = false
 
   $: p = typeof value === 'string' ? getBlobRef(undefined, value, name) : getBlobRef(value, value._id)
-  $: maxWidth =
-    metadata?.originalWidth && metadata?.pixelRatio
-      ? `min(${metadata.originalWidth / metadata.pixelRatio}px, 100%)`
-      : undefined
-  $: maxHeight =
-    metadata?.originalHeight && metadata?.pixelRatio
-      ? `min(${metadata.originalHeight / metadata.pixelRatio}px, 80vh)`
-      : undefined
+  $: width = metadata?.originalWidth ? `min(${metadata.originalWidth / metadata?.pixelRatio ?? 1}px, 100%)` : '100%'
+  $: height = metadata?.originalHeight
+    ? `min(${metadata.originalHeight / metadata?.pixelRatio ?? 1}px, ${fit ? '100%' : '80vh'})`
+    : '100%'
 </script>
 
 {#await p then blobRef}
   <img
-    class="object-contain"
-    style:max-width={maxWidth}
-    style:max-height={maxHeight}
+    class="object-contain mx-auto"
+    style:max-width={width}
+    style:max-height={height}
     src={blobRef.src}
     srcset={blobRef.srcset}
     alt={name}
diff --git a/plugins/view-resources/src/components/viewer/PDFViewer.svelte b/plugins/view-resources/src/components/viewer/PDFViewer.svelte
index 1b9374cafd..914ca76c1e 100644
--- a/plugins/view-resources/src/components/viewer/PDFViewer.svelte
+++ b/plugins/view-resources/src/components/viewer/PDFViewer.svelte
@@ -19,17 +19,24 @@
   export let value: Blob | Ref<Blob>
   export let name: string
   export let metadata: BlobMetadata | undefined
+  export let fit: boolean = false
 </script>
 
 {#await getBlobSrcFor(value, name) then href}
-  <iframe src={href + '#view=FitH&navpanes=0'} title={name} />
+  <iframe class:fit src={href + '#view=FitH&navpanes=0'} title={name} />
 {/await}
 
 <style lang="scss">
   iframe {
     width: 100%;
-    height: 80vh;
-    min-height: 20rem;
     border: none;
+
+    &.fit {
+      min-height: 100%;
+    }
+    &:not(.fit) {
+      height: 80vh;
+      min-height: 20rem;
+    }
   }
 </style>
diff --git a/plugins/view-resources/src/components/viewer/VideoViewer.svelte b/plugins/view-resources/src/components/viewer/VideoViewer.svelte
index d7261185c6..9f582e9adb 100644
--- a/plugins/view-resources/src/components/viewer/VideoViewer.svelte
+++ b/plugins/view-resources/src/components/viewer/VideoViewer.svelte
@@ -19,13 +19,19 @@
   export let value: Blob | Ref<Blob>
   export let name: string
   export let metadata: BlobMetadata | undefined
+  export let fit: boolean = false
 
   $: maxWidth = metadata?.originalWidth ? `min(${metadata.originalWidth}px, 100%)` : undefined
   $: maxHeight = metadata?.originalHeight ? `min(${metadata.originalHeight}px, 80vh)` : undefined
 </script>
 
 {#await getBlobSrcFor(value, name) then src}
-  <video style:max-width={maxWidth} style:max-height={maxHeight} controls preload={'auto'}>
+  <video
+    style:max-width={fit ? '100%' : maxWidth}
+    style:max-height={fit ? '100%' : maxHeight}
+    controls
+    preload={'auto'}
+  >
     <source {src} />
     <track kind="captions" label={name} />
   </video>