From 21a5f0787061f7dc3f9c663c071d4b0b4bf31e7f Mon Sep 17 00:00:00 2001
From: Alexander Onnikov <Alexander.Onnikov@xored.com>
Date: Mon, 23 Sep 2024 18:24:40 +0700
Subject: [PATCH] fix: better handling png image size for scale < 2 (#6688)

Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com>
---
 .../src/components/FilePreview.svelte         |  5 +++--
 packages/presentation/src/image.ts            | 21 +++++++++++--------
 .../components/CollaborativeTextEditor.svelte |  4 ++--
 .../src/components/StyledTextBox.svelte       |  4 ++--
 .../src/components/extension/imageExt.ts      |  3 +++
 .../components/extension/imageUploadExt.ts    |  6 ++++--
 .../src/components/viewer/ImageViewer.svelte  | 19 ++++++++++-------
 7 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/packages/presentation/src/components/FilePreview.svelte b/packages/presentation/src/components/FilePreview.svelte
index 96d3eee38e..5c988b3c99 100644
--- a/packages/presentation/src/components/FilePreview.svelte
+++ b/packages/presentation/src/components/FilePreview.svelte
@@ -27,6 +27,7 @@
 
   import { getFileUrl } from '../file'
   import { getPreviewType, previewTypes } from '../filetypes'
+  import { imageSizeToRatio } from '../image'
   import { BlobMetadata, FilePreviewExtension } from '../types'
 
   export let file: Ref<Blob>
@@ -68,8 +69,8 @@
       return
     }
     const pR: number = mD?.pixelRatio ?? 1
