From c2870a6df5783ac912be2b796600f5ef0304bf7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arno=C5=A1t=20Pleskot?= <arnostpleskot@gmail.com>
Date: Thu, 17 Aug 2023 18:41:53 +0200
Subject: [PATCH] fix: upscaling behavior after change of background

---
 src/components/ImageExportDialog.tsx | 32 ++++++++++++++++++----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/components/ImageExportDialog.tsx b/src/components/ImageExportDialog.tsx
index ed93e33d9..c109162e4 100644
--- a/src/components/ImageExportDialog.tsx
+++ b/src/components/ImageExportDialog.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useRef, useState } from "react";
+import React, { useCallback, useEffect, useRef, useState } from "react";
 import clsx from "clsx";
 
 import type { ActionManager } from "../actions/manager";
@@ -113,7 +113,16 @@ const ImageExportModal = ({
       })
     : elements;
 
-  //FIXME: this is broken by fix for padding in export preview
+  const updateAllScales = useCallback(
+    (scale: number) => {
+      actionManager.executeAction(actionChangeExportScale, "ui", scale);
+      setExportScale(scale);
+      setExportBaseScale(scale);
+    },
+    [actionManager, setExportScale, setExportBaseScale],
+  );
+
+  // Upscale exported image when is smaller than preview
   useEffect(() => {
     if (
       exportedElements.length > 0 &&
@@ -142,20 +151,21 @@ const ImageExportModal = ({
         ) / 100;
 
       if (scale > 1) {
-        actionManager.executeAction(actionChangeExportScale, "ui", scale);
-        setExportBaseScale(scale);
+        if (scale !== exportBaseScale) {
+          updateAllScales(scale);
+        }
       } else {
-        setExportBaseScale(defaultExportScale);
+        updateAllScales(defaultExportScale);
       }
-    } else {
-      setExportBaseScale(defaultExportScale);
+    } else if (exportBaseScale !== defaultExportScale) {
+      updateAllScales(defaultExportScale);
     }
   }, [
-    actionManager,
-    exportedElements,
-    previewRef,
-    exportWithBackground,
     exportBackgroundImage,
+    exportWithBackground,
+    exportedElements,
+    exportBaseScale,
+    updateAllScales,
   ]);
 
   useEffect(() => {