From 3c4fa63970e90e816ab8e9a031f4220e9ca97a33 Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Thu, 4 Apr 2024 16:22:07 +0700
Subject: [PATCH] TF-2774 Fix big image dimension in signature

---
 core/lib/data/network/download/download_client.dart            | 2 +-
 .../utils/html_transformer/dom/image_transformers.dart         | 3 +++
 .../presentation/controller/rich_text_web_controller.dart      | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/lib/data/network/download/download_client.dart b/core/lib/data/network/download/download_client.dart
index 82ad707d8..781eeab11 100644
--- a/core/lib/data/network/download/download_client.dart
+++ b/core/lib/data/network/download/download_client.dart
@@ -107,7 +107,7 @@ class DownloadClient {
     if (fileName.contains('.')) {
       fileName = fileName.split('.').first;
     }
-    final base64Uri = '<img src="${HtmlUtils.convertBase64ToImageResourceData(base64Data: base64Data, mimeType: mimeType)}" alt="$fileName" id="cid:$cid" style="max-width: 100%" />';
+    final base64Uri = '<img src="${HtmlUtils.convertBase64ToImageResourceData(base64Data: base64Data, mimeType: mimeType)}" alt="$fileName" id="cid:$cid" style="max-width: 100%;" />';
     return base64Uri;
   }
 }
\ No newline at end of file
diff --git a/core/lib/presentation/utils/html_transformer/dom/image_transformers.dart b/core/lib/presentation/utils/html_transformer/dom/image_transformers.dart
index e8ee882d2..8cfcce26b 100644
--- a/core/lib/presentation/utils/html_transformer/dom/image_transformers.dart
+++ b/core/lib/presentation/utils/html_transformer/dom/image_transformers.dart
@@ -24,6 +24,9 @@ class ImageTransformer extends DomTransformer {
     await Future.wait(imageElements.map((imageElement) async {
       var exStyle = imageElement.attributes['style'];
       if (exStyle != null) {
+        if (!exStyle.trim().endsWith(';')) {
+          exStyle = '$exStyle;';
+        }
         if (!exStyle.contains('display')) {
           exStyle = '$exStyle display:inline;';
         }
diff --git a/lib/features/composer/presentation/controller/rich_text_web_controller.dart b/lib/features/composer/presentation/controller/rich_text_web_controller.dart
index 5add197a8..5c1422e89 100644
--- a/lib/features/composer/presentation/controller/rich_text_web_controller.dart
+++ b/lib/features/composer/presentation/controller/rich_text_web_controller.dart
@@ -289,7 +289,7 @@ class RichTextWebController extends BaseRichTextController {
     if (platformFile.bytes != null) {
       final base64Data = base64Encode(platformFile.bytes!);
       editorController.insertHtml(
-        '<img src="${HtmlUtils.convertBase64ToImageResourceData(base64Data: base64Data, mimeType: 'image/${platformFile.extension}')}" data-filename="${platformFile.name}" alt="Image in my signature" style="max-width: 100%"/>'
+        '<img src="${HtmlUtils.convertBase64ToImageResourceData(base64Data: base64Data, mimeType: 'image/${platformFile.extension}')}" data-filename="${platformFile.name}" alt="Image in my signature" style="max-width: 100%;"/>'
       );
     } else {
       logError("RichTextWebController::insertImageAsBase64: bytes is null");