-    const fWidth: number = mD.originalWidth / pR
-    const fHeight: number = mD.originalHeight / pR
+    const fWidth: number = imageSizeToRatio(mD.originalWidth, pR)
+    const fHeight: number = imageSizeToRatio(mD.originalHeight, pR)
     let mHeight: number = 0
     let scale: number = 1
     if (fWidth > pWidth) {
diff --git a/packages/presentation/src/image.ts b/packages/presentation/src/image.ts
index cda525b48e..d5ff35337b 100644
--- a/packages/presentation/src/image.ts
+++ b/packages/presentation/src/image.ts
@@ -15,6 +15,11 @@
 
 import extract from 'png-chunks-extract'
 
+export function imageSizeToRatio (width: number, pixelRatio: number): number {
+  // consider pixel ratio < 2 as non retina and display them in original size
+  return pixelRatio < 2 ? width : Math.round(width / pixelRatio)
+}
+
 export async function getImageSize (file: Blob): Promise<{ width: number, height: number, pixelRatio: number }> {
   const size = isPng(file) ? await getPngImageSize(file) : undefined
 
@@ -65,20 +70,18 @@ async function getPngImageSize (file: Blob): Promise<{ width: number, height: nu
     const idhrData = parseIHDR(new DataView(iHDRChunk.data.buffer))
     const physData = parsePhys(new DataView(pHYsChunk.data.buffer))
 
-    if (physData.unit === 0 && physData.ppux === physData.ppuy) {
-      const pixelRatio = Math.round(physData.ppux / 2834.5)
-      return {
-        width: idhrData.width,
-        height: idhrData.height,
-        pixelRatio
-      }
+    // Assuming pixels are square
+    // http://www.libpng.org/pub/png/spec/1.2/PNG-Decoders.html#D.Pixel-dimensions
+    const pixelRatio = Math.round(physData.ppux * 0.0254) / 72
+    return {
+      width: idhrData.width,
+      height: idhrData.height,
+      pixelRatio
     }
   } catch (err) {
     console.error(err)
     return undefined
   }
-
-  return undefined
 }
 
 // See http://www.libpng.org/pub/png/spec/1.2/PNG-Chunks.html
diff --git a/plugins/text-editor-resources/src/components/CollaborativeTextEditor.svelte b/plugins/text-editor-resources/src/components/CollaborativeTextEditor.svelte
index 90eab040d5..304395eba2 100644
--- a/plugins/text-editor-resources/src/components/CollaborativeTextEditor.svelte
+++ b/plugins/text-editor-resources/src/components/CollaborativeTextEditor.svelte
@@ -17,7 +17,7 @@
 <script lang="ts">
   import { type Space, type Class, type CollaborativeDoc, type Doc, type Ref } from '@hcengineering/core'
   import { IntlString, translate } from '@hcengineering/platform'
-  import { getFileUrl, getImageSize } from '@hcengineering/presentation'
+  import { getFileUrl, getImageSize, imageSizeToRatio } from '@hcengineering/presentation'
   import { markupToJSON } from '@hcengineering/text'
   import {
     AnySvelteComponent,
@@ -297,7 +297,7 @@
         type: 'image',
         attrs: {
           'file-id': attached.file,
-          width: Math.round(size.width / size.pixelRatio)
+          width: imageSizeToRatio(size.width, size.pixelRatio)
         }
       },
       {
diff --git a/plugins/text-editor-resources/src/components/StyledTextBox.svelte b/plugins/text-editor-resources/src/components/StyledTextBox.svelte
index 46885cdd85..fc27ac1e32 100644
--- a/plugins/text-editor-resources/src/components/StyledTextBox.svelte
+++ b/plugins/text-editor-resources/src/components/StyledTextBox.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { Markup } from '@hcengineering/core'
   import { IntlString } from '@hcengineering/platform'
-  import presentation, { MessageViewer, getFileUrl, getImageSize } from '@hcengineering/presentation'
+  import presentation, { MessageViewer, getFileUrl, getImageSize, imageSizeToRatio } from '@hcengineering/presentation'
   import { EmptyMarkup } from '@hcengineering/text'
   import textEditor, { RefAction } from '@hcengineering/text-editor'
   import {
@@ -257,7 +257,7 @@
         type: 'image',
         attrs: {
           'file-id': attached.file,
-          width: Math.round(size.width / size.pixelRatio)
+          width: imageSizeToRatio(size.width, size.pixelRatio)
         }
       },
       {
diff --git a/plugins/text-editor-resources/src/components/extension/imageExt.ts b/plugins/text-editor-resources/src/components/extension/imageExt.ts
index 8c8afe7de4..f000915b34 100644
--- a/plugins/text-editor-resources/src/components/extension/imageExt.ts
+++ b/plugins/text-editor-resources/src/components/extension/imageExt.ts
@@ -153,12 +153,15 @@ export const ImageExtension = ImageNode.extend<ImageOptions>({
             const fileName = node.attrs.alt ?? ''
             const fileType = node.attrs['data-file-type'] ?? 'image/*'
 
+            const metadata = node.attrs.width !== undefined ? { originalWidth: node.attrs.width } : {}
+
             showPopup(
               FilePreviewPopup,
               {
                 file: fileId,
                 name: fileName,
                 contentType: fileType,
+                metadata,
                 fullSize: true,
                 showIcon: false
               },
diff --git a/plugins/text-editor-resources/src/components/extension/imageUploadExt.ts b/plugins/text-editor-resources/src/components/extension/imageUploadExt.ts
index d9a1a84be2..b43a6a7ff5 100644
--- a/plugins/text-editor-resources/src/components/extension/imageUploadExt.ts
+++ b/plugins/text-editor-resources/src/components/extension/imageUploadExt.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 //
 import { setPlatformStatus, unknownError } from '@hcengineering/platform'
-import { getImageSize } from '@hcengineering/presentation'
+import { imageSizeToRatio, getImageSize } from '@hcengineering/presentation'
 import { Extension } from '@tiptap/core'
 import { Plugin, PluginKey } from '@tiptap/pm/state'
 import { type EditorView } from '@tiptap/pm/view'
@@ -41,6 +41,8 @@ function getType (type: string): 'image' | 'other' {
  * @public
  */
 export const ImageUploadExtension = Extension.create<ImageUploadOptions>({
+  name: 'image-upload',
+
   addOptions () {
     return {
       getFileUrl: () => ''
@@ -157,7 +159,7 @@ async function handleImageUpload (
       src: url,
       alt: file.name,
       title: file.name,
-      width: Math.round(size.width / size.pixelRatio)
+      width: imageSizeToRatio(size.width, size.pixelRatio)
     })
 
     const transaction = view.state.tr.insert(pos?.pos ?? 0, node)
diff --git a/plugins/view-resources/src/components/viewer/ImageViewer.svelte b/plugins/view-resources/src/components/viewer/ImageViewer.svelte
index 2f55bbdb00..f894012eb6 100644
--- a/plugins/view-resources/src/components/viewer/ImageViewer.svelte
+++ b/plugins/view-resources/src/components/viewer/ImageViewer.svelte
@@ -14,7 +14,7 @@
 -->
 <script lang="ts">
   import { type Blob, type Ref } from '@hcengineering/core'
-  import { getBlobRef, type BlobMetadata } from '@hcengineering/presentation'
+  import { getBlobRef, imageSizeToRatio, type BlobMetadata } from '@hcengineering/presentation'
   import { Loading } from '@hcengineering/ui'
 
   export let value: Ref<Blob>
@@ -22,15 +22,20 @@
   export let metadata: BlobMetadata | undefined
   export let fit: boolean = false
 
-  $: p = getBlobRef(value, name)
-  $: 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%'
+  $: originalWidth = metadata?.originalWidth
+  $: originalHeight = metadata?.originalHeight
+  $: pixelRatio = metadata?.pixelRatio ?? 1
+
+  $: imageWidth = originalWidth != null ? imageSizeToRatio(originalWidth, pixelRatio) : undefined
+  $: imageHeight = originalHeight != null ? imageSizeToRatio(originalHeight, pixelRatio) : undefined
+
+  $: width = imageWidth != null ? `min(${imageWidth}px, 100%)` : '100%'
+  $: height = imageHeight != null ? `min(${imageHeight}px, ${fit ? '100%' : '80vh'})` : '100%'
+
   let loading = true
 </script>
 
-{#await p then blobRef}
+{#await getBlobRef(value, name) then blobRef}
   {#if loading}
     <div class="flex-center w-full h-full clear-mins">
       <Loading />